You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/10/27 05:00:12 UTC
svn commit: r468245 [2/4] - in /geronimo/server/trunk: ./
applications/console/geronimo-console-core/
applications/console/geronimo-console-ear/
applications/console/geronimo-console-standard/ applications/geronimo-dojo/
applications/geronimo-remote-de...
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,112 +41,112 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>remote-deploy-tomcat</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>shutdown</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>sharedlib</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>online-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>unavailable-client-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>unavailable-webservices-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>unavailable-ejb-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>hot-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -180,7 +180,7 @@
<artifactItem>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-boilerplate-minimal</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
@@ -198,7 +198,7 @@
<artifactItem>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat-minimal/src/main/var/config/config.xml Thu Oct 26 20:00:05 2006
@@ -8,7 +8,7 @@
<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes-1.1">
- <module name="org.apache.geronimo.configs/rmi-naming/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/rmi-naming/${version}/car">
<gbean name="RMIRegistry">
<attribute name="port">${PlanNamingPort}</attribute>
</gbean>
@@ -22,11 +22,11 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/j2ee-server/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
- <module name="org.apache.geronimo.configs/transaction/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/transaction/${version}/car"/>
- <module name="org.apache.geronimo.configs/j2ee-security/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/j2ee-security/${version}/car">
<gbean name="JaasLoginServiceRemotingServer">
<attribute name="host">${PlanServerHostname}</attribute>
<attribute name="port">${PlanRemoteLoginPort}</attribute>
@@ -39,7 +39,7 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/tomcat/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/tomcat/${version}/car">
<gbean name="TomcatResources"/>
<gbean name="TomcatWebConnector">
<attribute name="host">${PlanServerHostname}</attribute>
@@ -57,33 +57,33 @@
</gbean>
</module>
- <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
<gbean name="WebBuilder">
<attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
</gbean>
</module>
- <module name="org.apache.geronimo.configs/connector-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/connector-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/tomcat-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/unavailable-ejb-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/unavailable-webservices-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/unavailable-client-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/unavailable-client-deployer/${version}/car"/>
- <module name="org.apache.geronimo.configs/sharedlib/${pom.version}/car">
+ <module name="org.apache.geronimo.configs/sharedlib/${version}/car">
<gbean name="SharedLib">
<attribute name="classesDirs">var/shared/classes</attribute>
<attribute name="libDirs">var/shared/lib</attribute>
</gbean>
</module>
- <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/remote-deploy-tomcat/${version}/car"/>
- <module name="org.apache.geronimo.configs/hot-deployer/${pom.version}/car"/>
+ <module name="org.apache.geronimo.configs/hot-deployer/${version}/car"/>
</attributes>
Modified: geronimo/server/trunk/configs/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq-broker/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq-broker/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,20 +38,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/activemq/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/activemq/pom.xml (original)
+++ geronimo/server/trunk/configs/activemq/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>activemq-broker</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>test</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>ge-activemq-rar</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>rar</type>
</dependency>
@@ -73,7 +73,7 @@
<module>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>ge-activemq-rar</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>rar</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/axis-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/axis/pom.xml (original)
+++ geronimo/server/trunk/configs/axis/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/client-corba-sun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-sun/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-corba-sun/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-sun/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-corba-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-corba-sun/src/plan/plan.xml Thu Oct 26 20:00:05 2006
@@ -64,7 +64,7 @@
<!--
<gbean name="SSLClientCert" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
@@ -94,7 +94,7 @@
<gbean name="SSLClientPassword" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
@@ -124,7 +124,7 @@
<gbean name="NoSecurity" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
Modified: geronimo/server/trunk/configs/client-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,14 +38,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-corba-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-corba-yoko/src/plan/plan.xml Thu Oct 26 20:00:05 2006
@@ -62,7 +62,7 @@
<!--
<gbean name="SSLClientCert" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
@@ -92,7 +92,7 @@
<gbean name="SSLClientPassword" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
@@ -122,7 +122,7 @@
<gbean name="NoSecurity" class="org.apache.openejb.corba.CSSBeanGBean">
<reference name="TransactionManager">
- <module>geronimo/client/${pom.version}/car</module>
+ <module>geronimo/client/${version}/car</module>
<name>TransactionManager</name>
</reference>
<reference name="ConfigAdapter">
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=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,20 +38,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
@@ -59,80 +59,80 @@
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-management</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-transaction</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!-- this will get g-j2ee-schema -->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-j2ee-builder</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-client-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-naming-builder</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-security-builder</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-security</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-axis</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-webservices</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-connector</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-web-builder</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
</dependencies>
Modified: geronimo/server/trunk/configs/client-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-security/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-security/pom.xml (original)
+++ geronimo/server/trunk/configs/client-security/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -60,20 +60,20 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
-->
Modified: geronimo/server/trunk/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-system/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/configs/client-system/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
@@ -81,22 +81,22 @@
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/configs/client-transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-transaction/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client-transaction/pom.xml (original)
+++ geronimo/server/trunk/configs/client-transaction/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -46,13 +46,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${pom.version}</version>
+ <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=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/client/pom.xml (original)
+++ geronimo/server/trunk/configs/client/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>client-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -46,13 +46,13 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activation</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--
@@ -61,62 +61,62 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency> -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-interceptor</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- should be transitive dependency of geronimo-j2ee -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/clustering/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/clustering/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/clustering/pom.xml (original)
+++ geronimo/server/trunk/configs/clustering/pom.xml Thu Oct 26 20:00:05 2006
@@ -40,14 +40,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/connector-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/connector-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/connector-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/connector-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-connector-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/daytrader-jetty/src/plan/plan.xml Thu Oct 26 20:00:05 2006
@@ -526,7 +526,7 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</moduleId>
</client-environment>
@@ -534,12 +534,12 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</moduleId>
</server-environment>
<resource>
- <external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
+ <external-rar>geronimo/ge-activemq-rar/${version}/rar</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<resourceadapter-instance>
@@ -627,7 +627,7 @@
<ext-module>
<connector>TradeJMS</connector>
- <external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
+ <external-path>geronimo/ge-activemq-rar/${version}/rar</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
Modified: geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/daytrader-tomcat/src/plan/plan.xml Thu Oct 26 20:00:05 2006
@@ -526,7 +526,7 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</moduleId>
</client-environment>
@@ -534,12 +534,12 @@
<moduleId>
<groupId>${pom.groupId}</groupId>
<artifactId>${pom.artifactId}-streamer-client-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</moduleId>
</server-environment>
<resource>
- <external-rar>geronimo/ge-activemq-rar/${pom.version}/rar</external-rar>
+ <external-rar>geronimo/ge-activemq-rar/${version}/rar</external-rar>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
<resourceadapter-instance>
@@ -627,7 +627,7 @@
<ext-module>
<connector>TradeJMS</connector>
- <external-path>geronimo/ge-activemq-rar/${pom.version}/rar</external-path>
+ <external-path>geronimo/ge-activemq-rar/${version}/rar</external-path>
<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
<resourceadapter>
Modified: geronimo/server/trunk/configs/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/directory/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/directory/pom.xml (original)
+++ geronimo/server/trunk/configs/directory/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-directory</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/dojo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-jetty/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/dojo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-jetty/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/dojo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/dojo-tomcat/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/dojo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/dojo-tomcat/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-dojo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -38,25 +38,25 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- bootstrap -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-config</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/geronimo-gbean-deployer/src/plan/plan.xml Thu Oct 26 20:00:05 2006
@@ -30,7 +30,7 @@
<!-- Builder for handling plans defining Geronimo modules -->
<gbean name="ServiceBuilder" class="org.apache.geronimo.deployment.service.ServiceConfigBuilder">
- <!--<attribute name="defaultParentId">geronimo/j2ee-server/${pom.version}/car</attribute>-->
+ <!--<attribute name="defaultParentId">geronimo/j2ee-server/${version}/car</attribute>-->
<reference name="Repository">
<!--<pattern><gbean-name>geronimo.maven:name=Repository</gbean-name></pattern>-->
<!--<pattern><gbean-name>geronimo.server:name=Repository,*</gbean-name></pattern>-->
Modified: geronimo/server/trunk/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/hot-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/hot-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/hot-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,27 +37,27 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-hot-deploy</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-sun/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-corba-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-corba-yoko/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-corba-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
Modified: geronimo/server/trunk/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -60,43 +60,43 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-client</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-web-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-test-ddbean</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-security/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-security/pom.xml Thu Oct 26 20:00:05 2006
@@ -39,20 +39,20 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jmx-remoting</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
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=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-server/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-server/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -45,38 +45,38 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-core</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- ?????? -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-management</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.modules</groupId>-->
<!--<artifactId>geronimo-naming</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<!-- purpose unknown -->
Modified: geronimo/server/trunk/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-system/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/configs/j2ee-system/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
@@ -73,22 +73,22 @@
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/configs/javamail/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/javamail/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/javamail/pom.xml (original)
+++ geronimo/server/trunk/configs/javamail/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>rmi-naming</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-mail</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-builder-wadi/pom.xml Thu Oct 26 20:00:05 2006
@@ -41,32 +41,32 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-clustering-builder-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-clustering-wadi/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,20 +36,20 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty-clustering-wadi</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>wadi-clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty-builder</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jetty/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jetty/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,28 +37,28 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>clustering</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-jetty/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-jsp-examples</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-jsp-examples</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/jsp-examples-tomcat/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-jsp-examples</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications.examples</groupId>
<artifactId>geronimo-jsp-examples</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-jetty/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ldap-demo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ldap-demo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-demo-tomcat/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ldap-demo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -75,7 +75,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-ldap-demo</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>
Modified: geronimo/server/trunk/configs/ldap-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/ldap-realm/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/ldap-realm/pom.xml (original)
+++ geronimo/server/trunk/configs/ldap-realm/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>directory</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/online-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/online-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -55,37 +55,37 @@
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-util</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-deploy-tool</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</element>
<element>
<groupId>org.apache.geronimo.specs</groupId>
Modified: geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-corba-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<!-- we might need to add this by hand -->
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.configs</groupId>-->
<!--<artifactId>j2ee-corba-yoko</artifactId>-->
- <!--<version>${pom.version}</version>-->
+ <!--<version>${version}</version>-->
<!--<type>car</type>-->
<!--<scope>compile</scope>-->
<!--</dependency>-->
Modified: geronimo/server/trunk/configs/openejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,19 +37,19 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>connector-deployer</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>openejb</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
<scope>compile</scope>
</dependency>
Modified: geronimo/server/trunk/configs/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/openejb/pom.xml (original)
+++ geronimo/server/trunk/configs/openejb/pom.xml Thu Oct 26 20:00:05 2006
@@ -37,35 +37,35 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-security</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>transaction</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>axis</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>car</type>
</dependency>
@@ -73,7 +73,12 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-corba_2.3_spec</artifactId>
+ </dependency>
+
<!--<dependency>-->
<!--<groupId>org.apache.yoko</groupId>-->
<!--<artifactId>yoko-spec-corba</artifactId>-->
Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Thu Oct 26 20:00:05 2006
@@ -35,20 +35,20 @@
<properties>
<!-- This property is required by the car:package mojo -->
- <geronimoVersion>${pom.version}</geronimoVersion>
+ <geronimoVersion>${version}</geronimoVersion>
<!-- This property is required to process geronimo-plugin.xml (for m2 & m2) -->
- <pom.currentVersion>${pom.version}</pom.currentVersion>
+ <pom.currentVersion>${version}</pom.currentVersion>
- <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${pom.version}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${pom.version}/car</j2eeDeployer>
- <clientDeployer>org.apache.geronimo.configs/client-deployer/${pom.version}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${pom.version}/car</connectorDeployer>
- <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${pom.version}/car</openejbDeployer>
- <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${pom.version}/car</openejbcorbaDeployer>
- <axisDeployer>org.apache.geronimo.configs/axis-deployer/${pom.version}/car</axisDeployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${pom.version}/car</tomcatDeployer>
- <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
+ <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car</gbeanDeployer>
+ <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${version}/car</j2eeDeployer>
+ <clientDeployer>org.apache.geronimo.configs/client-deployer/${version}/car</clientDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${version}/car</connectorDeployer>
+ <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${version}/car</openejbDeployer>
+ <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${version}/car</openejbcorbaDeployer>
+ <axisDeployer>org.apache.geronimo.configs/axis-deployer/${version}/car</axisDeployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat-deployer/${version}/car</tomcatDeployer>
+ <jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${version}/car</jettyDeployer>
<!-- Common plan properties -->
<PlanServerHostname>0.0.0.0</PlanServerHostname>
@@ -81,7 +81,7 @@
<extension>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
</extension>
</extensions>
-->
@@ -91,7 +91,7 @@
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Modified: geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml?view=diff&rev=468245&r1=468244&r2=468245
==============================================================================
--- geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml (original)
+++ geronimo/server/trunk/configs/remote-deploy-jetty/pom.xml Thu Oct 26 20:00:05 2006
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-remote-deploy</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</dependency>
@@ -65,7 +65,7 @@
<module>
<groupId>org.apache.geronimo.applications</groupId>
<artifactId>geronimo-remote-deploy</artifactId>
- <version>${pom.version}</version>
+ <version>${version}</version>
<type>war</type>
</module>
</configuration>