geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1103355 - in /geronimo/server/trunk: ./ plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/ plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/ plugins/uddi/uddi-...
Date Sun, 15 May 2011 12:53:47 GMT
Author: genspring
Date: Sun May 15 12:53:46 2011
New Revision: 1103355

URL: http://svn.apache.org/viewvc?rev=1103355&view=rev
Log:
adding axis2 deployer for uddi module.

Modified:
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
    geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java?rev=1103355&r1=1103354&r2=1103355&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
Sun May 15 12:53:46 2011
@@ -240,10 +240,10 @@ public class WsdlGeneratorUtils {
             try {
                 int errorCode = process.exitValue();
                 if (errorCode == 0) {
-                    LOG.debug("Process output: {}", outputThread.getOutput());
+                    System.err.println("Process output: {}" +outputThread.getOutput() );
                     return true;
                 } else {
-                    LOG.error("Process failed: {}", outputThread.getOutput());
+                    System.err.println("Process output: {}" +outputThread.getOutput() );
                     return false;
                 }
             } catch (IllegalThreadStateException e) {

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java?rev=1103355&r1=1103354&r2=1103355&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
(original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
Sun May 15 12:53:46 2011
@@ -65,7 +65,9 @@ public class JAXWSTools {
         { "org.apache.geronimo.specs",    "geronimo-j2ee-management_1.1_spec"},
         { "org.apache.geronimo.bundles",        "woodstox" },
         { "org.apache.geronimo.modules",  "geronimo-webservices" },
-        { "org.ops4j.pax.logging", "pax-logging-api" }
+        { "org.ops4j.pax.logging", "pax-logging-api" },
+        { "commons-lang", "commons-lang" },
+        { "org.apache.openjpa", "openjpa"}
     };
 
     private final static String[] HIDDEN_CLASSES =

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml?rev=1103355&r1=1103354&r2=1103355&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/pom.xml Sun May 15 12:53:46 2011
@@ -49,6 +49,14 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jaxws-sun-tools</artifactId>  
+            <version>${project.version}</version>
+            <type>car</type>
+            <scope>provided</scope>            
+        </dependency>           
 	
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -97,11 +105,27 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        </dependency>
         
         <dependency>
     	    <groupId>org.apache.geronimo.specs</groupId>
     	    <artifactId>geronimo-jaxr_1.0_spec</artifactId>
-        </dependency>              
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+        </dependency>                        
         
         <dependency>
             <groupId>org.apache.geronimo.bundles</groupId>
@@ -132,6 +156,11 @@
     	    <groupId>commons-beanutils</groupId>
     	    <artifactId>commons-beanutils</artifactId>
     	</dependency>
+        
+        <dependency>         
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -144,7 +173,8 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${tomcatDeployer}</deploymentConfig>
-                        <!--deploymentConfig>${axis2Deployer}</deploymentConfig-->
+                        <deploymentConfig>${jaxwsSunTools}</deploymentConfig>
+                        <deploymentConfig>${axis2Deployer}</deploymentConfig>
                         <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <category>Web Services</category>

Modified: geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml?rev=1103355&r1=1103354&r2=1103355&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-tomcat/src/main/history/dependencies.xml Sun May
15 12:53:46 2011
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging-api</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1103355&r1=1103354&r2=1103355&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sun May 15 12:53:46 2011
@@ -109,7 +109,8 @@
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${project.version}/car</jpaDeployer>
         <myfacesDeployer>org.apache.geronimo.configs/myfaces-deployer/${project.version}/car</myfacesDeployer>
         <openwebbeansDeployer>org.apache.geronimo.configs/openwebbeans-deployer/${project.version}/car</openwebbeansDeployer>
-
+        
+        <jaxwsSunTools>org.apache.geronimo.configs/jaxws-sun-tools/${project.version}/car</jaxwsSunTools>
 
         <!-- Common plan properties -->
         <planServerHostname>0.0.0.0</planServerHostname>



Mime
View raw message