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/02/09 23:12:48 UTC

svn commit: r376451 [1/3] - in /incubator/servicemix/trunk: etc/ sandbox/servicemix-wsn-1.2/ sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/ servicemix-assembly/ servicemix-assembly/src/main/release/examples/servicemix-web/ ser...

Author: gnodet
Date: Thu Feb  9 14:11:46 2006
New Revision: 376451

URL: http://svn.apache.org/viewcvs?rev=376451&view=rev
Log:
Migrated to using xbean 2.2-SNAPSHOT

Modified:
    incubator/servicemix/trunk/etc/project.properties
    incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml
    incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiHttpNotificationTest.java
    incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java
    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-common/project.xml
    incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
    incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java
    incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java
    incubator/servicemix/trunk/servicemix-components/project.xml
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingClusterTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingUsingEndpointSubscriptionTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jmx/CounterMonitorComponentTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MorePojoTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentClusterTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/rss/FeedWriterTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/GroovyTransformTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/vfs/FileTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/TransformComponentTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltPublisherTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltRouterTest.java
    incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltSplitTest.java
    incubator/servicemix/trunk/servicemix-core/maven.xml
    incubator/servicemix/trunk/servicemix-core/project.xml
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/Main.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditor.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/XmlWebApplicationContext.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/spring/XBeanProcessor.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringServiceUnitContainer.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java
    incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java
    incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java
    incubator/servicemix/trunk/servicemix-gbean/project.xml
    incubator/servicemix/trunk/servicemix-gbean/src/main/java/org/apache/servicemix/gbean/ServiceMixConfigBuilder.java
    incubator/servicemix/trunk/servicemix-gplan/project.xml
    incubator/servicemix/trunk/servicemix-http/maven.xml
    incubator/servicemix/trunk/servicemix-http/project.xml
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
    incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpSpringComponent.java
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
    incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
    incubator/servicemix/trunk/servicemix-jms/project.xml
    incubator/servicemix/trunk/servicemix-jsr181/maven.xml
    incubator/servicemix/trunk/servicemix-jsr181/project.xml
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181SpringComponent.java
    incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java
    incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
    incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerXBeanDeployer.java
    incubator/servicemix/trunk/servicemix-sca/maven.xml
    incubator/servicemix/trunk/servicemix-sca/project.xml
    incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.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=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Thu Feb  9 14:11:46 2006
@@ -279,7 +279,7 @@
 xerces_version=2.2.1
 xercesImpl_version=2.7.1
 # http://www.xbean.org/, ASL 2
-xbean_version=2.1
+xbean_version=2.2-SNAPSHOT
 # http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD
 xfire_version=1.0-20060106
 xfire_jaxws_version=1.0-20060106

Modified: incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/project.xml Thu Feb  9 14:11:46 2006
@@ -1,270 +1,270 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-  <pomVersion>3</pomVersion>
-  <extend>${basedir}/../etc/project.xml</extend>
-
-  <name>ServiceMix :: WS-Notification</name>
-  <id>servicemix-wsnotification</id>
-  <description>
-        ServiceMix implementation of WS Notification
-  </description>
-
-  <package>*</package>
-
- <packageGroups>
-    <packageGroup>
-      <title>WS-Notification Implementation</title>
-      <packages>org.servicemix.ws.notification</packages>
-    </packageGroup>
-  </packageGroups>
-
-
-  <siteDirectory>/home/projects/servicemix/public_html/maven/ws/jaxws/wsn</siteDirectory>
-
-  <dependencies>
-
-    <!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr181-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxws-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxws-rt</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-impl</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jaxb-xjc</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>saaj-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>saaj-impl</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr181-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>jsr250-api</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>sjsxp</artifactId>
-      <version>${jaxws_rt_version}</version>
-    </dependency>
-    
-    <dependency>
-      <id>stax+api</id>
-      <version>${stax_api_version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-jbi</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-core</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-common</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-jsr181</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-components</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>org.xbean</groupId>
-      <artifactId>xbean-spring</artifactId>
-      <version>${xbean_version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>${commons_logging_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>backport-util-concurrent</groupId>
-      <artifactId>backport-util-concurrent</artifactId>
-      <version>${backport_util_concurrent_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>${concurrent_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-jmx</artifactId>
-      <version>${mx4j_version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>activemq</groupId>
-      <artifactId>activemq</artifactId>
-      <version>${activemq_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-servlet</artifactId>
-      <version>${geronimo_spec_servlet_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-activation</artifactId>
-      <version>${geronimo_spec_activation_version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring</artifactId>
-      <version>${spring_version}</version>
-    </dependency>
-
-    <!-- WS POJOs -->
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>servicemix-wspojo</artifactId>
-      <version>${pom.currentVersion}</version>
-      <properties>
-        <eclipse.dependency>true</eclipse.dependency>
-        <jbi.su.bundle>true</jbi.su.bundle>
-      </properties>
-    </dependency>
-
-    <!-- for testing -->
-    <dependency>
-      <id>jencks+all</id>
-      <version>${jencks_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>xfire-all</artifactId>
-      <version>${xfire_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>servicemix</groupId>
-      <artifactId>xfire-jaxws</artifactId>
-      <version>${xfire_jaxws_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-      <version>${jdom_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>backport175</groupId>
-      <artifactId>backport175</artifactId>
-      <version>${backport175_version}</version>
-    </dependency>
-      <dependency>
-        <groupId>commons-attributes</groupId>
-        <artifactId>commons-attributes-api</artifactId>
-        <version>${commons_attributes_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>wsdl4j</groupId>
-        <artifactId>wsdl4j</artifactId>
-        <version>${wsdl4j_version}</version>
-      </dependency>
-    <dependency>
-      <groupId>jetty</groupId>
-      <artifactId>org.mortbay.jetty</artifactId>
-      <version>${org.mortbay.jetty_version}</version>
-    </dependency>
-    <dependency>
-      <id>commons-httpclient</id>
-      <version>${commons_httpclient_version}</version>
-    </dependency>
-    <dependency>
-      <id>commons-codec</id>
-      <version>${commons_codec_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-javamail</artifactId>
-      <version>${geronimo_spec_javamail_version}</version>
-    </dependency>
-    <dependency>
-      <id>xalan</id>
-      <version>${xalan_version}</version>
-    </dependency>
-    <dependency>
-      <id>log4j</id>
-      <version>${log4j_version}</version>
-    </dependency>
-    
-    <!-- optional ActiveSOAP component -->
-    <dependency>
-      <id>activesoap</id>
-      <version>${activesoap_version}</version>
-    </dependency>
-  </dependencies>
-
-
-  <build>
-    <resources>
-      <resource>
-          <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*.xml</include>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project>
+  <pomVersion>3</pomVersion>
+  <extend>${basedir}/../etc/project.xml</extend>
+
+  <name>ServiceMix :: WS-Notification</name>
+  <id>servicemix-wsnotification</id>
+  <description>
+        ServiceMix implementation of WS Notification
+  </description>
+
+  <package>*</package>
+
+ <packageGroups>
+    <packageGroup>
+      <title>WS-Notification Implementation</title>
+      <packages>org.servicemix.ws.notification</packages>
+    </packageGroup>
+  </packageGroups>
+
+
+  <siteDirectory>/home/projects/servicemix/public_html/maven/ws/jaxws/wsn</siteDirectory>
+
+  <dependencies>
+
+    <!-- For JAX-WS: only required for Java 5, will be part of Java 6 -->
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr181-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxws-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxws-rt</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jaxb-xjc</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>saaj-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>saaj-impl</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr181-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>sjsxp</artifactId>
+      <version>${jaxws_rt_version}</version>
+    </dependency>
+    
+    <dependency>
+      <id>stax+api</id>
+      <version>${stax_api_version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-jbi</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-core</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-common</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-jsr181</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-components</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-spring</artifactId>
+      <version>${xbean_version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>${commons_logging_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+      <version>${backport_util_concurrent_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>${concurrent_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-jmx</artifactId>
+      <version>${mx4j_version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>activemq</groupId>
+      <artifactId>activemq</artifactId>
+      <version>${activemq_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-servlet</artifactId>
+      <version>${geronimo_spec_servlet_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-activation</artifactId>
+      <version>${geronimo_spec_activation_version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>${spring_version}</version>
+    </dependency>
+
+    <!-- WS POJOs -->
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>servicemix-wspojo</artifactId>
+      <version>${pom.currentVersion}</version>
+      <properties>
+        <eclipse.dependency>true</eclipse.dependency>
+        <jbi.su.bundle>true</jbi.su.bundle>
+      </properties>
+    </dependency>
+
+    <!-- for testing -->
+    <dependency>
+      <id>jencks+all</id>
+      <version>${jencks_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>xfire-all</artifactId>
+      <version>${xfire_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>servicemix</groupId>
+      <artifactId>xfire-jaxws</artifactId>
+      <version>${xfire_jaxws_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>jdom</groupId>
+      <artifactId>jdom</artifactId>
+      <version>${jdom_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>backport175</groupId>
+      <artifactId>backport175</artifactId>
+      <version>${backport175_version}</version>
+    </dependency>
+      <dependency>
+        <groupId>commons-attributes</groupId>
+        <artifactId>commons-attributes-api</artifactId>
+        <version>${commons_attributes_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>wsdl4j</groupId>
+        <artifactId>wsdl4j</artifactId>
+        <version>${wsdl4j_version}</version>
+      </dependency>
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+      <version>${org.mortbay.jetty_version}</version>
+    </dependency>
+    <dependency>
+      <id>commons-httpclient</id>
+      <version>${commons_httpclient_version}</version>
+    </dependency>
+    <dependency>
+      <id>commons-codec</id>
+      <version>${commons_codec_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-javamail</artifactId>
+      <version>${geronimo_spec_javamail_version}</version>
+    </dependency>
+    <dependency>
+      <id>xalan</id>
+      <version>${xalan_version}</version>
+    </dependency>
+    <dependency>
+      <id>log4j</id>
+      <version>${log4j_version}</version>
+    </dependency>
+    
+    <!-- optional ActiveSOAP component -->
+    <dependency>
+      <id>activesoap</id>
+      <version>${activesoap_version}</version>
+    </dependency>
+  </dependencies>
+
+
+  <build>
+    <resources>
+      <resource>
+          <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*.xml</include>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+  </build>
+
+</project>

Modified: incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiHttpNotificationTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiHttpNotificationTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiHttpNotificationTest.java (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiHttpNotificationTest.java Thu Feb  9 14:11:46 2006
@@ -19,7 +19,7 @@
 import org.servicemix.jbi.jaxp.SourceTransformer;
 import org.servicemix.jbi.jaxp.StringSource;
 import org.servicemix.tck.Receiver;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 import org.xmlsoap.schemas.ws._2003._03.addressing.EndpointReferenceType;
 import org.xmlsoap.schemas.ws._2003._03.addressing.ServiceNameType;
 

Modified: incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java (original)
+++ incubator/servicemix/trunk/sandbox/servicemix-wsn-1.2/src/test/java/org/servicemix/ws/notification/JbiNotificationTest.java Thu Feb  9 14:11:46 2006
@@ -3,7 +3,7 @@
 import org.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.jbi.messaging.NormalizedMessage;
 import javax.xml.namespace.QName;

Modified: incubator/servicemix/trunk/servicemix-assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/project.xml Thu Feb  9 14:11:46 2006
@@ -126,7 +126,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
       <version>${xbean_version}</version>
       <properties>
@@ -134,7 +134,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-server</artifactId>
       <version>${xbean_version}</version>
       <properties>
@@ -142,7 +142,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-kernel</artifactId>
       <version>${xbean_version}</version>
       <properties>

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=376451&r1=376450&r2=376451&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 Thu Feb  9 14:11:46 2006
@@ -31,7 +31,7 @@
 commons_logging_version=1.0.4
 jetty_version=6.0-SNAPSHOT
 spring_version=1.2.5
-xbean_version=2.1
+xbean_version=2.2-SNAPSHOT
 jencks_version=1.1.2
 concurrent_version=1.3.4
 commons_dbcp_version=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=376451&r1=376450&r2=376451&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 Thu Feb  9 14:11:46 2006
@@ -101,7 +101,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
       <version>${xbean_version}</version>
       <url>http://www.xbean.org</url>

Modified: incubator/servicemix/trunk/servicemix-common/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-common/project.xml Thu Feb  9 14:11:46 2006
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-
-    Copyright 2004 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 :: Common</name>
-    <id>servicemix-common</id>
-    <shortDescription>Common components library</shortDescription>
-    <description>Common library for binding component and service engines</description>
-  
-    <package>org.apache.servicemix.common</package>
-    <packageGroups>
-      <packageGroup>
-        <title>Common components library</title>
-        <packages>org.apache.servicemix.common</packages>
-      </packageGroup>
-    </packageGroups>
- 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <dependencies>
-    
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-jbi</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      
-      <!-- J2EE JARs -->
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>${geronimo_spec_j2ee_connector_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>${geronimo_spec_jta_version}</version>
-      </dependency>      
-
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons_logging_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>${backport_util_concurrent_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxp</artifactId>
-        <version>${jaxp_version}</version>
-      </dependency>
-
-      <!-- WSDL deployment -->
-      <dependency>
-        <groupId>wsdl4j</groupId>
-        <artifactId>wsdl4j</artifactId>
-        <version>${wsdl4j_version}</version>
-      </dependency>
-
-      <!-- XBEAN deployment -->
-      <dependency>
-        <groupId>org.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <version>${xbean_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.xbean</groupId>
-        <artifactId>xbean-server</artifactId>
-        <version>${xbean_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.xbean</groupId>
-        <artifactId>xbean-kernel</artifactId>
-        <version>${xbean_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>${spring_version}</version>
-      </dependency>
-
-    </dependencies>  
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+
+    Copyright 2004 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 :: Common</name>
+    <id>servicemix-common</id>
+    <shortDescription>Common components library</shortDescription>
+    <description>Common library for binding component and service engines</description>
+  
+    <package>org.apache.servicemix.common</package>
+    <packageGroups>
+      <packageGroup>
+        <title>Common components library</title>
+        <packages>org.apache.servicemix.common</packages>
+      </packageGroup>
+    </packageGroups>
+ 
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+    
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-jbi</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      
+      <!-- J2EE JARs -->
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>${geronimo_spec_j2ee_connector_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+        <version>${geronimo_spec_jta_version}</version>
+      </dependency>      
+
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>${backport_util_concurrent_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>servicemix</groupId>
+        <artifactId>jaxp</artifactId>
+        <version>${jaxp_version}</version>
+      </dependency>
+
+      <!-- WSDL deployment -->
+      <dependency>
+        <groupId>wsdl4j</groupId>
+        <artifactId>wsdl4j</artifactId>
+        <version>${wsdl4j_version}</version>
+      </dependency>
+
+      <!-- XBEAN deployment -->
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbean_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-server</artifactId>
+        <version>${xbean_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-kernel</artifactId>
+        <version>${xbean_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>${spring_version}</version>
+      </dependency>
+
+    </dependencies>  
+
+</project>

Modified: incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/AbstractXBeanDeployer.java Thu Feb  9 14:11:46 2006
@@ -29,11 +29,11 @@
 import org.apache.servicemix.common.ServiceUnit;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.core.io.FileSystemResource;
-import org.xbean.kernel.Kernel;
-import org.xbean.kernel.KernelFactory;
-import org.xbean.kernel.ServiceName;
-import org.xbean.server.repository.FileSystemRepository;
-import org.xbean.server.spring.loader.SpringLoader;
+import org.apache.xbean.kernel.Kernel;
+import org.apache.xbean.kernel.KernelFactory;
+import org.apache.xbean.kernel.ServiceName;
+import org.apache.xbean.server.repository.FileSystemRepository;
+import org.apache.xbean.server.spring.loader.SpringLoader;
 
 public class AbstractXBeanDeployer extends AbstractDeployer {
 

Modified: incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/ClassLoaderXmlPreprocessor.java Thu Feb  9 14:11:46 2006
@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.ListIterator;
 
-import org.xbean.server.classloader.MultiParentClassLoader;
-import org.xbean.server.repository.Repository;
-import org.xbean.server.spring.loader.SpringLoader;
-import org.xbean.spring.context.SpringXmlPreprocessor;
-import org.xbean.spring.context.SpringApplicationContext;
+import org.apache.xbean.server.classloader.MultiParentClassLoader;
+import org.apache.xbean.server.repository.Repository;
+import org.apache.xbean.server.spring.loader.SpringLoader;
+import org.apache.xbean.spring.context.SpringXmlPreprocessor;
+import org.apache.xbean.spring.context.SpringApplicationContext;
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.w3c.dom.Document;
@@ -37,7 +37,7 @@
 * ClassLoaderXmlPreprocessor extracts a ClassLoader definition from the xml document, builds a class loader, assigns
 * the class loader to the application context and xml reader, and removes the classpath element from document.
 *
-* @org.xbean.XBean namespace="http://xbean.org/schemas/server" element="class-loader-xml-preprocessor"
+* @org.apache.xbean.XBean namespace="http://xbean.org/schemas/server" element="class-loader-xml-preprocessor"
 *     description="Extracts a ClassLoader definition from the xml document."
 *
 * @author Dain Sundstrom

Modified: incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java (original)
+++ incubator/servicemix/trunk/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/XBeanServiceUnit.java Thu Feb  9 14:11:46 2006
@@ -16,10 +16,10 @@
 package org.apache.servicemix.common.xbean;
 
 import org.apache.servicemix.common.ServiceUnit;
-import org.xbean.kernel.Kernel;
-import org.xbean.kernel.ServiceName;
-import org.xbean.kernel.ServiceNotFoundException;
-import org.xbean.server.spring.configuration.SpringConfigurationServiceFactory;
+import org.apache.xbean.kernel.Kernel;
+import org.apache.xbean.kernel.ServiceName;
+import org.apache.xbean.kernel.ServiceNotFoundException;
+import org.apache.xbean.server.spring.configuration.SpringConfigurationServiceFactory;
 
 import javax.jbi.JBIException;
 

Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Thu Feb  9 14:11:46 2006
@@ -312,7 +312,7 @@
 
     <!--  for custom XML parsing -->
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
       <version>${xbean_version}</version>
       <url>http://www.xbean.org</url>
@@ -321,13 +321,13 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-server</artifactId>
       <version>${xbean_version}</version>
       <url>http://www.xbean.org</url>
     </dependency>
     <dependency>
-      <groupId>org.xbean</groupId>
+      <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-kernel</artifactId>
       <version>${xbean_version}</version>
       <url>http://www.xbean.org</url>

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/cache/CacheTest.java Thu Feb  9 14:11:46 2006
@@ -21,7 +21,7 @@
 import org.apache.servicemix.jbi.resolver.EndpointResolver;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsTest.java Thu Feb  9 14:11:46 2006
@@ -19,7 +19,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesForwardTest.java Thu Feb  9 14:11:46 2006
@@ -32,6 +32,6 @@
     }
 
     protected AbstractXmlApplicationContext createBeanFactory() {
-        return new org.xbean.spring.context.ClassPathXmlApplicationContext("org/apache/servicemix/components/drools/jbi-example-forward.xml");
+        return new org.apache.xbean.spring.context.ClassPathXmlApplicationContext("org/apache/servicemix/components/drools/jbi-example-forward.xml");
     }
 }

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/drools/DroolsWithJbiRulesTest.java Thu Feb  9 14:11:46 2006
@@ -16,7 +16,7 @@
 package org.apache.servicemix.components.drools;
 
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/EmailTest.java Thu Feb  9 14:11:46 2006
@@ -22,7 +22,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/MimeMailTest.java Thu Feb  9 14:11:46 2006
@@ -27,7 +27,7 @@
 import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/email/SimpleMailTest.java Thu Feb  9 14:11:46 2006
@@ -27,7 +27,7 @@
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.mail.SimpleMailMessage;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/BinaryFileTest.java Thu Feb  9 14:11:46 2006
@@ -23,7 +23,7 @@
 import org.apache.servicemix.jbi.util.FileUtil;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision: 359213 $

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/file/FileTest.java Thu Feb  9 14:11:46 2006
@@ -22,7 +22,7 @@
 import org.apache.servicemix.jbi.util.FileUtil;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyChainTest.java Thu Feb  9 14:11:46 2006
@@ -29,7 +29,7 @@
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.tck.Receiver;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/GroovyTest.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.apache.servicemix.components.groovy.GroovyComponent;
 import org.apache.servicemix.tck.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/groovy/ServiceMixClientTest.java Thu Feb  9 14:11:46 2006
@@ -37,7 +37,7 @@
 import org.apache.servicemix.jbi.resolver.EndpointResolver;
 import org.apache.servicemix.tck.Receiver;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpSoapWsTest.java Thu Feb  9 14:11:46 2006
@@ -27,7 +27,7 @@
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision: 359186 $

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/http/HttpTest.java Thu Feb  9 14:11:46 2006
@@ -27,7 +27,7 @@
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberChatWithActiveMQTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jabber/JabberGroupChatTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithFullXATest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jca/JmsOverJcaWithXATest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingClusterTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingClusterTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingClusterTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingClusterTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingUsingEndpointSubscriptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingUsingEndpointSubscriptionTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingUsingEndpointSubscriptionTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jms/JmsBindingUsingEndpointSubscriptionTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jmx/CounterMonitorComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jmx/CounterMonitorComponentTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jmx/CounterMonitorComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/jmx/CounterMonitorComponentTest.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision: 359186 $

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPPollTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/net/FTPTest.java Thu Feb  9 14:11:46 2006
@@ -19,7 +19,7 @@
 import org.apache.servicemix.jbi.resolver.ServiceNameEndpointResolver;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.jbi.messaging.InOnly;
 import javax.jbi.messaging.NormalizedMessage;

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MorePojoTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MorePojoTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MorePojoTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/MorePojoTest.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.apache.servicemix.components.util.PojoLifecycleAdaptor;
 import org.apache.servicemix.tck.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/pojo/PojoTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentClusterTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentClusterTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentClusterTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentClusterTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision: 359186 $
@@ -31,4 +31,4 @@
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/quartz/example-cluster.xml");
     }
-}
\ No newline at end of file
+}

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/quartz/QuartzComponentTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$
@@ -31,4 +31,4 @@
     protected AbstractXmlApplicationContext createBeanFactory() {
         return new ClassPathXmlApplicationContext("org/apache/servicemix/components/quartz/example.xml");
     }
-}
\ No newline at end of file
+}

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/reflection/ReflectionBindingTest.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
 import org.apache.servicemix.components.reflection.ProxyInOnlyBinding;
 import org.apache.servicemix.jbi.container.SpringJBIContainer;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/rss/FeedWriterTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/rss/FeedWriterTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/rss/FeedWriterTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/rss/FeedWriterTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/saaj/SaajTest.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/GroovyTransformTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/GroovyTransformTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/GroovyTransformTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/GroovyTransformTest.java Thu Feb  9 14:11:46 2006
@@ -26,7 +26,7 @@
 import org.apache.servicemix.tck.Receiver;
 import org.apache.servicemix.tck.Sender;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/script/ScriptTest.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
 import org.apache.servicemix.components.script.ScriptComponent;
 import org.apache.servicemix.tck.Sender;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/validation/ValidationTest.java Thu Feb  9 14:11:46 2006
@@ -21,7 +21,7 @@
 
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/vfs/FileTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/vfs/FileTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/vfs/FileTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/vfs/FileTest.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
 import org.apache.servicemix.jbi.util.FileUtil;
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import javax.xml.namespace.QName;
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/wsif/WsifTest.java Thu Feb  9 14:11:46 2006
@@ -22,7 +22,7 @@
 import org.apache.servicemix.tck.TestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.w3c.dom.Node;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * @version $Revision$