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/07/20 03:12:59 UTC
svn commit: r423692 - in /geronimo/sandbox/svkmerge/m2migration: configs/
configs/console-jetty/ configs/console-tomcat/ configs/jsp-examples-jetty/
configs/jsp-examples-tomcat/ configs/servlets-examples-tomcat/
m2-assemblies/geronimo-jetty-j2ee/
Author: jdillon
Date: Wed Jul 19 18:12:59 2006
New Revision: 423692
URL: http://svn.apache.org/viewvc?rev=423692&view=rev
Log:
Applied GERONIMO-2206 to enable jsp & servlet modules
Modified:
geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-jetty/pom.xml Wed Jul 19 18:12:59 2006
@@ -209,6 +209,7 @@
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+ <geronimoPlugin>true</geronimoPlugin>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/console-tomcat/pom.xml Wed Jul 19 18:12:59 2006
@@ -209,6 +209,7 @@
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<moduleFile>${settings.localRepository}/org/apache/geronimo/applications/console/geronimo-console/${pom.version}/geronimo-console-${pom.version}.ear</moduleFile>
+ <geronimoPlugin>true</geronimoPlugin>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-jetty/pom.xml Wed Jul 19 18:12:59 2006
@@ -72,6 +72,7 @@
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+ <geronimoPlugin>true</geronimoPlugin>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/jsp-examples-tomcat/pom.xml Wed Jul 19 18:12:59 2006
@@ -67,6 +67,7 @@
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-jsp-examples-tomcat/${tomcatVersion}/geronimo-jsp-examples-tomcat-${tomcatVersion}.war</moduleFile>
+ <geronimoPlugin>true</geronimoPlugin>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Wed Jul 19 18:12:59 2006
@@ -126,8 +126,8 @@
<module>javamail</module>
<module>jetty</module>
<module>jetty-deployer</module>
- <!-- <module>jsp-examples-jetty</module> -->
- <!-- <module>jsp-examples-tomcat</module> -->
+ <module>jsp-examples-jetty</module>
+ <module>jsp-examples-tomcat</module>
<module>ldap-demo-jetty</module>
<module>ldap-demo-tomcat</module>
<module>ldap-realm</module>
@@ -137,8 +137,8 @@
<module>remote-deploy-jetty</module>
<module>remote-deploy-tomcat</module>
<module>rmi-naming</module>
- <!-- <module>servlets-examples-jetty</module> -->
- <!-- <module>servlets-examples-tomcat</module> -->
+ <!-- module>servlets-examples-jetty</module -->
+ <module>servlets-examples-tomcat</module>
<module>sharedlib</module>
<module>shutdown</module>
<module>system-database</module>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/servlets-examples-tomcat/pom.xml Wed Jul 19 18:12:59 2006
@@ -81,6 +81,7 @@
<deploymentConfig>${axisDeployer}</deploymentConfig>
</deploymentConfigs>
<moduleFile>${settings.localRepository}/geronimo-samples/geronimo-servlet-examples-tomcat/${tomcatVersion}/geronimo-servlet-examples-tomcat-${tomcatVersion}.war</moduleFile>
+ <geronimoPlugin>true</geronimoPlugin>
</configuration>
</plugin>
</plugins>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=423692&r1=423691&r2=423692&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Wed Jul 19 18:12:59 2006
@@ -219,15 +219,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>ldap-demo-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-jetty</artifactId>
@@ -235,21 +226,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>servlets-examples-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsp-examples-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
- -->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -278,20 +254,6 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>uddi-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>daytrader-derby-jetty</artifactId>
- <version>${pom.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>daytrader-derby-jetty-streamer-client</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>