You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/01/31 15:36:47 UTC

svn commit: r373823 [1/3] - in /incubator/servicemix/trunk: etc/ servicemix-assembly/ servicemix-assembly/src/main/release/examples/servicemix-web/ servicemix-assembly/src/sandbox/xfire-binding/ servicemix-components/ servicemix-components/src/main/jav...

Author: gnodet
Date: Tue Jan 31 06:36:22 2006
New Revision: 373823

URL: http://svn.apache.org/viewcvs?rev=373823&view=rev
Log:
SM-278 : Upgrade to jetty 6

Modified:
    incubator/servicemix/trunk/etc/project.properties
    incubator/servicemix/trunk/servicemix-assembly/project.xml
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
    incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
    incubator/servicemix/trunk/servicemix-assembly/src/sandbox/xfire-binding/project.xml
    incubator/servicemix/trunk/servicemix-components/project.xml
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpClientMarshaler.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpConnector.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpInvoker.java
    incubator/servicemix/trunk/servicemix-components/src/main/java/org/apache/servicemix/components/http/HttpSoapConnector.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapTest.java
    incubator/servicemix/trunk/servicemix-core/project.xml
    incubator/servicemix/trunk/servicemix-http/project.xml
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpBridgeServlet.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfiguration.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpConfigurationMBean.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpLifeCycle.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/ServerManager.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ConsumerProcessor.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpConsumerTest.java
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpProviderTest.java
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/ServerManagerTest.java
    incubator/servicemix/trunk/servicemix-wsn2005/project.xml

Modified: incubator/servicemix/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.properties?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Tue Jan 31 06:36:22 2006
@@ -18,8 +18,6 @@
 # P R O J E C T  P R O P E R T I E S
 # -------------------------------------------------------------------
 
-maven.repo.remote=http://www.ibiblio.org/maven,http://dist.codehaus.org,http://cvs.apache.org/repository
-
 maven.compile.source=1.4
 maven.compile.target=1.4
 maven.test.source=1.4
@@ -80,10 +78,10 @@
 maven.repo.apache.ssh.executable=ssh
 maven.repo.apache.scp.executable=scp
 
-maven.repo.remote=\
-http://cvs.apache.org/repository,\
-http://www.ibiblio.org/maven,\
-http://dist.codehaus.org
+maven.repo.remote = http://cvs.apache.org/repository, \
+                    http://www.ibiblio.org/maven, \
+                    http://dist.codehaus.org, \
+                    http://servicemix.org/maven-repo
 
 maven.eclipse.resources.addtoclasspath = true
 
@@ -237,7 +235,7 @@
 # http://openejb.codehaus.org/, (Used in Geronimo) - BSD
 openejb_core_version=2.0-SNAPSHOT
 # http://jetty.mortbay.org/, ASL 2
-org.mortbay.jetty_version=5.1.9
+jetty_version=6.0-SNAPSHOT
 # http://jakarta.apache.org/oro/, ASL 2
 oro_version=2.0.8
 # http://portals.apache.org/pluto/, ASL 2

Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Tue Jan 31 06:36:22 2006
@@ -1,799 +1,799 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-
-    Copyright 2005 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
-<!DOCTYPE project>
-<project>
-  <pomVersion>3</pomVersion>
-  <extend>${basedir}/../etc/project.xml</extend>
-  
-  <name>ServiceMix :: Assembly</name>
-  <id>servicemix</id>   
-  
-  <shortDescription>ServiceMix Assembly</shortDescription>
-  <description>ServiceMix Assembly creates a ServiceMix distribution</description>
-
-  <!-- ============ -->
-  <!-- Dependencies -->
-  <!-- ============ -->
-  <dependencies>
-
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-jbi</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <servicemix.module>true</servicemix.module>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <servicemix.module>true</servicemix.module>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-components</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <servicemix.module>true</servicemix.module>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-jms</artifactId>
-      <version>${pom.currentVersion}</version>
-      <type>zip</type>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-http</artifactId>
-      <type>zip</type>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-sca</artifactId>
-      <type>zip</type>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-lwcontainer</artifactId>
-      <version>${pom.currentVersion}</version>
-      <type>zip</type>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-jsr181</artifactId>
-      <version>${pom.currentVersion}</version>
-      <type>zip</type>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>servicemix-wsn2005</artifactId>
-      <version>${pom.currentVersion}</version>
-      <type>zip</type>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <component>true</component>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <version>${xbean_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.xbean</groupId>
-      <artifactId>xbean-server</artifactId>
-      <version>${xbean_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.xbean</groupId>
-      <artifactId>xbean-kernel</artifactId>
-      <version>${xbean_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring</artifactId>
-      <version>${spring_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <id>concurrent</id>
-      <version>${concurrent_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>backport-util-concurrent</id>
-      <version>${backport_util_concurrent_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>wsdl4j</id>
-      <version>${wsdl4j_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-beanutils</id>
-      <version>${commons_beanutils_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>ant</id>
-      <version>${ant_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <!-- XML -->
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax-api</artifactId>
-      <version>${stax_api_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>stax-utils</artifactId>
-      <version>${stax_utils_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>woodstox</groupId>
-      <artifactId>wstx-asl</artifactId>
-      <version>${woodstox_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>${xalan_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>${xercesImpl_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <!-- LOGGING -->
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons_logging_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>${log4j_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-      
-    <!-- J2EE JARs -->
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jms_1.1_spec</artifactId>
-      <version>${geronimo_spec_jms_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-      <version>${geronimo_spec_jta_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-      <version>${geronimo_spec_j2ee_management_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-      <version>${geronimo_spec_j2ee_connector_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
-      <version>${geronimo_spec_activation_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-servlet_2.4_spec</artifactId>
-      <version>${geronimo_spec_servlet_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
-      <version>${geronimo_spec_javamail_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- example database for testing -->
-    <dependency>
-      <id>hsqldb</id>
-      <version>${hsqldb_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- Jencks -->
-    <dependency>
-      <id>jencks+all</id>
-      <version>${jencks_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-
-    <!--  for ActiveMQ 4.x -->
-    <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activemq</artifactId>
-      <version>${activemq_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>incubator-activemq</groupId>
-      <artifactId>activemq-ra</artifactId>
-      <version>${activemq_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-
-    <!-- default database for ActiveMQ -->
-    <!-- To create Pooled DataSources for the JDBC message store -->
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-      <version>${commons_dbcp_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <version>${derby_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- for pooling JMS and other resources -->
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>${commons_collections_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-pool</groupId>
-      <artifactId>commons-pool</artifactId>
-      <version>${commons_pool_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <!-- MX4J JMX Server -->
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j</artifactId>
-      <version>${mx4j_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-remote</artifactId>
-      <version>${mx4j_remote_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-tools</artifactId>
-      <version>${mx4j_tools_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <!-- Quartz scheduler -->
-    <dependency>
-      <groupId>quartz</groupId>
-      <artifactId>quartz</artifactId>
-      <version>${quartz_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-      <version>${jaxen_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- optional used for in-web container testing -->
-    <dependency>
-      <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
-      <version>${org.mortbay.jetty_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler-jdt</artifactId>
-      <version>${jasper_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-compiler</artifactId>
-      <version>${jasper_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>tomcat</groupId>
-      <artifactId>jasper-runtime</artifactId>
-      <version>${jasper_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- Rome RSS Reader -->
-    <dependency>
-      <groupId>rome</groupId>
-      <artifactId>rome</artifactId>
-      <version>${rome_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- VFS binding -->
-    <dependency>
-      <groupId>commons-vfs</groupId>
-      <artifactId>commons-vfs</artifactId>
-      <version>${commons_vfs_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    
-    <!-- Lingo -->
-    <dependency>
-      <groupId>lingo</groupId>
-      <artifactId>lingo</artifactId>
-      <version>${lingo_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-
-    <!-- Groovy -->
-    <dependency>
-      <groupId>groovy</groupId>
-      <artifactId>groovy-all-1.0-jsr</artifactId>
-      <version>${groovy_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr-223</artifactId>
-      <version>${jsr_223_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <id>activecluster</id>
-      <version>${activecluster_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>activesoap</id>
-      <version>${activesoap_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>antlr</groupId>
-      <artifactId>antlr</artifactId>
-      <version>${antlr_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis</artifactId>
-      <version>${axis_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>axis</groupId>
-      <artifactId>axis-jaxrpc</artifactId>
-      <version>${axis_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>${commons_httpclient_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-codec</id>
-      <version>${commons_codec_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-discovery</id>
-      <version>${commons_discovery_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>commons-net</id>
-      <version>${commons_net_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>oro</id>
-      <version>${oro_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>drools+all-jdk1.4</id>
-      <version>${drools_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>janino</id>
-      <version>${janino_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <id>jdom</id>
-      <version>${jdom_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>wsif</artifactId>
-      <version>${wsif_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>wsif-j2c</artifactId>
-      <version>${wsif_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>xfire-all</artifactId>
-      <version>${xfire_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>yom</groupId>
-      <artifactId>yom</artifactId>
-      <version>${yom_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>xstream</groupId>
-      <artifactId>xstream</artifactId>
-      <version>${xstream_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>xmlbeans</groupId>
-      <artifactId>xbean</artifactId>
-      <version>${xmlbeans_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-
-    <!-- JAX-WS component dependencies -->
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr181-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxws-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>saaj-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>saaj-impl</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxws-rt</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>http</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>sjsxp</artifactId>
-      <version>${jaxws_rt_version}</version>
-      <properties>
-        <optional>true</optional>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>${xml_apis_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>ddlutils</artifactId>
-      <version>${ddlutils_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>${commons_lang_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-betwixt</groupId>
-      <artifactId>commons-betwixt</artifactId>
-      <version>${commons_betwixt_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>${commons_digester_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>${classworlds_version}</version>
-      <properties>
-        <lib>true</lib>
-      </properties>
-    </dependency>
-  </dependencies>
-
-</project>
-    
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+
+    Copyright 2005 The Apache Software Foundation
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+
+<!DOCTYPE project>
+<project>
+  <pomVersion>3</pomVersion>
+  <extend>${basedir}/../etc/project.xml</extend>
+  
+  <name>ServiceMix :: Assembly</name>
+  <id>servicemix</id>   
+  
+  <shortDescription>ServiceMix Assembly</shortDescription>
+  <description>ServiceMix Assembly creates a ServiceMix distribution</description>
+
+  <!-- ============ -->
+  <!-- Dependencies -->
+  <!-- ============ -->
+  <dependencies>
+
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-jbi</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <servicemix.module>true</servicemix.module>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <servicemix.module>true</servicemix.module>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-components</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <servicemix.module>true</servicemix.module>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-jms</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>zip</type>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-http</artifactId>
+      <type>zip</type>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-sca</artifactId>
+      <type>zip</type>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-lwcontainer</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>zip</type>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-jsr181</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>zip</type>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>servicemix-wsn2005</artifactId>
+      <version>${pom.currentVersion}</version>
+      <type>zip</type>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <component>true</component>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <version>${xbean_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.xbean</groupId>
+      <artifactId>xbean-server</artifactId>
+      <version>${xbean_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.xbean</groupId>
+      <artifactId>xbean-kernel</artifactId>
+      <version>${xbean_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>${spring_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <id>concurrent</id>
+      <version>${concurrent_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>backport-util-concurrent</id>
+      <version>${backport_util_concurrent_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>wsdl4j</id>
+      <version>${wsdl4j_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-beanutils</id>
+      <version>${commons_beanutils_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>ant</id>
+      <version>${ant_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <!-- XML -->
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>${stax_api_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>stax-utils</artifactId>
+      <version>${stax_utils_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <version>${woodstox_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>${xalan_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>${xercesImpl_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <!-- LOGGING -->
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons_logging_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>${log4j_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+      
+    <!-- J2EE JARs -->
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+      <version>${geronimo_spec_jms_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+      <version>${geronimo_spec_jta_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+      <version>${geronimo_spec_j2ee_management_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+      <version>${geronimo_spec_j2ee_connector_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+      <version>${geronimo_spec_activation_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-servlet_2.4_spec</artifactId>
+      <version>${geronimo_spec_servlet_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-javamail_1.3.1_spec</artifactId>
+      <version>${geronimo_spec_javamail_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- example database for testing -->
+    <dependency>
+      <id>hsqldb</id>
+      <version>${hsqldb_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- Jencks -->
+    <dependency>
+      <id>jencks+all</id>
+      <version>${jencks_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+
+    <!--  for ActiveMQ 4.x -->
+    <dependency>
+      <groupId>incubator-activemq</groupId>
+      <artifactId>activemq</artifactId>
+      <version>${activemq_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>incubator-activemq</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <version>${activemq_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+
+    <!-- default database for ActiveMQ -->
+    <!-- To create Pooled DataSources for the JDBC message store -->
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>${commons_dbcp_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- for pooling JMS and other resources -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commons_collections_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>${commons_pool_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <!-- MX4J JMX Server -->
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j</artifactId>
+      <version>${mx4j_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-remote</artifactId>
+      <version>${mx4j_remote_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-tools</artifactId>
+      <version>${mx4j_tools_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <!-- Quartz scheduler -->
+    <dependency>
+      <groupId>quartz</groupId>
+      <artifactId>quartz</artifactId>
+      <version>${quartz_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <version>${jaxen_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- optional used for in-web container testing -->
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>${jetty_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler-jdt</artifactId>
+      <version>${jasper_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <version>${jasper_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${jasper_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- Rome RSS Reader -->
+    <dependency>
+      <groupId>rome</groupId>
+      <artifactId>rome</artifactId>
+      <version>${rome_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- VFS binding -->
+    <dependency>
+      <groupId>commons-vfs</groupId>
+      <artifactId>commons-vfs</artifactId>
+      <version>${commons_vfs_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    
+    <!-- Lingo -->
+    <dependency>
+      <groupId>lingo</groupId>
+      <artifactId>lingo</artifactId>
+      <version>${lingo_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+
+    <!-- Groovy -->
+    <dependency>
+      <groupId>groovy</groupId>
+      <artifactId>groovy-all-1.0-jsr</artifactId>
+      <version>${groovy_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr-223</artifactId>
+      <version>${jsr_223_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <id>activecluster</id>
+      <version>${activecluster_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>activesoap</id>
+      <version>${activesoap_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>${antlr_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+      <version>${axis_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis-jaxrpc</artifactId>
+      <version>${axis_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-httpclient</id>
+      <version>${commons_httpclient_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-codec</id>
+      <version>${commons_codec_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-discovery</id>
+      <version>${commons_discovery_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>commons-net</id>
+      <version>${commons_net_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>oro</id>
+      <version>${oro_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>drools+all-jdk1.4</id>
+      <version>${drools_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>janino</id>
+      <version>${janino_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <id>jdom</id>
+      <version>${jdom_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>wsif</artifactId>
+      <version>${wsif_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>wsif-j2c</artifactId>
+      <version>${wsif_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>xfire-all</artifactId>
+      <version>${xfire_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>yom</groupId>
+      <artifactId>yom</artifactId>
+      <version>${yom_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xstream</groupId>
+      <artifactId>xstream</artifactId>
+      <version>${xstream_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xmlbeans</groupId>
+      <artifactId>xbean</artifactId>
+      <version>${xmlbeans_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+
+    <!-- JAX-WS component dependencies -->
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr181-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>saaj-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxws-rt</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>http</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>sjsxp</artifactId>
+      <version>${jaxws_rt_version}</version>
+      <properties>
+        <optional>true</optional>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>${xml_apis_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>ddlutils</artifactId>
+      <version>${ddlutils_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>${commons_lang_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-betwixt</groupId>
+      <artifactId>commons-betwixt</artifactId>
+      <version>${commons_betwixt_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>${commons_digester_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>classworlds</groupId>
+      <artifactId>classworlds</artifactId>
+      <version>${classworlds_version}</version>
+      <properties>
+        <lib>true</lib>
+      </properties>
+    </dependency>
+  </dependencies>
+
+</project>
+    

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties Tue Jan 31 06:36:22 2006
@@ -29,7 +29,7 @@
 geronimo_spec_jms_version=1.0
 activemq_version=4.0-SNAPSHOT
 commons_logging_version=1.0.4
-org.mortbay.jetty_version=5.1.9
+jetty_version=6.0-SNAPSHOT
 spring_version=1.2.5
 xbean_version=2.1
 jencks_version=1.1.2

Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml Tue Jan 31 06:36:22 2006
@@ -86,8 +86,8 @@
     
     <dependency>
       <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
-      <version>${org.mortbay.jetty_version}</version>
+      <artifactId>jetty</artifactId>
+      <version>${jetty_version}</version>
       <properties>
         <war.bundle>false</war.bundle>
       </properties>

Modified: incubator/servicemix/trunk/servicemix-assembly/src/sandbox/xfire-binding/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/sandbox/xfire-binding/project.xml?rev=373823&r1=373822&r2=373823&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/sandbox/xfire-binding/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/sandbox/xfire-binding/project.xml Tue Jan 31 06:36:22 2006
@@ -116,7 +116,7 @@
 
     <dependency>
       <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
+      <artifactId>jetty</artifactId>
       <version>5.1-SNAPSHOT</version>
       <properties>
         <optional>true</optional>