geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1051895 - in /geronimo/server/trunk: plugingroups/webservices-axis2/ plugingroups/webservices-axis2/src/main/history/ plugins/ plugins/axis/axis/src/main/history/ plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/w...
Date Wed, 22 Dec 2010 13:46:07 GMT
Author: genspring
Date: Wed Dec 22 13:46:07 2010
New Revision: 1051895

URL: http://svn.apache.org/viewvc?rev=1051895&view=rev
Log:
GERONIMO-5005 Enable JAXR GBean.

Modified:
    geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
    geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml?rev=1051895&r1=1051894&r2=1051895&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/pom.xml Wed Dec 22 13:46:07 2010
@@ -38,12 +38,12 @@
     </description>
 
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>axis-deployer</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml?rev=1051895&r1=1051894&r2=1051895&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugingroups/webservices-axis2/src/main/history/dependencies.xml
Wed Dec 22 13:46:07 2010
@@ -8,6 +8,11 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>axis-deployer</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2-deployer</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml?rev=1051895&r1=1051894&r2=1051895&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis/axis/src/main/history/dependencies.xml Wed Dec 22 13:46:07
2010
@@ -7,68 +7,8 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>axis</groupId>
-        <artifactId>axis</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>axis</groupId>
-        <artifactId>axis-wsdl4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.stream.buffer</groupId>
-        <artifactId>streambuffer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.ws</groupId>
-        <artifactId>jaxws-rt</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-discovery</groupId>
-        <artifactId>commons-discovery</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>javax.xml.stream</groupId>
-        <artifactId>stax-api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis</groupId>
-        <artifactId>axis-jaxrpc</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.axis</groupId>
-        <artifactId>axis-saaj</artifactId>
+        <artifactId>commons-logging-api</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -78,11 +18,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
-        <artifactId>commons-discovery</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>scout</artifactId>
         <type>jar</type>
     </dependency>
@@ -111,34 +46,4 @@
         <artifactId>uddi-ws</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-axis</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-http</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>openejb-webservices</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.ws.commons.schema</groupId>
-        <artifactId>XmlSchema</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.jvnet.staxex</groupId>
-        <artifactId>stax-ex</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>wsdl4j</groupId>
-        <artifactId>wsdl4j</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=1051895&r1=1051894&r2=1051895&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Dec 22 13:46:07 2010
@@ -153,7 +153,7 @@
         <module>system-database</module>
         <module>activemq</module>
         <module>aspectj</module>
-        <!--<module>axis</module>-->
+        <module>axis</module>
         <module>axis2</module>
         <module>client</module>
         <module>clustering</module>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java?rev=1051895&r1=1051894&r2=1051895&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java
(original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/src/main/java/org/apache/geronimo/webservices/jaxr/JAXRGBean.java
Wed Dec 22 13:46:07 2010
@@ -19,18 +19,25 @@ package org.apache.geronimo.webservices.
 import javax.xml.registry.ConnectionFactory;
 import javax.xml.registry.JAXRException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.naming.ResourceSource;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.OsgiService;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.naming.ResourceSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Simple GBean to provide access to a JAXR ConnectionFactory
  *
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = NameFactory.JAXR_CONNECTION_FACTORY)
+@OsgiService
 public class JAXRGBean implements ResourceSource
 {
     private static final Logger log = LoggerFactory.getLogger(JAXRGBean.class);
@@ -38,7 +45,8 @@ public class JAXRGBean implements Resour
     private final ClassLoader cl;
     private final String connectionFactoryClass;
 
-    public JAXRGBean(String connectionFactoryClass, ClassLoader cl) {
+    public JAXRGBean(@ParamAttribute(name="connectionFactoryClass")String connectionFactoryClass,
+                     @ParamSpecial(type = SpecialAttributeType.classLoader)ClassLoader cl)
{
         this.cl = cl;
         this.connectionFactoryClass = connectionFactoryClass;
     }
@@ -67,26 +75,4 @@ public class JAXRGBean implements Resour
         return null;
     }
 
-
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(JAXRGBean.class,
-                NameFactory.JAXR_CONNECTION_FACTORY);
-
-        infoFactory.addAttribute("connectionFactoryClass", String.class, true, true);
-        infoFactory.addAttribute("classLoader", ClassLoader.class, false);
-
-        infoFactory.addOperation("$getResource");
-
-        infoFactory.setConstructor(new String[] {"connectionFactoryClass", "classLoader"});
-
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
-
 }



Mime
View raw message