You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/06/10 13:35:18 UTC
svn commit: r953283 [5/5] - in /geronimo/server/trunk: ./ framework/
framework/configs/karaf-framework/src/main/distribution/instance/var/log/
framework/configs/karaf-framework/src/main/distribution/text/
framework/configs/karaf-framework/src/main/dist...
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -176,6 +176,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/connector-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/pom.xml Thu Jun 10 11:35:16 2010
@@ -51,6 +51,18 @@
<module>geronimo-connector-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>client-transaction-1_6</module>
+ <module>connector-deployer-1_6</module>
+ <module>geronimo-connector-1_6</module>
+ <module>geronimo-connector-builder-1_6</module>
+ <module>geronimo-transaction-1_6</module>
+ <module>transaction-1_6</module>
+ <module>geronimo-connector-server</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Modified: geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Thu Jun 10 11:35:16 2010
@@ -54,6 +54,24 @@
<module>console-tomcat-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-converter</module>
+ <module>console-core</module>
+ <module>console-base-portlets</module>
+ <module>console-filter</module>
+ <module>console-portal-driver</module>
+ <module>console-ear</module>
+ <module>console-tomcat</module>
+ <module>console-jetty</module>
+ <module>plugin-portlets</module>
+ <module>plugin-console-jetty</module>
+ <module>plugin-console-tomcat</module>
+ <module>console-jetty-server</module>
+ <module>console-tomcat-server</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Modified: geronimo/server/trunk/plugins/corba/corba-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/corba-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/corba-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/corba-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Thu Jun 10 11:35:16 2010
@@ -50,6 +50,18 @@
<module>corba-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>client-corba-yoko</module>
+ <module>geronimo-corba</module>
+ <module>geronimo-corba-builder</module>
+ <module>geronimo-yoko</module>
+ <module>j2ee-corba-yoko</module>
+ <module>openejb-corba-deployer</module>
+ <module>corba-server</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Modified: geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Thu Jun 10 11:35:16 2010
@@ -119,6 +119,20 @@
<module>jetty-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-jetty8</module>
+ <module>geronimo-jetty8-builder</module>
+ <module>jetty8</module>
+ <module>jetty8-deployer</module>
+ <module>geronimo-jetty8-clustering-builder-wadi</module>
+ <module>geronimo-jetty8-clustering-wadi</module>
+ <module>jetty8-clustering-builder-wadi</module>
+ <module>jetty8-clustering-wadi</module>
+ <module>jetty-server</module>
+ </modules>
+ </profile>
</profiles>
</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -73,6 +73,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/myfaces/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/pom.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/pom.xml Thu Jun 10 11:35:16 2010
@@ -46,6 +46,16 @@
<module>myfaces-jetty-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-myfaces</module>
+ <module>geronimo-myfaces-builder</module>
+ <module>myfaces</module>
+ <module>myfaces-deployer</module>
+ <module>myfaces-jetty-server</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Propchange: geronimo/server/trunk/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914
-/geronimo/server/branches/3.0-M1/plugins/openejb:948864
+/geronimo/server/branches/3.0-M1/plugins/openejb:948864,951792
/geronimo/server/trunk/plugins/j2ee/openejb:887507
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -72,6 +72,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -95,7 +102,4 @@
</dependency>
</dependencies>
- <!--<properties>-->
- <!--<geronimoVersion>3.0-SNAPSHOT</geronimoVersion>-->
- <!--</properties>-->
</project>
Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/history/dependencies.xml Thu Jun 10 11:35:16 2010
@@ -36,4 +36,9 @@
<artifactId>openejb-osgi-core</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Thu Jun 10 11:35:16 2010
@@ -122,11 +122,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-bundleutils</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Thu Jun 10 11:35:16 2010
@@ -53,6 +53,23 @@
<module>geronimo-openejb-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-openejb</module>
+ <module>geronimo-openejb-builder</module>
+ <module>geronimo-openejb-clustering-wadi</module>
+ <module>geronimo-openejb-clustering-builder-wadi</module>
+ <module>openejb</module>
+ <module>openejb-deployer</module>
+ <module>openejb-portlets</module>
+ <!--<module>openejb-console-jetty</module>-->
+ <!--<module>openejb-console-tomcat</module>-->
+ <module>openejb-clustering-wadi</module>
+ <module>openejb-clustering-builder-wadi</module>
+ <module>geronimo-openejb-server</module>
+ </modules>
+ </profile>
</profiles>
<dependencyManagement>
Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -0,0 +1 @@
+/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:951792
Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,4 +1,4 @@
/geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder:829715
/geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa20-builder:829715
/geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715,832538,885058
-/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder:948864
+/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder:948864,951792
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
-/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864
+/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864,951792
/tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915
Modified: geronimo/server/trunk/plugins/uddi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/pom.xml Thu Jun 10 11:35:16 2010
@@ -34,7 +34,6 @@
<modules>
<module>uddi-db</module>
- <!--<module>geronimo-uddi-server</module>-->
<module>uddi-jetty</module>
<module>uddi-tomcat</module>
</modules>
@@ -68,5 +67,14 @@
<module>uddi-jetty-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>uddi-db</module>
+ <module>uddi-jetty</module>
+ <module>uddi-tomcat</module>
+ <module>uddi-jetty-server</module>
+ </modules>
+ </profile>
</profiles>
</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -75,6 +75,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:832538,885058
-/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:887507
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:832538,885058
-/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:887507
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:832538,885058
-/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:887507
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,3 +1,3 @@
/geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058
-/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864,951792
/geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507
Modified: geronimo/server/trunk/plugins/wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/pom.xml Thu Jun 10 11:35:16 2010
@@ -59,6 +59,16 @@
<module>web-jetty-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-wab</module>
+ <module>geronimo-web-extender</module>
+ <module>web-extender</module>
+ <module>web-tomcat-server</module>
+ <module>web-jetty-server</module>
+ </modules>
+ </profile>
</profiles>
</project>
Modified: geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -74,6 +74,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/wab/web-tomcat-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -74,6 +74,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: geronimo/server/trunk/plugins/welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/pom.xml Thu Jun 10 11:35:16 2010
@@ -46,6 +46,16 @@
<module>welcome-tomcat-server</module>
</modules>
</profile>
+ <profile>
+ <id>all-subprojects</id>
+ <modules>
+ <module>geronimo-welcome</module>
+ <module>welcome-jetty</module>
+ <module>welcome-tomcat</module>
+ <module>welcome-jetty-server</module>
+ <module>welcome-tomcat-server</module>
+ </modules>
+ </profile>
</profiles>
</project>
\ No newline at end of file
Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -79,6 +79,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml?rev=953283&r1=953282&r2=953283&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.xml Thu Jun 10 11:35:16 2010
@@ -73,6 +73,13 @@
</servers>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
/geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources:832538,885058
-/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:948864
+/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:948864,951792
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 10 11:35:16 2010
@@ -1,2 +1,2 @@
/geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources:832538,885058
-/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:948864
+/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:948864,951792