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/06/04 17:18:42 UTC
svn commit: r663185 - in /geronimo/samples/branches/2.1/samples: ./
app-per-port/ app-per-port/app-per-port-connector-war/
app-per-port/app-per-port-ear/ app-per-port/app-per-port-tomcat/
app-per-port/app-per-port-war1/ app-per-port/app-per-port-war2/
Author: jbohn
Date: Wed Jun 4 08:18:41 2008
New Revision: 663185
URL: http://svn.apache.org/viewvc?rev=663185&view=rev
Log:
include app-per-port from samples/trunk
Added:
geronimo/samples/branches/2.1/samples/app-per-port/
- copied from r663125, geronimo/samples/trunk/samples/app-per-port/
Modified:
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/pom.xml
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml
geronimo/samples/branches/2.1/samples/app-per-port/pom.xml
geronimo/samples/branches/2.1/samples/pom.xml
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-connector-war/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>app-per-port-connector-war</artifactId>
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-ear/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>app-per-port-ear</artifactId>
@@ -40,20 +40,20 @@
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-war1</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-war2</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-connector-war</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<groupId>org.apache.geronimo.samples</groupId>
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-ear</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<type>ear</type>
<scope>provided</scope>
</dependency>
@@ -88,7 +88,7 @@
</dependencies>
<properties>
- <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
+ <!--<geronimoVersion>2.1-SNAPSHOT</geronimoVersion>-->
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -101,7 +101,7 @@
<plugin>
<groupId>org.apache.geronimo.buildsupport</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>${geronimoVersion}</version>
<extensions>true</extensions>
<configuration>
<deploymentConfigs>
@@ -113,7 +113,7 @@
<module>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port-ear</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
<type>ear</type>
</module>
<useMavenDependencies>
@@ -142,22 +142,5 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>it</id>
- <!--<properties>-->
- <!--<it-server>tomcat</it-server>-->
- <!--</properties>-->
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war1/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>app-per-port-war1</artifactId>
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-war2/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>app-per-port</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>app-per-port-war2</artifactId>
Modified: geronimo/samples/branches/2.1/samples/app-per-port/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/pom.xml?rev=663185&r1=663125&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/pom.xml Wed Jun 4 08:18:41 2008
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>samples</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1-SNAPSHOT</version>
</parent>
<artifactId>app-per-port</artifactId>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=663185&r1=663184&r2=663185&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Wed Jun 4 08:18:41 2008
@@ -67,6 +67,7 @@
<module>timereport</module>
<module>jsp-examples</module>
<module>servlet-examples</module>
+ <module>app-per-port</module>
</modules>
<dependencies>