geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r495667 - in /geronimo/server/trunk/assemblies: geronimo-jetty6-jee5/pom.xml geronimo-jetty6-jee5/src/main/var/config/config.xml geronimo-tomcat6-jee5/pom.xml geronimo-tomcat6-jee5/src/main/var/config/config.xml
Date Fri, 12 Jan 2007 18:04:16 GMT
Author: dims
Date: Fri Jan 12 10:04:15 2007
New Revision: 495667

URL: http://svn.apache.org/viewvc?view=rev&rev=495667
Log:
Fix for GERONIMO-2727 - Enable axis2-deployer in jetty and tomcat jee5 assemblies

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml?view=diff&rev=495667&r1=495666&r2=495667
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/pom.xml Fri Jan 12 10:04:15 2007
@@ -96,6 +96,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -237,6 +243,12 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=495667&r1=495666&r2=495667
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Fri
Jan 12 10:04:15 2007
@@ -58,6 +58,7 @@
     </module>
 
     <module name="org.apache.geronimo.configs/axis/${version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/axis2/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
@@ -182,6 +183,12 @@
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car">
         <!-- this gbean is not yet written -->
         <!--<gbean name="CXFServiceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>-->
+    </module>
+    <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car">
+        <!-- this gbean is not yet written -->
+        <!--<gbean name="Axis2ServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>-->
     </module>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml?view=diff&rev=495667&r1=495666&r2=495667
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/pom.xml Fri Jan 12 10:04:15 2007
@@ -96,6 +96,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -223,6 +229,12 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=495667&r1=495666&r2=495667
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
Fri Jan 12 10:04:15 2007
@@ -58,6 +58,7 @@
     </module>
 
     <module name="org.apache.geronimo.configs/axis/${version}/car"/>
+    <module name="org.apache.geronimo.configs/axis2/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
@@ -188,6 +189,12 @@
 
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car">
         <!--<gbean name="CXFServiceRefBuilder">
+            <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
+        </gbean>-->
+    </module>
+    <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car">
+        <!-- this gbean is not yet written -->
+        <!--<gbean name="Axis2ServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>-->
     </module>



Mime
View raw message