You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2007/10/05 17:10:05 UTC
svn commit: r582304 - in /geronimo/server/trunk/assemblies:
geronimo-jetty6-javaee5/
geronimo-jetty6-javaee5/src/main/resources/var/config/
geronimo-tomcat6-javaee5/
geronimo-tomcat6-javaee5/src/main/resources/var/config/
Author: gawor
Date: Fri Oct 5 08:09:54 2007
New Revision: 582304
URL: http://svn.apache.org/viewvc?rev=582304&view=rev
Log:
for now, do not install axis2 in jetty and cxf in tomcat becuase of GERONIMO-3502. also map j2ee-system/car to client-system/car to prevent classloader errors in app client
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=582304&r1=582303&r2=582304&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Fri Oct 5 08:09:54 2007
@@ -102,7 +102,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2</artifactId>
@@ -116,7 +116,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>cxf</artifactId>
@@ -312,7 +312,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis2-deployer</artifactId>
@@ -326,7 +326,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>cxf-deployer</artifactId>
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties?rev=582304&r1=582303&r2=582304&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties Fri Oct 5 08:09:54 2007
@@ -22,7 +22,9 @@
#the next 2 lines allow running the webservices-common config on the client
org.apache.geronimo.configs/j2ee-security//car=org.apache.geronimo.configs/client-security/${version}/car
org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/client/${version}/car
+org.apache.geronimo.configs/j2ee-system//car=org.apache.geronimo.configs/client-system/${version}/car
org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/client-transaction/${version}/car
org.apache.geronimo.configs/j2ee-security/${version}/car=org.apache.geronimo.configs/client-security/${version}/car
org.apache.geronimo.configs/j2ee-server/${version}/car=org.apache.geronimo.configs/client/${version}/car
+org.apache.geronimo.configs/j2ee-system/${version}/car=org.apache.geronimo.configs/client-system/${version}/car
org.apache.geronimo.configs/transaction/${version}/car=org.apache.geronimo.configs/client-transaction/${version}/car
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=582304&r1=582303&r2=582304&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Fri Oct 5 08:09:54 2007
@@ -116,7 +116,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>cxf</artifactId>
@@ -130,7 +130,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-corba-yoko</artifactId>
@@ -312,7 +312,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+<!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>cxf-deployer</artifactId>
@@ -326,7 +326,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-deployer</artifactId>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties?rev=582304&r1=582303&r2=582304&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/client_artifact_aliases.properties Fri Oct 5 08:09:54 2007
@@ -22,7 +22,9 @@
#the next 2 lines allow running the webservices-common config on the client
org.apache.geronimo.configs/j2ee-security//car=org.apache.geronimo.configs/client-security/${version}/car
org.apache.geronimo.configs/j2ee-server//car=org.apache.geronimo.configs/client/${version}/car
+org.apache.geronimo.configs/j2ee-system//car=org.apache.geronimo.configs/client-system/${version}/car
org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/client-transaction/${version}/car
org.apache.geronimo.configs/j2ee-security/${version}/car=org.apache.geronimo.configs/client-security/${version}/car
org.apache.geronimo.configs/j2ee-server/${version}/car=org.apache.geronimo.configs/client/${version}/car
+org.apache.geronimo.configs/j2ee-system/${version}/car=org.apache.geronimo.configs/client-system/${version}/car
org.apache.geronimo.configs/transaction/${version}/car=org.apache.geronimo.configs/client-transaction/${version}/car