You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/02/27 03:18:20 UTC
svn commit: r631464 - in /geronimo/samples/branches/2.1/samples: ./
jsp-examples/jsp-examples-jetty/ jsp-examples/jsp-examples-tomcat/
ldap-sample-app/ldap-sample-app-jetty/ ldap-sample-app/ldap-sample-app-realm/
ldap-sample-app/ldap-sample-app-tomcat/...
Author: jbohn
Date: Tue Feb 26 18:18:19 2008
New Revision: 631464
URL: http://svn.apache.org/viewvc?rev=631464&view=rev
Log:
version and other updates necessary for sample plugins to work with Geronimo 2.1
Modified:
geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/pom.xml
geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml Tue Feb 26 18:18:19 2008
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>jsp-examples-jetty</artifactId>
<name>Geronimo Configs :: JSP Examples Jetty</name>
<packaging>car</packaging>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml Tue Feb 26 18:18:19 2008
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>jsp-examples-tomcat</artifactId>
<name>Geronimo Configs :: JSP Examples Tomcat</name>
<packaging>car</packaging>
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -60,7 +60,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Tue Feb 26 18:18:19 2008
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Tue Feb 26 18:18:19 2008
@@ -47,7 +47,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-gbean-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>directory</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
-->
Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Tue Feb 26 18:18:19 2008
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Tue Feb 26 18:18:19 2008
@@ -33,22 +33,22 @@
</description>
<properties>
- <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
+ <geronimoVersion>2.1</geronimoVersion>
- <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car</gbeanDeployerBootstrap>
- <gbeanDeployer>org.apache.geronimo.framework/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>
- <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${version}/car</cxfDeployer>
- <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${version}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${version}/car</tomcatDeployer>
- <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${version}/car</jetty6Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${version}/car</jasperDeployer>
- <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${version}/car</jpaDeployer>
+ <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
+ <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+ <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+ <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
+ <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
+ <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
+ <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
+ <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
+ <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
+ <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
+ <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+ <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+ <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
+ <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
</properties>
@@ -76,19 +76,19 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_3.0_spec</artifactId>
- <version>1.0</version>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.1</version>
+ <version>1.1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -186,7 +186,7 @@
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.1</version>
<!-- Install as extention to allow 'car' packaging to be
used. -->
<extensions>true</extensions>
Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml Tue Feb 26 18:18:19 2008
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>servlet-examples-jetty</artifactId>
<name>Geronimo Configs :: Servlet Examples for Jetty</name>
<packaging>car</packaging>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jetty6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=631464&r1=631463&r2=631464&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml Tue Feb 26 18:18:19 2008
@@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.geronimo.configs</groupId>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>servlet-examples-tomcat</artifactId>
<name>Geronimo Configs :: Servlet Examples for Tomcat</name>
<packaging>car</packaging>
@@ -49,7 +49,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>tomcat6-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper-deployer</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
</dependency>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>jasper</artifactId>
- <version>${version}</version>
+ <version>${geronimoVersion}</version>
<type>car</type>
</dependency>