You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2011/08/02 16:20:21 UTC
svn commit: r1153137 - in /geronimo/server/trunk:
framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/
framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/
framework/configs/geronimo-gbean-deployer/src/i...
Author: rwonly
Date: Tue Aug 2 14:20:17 2011
New Revision: 1153137
URL: http://svn.apache.org/viewvc?rev=1153137&view=rev
Log:
some codes clean up
Modified:
geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Tue Aug 2 14:20:17 2011
@@ -119,7 +119,7 @@
<!-- note the variable ${RollerContextPath} which is further specified in var/config/config-substitutions.properties -->
<!--
<config-xml-content server="default">
- <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0-SNAPSHOT/car">
+ <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0/car">
<attribute name="contextPath">${RollerContextPath}</attribute>
</gbean>
</config-xml-content>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml Tue Aug 2 14:20:17 2011
@@ -39,13 +39,7 @@
<artifactId>geronimo-common</artifactId>
<version>${project.version}</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-config-groovy-transformer</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
+
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/geronimo-plugin.xml Tue Aug 2 14:20:17 2011
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>car</type>
</module-id>
<dependency start="false">
@@ -44,7 +44,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -56,7 +56,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
</dependency>
<dependency start="false">
@@ -110,7 +110,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/src/test/resources/META-INF/plan.xml Tue Aug 2 14:20:17 2011
@@ -25,7 +25,7 @@ specific services - those should be prov
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>car</type>
</moduleId>
<dependencies>
@@ -46,7 +46,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-common</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -60,7 +60,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-crypto</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
<import>classes</import>
</dependency>
@@ -123,7 +123,7 @@ specific services - those should be prov
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
<import>classes</import>
</dependency>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/geronimo-plugin.xml Tue Aug 2 14:20:17 2011
@@ -27,7 +27,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>car</type>
</module-id>
<dependency start="true">
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/src/test/resources/META-INF/plan.xml Tue Aug 2 14:20:17 2011
@@ -25,7 +25,7 @@ specific services - those should be prov
<moduleId>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>j2ee-system</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>car</type>
</moduleId>
<dependencies>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it3/src/test/resources/META-INF/geronimo-plugin.xml Tue Aug 2 14:20:17 2011
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
@@ -53,7 +53,7 @@
<dependency start="false">
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-service-builder</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
</dependency>
<obsoletes>
<groupId>commons-logging</groupId>
Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/metadatageneration-it4/src/test/resources/META-INF/geronimo-plugin.xml Tue Aug 2 14:20:17 2011
@@ -26,7 +26,7 @@
<module-id>
<groupId>org.apache.geronimo.buildsupport.it</groupId>
<artifactId>car-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2-TEST</version>
<type>jar</type>
</module-id>
<jvm-version>1.5</jvm-version>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Tue Aug 2 14:20:17 2011
@@ -68,18 +68,7 @@
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>org.soter.rbac</groupId>
- <artifactId>rbac-xml-model</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.soter.rbac</groupId>
- <artifactId>rbac-jacc</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
--->
+
</dependencies>
<build>
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/java/org/apache/geronimo/system/plugin/CopyConfigTest.java Tue Aug 2 14:20:17 2011
@@ -55,10 +55,10 @@ public class CopyConfigTest extends Test
" <module-id>\n" +
" <groupId>org.apache.geronimo.configs</groupId>\n" +
" <artifactId>j2ee-deployer</artifactId>\n" +
- " <version>2.1-SNAPSHOT</version>\n" +
+ " <version>2.1-TEST</version>\n" +
" <type>car</type>\n" +
" </module-id>\n" +
- " <geronimo-version>2.1-SNAPSHOT</geronimo-version>\n" +
+ " <geronimo-version>2.1-TEST</geronimo-version>\n" +
" <jvm-version>1.5</jvm-version>\n" +
" <source-repository>http://www.geronimoplugins.com/repository/geronimo-1.1</source-repository>\n" +
" <source-repository>http://repo1.maven.org/maven2/</source-repository>\n" +
Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/test/resources/geronimo-plugins.xml Tue Aug 2 14:20:17 2011
@@ -25,7 +25,7 @@
<module-id>
<groupId>geronimo</groupId>
<artifactId>daytrader-derby-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-TEST</version>
<type>car</type>
</module-id>
<geronimo-versions>
@@ -45,8 +45,8 @@
from another Tomcat Geronimo installation.
</description>
</prerequisite>
- <dependency>geronimo/j2ee-server/3.0-SNAPSHOT/car</dependency>
- <dependency>geronimo/geronimo-daytrader-derby-db/2.0-SNAPSHOT/jar</dependency>
+ <dependency>geronimo/j2ee-server/3.0-TEST/car</dependency>
+ <dependency>geronimo/geronimo-daytrader-derby-db/2.0-TEST/jar</dependency>
</plugin-artifact>
</plugin>
@@ -58,7 +58,7 @@
<module-id>
<groupId>geronimo</groupId>
<artifactId>daytrader-derby-jetty-streamer-client</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-TEST</version>
<type>car</type>
</module-id>
<geronimo-versions>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>client</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0-TEST</version>
<type>car</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/test/java/org/apache/geronimo/system/configuration/LocalAttributeManagerReadWriteTest.java Tue Aug 2 14:20:17 2011
@@ -38,11 +38,11 @@ public class LocalAttributeManagerReadWr
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
"<ns2:attributes xmlns:ns2=\"http://geronimo.apache.org/xml/ns/attributes-1.2\" xmlns=\"http://geronimo.apache.org/xml/ns/plugins-1.3\">\n" +
" <ns2:comment>This is a test comment. Without it, a default warning comment will be created</ns2:comment>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/ca-helper-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jasper/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/transaction/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jetty6/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/ca-helper-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jasper/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/j2ee-server/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/transaction/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jetty6/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"JettyWebConnector\">\n" +
" <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
" <ns2:attribute name=\"port\">${HTTPPort + PortOffset}</ns2:attribute>\n" +
@@ -58,15 +58,15 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"port\">${HTTPSPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/clustering/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/clustering/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"Node\">\n" +
" <ns2:attribute name=\"nodeName\">${clusterNodeName}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/webservices-common/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/myfaces-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/myfaces/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/j2ee-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/webservices-common/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/myfaces-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/myfaces/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/j2ee-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"WebBuilder\">\n" +
" <ns2:attribute name=\"defaultNamespace\">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0</ns2:attribute>\n" +
" </ns2:gbean>\n" +
@@ -74,12 +74,12 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/activemq-ra/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/activemq-ra/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"ActiveMQ RA\">\n" +
" <ns2:attribute name=\"ServerUrl\">tcp://${ServerHostname}:${ActiveMQPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/activemq-broker/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/activemq-broker/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"ActiveMQ.tcp.default\">\n" +
" <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
" <ns2:attribute name=\"port\">${ActiveMQPort + PortOffset}</ns2:attribute>\n" +
@@ -89,13 +89,13 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"port\">${ActiveMQStompPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/system-database/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/system-database/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"DerbyNetwork\">\n" +
" <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
" <ns2:attribute name=\"port\">${DerbyPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/connector-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/connector-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"ResourceRefBuilder\">\n" +
" <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
" <ns2:attribute name=\"defaultEnvironment\">\n" +
@@ -126,18 +126,18 @@ public class LocalAttributeManagerReadWr
" </environment:environment></ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jasper-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jetty6-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/client-security/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/client/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb-deployer/2.1-SNAPSHOT/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jasper-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jetty6-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/client-security/2.1-TEST/car\" load=\"false\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/client/2.1-TEST/car\" load=\"false\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb-deployer/2.1-TEST/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\">\n" +
" <ns2:gbean name=\"Axis2ModuleBuilderExtension\">\n" +
" <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jaxws-ejb-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jaxws-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/openejb-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jaxws-ejb-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jaxws-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/openejb-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"EjbRefBuilder\">\n" +
" <ns2:attribute name=\"eeNamespaces\">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</ns2:attribute>\n" +
" </ns2:gbean>\n" +
@@ -147,27 +147,27 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"port\">${OpenEJBPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/openejb/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/openejb/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"EJBNetworkService\">\n" +
" <ns2:attribute name=\"port\">${OpenEJBPort + PortOffset}</ns2:attribute>\n" +
" <ns2:attribute name=\"host\">${ServerHostname}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/openjpa/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis2-deployer/2.1-SNAPSHOT/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis2/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/system-database-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/console-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/pluto-support/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/spring/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.framework/transformer-agent/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/remote-deploy-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/cxf/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/debugviews-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/dojo-jetty6/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/persistence-jpa10-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/openjpa/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis2-deployer/2.1-TEST/car\" condition=\"props['org.apache.geronimo.jaxws.provider'] == 'axis2'\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis2/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis2-ejb/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/system-database-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/console-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/pluto-support/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/spring/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.framework/transformer-agent/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/remote-deploy-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/cxf/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/debugviews-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/dojo-jetty6/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/persistence-jpa10-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"PersistenceUnitBuilder\">\n" +
" <ns2:attribute name=\"defaultPersistenceProviderClassName\">org.apache.openjpa.persistence.PersistenceProviderImpl</ns2:attribute>\n" +
" <ns2:attribute name=\"defaultPersistenceUnitProperties\">openjpa.Log=commons\n" +
@@ -186,9 +186,9 @@ public class LocalAttributeManagerReadWr
" </environment:environment></ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/activemq-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-wadi/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/wadi-clustering/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/activemq-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-wadi/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/wadi-clustering/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"DefaultBackingStrategyFactory\">\n" +
" <ns2:attribute name=\"nbReplica\">${ReplicaCount}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
@@ -197,9 +197,9 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"clusterName\">${ClusterName}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/uddi-jetty6/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/axis-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/uddi-jetty6/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/axis-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"AxisModuleBuilderExtension\">\n" +
" <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
" <ns2:attribute name=\"defaultEnvironment\">\n" +
@@ -214,7 +214,7 @@ public class LocalAttributeManagerReadWr
" </environment:environment></ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/j2ee-corba-yoko/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/j2ee-corba-yoko/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"NameServer\">\n" +
" <ns2:attribute name=\"port\">${COSNamingPort + PortOffset}</ns2:attribute>\n" +
" <ns2:attribute name=\"host\">${COSNamingHost}</ns2:attribute>\n" +
@@ -228,38 +228,38 @@ public class LocalAttributeManagerReadWr
" <ns2:attribute name=\"host\">${ORBHost}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/mejb/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-builder-wadi/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/mejb/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/jetty6-clustering-builder-wadi/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"JettyClusteringBuilder\">\n" +
" <ns2:attribute name=\"defaultSweepInterval\">${DefaultWadiSweepInterval}</ns2:attribute>\n" +
" <ns2:attribute name=\"defaultNumPartitions\">${DefaultWadiNumPartitions}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/hot-deployer/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/hot-deployer/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"HotDeployer\">\n" +
" <ns2:attribute name=\"path\">deploy/</ns2:attribute>\n" +
" <ns2:attribute name=\"pollIntervalMillis\">2000</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/openejb-corba-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/client-corba-yoko/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/javamail/2.1-SNAPSHOT/car\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/openejb-corba-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/client-corba-yoko/2.1-TEST/car\" load=\"false\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/javamail/2.1-TEST/car\">\n" +
" <ns2:gbean name=\"SMTPTransport\">\n" +
" <ns2:attribute name=\"host\">${SMTPHost}</ns2:attribute>\n" +
" <ns2:attribute name=\"port\">${SMTPPort + PortOffset}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/cxf-deployer/2.1-SNAPSHOT/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/welcome-jetty/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/sharedlib/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/client-deployer/2.1-SNAPSHOT/car\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/client-transaction/2.1-SNAPSHOT/car\" load=\"false\"/>\n" +
- " <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb-deployer/2.1-SNAPSHOT/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\">\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/cxf-deployer/2.1-TEST/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/welcome-jetty/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/sharedlib/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/client-deployer/2.1-TEST/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/client-transaction/2.1-TEST/car\" load=\"false\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.configs/cxf-ejb-deployer/2.1-TEST/car\" condition=\"props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'\">\n" +
" <ns2:gbean name=\"CXFModuleBuilderExtension\">\n" +
" <ns2:attribute name=\"listener\">?name=${webcontainer}</ns2:attribute>\n" +
" </ns2:gbean>\n" +
" </ns2:module>\n" +
- " <ns2:module name=\"org.apache.geronimo.plugins/plancreator-jetty/2.1-SNAPSHOT/car\"/>\n" +
+ " <ns2:module name=\"org.apache.geronimo.plugins/plancreator-jetty/2.1-TEST/car\"/>\n" +
"</ns2:attributes>\n";
public void testReadWrite() throws Exception {
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -313,11 +313,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -97,16 +97,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -102,16 +102,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -158,11 +158,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-clustering-wadi/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -67,16 +67,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<type>jar</type>
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=1153137&r1=1153136&r2=1153137&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 Tue Aug 2 14:20:17 2011
@@ -88,11 +88,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>commons-dbcp-all</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>mbean-annotation-api</artifactId>
<type>jar</type>
</dependency>
@@ -163,11 +158,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans-deployer/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -21,4 +21,9 @@
<artifactId>geronimo-openwebbeans-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Tue Aug 2 14:20:17 2011
@@ -57,11 +57,6 @@
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-j2ee-schema</artifactId>
<type>jar</type>
@@ -113,21 +108,6 @@
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-javaagent</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jee</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-loader</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-multicast</artifactId>
<type>jar</type>
</dependency>
@@ -143,25 +123,10 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ee-common</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp?rev=1153137&r1=1153136&r2=1153137&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/plugins/welcome/geronimo-welcome/src/main/webapp/index.jsp Tue Aug 2 14:20:17 2011
@@ -103,7 +103,7 @@
<!--<a href="/servlets-examples/">Servlet Examples </a><br />-->
<!--<a href="/jsp-examples/">JSP Examples </a><br />-->
<!--<a href="/ldap-demo/">LDAP Demo</a><br />-->
- <a href="http://geronimo.apache.org/redirects/additionalSamples.html">Geronimo Sample Applications</a><br />
+ - <a href="http://geronimo.apache.org/redirects/additionalSamples.html">Geronimo Sample Applications</a><br />
</td>
</tr>
</table>