You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/02/23 10:17:48 UTC
svn commit: r510880 - in /geronimo/server/trunk:
assemblies/geronimo-boilerplate-jee5/
assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/
configs/axis-deployer/src/plan/ configs/client-deployer/ configs/client/
configs/j2ee-server/
Author: djencks
Date: Fri Feb 23 01:17:48 2007
New Revision: 510880
URL: http://svn.apache.org/viewvc?view=rev&rev=510880
Log:
GERONIMO-2875 rearrange stuff to use webservices-common in the client
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/client-deployer/pom.xml
geronimo/server/trunk/configs/client/pom.xml
geronimo/server/trunk/configs/j2ee-server/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml Fri Feb 23 01:17:48 2007
@@ -40,6 +40,19 @@
</description>
<build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>var/config/**</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/config/client_artifact_aliases.properties Fri Feb 23 01:17:48 2007
@@ -19,3 +19,6 @@
#org.apache.geronimo.configs/transaction//car=org.apache.geronimo.configs/transaction-jta11/1.2-SNAPSHOT/car
#versions can be ommitted on the left side but not the right.
#This can also specify explicit versions in the same format.
+#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
Modified: geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml Fri Feb 23 01:17:48 2007
@@ -23,9 +23,9 @@
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis</artifactId>
+ <type>car</type>
</dependency>
</dependencies>
</environment>
@@ -37,9 +37,9 @@
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <type>jar</type>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>axis</artifactId>
+ <type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -57,7 +57,7 @@
</gbean>
<gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
@@ -75,23 +75,13 @@
</gbean>
<gbean name="AxisClientServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
- <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>client-security</artifactId>
+ <artifactId>axis</artifactId>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/client-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/pom.xml?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/pom.xml Fri Feb 23 01:17:48 2007
@@ -57,84 +57,17 @@
<scope>runtime</scope>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-management</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-transaction</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!-- this will get g-j2ee-schema -->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-j2ee-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-client-builder</artifactId>
<version>${version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-naming-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-security-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-security</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-axis</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-webservices</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
<version>${version}</version>
</dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-connector</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-web-builder</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/configs/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Fri Feb 23 01:17:48 2007
@@ -116,12 +116,6 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-axis</artifactId>
- <version>${version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${version}</version>
</dependency>
@@ -173,31 +167,6 @@
<artifactId>concurrent</artifactId>
</dependency>
- <!-- REMOVE WHEN G-2383 is applied -->
- <!--<dependency>-->
- <!--<groupId>org.apache.openejb</groupId>-->
- <!--<artifactId>openejb-core</artifactId>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.openejb</groupId>-->
- <!--<artifactId>openejb-yoko</artifactId>-->
- <!--</dependency>-->
-<!---->
- <!--<dependency>-->
- <!--<groupId>org.apache.yoko</groupId>-->
- <!--<artifactId>yoko-core</artifactId>-->
- <!--</dependency>-->
-<!---->
- <!--<dependency>-->
- <!--<groupId>org.apache.yoko</groupId>-->
- <!--<artifactId>yoko-spec-corba</artifactId>-->
- <!--</dependency>-->
-<!---->
- <!--<dependency>-->
- <!--<groupId>org.apache.yoko</groupId>-->
- <!--<artifactId>yoko-rmi</artifactId>-->
- <!--</dependency>-->
</dependencies>
</project>
Modified: geronimo/server/trunk/configs/j2ee-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/pom.xml?view=diff&rev=510880&r1=510879&r2=510880
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Fri Feb 23 01:17:48 2007
@@ -68,12 +68,6 @@
<version>${version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>