SUPPORT-1989: Update to 1.3.0 from upstream

.travis.deploy.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+mvn deploy  --settings ./.travis.settings.xml -DaltDeploymentRepository=sonatype-snapshots::default::https://oss.sonatype.org/content/repositories/snapshots -DskipTests -B

.travis.settings.xml

@@ -0,0 +1,9 @@
+<settings>
+    <servers>
+        <server>
+            <id>sonatype-snapshots</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>

.travis.yml

@@ -5,12 +5,23 @@ notifications:
     - lada.dvorak7@gmail.com
 
 jdk:
-  - oraclejdk7
+  - openjdk7
 
 env:
 
   matrix:
     - WELD_VERSION=2.2.13.Final
+
+  global:
+    # SONATYPE
+    - secure: "WkSh9OeKNC1YZKiQTtfONWwHr+Y3e//URAjlbvmzig2eEMJHeQO/1ZXpvxSFDAhYDfDUFE2sCdTlO8s4cDF8/7+ZCzcvCj/ZeUUQYEf6KRCrkn1awVo+VBBVyJPN80j67oVBN3zipkRXRkxU5lMyHZkABH+722/9YhGcZvg3BIHGPKRvHrZfN61LJirpsyJ0hN6okX1pqyibWiVOsq324vXXZ8Z1kdubH6KIqA6w4uX6IZ9HtOJKe570NXE13xxXIHJ4oO+g1is8w4j8axjLkoX+5ZaIo3tSmmVTNE1oCOLulkAxwis5t4+w4lkGFqOkOrvrWkkch0IrnmNAbP5WVdC/9ILemwF09qiVb9cnNPykRbLwMHFrlDzP+nyMk4ecXbWq1FhLj/WqpdJAk3s8RgZVFwX6R8DQFVk5tCDnycKuM8HSxxNYE35KRcBAxh/9YL88wkufGt7BtrflCg6eG+Hkk+SQE4FHd7xW07YyODn/RhA6s0yF8x2g76zAkvYlLd7xbigApnmmA80fcJP0lDKDOHNVGsX/2VU/ucHq5/DaqsT3A/AlrFz3YwjHf1XG4w+Dl8l38im19OW6dxrqSEaucrECm94muXhfvs0GnIcdmPrfeWX43LHx7XItcK3/hp/iG09DuUVvbLIe75iFkmI2CSxOQpCFJpb8qOTCTdg="
+    - secure: "aXfkaGzi80Uaa93pCnhIw5xMjaBhL9k5ArOZwgeKeK5mey1Tt5ttump8LuP/kb7rToauzUr8Su6YeaMZgFhUf+oZNOZ8giq4OO+qsnXAudLROMGEYrPnbC03YalCcsThDRQua6//U3Z3abG0TSS227peQaGgFJn26itRuoZd5WalWXOfCWaxrSCljmEHNJui1UnNwRFYKETw/QdsCbd2C0SO0nT/85hxKy50RwujDbgHMfZsW6o5YpAZbkUchYtON1vkCNc2G1sH4EPLci5zsgPDn6THoznqXBc4byOUtYHPPA2852TW52YtzhUgwyNxP42mJGGlgoH+3Df6FnK+8jLDLpHQAHpJeqndB67bO6KzyWuO8YLsAzHbnWJUbOIJxrb2/pBsn3z8ImM9NQMNuShJXbatNw5iIdr+/+RQiBUsNwPsAJJ42iybjufLouC+xJL+zmDnLygFmy2Y6O3uR6oRa3E+rQscWdKvOplpKgf6hPjoy44y147IJzHDbHUCnBHt8vg2Vy7zT+pM+Uvb4kESwl0NDbEDE3X3tWT7JeRZmF2GWOsSnPK8XDr/EO0QlNFwJ+SN6CYYPME8CxnD0iSO90CThiquHpT4GfvIep88UMTbu3WbmqYA2XKvPzaCWZrgZQ9q1TumYNtqHfVdRX8HcPm+o2VK0+7RBOJ1ciA="
 
 
 script: "mvn clean install -DskipTests"
+deploy:
+  - provider: script
+    script: ./.travis.deploy.sh
+    skip_cleanup: true
+    on:
+      branch: master

README.md

@@ -8,8 +8,6 @@ Java unlimited runtime class and resource redefinition.
 The main purpose of this project is to avoid infamous change->restart + *wait*->check development lifecycle.
 Save&Reload during development should be standard and many other languages (including C#) contain this feature.
 
-This project is still in a beta version.
-
 ### Easy to start
 Download and install latest [DCEVM Java patch](https://github.com/dcevm/dcevm/releases) +
 [agent jar](https://github.com/HotswapProjects/HotswapAgent/releases) and launch your application server
@@ -145,33 +143,37 @@ uses agent services to:
 
 #### Java frameworks plugins:
 
-* [Deltaspike](plugin/hotswap-agent-deltaspike-plugin/README.md) (1.x) - messages, ViewConfig, repository, proxy reloading.
+* [Deltaspike](plugin/hotswap-agent-deltaspike-plugin/README.md) (1.x) - messages, ViewConfig, repository, proxy reloading. Deltaspike scoped CDI beans reinjection.
 * [ELResolver](plugin/hotswap-agent-el-resolver-plugin/README.md) 2.2 (JuelEL, Appache Commons EL, Oracle EL 3.0)- clear ELResolver cache on class change. Support hotswap for #{...} expressions.
 * [Hibernate](plugin/hotswap-agent-hibernate-plugin/README.md) (3x,4x,5x) - Reload Hibernate configuration after entity create/change.
 * [Jersey1](plugin/hotswap-agent-jersey1-plugin/README.md) - reload Jersey1 container after root resource or provider class definition or redefinition.
 * [Jersey2](plugin/hotswap-agent-jersey2-plugin/README.md) - reload Jersey2 container after root resource or provider class definition or redefinition.
-* [JSF](plugin/hotswap-agent-jsf-plugin/README.md) (mojarra 2.1, 2.2, MyFaces 2.2) - support for application resource bundle changes (properties files).
 * [Logback](plugin/hotswap-agent-logback-plugin/README.md) - Logback configuration reload.
 * [Log4j2](plugin/hotswap-agent-log4j2-plugin/README.md) - Log4j2 configuration reload.
+* [Mojarra](plugin/hotswap-agent-mojarra-plugin/README.md) (2.1,2.2) - support for application resource bundle changes (properties files). Support for ViewScoped beans reinjection/reloading.
+* [MyFaces](plugin/hotswap-agent-myfaces-plugin/README.md) (2.2) - support for application resource bundle changes (properties files). Support for ViewScoped beans reinjection/reloading.
+* [OmniFaces](plugin/hotswap-agent-owb-plugin/README.md) - support for ViewScoped beans reinjection/reloading.
+* [OpenWebBeans](plugin/hotswap-agent-owb-plugin/README.md) - (CDI) (1.7.x) - reload bean class definition after class definition/change. Beans can be reloaded according strategy defined in property file.
 * [OsgiEquinox](plugin/hotswap-agent-osgiequinox-plugin/README.md) - Hotswap support for Eclipse plugin or Eclipse platform development.
 * [RestEasy](plugin/hotswap-agent-resteasy-registry-plugin/README.md) (2.x, 3.x) - Cleanups and registers class redefinitions.
 * [Seam](plugin/hotswap-agent-seam-plugin/README.md) (2.2, 2.3) - flush JBoss reference cache. Support for properties file change (messages[])
 * [Spring](plugin/hotswap-agent-spring-plugin/README.md) (3x, 4.x) - Reload Spring configuration after class definition/change.
+* [Vaadin](plugin/hotswap-agent-vaadin-plugin/README.md) (10.x) - Update routes, template models and in practice anything on the fly.
 * [WebObjects](plugin/hotswap-agent-webobjects-plugin/README.md) - Clear key value coding, component, action and validation caches after class change.
-* [Weld](plugin/hotswap-agent-weld-plugin/README.md) (CDI) (2.2-2.4) - reload bean class definition after class definition/change. Support for weld proxy, EAR. Beans can be reloaded according strategy defined in property file.
+* [Weld](plugin/hotswap-agent-weld-plugin/README.md) (CDI) (2.2-2.4) - reload bean class definition after class definition/change. Beans can be reloaded according strategy defined in property file.
 * [WildFlyELResolver](plugin/hotswap-agent-wildfly-el-plugin/README.md) - Clear BeanELResolver after any class redefinition.
 * [ZK](plugin/hotswap-agent-zk-plugin/README.md) (5x-7x) - ZK Framework (http://www.zkoss.org/). Change library properties default values to disable caches, maintains Label cache and bean resolver cache.
 
 #### Servlet containers and application servers plugins:
 
-* [JBossModules](plugin/ihotswap-agent-jbossmodules-plugin/README.md) - add extra class path to JBoss's module class loader. (Wildfly)
+* [JBossModules](plugin/hotswap-agent-jbossmodules-plugin/README.md) - add extra class path to JBoss's module class loader. (Wildfly)
 * [Jetty](plugin/hotswap-agent-jetty-plugin/README.md) - add extra classpath to the app classloader. All versions supporting WebAppContext.getExtraClasspath should be supported.
-* [Tomcat](plugin/hotswap-agent-tomcat-plugin/README.md) (7.x, 8.x) configure Apache Tomcat with extraClasspath property.
+* [Tomcat](plugin/hotswap-agent-tomcat-plugin/README.md) (7.x, 8.x) configure Apache Tomcat with extraClasspath and webApp property. Supports also GlassFish, Payara and Tomee7.
 
 #### JVM plugins - hotswapping enhancements:
 
 * [AnonymousClassPatch](hotswap-agent-core/src/main/java/org/hotswap/agent/plugin/jvm/README.md) - Swap anonymous inner class names to avoid not compatible changes.
-* [ClassInit](hotswap-agent-core/src/main/java/org/hotswap/agent/plugin/jvm/README.md) - initializes new static members/enum values after class/enum redefinition and keeps surviving static values. (Fix of known DCEVM)
+* [ClassInit](hotswap-agent-core/src/main/java/org/hotswap/agent/plugin/jvm/README.md) - initializes new static members/enum values after class/enum redefinition and keeps surviving static values. (Fix of known DCEVM limitation)
 * [Hotswapper](hotswap-agent-core/src/main/java/org/hotswap/agent/plugin/hotswapper/README.md) - Watch for any class file change and reload (hotswap) it on the fly via Java Platform Debugger Architecture (JPDA)
 * [Proxy](plugin/hotswap-agent-proxy-plugin/README.md) (supported com.sun.proxy, CGlib) - redefines proxy classes that implement or extend changed interfaces or classes.
 
@@ -198,7 +200,7 @@ agent JAR dependency to compile, but be careful NOT to add the JAR to your appli
 as a javaagent. Maven dependency:
 
         <dependency>
-            <groupId>org.hotswap.agent</groupId>
+            <groupId>org.hotswapagent</groupId>
             <artifactId>HotswapAgent</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -233,7 +235,7 @@ Hotswap agent:
 * Jiri Bubnik - project coordinator, initial implementation
 * Alexandros Papadakis - Maven Versioning, Weld, JSF, Hibernate3, RestEasy, WildFly plugins
 * Erki Ehtla - Spring plugin, Proxy plugin
-* Vladimir Dvorak - Seam, ELResolver, JSF, OsgiEquinox, Weld, Deltaspike, JavaBean, JBossModules, ClassInit
+* Vladimir Dvorak - ELResolver, OsgiEquinox, Weld, Owb, Deltaspike, Jvm, Jdk, JBossModules, ClassInit, JSF
 * Sergey Lysenko - Weld plugin
 * Samuel Pelletier - WebObjects plugin
 * Jan Tecl - web design

hotswap-agent-core/pom.xml

@@ -4,9 +4,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.hotswap.agent</groupId>
+        <groupId>org.hotswapagent</groupId>
         <artifactId>hotswap-agent-parent</artifactId>
-        <version>1.0-cg-1</version>
+        <version>1.3.0-cg.1</version>
         <relativePath>../hotswap-agent-parent/pom.xml</relativePath>
     </parent>
 
@@ -19,6 +19,7 @@
                 <os>
                     <family>!mac</family>
                 </os>
+                <jdk>(,1.9)</jdk>
             </activation>
             <dependencies>
                 <dependency>
@@ -37,6 +38,7 @@
                 <os>
                     <family>mac</family>
                 </os>
+                <jdk>(,1.9)</jdk>
             </activation>
             <dependencies>
                 <dependency>
@@ -114,6 +116,6 @@
         <dependency>
             <groupId>org.jmock</groupId>
             <artifactId>jmock-legacy</artifactId>
-        </dependency>    
+        </dependency>
     </dependencies>
 </project>

hotswap-agent-core/src/main/java/org/hotswap/agent/HotswapAgent.java

@@ -134,5 +134,6 @@ private static void fixJboss7Modules() {
             + "org.hotswap.agent.plugin," //
             + "org.hotswap.agent.util," //
             + "org.hotswap.agent.watch," //
+            + "org.hotswap.agent.versions," //
             + "org.hotswap.agent.javassist";
 }

hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/Plugin.java

@@ -25,6 +25,19 @@
      */
     String description() default "";
 
+    /**
+     * Plugin group the plugin belongs to. Group is used to resolve fallback plugin
+     *
+     * @return the string
+     */
+    String group() default "";
+
+    /**
+     * If no other plugin matches and fallback is set to true, then use this plugin
+     * @return
+     */
+    boolean fallback() default false;
+
     /**
      * Version of target framework this framework was tested with.
      */
@@ -42,4 +55,5 @@
      * supporting class in addition to pluginClass itself.
      */
     Class<?>[] supportClass() default {};
+
 }

hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/Versions.java

@@ -1,18 +1,18 @@
 /*
  * Copyright 2016 the original author or authors.
- * 
+ *
  * This file is part of HotswapAgent.
- * 
+ *
  * HotswapAgent is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
  * Free Software Foundation, either version 2 of the License, or (at your
  * option) any later version.
- * 
+ *
  * HotswapAgent is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
  * Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along
  * with HotswapAgent. If not, see http://www.gnu.org/licenses/.
  */
@@ -28,7 +28,7 @@
 /**
  * Defines an artifact (jar) which needs to be matched against Maven coordinates
  * of Manifest file information for this plugin to be enabled
- * 
+ *
  * The above are matched as OR (any of).
  *
  * @author alpapad@gmail.com
@@ -38,11 +38,6 @@
 @Target({ElementType.TYPE, ElementType.METHOD })
 public @interface Versions {
 
-    /**
-     * If no other plugin matches and fallback is set to true, then use this plugin
-     * @return
-     */
-    boolean fallback() default false;
     /**
      * A list of maven coordinates to be matched.
      *

hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/handler/PluginAnnotation.java

@@ -5,7 +5,7 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-import org.hotswap.agent.annotation.Versions;
+import org.hotswap.agent.annotation.Plugin;
 import org.hotswap.agent.logging.AgentLogger;
 import org.hotswap.agent.versions.DeploymentInfo;
 import org.hotswap.agent.versions.VersionMatchResult;
@@ -39,42 +39,45 @@ public class PluginAnnotation<T extends Annotation> {
 
     // plugin matcher
     final PluginMatcher pluginMatcher;
-    
+
     // Method matcher
     final MethodMatcher methodMatcher;
-
+
+    // plugin group (elresolver etc..)
+    final String group;
+
+    // Falback plugin - plugin is used if no other plugin in the group version matches
     final boolean fallback;
-    
+
     public PluginAnnotation(Class<?> pluginClass, Object plugin, T annotation, Method method) {
         this.pluginClass = pluginClass;
         this.plugin = plugin;
         this.annotation = annotation;
         this.method = method;
-
+
+        Plugin pluginAnnotation = pluginClass.getAnnotation(Plugin.class);
+        this.group = (pluginAnnotation.group() != null && !pluginAnnotation.group().isEmpty()) ? pluginAnnotation.group() : null;
+        this.fallback = pluginAnnotation.fallback();
+
         if(method != null && (Modifier.isStatic(method.getModifiers()))) {
             this.pluginMatcher = new PluginMatcher(pluginClass);
             this.methodMatcher= new MethodMatcher(method);
-            Versions v = pluginClass.getAnnotation(Versions.class);
-            if(v == null || v.fallback()) {
-                this.fallback = Boolean.TRUE;
-            } else {
-                this.fallback = Boolean.FALSE;
-            }
         } else {
             this.pluginMatcher = null;
             this.methodMatcher = null;
-            this.fallback  = Boolean.TRUE;
-        }        
+        }
     }
 
     public PluginAnnotation(Class<?> pluginClass, Object plugin, T annotation, Field field) {
+
         this.pluginClass = pluginClass;
         this.plugin = plugin;
         this.annotation = annotation;
         this.field = field;
         this.pluginMatcher = null;
-        this.methodMatcher = null;    
-        this.fallback  = Boolean.TRUE;    
+        this.methodMatcher = null;
+        this.fallback  = false;
+        this.group = null;
     }
 
     /**
@@ -99,7 +102,7 @@ public Method getMethod() {
     public Field getField() {
         return field;
     }
-    
+
     public boolean shouldCheckVersion() {
         return //
         (this.plugin == null)//
@@ -110,12 +113,21 @@ public boolean shouldCheckVersion() {
                         (methodMatcher != null && methodMatcher.isApply())//
                 );//
     }
-
+
+    /**
+     * @return true, if plugin is fallback
+     */
     public boolean isFallBack() {
        return fallback;
     }
 
-
+    /**
+     * @return the plugin group
+     */
+    public String getGroup() {
+        return group;
+    }
+
     /**
      * Matches.
      *
@@ -127,7 +139,7 @@ public boolean matches(DeploymentInfo deploymentInfo){
             LOGGER.debug("No matchers, apply");
             return true;
         }
-        
+
         if(pluginMatcher != null && pluginMatcher.isApply()) {
             if(VersionMatchResult.REJECTED.equals(pluginMatcher.matches(deploymentInfo))){
                 LOGGER.debug("Plugin matcher rejected");

hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/handler/PluginClassFileTransformer.java

@@ -48,15 +48,19 @@ public boolean isPluginDisabled(ClassLoader loader){
         // can't tell
         return false;
     }
-    
+
     public boolean shouldCheckVersion(){
         return pluginAnnotation.shouldCheckVersion();
     }
-    
-    public boolean isDefaultPlugin(){
+
+    public boolean isFallbackPlugin(){
         return pluginAnnotation.isFallBack();
     }
-
+
+    public String getPluginGroup() {
+        return pluginAnnotation.getGroup();
+    }
+
     public boolean versionMatches(ClassLoader loader){
         if (pluginAnnotation.shouldCheckVersion()) {
             DeploymentInfo info = DeploymentInfo.fromClassLoader(loader);
@@ -67,7 +71,7 @@ public boolean versionMatches(ClassLoader loader){
         }
         return true;
     }
-    
+
     @Override
     public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
         if ((classBeingRedefined == null) ? !events.contains(LoadEvent.DEFINE) : !events.contains(LoadEvent.REDEFINE)) {
@@ -84,8 +88,8 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
 
         return transform(pluginManager, pluginAnnotation, loader, className, classBeingRedefined, protectionDomain, classfileBuffer);
     }
-    
-    
+
+
     @Override
     public String toString() {
         return "\n\t\t\tPluginClassFileTransformer [pluginAnnotation=" + pluginAnnotation + "]";

hotswap-agent-core/src/main/java/org/hotswap/agent/annotation/handler/WatchEventCommand.java

@@ -161,7 +161,7 @@ public void onWatchEvent(PluginAnnotation<T> pluginAnnotation, WatchFileEvent ev
             } else if (watchEventDTO.isClassFileEvent() && type.isAssignableFrom(CtClass.class)) {
                 args.add(ctClass);
             } else if (watchEventDTO.isClassFileEvent() && type.isAssignableFrom(String.class)) {
-                args.add(ctClass.getName());
+                args.add(ctClass != null ? ctClass.getName() : null);
             } else {
                 LOGGER.error("Unable to call method {} on plugin {}. Method parameter type {} is not recognized.",
                         pluginAnnotation.getMethod().getName(), plugin.getClass().getName(), type);