geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r645077 [3/3] - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/ assemblies/geronimo-boilerplate-minimal/src/main/assembly/ framework/configs/j2ee-system/ framework/configs/jsr88-deploymentfactory/ framework/configs/onlin...
Date Sat, 05 Apr 2008 11:13:33 GMT
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValveRetriever.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValveRetriever.java?rev=645077&r1=645076&r2=645077&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValveRetriever.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6-clustering-wadi/src/main/java/org/apache/geronimo/tomcat/cluster/wadi/WADIClusteredValveRetriever.java
Sat Apr  5 04:13:30 2008
@@ -20,10 +20,8 @@
 package org.apache.geronimo.tomcat.cluster.wadi;
 
 import org.apache.geronimo.clustering.wadi.WADISessionManager;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.tomcat.ObjectRetriever;
 import org.codehaus.wadi.core.manager.Manager;
 
@@ -36,7 +34,7 @@
     private final WADISessionManager sessionManager;
     private Manager wadiManager;
 
-    public WADIClusteredValveRetriever(WADISessionManager sessionManager) {
+    public WADIClusteredValveRetriever(@ParamReference(name=GBEAN_REF_WADI_SESSION_MANAGER)
WADISessionManager sessionManager) {
         this.sessionManager = sessionManager;
     }
     
@@ -54,25 +52,5 @@
     public void doFail() {
     }
     
-    public static final GBeanInfo GBEAN_INFO;
     public static final String GBEAN_REF_WADI_SESSION_MANAGER = "WADISessionManager";
-
-    static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("WADI Clustered Valve
Retriever",
-            WADIClusteredValveRetriever.class,
-            NameFactory.GERONIMO_SERVICE);
-
-        infoFactory.addReference(GBEAN_REF_WADI_SESSION_MANAGER,
-            WADISessionManager.class,
-            NameFactory.GERONIMO_SERVICE);
-
-        infoFactory.setConstructor(new String[]{GBEAN_REF_WADI_SESSION_MANAGER});
-
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }



Mime
View raw message