Doc+cleanup

Author: skybber

README.md

@@ -145,6 +145,7 @@ uses agent services to:
 
 #### Java frameworks plugins:
 
+* [CXF-JAXRS](plugin/hotswap-agent-cxf-plugin/README.md) (3.x) - redefine JAXRS resource after resource class redefinition, reinject instance if integrated with CDI (Weld/OWB).
 * [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.

plugin/hotswap-agent-cxf-plugin/README.md

@@ -1,8 +1,16 @@
-[CXF plugin](http://)
-===========================================
+[CXF](http://cxf.apache.org/)
+=============================
 
-JARX-RS
-=======
+[CxfJAXRSPlugin](http://cxf.apache.org/docs/jax-rs.html)
+=======================================================
+CxfJAXRSPlugin redefine resource classes (services) on resource class modification.
+
+This plugin does not handle javax.ws.rs.ext.* annotations like @Provider
 
 #### Implementation notes:
+ClassResourceInfo instance is proxied using javassist delegating proxy. When service class is modified then delegating instance of
+ClassResource info is recreated using original creational parameters from first definition. Injection points in service innstance
+are re-injected in following enviroments:
+* CDI - Weld
+* CDI - OWB
 

plugin/hotswap-agent-cxf-plugin/src/main/java/org/hotswap/agent/plugin/cxf/jaxrs/ClassResourceInfoProxyHelper.java

@@ -20,7 +20,6 @@
 
 import java.lang.reflect.Method;
 
-import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;

plugin/hotswap-agent-cxf-plugin/src/main/java/org/hotswap/agent/plugin/cxf/jaxrs/CxfJAXRSPlugin.java

@@ -24,10 +24,8 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.hotswap.agent.annotation.FileEvent;
 import org.hotswap.agent.annotation.Init;
 import org.hotswap.agent.annotation.LoadEvent;
-import org.hotswap.agent.annotation.OnClassFileEvent;
 import org.hotswap.agent.annotation.OnClassLoadEvent;
 import org.hotswap.agent.annotation.Plugin;
 import org.hotswap.agent.command.Command;
@@ -53,7 +51,7 @@
  *
  */
 @Plugin(name = "CxfJAXRS",
-        description = "CXF-JAXRS forntend plugin. Reload services on class change.", //
+        description = "CXF-JAXRS plugin for JAXRS CXF frontend. Reload jaxrs resource on resource class change. Reinject resource's injection points.", //
         testedVersions = { "3.2.7" },
         expectedVersions = { "3.2.7" })
 public class CxfJAXRSPlugin {
@@ -166,7 +164,7 @@ public static void patchClassResourceInfo(CtClass ctClass, ClassPool classPool)
     }
 
     @OnClassLoadEvent(classNameRegexp = ".*", events = LoadEvent.REDEFINE)
-    public void entityReload(ClassLoader classLoader, CtClass clazz, Class<?> original) {
+    public void classReload(ClassLoader classLoader, CtClass clazz, Class<?> original) {
         if (AnnotationHelper.hasAnnotation(original, PATH_ANNOTATION)
                 || AnnotationHelper.hasAnnotation(clazz, PATH_ANNOTATION)) {
             if(LOGGER.isLevelEnabled(Level.TRACE)) {
@@ -176,15 +174,17 @@ public void entityReload(ClassLoader classLoader, CtClass clazz, Class<?> origin
         }
     }
 
+    /*
     @OnClassFileEvent(classNameRegexp = ".*", events = { FileEvent.CREATE })
-    public void newEntity(ClassLoader classLoader, CtClass clazz) throws Exception {
+    public void newClass(ClassLoader classLoader, CtClass clazz) throws Exception {
         if (AnnotationHelper.hasAnnotation(clazz, PATH_ANNOTATION)) {
             if(LOGGER.isLevelEnabled(Level.TRACE)) {
                 LOGGER.trace("Load @Path annotated class {}", clazz.getName());
             }
             refreshClass(classLoader, clazz.getName(), null, WAIT_ON_CREATE);
         }
     }
+    */
 
     private void refreshClass(ClassLoader classLoader, String className, Class<?> original, int timeout) {
         try {

plugin/hotswap-agent-owb-plugin/README.md

@@ -1,11 +1,11 @@
 [Open Web Beans/CDI](http://openwebbeans.apache.org/)
 =====================================
-Reinject injection points after bean redefinition. Define and register new bean in BeanManager if a new bean class is defined.
-Redefine proxy class if proxied class is redefined. Appropriate redefinition can be specified in `hotswap-agent.properties` file. Generally
-there are 2 approaches what to do after bean class redefinition:
+Reinject injection points after bean redefinition. Define and register a new bean in BeanManager on new bean definition.
+Redefine proxy class if proxied class is redefined. Appropriate redefinition can be specified in `hotswap-agent.properties` file.
+There are 2 approaches what to do after bean class redefinition:
 
-* reinject injection points in existing bean instances - bean instances **survive**
-* reload existing bean instances in contexts - bean instances are **lost**
+* reinject injection points in existing bean instances - old bean instances **survive**
+* reload existing bean instances in contexts - old bean instances are **lost**
 
 OWB plugin uses reinjection by default, but it is not desired in some cases. Therefore it is possible to specify reloading strategy
 in `hotswap-agent.properties config`: file using parameter `owb.beanReloadStrategy` with following values:

plugin/hotswap-agent-spring-plugin/src/main/java/org/hotswap/agent/plugin/spring/getbean/DetachableBeanHolder.java

@@ -38,6 +38,8 @@
  */
 public class DetachableBeanHolder implements Serializable {
 
+    private static final long serialVersionUID = -7443802320153815102L;
+
     private Object bean;
     private Object beanFactory;
     private Class<?>[] paramClasses;
@@ -128,8 +130,8 @@ public Object getBean() throws IllegalAccessException, InvocationTargetException
                     Object freshBean = factoryMethod.invoke(beanFactory, paramValues);
 
                     // Factory returns HA proxy, but current method is invoked from HA proxy!
-                    // It migt be the same object (if factory returns same object - meaning
-                    //   that although clearAllProxies() was called, this bean did not change)
+                    // It might be the same object (if factory returns same object - meaning
+                    // that although clearAllProxies() was called, this bean did not change)
                     // Unwrap the target bean, it is always available
                     // see org.hotswap.agent.plugin.spring.getbean.EnhancerProxyCreater.create()
                     if (freshBean instanceof SpringHotswapAgentProxy) {

plugin/hotswap-agent-spring-plugin/src/main/java/org/hotswap/agent/plugin/spring/getbean/HotswapSpringInvocationHandler.java

@@ -30,6 +30,9 @@
  *
  */
 public class HotswapSpringInvocationHandler extends DetachableBeanHolder implements InvocationHandler {
+
+    private static final long serialVersionUID = 8037007940960065166L;
+
     /**
      *
      * @param beanFactry

plugin/hotswap-agent-weld-plugin/README.md

@@ -1,11 +1,11 @@
 [Weld/CDI](http://weld.cdi-spec.org/)
 =====================================
-Reinject injection points after bean redefinition. Define and register new bean in BeanManager if a new bean class is defined.
-Redefine proxy class if proxied class is redefined. Appropriate redefinition can be specified in `hotswap-agent.properties` file. Generally
-there are 2 approaches what to do after bean class redefinition:
+Reinject injection points after bean redefinition. Define and register a new bean in BeanManager on new bean definition.
+Redefine proxy class if proxied class is redefined. Appropriate redefinition can be specified in `hotswap-agent.properties` file.
+There are 2 approaches what to do after bean class redefinition:
 
-* reinject injection points in existing bean instances - bean instances **survives**
-* reload existing bean instances in contexts - bean instances are **lost**
+* reinject injection points in existing bean instances - old bean instances **survives**
+* reload existing bean instances in contexts - old bean instances are **lost**
 
 Weld plugin uses reinjection by default, but it is not desired in some cases. Therefore it is possible to specify precise reloading strategy
 in `hotswap-agent.properties config` file using parameter `weld.beanReloadStrategy` using following values: