You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/12/11 10:45:11 UTC
svn commit: r355949 - in /geronimo/branches/1.0: ./ configs/activemq-broker/
configs/client-corba/ configs/client-security/ configs/client/
configs/console-jetty/ configs/console-tomcat/ configs/daytrader-jetty/
configs/daytrader-tomcat/ configs/direct...
Author: djencks
Date: Sun Dec 11 01:44:56 2005
New Revision: 355949
URL: http://svn.apache.org/viewcvs?rev=355949&view=rev
Log:
GERONIMO-1326 Remove servicemix from branch 1.0
Removed:
geronimo/branches/1.0/modules/servicemix/
geronimo/branches/1.0/modules/servicemix-builder/
Modified:
geronimo/branches/1.0/configs/activemq-broker/project.xml
geronimo/branches/1.0/configs/client-corba/project.xml
geronimo/branches/1.0/configs/client-security/project.xml
geronimo/branches/1.0/configs/client/project.xml
geronimo/branches/1.0/configs/console-jetty/project.xml
geronimo/branches/1.0/configs/console-tomcat/project.xml
geronimo/branches/1.0/configs/daytrader-jetty/project.xml
geronimo/branches/1.0/configs/daytrader-tomcat/project.xml
geronimo/branches/1.0/configs/directory/project.xml
geronimo/branches/1.0/configs/hot-deployer/project.xml
geronimo/branches/1.0/configs/j2ee-corba/project.xml
geronimo/branches/1.0/configs/j2ee-deployer/project.xml
geronimo/branches/1.0/configs/j2ee-deployer/src/plan/plan.xml
geronimo/branches/1.0/configs/j2ee-security/project.xml
geronimo/branches/1.0/configs/j2ee-server/project.xml
geronimo/branches/1.0/configs/jetty-deployer/project.xml
geronimo/branches/1.0/configs/jetty/project.xml
geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml
geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml
geronimo/branches/1.0/configs/jsp-examples-jetty/project.xml
geronimo/branches/1.0/configs/jsp-examples-tomcat/project.xml
geronimo/branches/1.0/configs/rmi-naming/project.xml
geronimo/branches/1.0/configs/servlets-examples-jetty/project.xml
geronimo/branches/1.0/configs/servlets-examples-tomcat/project.xml
geronimo/branches/1.0/configs/system-database/project.xml
geronimo/branches/1.0/configs/tomcat-deployer/project.xml
geronimo/branches/1.0/configs/tomcat/project.xml
geronimo/branches/1.0/configs/uddi-jetty/project.xml
geronimo/branches/1.0/configs/uddi-tomcat/project.xml
geronimo/branches/1.0/configs/welcome-jetty/project.xml
geronimo/branches/1.0/configs/welcome-tomcat/project.xml
geronimo/branches/1.0/etc/project.properties
geronimo/branches/1.0/pom.xml
Modified: geronimo/branches/1.0/configs/activemq-broker/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/activemq-broker/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/activemq-broker/project.xml (original)
+++ geronimo/branches/1.0/configs/activemq-broker/project.xml Sun Dec 11 01:44:56 2005
@@ -139,11 +139,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/client-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/client-corba/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/client-corba/project.xml (original)
+++ geronimo/branches/1.0/configs/client-corba/project.xml Sun Dec 11 01:44:56 2005
@@ -139,11 +139,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/client-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/client-security/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/client-security/project.xml (original)
+++ geronimo/branches/1.0/configs/client-security/project.xml Sun Dec 11 01:44:56 2005
@@ -133,11 +133,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/client/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/client/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/client/project.xml (original)
+++ geronimo/branches/1.0/configs/client/project.xml Sun Dec 11 01:44:56 2005
@@ -175,11 +175,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/console-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/console-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/console-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/console-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -294,11 +294,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/console-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/console-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/console-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/console-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -300,11 +300,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/daytrader-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -164,11 +164,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/daytrader-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/daytrader-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/daytrader-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/daytrader-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -166,11 +166,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-tomcat</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/directory/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/directory/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/directory/project.xml (original)
+++ geronimo/branches/1.0/configs/directory/project.xml Sun Dec 11 01:44:56 2005
@@ -149,11 +149,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/hot-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/hot-deployer/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/hot-deployer/project.xml (original)
+++ geronimo/branches/1.0/configs/hot-deployer/project.xml Sun Dec 11 01:44:56 2005
@@ -172,11 +172,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/j2ee-corba/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-corba/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-corba/project.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-corba/project.xml Sun Dec 11 01:44:56 2005
@@ -139,11 +139,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/j2ee-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-deployer/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-deployer/project.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-deployer/project.xml Sun Dec 11 01:44:56 2005
@@ -321,15 +321,6 @@
</properties>
</dependency>
- <!-- JBI using ServiceMix -->
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix-builder</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
</dependencies>
</project>
Modified: geronimo/branches/1.0/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-deployer/src/plan/plan.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-deployer/src/plan/plan.xml Sun Dec 11 01:44:56 2005
@@ -16,9 +16,6 @@
limitations under the License.
-->
-<!--
- parentId="${pom.groupId}/geronimo-gbean-deployer/${pom.currentVersion}/car"
--->
<configuration xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car"
>
@@ -117,17 +114,6 @@
<pattern><gbean-name>geronimo.maven:name=MavenConfigStore,j2eeType=ConfigurationStore</gbean-name></pattern>
<pattern><gbean-name>geronimo.server:j2eeType=ConfigurationStore,name=Local</gbean-name></pattern>
</references>
- <reference name="Repository">
- <gbean-name>*:name=Repository,*</gbean-name>
- </reference>
- </gbean>
-
- <gbean name="JBIBuilder" class="org.apache.geronimo.servicemix.deployment.ServiceMixConfigBuilder">
- <attribute name="defaultParentId">${pom.groupId}/j2ee-server/${pom.currentVersion}/car</attribute>
- <attribute name="deploymentDependencies">
- servicemix/jars/spring-${servicemix_spring_version}.jar,
- servicemix/jars/servicemix-${servicemix_version}.jar
- </attribute>
<reference name="Repository">
<gbean-name>*:name=Repository,*</gbean-name>
</reference>
Modified: geronimo/branches/1.0/configs/j2ee-security/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-security/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-security/project.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-security/project.xml Sun Dec 11 01:44:56 2005
@@ -142,11 +142,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/j2ee-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/j2ee-server/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/j2ee-server/project.xml (original)
+++ geronimo/branches/1.0/configs/j2ee-server/project.xml Sun Dec 11 01:44:56 2005
@@ -105,14 +105,6 @@
</properties>
</dependency>
<dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- <properties>
- <geronimo.dependency>true</geronimo.dependency>
- </properties>
- </dependency>
- <dependency>
<groupId>openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb_version}</version>
Modified: geronimo/branches/1.0/configs/jetty-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jetty-deployer/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jetty-deployer/project.xml (original)
+++ geronimo/branches/1.0/configs/jetty-deployer/project.xml Sun Dec 11 01:44:56 2005
@@ -146,11 +146,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -148,11 +148,6 @@
<artifactId>geronimo-axis</artifactId>
<version>${geronimo_version}</version>
</dependency>
- <dependency>
- <groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
<dependency>
<groupId>concurrent</groupId>
Modified: geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/jmxdebug-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/jmxdebug-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/jsp-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jsp-examples-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jsp-examples-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/jsp-examples-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/jsp-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jsp-examples-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jsp-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/jsp-examples-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/rmi-naming/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/rmi-naming/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/rmi-naming/project.xml (original)
+++ geronimo/branches/1.0/configs/rmi-naming/project.xml Sun Dec 11 01:44:56 2005
@@ -157,11 +157,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/servlets-examples-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/servlets-examples-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/servlets-examples-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/servlets-examples-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/servlets-examples-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/servlets-examples-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/servlets-examples-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/servlets-examples-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/system-database/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/system-database/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/system-database/project.xml (original)
+++ geronimo/branches/1.0/configs/system-database/project.xml Sun Dec 11 01:44:56 2005
@@ -179,11 +179,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/tomcat-deployer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/tomcat-deployer/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/tomcat-deployer/project.xml (original)
+++ geronimo/branches/1.0/configs/tomcat-deployer/project.xml Sun Dec 11 01:44:56 2005
@@ -147,11 +147,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -137,11 +137,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/uddi-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/uddi-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/uddi-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/uddi-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -185,11 +185,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/uddi-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/uddi-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/uddi-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/uddi-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -200,11 +200,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/welcome-jetty/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/welcome-jetty/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/welcome-jetty/project.xml (original)
+++ geronimo/branches/1.0/configs/welcome-jetty/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/configs/welcome-tomcat/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/welcome-tomcat/project.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/welcome-tomcat/project.xml (original)
+++ geronimo/branches/1.0/configs/welcome-tomcat/project.xml Sun Dec 11 01:44:56 2005
@@ -150,11 +150,6 @@
</dependency>
<dependency>
<groupId>geronimo</groupId>
- <artifactId>geronimo-servicemix</artifactId>
- <version>${geronimo_version}</version>
- </dependency>
- <dependency>
- <groupId>geronimo</groupId>
<artifactId>geronimo-jetty</artifactId>
<version>${geronimo_version}</version>
</dependency>
Modified: geronimo/branches/1.0/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/etc/project.properties?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/etc/project.properties (original)
+++ geronimo/branches/1.0/etc/project.properties Sun Dec 11 01:44:56 2005
@@ -161,10 +161,7 @@
p2psockets_version=1.1.2
regexp_version=1.3
scout_version=0.5
-servicemix_spring_version=1.2.2-dev-2
-servicemix_version=1.0.1
slf4j_version=1.0-beta7
-spring_version=1.1.3
standard_taglibs_version=1.1.1
stax_version=1.1.1-dev
stax_api_version=1.0
Modified: geronimo/branches/1.0/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/pom.xml?rev=355949&r1=355948&r2=355949&view=diff
==============================================================================
--- geronimo/branches/1.0/pom.xml (original)
+++ geronimo/branches/1.0/pom.xml Sun Dec 11 01:44:56 2005
@@ -187,10 +187,7 @@
<portletApiVersion>1.0</portletApiVersion>
<regexpVersion>1.3</regexpVersion>
<scoutVersion>0.5</scoutVersion>
- <servicemixSpringVersion>1.2.2-dev-2</servicemixSpringVersion>
- <servicemixVersion>1.0.1</servicemixVersion>
<slf4jVersion>1.0-beta7</slf4jVersion>
- <springVersion>1.1.3</springVersion>
<standardTaglibsVersion>1.1.1</standardTaglibsVersion>
<staxApiVersion>1.0</staxApiVersion>
<staxVersion>1.1.1-dev</staxVersion>