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 [2/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...

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireBindingTest.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;
 
 public class XFireBindingTest extends TestSupport {
 

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xfire/XFireOutBindingTest.java Thu Feb  9 14:11:46 2006
@@ -22,7 +22,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;
 
 public class XFireOutBindingTest extends TestSupport {
     private OneWayService receiverService;

Modified: incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/TransformComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/TransformComponentTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/TransformComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/TransformComponentTest.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/xslt/XsltPublisherTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltPublisherTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltPublisherTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltPublisherTest.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.apache.servicemix.tck.MessageList;
 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/xslt/XsltRouterTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltRouterTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltRouterTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltRouterTest.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/xslt/XsltSplitTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltSplitTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltSplitTest.java (original)
+++ incubator/servicemix/trunk/servicemix-components/src/test/java/org/apache/servicemix/components/xslt/XsltSplitTest.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.apache.servicemix.tck.MessageList;
 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;
 import java.util.Date;

Modified: incubator/servicemix/trunk/servicemix-core/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/maven.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/maven.xml Thu Feb  9 14:11:46 2006
@@ -1,69 +1,69 @@
-<?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.
-
--->
-
-<project default="default"
-         xmlns:j="jelly:core"
-         xmlns:u="jelly:util"
-         xmlns:ant="jelly:ant"
-         xmlns:util="jelly:util"
-         xmlns:artifact="artifact">
-
-  <postGoal name="java:compile">
-    <attainGoal name="xbean:generate" />
-  </postGoal>
-  
-  <goal name="setclasspath" prereqs="java:compile, test:compile">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}"/>
-      <pathelement path="target/classes"/>
-      <pathelement path="target/test-classes"/>
-      <path refid="maven.dependency.classpath"/>
-    </path>
-  </goal>
-  
-  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}" />
-      <pathelement path="${basedir}/target/classes" />
-      <pathelement path="${basedir}/target/test-classes" />
-      <path refid="maven.dependency.classpath" />
-    </path>
-
-    <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
-      <classpath refid="test.classpath" />
-    </taskdef>
-    
-    <xsdGenerate destFile="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-                 namespace="http://servicemix.apache.org/config/1.0"
-    		 classpathref="test.classpath" srcdir="${basedir}/src/main/java"  
-    		 metaInfDir="${basedir}/target/generated/"/>
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-          todir="${basedir}/target/generated/"/>
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
-          todir="${basedir}/../xdocs"/>    
-    
-    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd.html" 
-          todir="${basedir}/../xdocs"/>
-  
-  </goal>
-
-</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.
+
+-->
+
+<project default="default"
+         xmlns:j="jelly:core"
+         xmlns:u="jelly:util"
+         xmlns:ant="jelly:ant"
+         xmlns:util="jelly:util"
+         xmlns:artifact="artifact">
+
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+  
+  <goal name="setclasspath" prereqs="java:compile, test:compile">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}"/>
+      <pathelement path="target/classes"/>
+      <pathelement path="target/test-classes"/>
+      <path refid="maven.dependency.classpath"/>
+    </path>
+  </goal>
+  
+  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}" />
+      <pathelement path="${basedir}/target/classes" />
+      <pathelement path="${basedir}/target/test-classes" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
+    <taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
+      <classpath refid="test.classpath" />
+    </taskdef>
+    
+    <xsdGenerate destFile="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+                 namespace="http://servicemix.apache.org/config/1.0"
+    		 classpathref="test.classpath" srcdir="${basedir}/src/main/java"  
+    		 metaInfDir="${basedir}/target/generated/"/>
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+          todir="${basedir}/target/generated/"/>
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd" 
+          todir="${basedir}/../xdocs"/>    
+    
+    <copy file="${basedir}/target/servicemix-${pom.currentVersion}.xsd.html" 
+          todir="${basedir}/../xdocs"/>
+  
+  </goal>
+
+</project>

Modified: incubator/servicemix/trunk/servicemix-core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-core/project.xml Thu Feb  9 14:11:46 2006
@@ -197,7 +197,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>

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/Main.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/Main.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/Main.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/Main.java Thu Feb  9 14:11:46 2006
@@ -22,8 +22,8 @@
 import org.apache.servicemix.jbi.container.SpringJBIContainer;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.context.ApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
-import org.xbean.spring.context.FileSystemXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
 
 /**
  * A simple stand alone application which runs ServiceMix from the command line.

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditor.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditor.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/audit/jdbc/JdbcAuditor.java Thu Feb  9 14:11:46 2006
@@ -55,7 +55,7 @@
  * To minimize overhead, the exchange serialized is the undelying
  * {@link org.apache.servicemix.jbi.messaging.ExchangePacket}.
  * 
- * @org.xbean.XBean element="jdbcAuditor" description="The Auditor of message exchanges to a JDBC database"
+ * @org.apache.xbean.XBean element="jdbcAuditor" description="The Auditor of message exchanges to a JDBC database"
  * 
  * @author Guillaume Nodet (gnt)
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/XmlWebApplicationContext.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/XmlWebApplicationContext.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/XmlWebApplicationContext.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/XmlWebApplicationContext.java Thu Feb  9 14:11:46 2006
@@ -23,7 +23,7 @@
  * Application context for ServiceMix 1.x xml syntax compatibility
  */ 
 public class XmlWebApplicationContext
-    extends org.xbean.spring.context.XmlWebApplicationContext {
+    extends org.apache.xbean.spring.context.XmlWebApplicationContext {
 
   public XmlWebApplicationContext() {
     super(Arrays.asList(new Object[] {new XBeanProcessor()}));

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/spring/XBeanProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/spring/XBeanProcessor.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/spring/XBeanProcessor.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/config/spring/XBeanProcessor.java Thu Feb  9 14:11:46 2006
@@ -23,8 +23,8 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xbean.spring.context.SpringApplicationContext;
-import org.xbean.spring.context.SpringXmlPreprocessor;
+import org.apache.xbean.spring.context.SpringApplicationContext;
+import org.apache.xbean.spring.context.SpringXmlPreprocessor;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/ActivationSpec.java Thu Feb  9 14:11:46 2006
@@ -29,7 +29,7 @@
 /**
  * Represents the registration of a component with the {@link JBIContainer}
  *
- * @org.xbean.XBean element="activationSpec"
+ * @org.apache.xbean.XBean element="activationSpec"
  * description="The Component configuration consisting of its container related properties such as its routing information"
  * 
  * @version $Revision$
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @org.xbean.Property
+     * @org.apache.xbean.Property
      * @return
      */
     public Object getComponent() {

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringJBIContainer.java Thu Feb  9 14:11:46 2006
@@ -34,7 +34,7 @@
  * An enhanced JBI container which adds some Spring helper methods for
  * easier configuration through spring's XML configuration file.
  *
- * @org.xbean.XBean element="container" rootElement="true"
+ * @org.apache.xbean.XBean element="container" rootElement="true"
  * description="The ServiceMix JBI Container"
  * 
  * @version $Revision$

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringServiceUnitContainer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringServiceUnitContainer.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringServiceUnitContainer.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SpringServiceUnitContainer.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
  * are registered into the JBI container using the Service Unit
  * Manager life cycle methods.
  *
- * @org.xbean.XBean element="serviceunit" rootElement="true"
+ * @org.apache.xbean.XBean element="serviceunit" rootElement="true"
  *                  description="A deployable service unit container"
  * @version $Revision$
  */

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/container/SubscriptionSpec.java Thu Feb  9 14:11:46 2006
@@ -30,7 +30,7 @@
 /**
  * Represents a subscription to a JBI endpoint.
  * 
- * @org.xbean.XBean element="subscriptionSpec"
+ * @org.apache.xbean.XBean element="subscriptionSpec"
  * 
  * @version $Revision$
  */
@@ -96,7 +96,7 @@
     }
 
     /**
-     * @org.xbean.XBean hide="true"
+     * @org.apache.xbean.XBean hide="true"
      * 
      * @param name
      *            The name to set.

Modified: incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/main/java/org/apache/servicemix/jbi/framework/AutoDeploymentService.java Thu Feb  9 14:11:46 2006
@@ -49,7 +49,7 @@
 import org.apache.servicemix.jbi.management.BaseSystemService;
 import org.apache.servicemix.jbi.util.FileUtil;
 import org.apache.servicemix.jbi.util.XmlPersistenceSupport;
-import org.xbean.spring.context.FileSystemXmlApplicationContext;
+import org.apache.xbean.spring.context.FileSystemXmlApplicationContext;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/client/ServiceMixClientTest.java Thu Feb  9 14:11:46 2006
@@ -23,7 +23,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;
 
 import javax.jbi.JBIException;
 import javax.jbi.messaging.InOnly;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ComponentRouteWithVanillaSpringTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/ContainerRouteWithVanillaSpringTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/config/DebugClassPathXmlApplicationContext.java Thu Feb  9 14:11:46 2006
@@ -18,7 +18,7 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 import java.io.IOException;
 import java.util.List;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/jbi/nmr/flow/jms/SimpleClusterSendSyncTest.java Thu Feb  9 14:11:46 2006
@@ -26,7 +26,7 @@
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.xbean.spring.context.ClassPathXmlApplicationContext;
+import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
 
 /**
  * JMSCluster Test for SendSync

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/remoting/RemoteServiceMixClientTest.java Thu Feb  9 14:11:46 2006
@@ -20,7 +20,7 @@
 import org.apache.servicemix.client.ServiceMixClient;
 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;
 
 import javax.jbi.messaging.InOut;
 import javax.jbi.messaging.NormalizedMessage;

Modified: incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringAsyncPojoTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringComponentTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java (original)
+++ incubator/servicemix/trunk/servicemix-core/src/test/java/org/apache/servicemix/tck/SpringPojoTest.java Thu Feb  9 14:11:46 2006
@@ -17,7 +17,7 @@
 
 import org.apache.servicemix.examples.AbstractSpringTestSupport;
 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-gbean/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gbean/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gbean/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-gbean/project.xml Thu Feb  9 14:11:46 2006
@@ -1,136 +1,136 @@
-<?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 :: GBeans</name>
-    <id>servicemix-gbean</id>
-    <shortDescription>Geronimo / GBean support</shortDescription>
-    <description>ServiceMix GBeans used for integration into Apache Geronimo</description>
-  
-    <package>org.apache.servicemix.gbean</package>
-    <packageGroups>
-      <packageGroup>
-        <title>Geronimo / GBean support</title>
-        <packages>org.apache.servicemix.gbean</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>
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-core</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>springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>${spring_version}</version>
-      </dependency>      
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons_logging_version}</version>
-      </dependency>
-      
-      <!-- Geronimo JARs -->
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-kernel</artifactId>
-        <version>${geronimo_kernel_version}</version>
-      </dependency>      
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-deployment</artifactId>
-        <version>${geronimo_deployment_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-common</artifactId>
-        <version>${geronimo_common_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-j2ee</artifactId>
-        <version>${geronimo_j2ee_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-transaction</artifactId>
-        <version>${geronimo_transaction_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>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>${geronimo_spec_j2ee_connector_version}</version>
-      </dependency>
-      <!-- dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-system</artifactId>
-        <version>${geronimo_system_version}</version>
-      </dependency -->
-      <!-- dependency>
-        <groupId>geronimo</groupId>
-        <artifactId>geronimo-connector</artifactId>
-        <version>${geronimo_connector_version}</version>
-      </dependency -->      
-
-      <dependency>
-        <groupId>jencks</groupId>
-        <artifactId>jencks</artifactId>
-        <version>${jencks_version}</version>
-      </dependency>
-
-      <!-- dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j_version}</version>
-      </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 :: GBeans</name>
+    <id>servicemix-gbean</id>
+    <shortDescription>Geronimo / GBean support</shortDescription>
+    <description>ServiceMix GBeans used for integration into Apache Geronimo</description>
+  
+    <package>org.apache.servicemix.gbean</package>
+    <packageGroups>
+      <packageGroup>
+        <title>Geronimo / GBean support</title>
+        <packages>org.apache.servicemix.gbean</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>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-core</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>springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>${spring_version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+      </dependency>
+      
+      <!-- Geronimo JARs -->
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-kernel</artifactId>
+        <version>${geronimo_kernel_version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-deployment</artifactId>
+        <version>${geronimo_deployment_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-common</artifactId>
+        <version>${geronimo_common_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-j2ee</artifactId>
+        <version>${geronimo_j2ee_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-transaction</artifactId>
+        <version>${geronimo_transaction_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>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+        <version>${geronimo_spec_j2ee_connector_version}</version>
+      </dependency>
+      <!-- dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-system</artifactId>
+        <version>${geronimo_system_version}</version>
+      </dependency -->
+      <!-- dependency>
+        <groupId>geronimo</groupId>
+        <artifactId>geronimo-connector</artifactId>
+        <version>${geronimo_connector_version}</version>
+      </dependency -->      
+
+      <dependency>
+        <groupId>jencks</groupId>
+        <artifactId>jencks</artifactId>
+        <version>${jencks_version}</version>
+      </dependency>
+
+      <!-- dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j_version}</version>
+      </dependency -->
+      
+    </dependencies>  
+</project>

Modified: incubator/servicemix/trunk/servicemix-gbean/src/main/java/org/apache/servicemix/gbean/ServiceMixConfigBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-gbean/src/main/java/org/apache/servicemix/gbean/ServiceMixConfigBuilder.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-gbean/src/main/java/org/apache/servicemix/gbean/ServiceMixConfigBuilder.java (original)
+++ incubator/servicemix/trunk/servicemix-gbean/src/main/java/org/apache/servicemix/gbean/ServiceMixConfigBuilder.java Thu Feb  9 14:11:46 2006
@@ -31,7 +31,7 @@
 import org.apache.servicemix.jbi.config.spring.XBeanProcessor;
 import org.apache.servicemix.jbi.deployment.Descriptor;
 import org.springframework.core.io.UrlResource;
-import org.xbean.spring.context.ResourceXmlApplicationContext;
+import org.apache.xbean.spring.context.ResourceXmlApplicationContext;
 
 import javax.management.ObjectName;
 

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

Modified: incubator/servicemix/trunk/servicemix-http/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/maven.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/maven.xml Thu Feb  9 14:11:46 2006
@@ -1,52 +1,52 @@
-<?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.
-
--->
-
-<project default="default"
-    xmlns:ant="jelly:ant"
-    xmlns:artifact="artifact">
-
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
-  <postGoal name="java:compile">
-    <attainGoal name="xbean:generate" />
-  </postGoal>
-
-  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}" />
-      <pathelement path="${basedir}/target/classes" />
-      <pathelement path="${basedir}/target/test-classes" />
-      <path refid="maven.dependency.classpath" />
-    </path>
-
-    <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
-      <classpath refid="test.classpath" />
-    </taskdef>
-    <xsdGenerate
-    destFile="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/http/1.0"
-    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
-    <copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
-  </goal>
-  
-</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.
+
+-->
+
+<project default="default"
+    xmlns:ant="jelly:ant"
+    xmlns:artifact="artifact">
+
+  <!-- redefined "build" goal from parent pom -->
+  <goal name="default" prereqs="clean, jar:install, jbi:install"/>  
+  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
+
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+
+  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}" />
+      <pathelement path="${basedir}/target/classes" />
+      <pathelement path="${basedir}/target/test-classes" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
+    <taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
+      <classpath refid="test.classpath" />
+    </taskdef>
+    <xsdGenerate
+    destFile="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/http/1.0"
+    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
+    <copy file="${basedir}/target/servicemix-http-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+  </goal>
+  
+</project>

Modified: incubator/servicemix/trunk/servicemix-http/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-http/project.xml Thu Feb  9 14:11:46 2006
@@ -132,7 +132,7 @@
         </properties>
       </dependency>
       <dependency>
-        <groupId>org.xbean</groupId>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-spring</artifactId>
         <version>${xbean_version}</version>
         <properties>
@@ -140,7 +140,7 @@
         </properties>
       </dependency>
       <dependency>
-        <groupId>org.xbean</groupId>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-server</artifactId>
         <version>${xbean_version}</version>
         <properties>
@@ -148,7 +148,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-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java Thu Feb  9 14:11:46 2006
@@ -32,7 +32,7 @@
  * 
  * @author gnodet
  * @version $Revision$
- * @org.xbean.XBean element="endpoint"
+ * @org.apache.xbean.XBean element="endpoint"
  *                  description="An http endpoint"
  * 
  */
@@ -95,7 +95,7 @@
     }
     
     /**
-     * @org.xbean.Property alias="role"
+     * @org.apache.xbean.Property alias="role"
      * @param role
      */
     public void setRoleAsString(String role) {

Modified: incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpSpringComponent.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpSpringComponent.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpSpringComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/main/java/org/apache/servicemix/http/HttpSpringComponent.java Thu Feb  9 14:11:46 2006
@@ -29,7 +29,7 @@
  * 
  * @author gnodet
  * @version $Revision$
- * @org.xbean.XBean element="component"
+ * @org.apache.xbean.XBean element="component"
  *                  description="An http component"
  */
 public class HttpSpringComponent extends BaseComponent {

Modified: incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpAddressingTest.java Thu Feb  9 14:11:46 2006
@@ -28,7 +28,7 @@
 import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 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;
 
 public class HttpAddressingTest extends SpringTestSupport {
 

Modified: incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java (original)
+++ incubator/servicemix/trunk/servicemix-http/src/test/java/org/apache/servicemix/http/HttpSpringTest.java Thu Feb  9 14:11:46 2006
@@ -26,7 +26,7 @@
 import org.apache.servicemix.jbi.jaxp.StringSource;
 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;
 
 public class HttpSpringTest extends SpringTestSupport {
 

Modified: incubator/servicemix/trunk/servicemix-jms/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jms/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jms/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jms/project.xml Thu Feb  9 14:11:46 2006
@@ -1,198 +1,198 @@
-<?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 :: JMS</name>
-    <id>servicemix-jms</id>
-    <shortDescription>JMS Binding Component</shortDescription>
-    <description>JMS Binding Component</description>
-  
-    <package>org.apache.servicemix.jms</package>
-    <packageGroups>
-      <packageGroup>
-        <title>JMS Binding Component</title>
-        <packages>org.apache.servicemix.jms</packages>
-      </packageGroup>
-    </packageGroups>
- 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    <dependencies>
-    
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>maven-jbi-plugin</artifactId>
-        <version>${pom.currentVersion}</version>
-        <type>plugin</type>
-      </dependency>
-    
-      <!-- JBI bundled dependencies -->
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-common</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-          <jbi.bundle>true</jbi.bundle>
-          <jbi.bootstrap>true</jbi.bootstrap>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${commons_logging_version}</version>
-        <properties>
-          <jbi.bundle>true</jbi.bundle>
-          <jbi.bootstrap>true</jbi.bootstrap>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <version>${backport_util_concurrent_version}</version>
-        <properties>
-          <jbi.bundle>true</jbi.bundle>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>wsdl4j</groupId>
-        <artifactId>wsdl4j</artifactId>
-        <version>${wsdl4j_version}</version>
-        <properties>
-          <jbi.bundle>true</jbi.bundle>
-        </properties>
-      </dependency>
-      
-      <!-- Provided dependencies -->
-      
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-jbi</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>${geronimo_spec_jms_version}</version>
-      </dependency>
-      <!-- dependency>
-        <groupId>servicemix</groupId>
-        <artifactId>jaxp</artifactId>
-        <version>${jaxp_version}</version>
-      </dependency -->
-      <!-- dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-j2ee-connector</artifactId>
-        <version>${geronimo_spec_j2ee_connector_version}</version>
-      </dependency -->
-      <!-- dependency>
-        <groupId>geronimo-spec</groupId>
-        <artifactId>geronimo-spec-jta</artifactId>
-        <version>${geronimo_spec_jta_version}</version>
-      </dependency -->
-      
-
-      <!-- Testing only -->
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-core</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>${pom.groupId}</groupId>
-        <artifactId>servicemix-components</artifactId>
-        <version>${pom.currentVersion}</version>
-        <properties>
-          <eclipse.dependency>true</eclipse.dependency>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>springframework</groupId>
-        <artifactId>spring</artifactId>
-        <version>${spring_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>incubator-activemq</groupId>
-        <artifactId>activemq</artifactId>
-        <version>${activemq_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>activeio</groupId>
-        <artifactId>activeio</artifactId>
-        <version>${activeio_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>concurrent</groupId>
-        <artifactId>concurrent</artifactId>
-        <version>${concurrent_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>jencks</groupId>
-        <artifactId>jencks-all</artifactId>
-        <version>${jencks_version}</version>
-      </dependency>
-      <dependency>
-        <id>commons-beanutils</id>
-        <version>${commons_beanutils_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>${commons_pool_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${commons_collections_version}</version>
-      </dependency>
-      <!-- dependency>
-        <groupId>mx4j</groupId>
-        <artifactId>mx4j</artifactId>
-        <version>${mx4j_version}</version>
-      </dependency -->
-      <dependency>
-        <groupId>xstream</groupId>
-        <artifactId>xstream</artifactId>
-        <version>${xstream_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <version>${xbean_version}</version>
-      </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>${xml_apis_version}</version>
-      </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 :: JMS</name>
+    <id>servicemix-jms</id>
+    <shortDescription>JMS Binding Component</shortDescription>
+    <description>JMS Binding Component</description>
+  
+    <package>org.apache.servicemix.jms</package>
+    <packageGroups>
+      <packageGroup>
+        <title>JMS Binding Component</title>
+        <packages>org.apache.servicemix.jms</packages>
+      </packageGroup>
+    </packageGroups>
+ 
+    <!-- ============ -->
+    <!-- Dependencies -->
+    <!-- ============ -->
+    <dependencies>
+    
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>maven-jbi-plugin</artifactId>
+        <version>${pom.currentVersion}</version>
+        <type>plugin</type>
+      </dependency>
+    
+      <!-- JBI bundled dependencies -->
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-common</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+          <jbi.bundle>true</jbi.bundle>
+          <jbi.bootstrap>true</jbi.bootstrap>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons_logging_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+          <jbi.bootstrap>true</jbi.bootstrap>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>backport-util-concurrent</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <version>${backport_util_concurrent_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>wsdl4j</groupId>
+        <artifactId>wsdl4j</artifactId>
+        <version>${wsdl4j_version}</version>
+        <properties>
+          <jbi.bundle>true</jbi.bundle>
+        </properties>
+      </dependency>
+      
+      <!-- Provided dependencies -->
+      
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-jbi</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jms_1.1_spec</artifactId>
+        <version>${geronimo_spec_jms_version}</version>
+      </dependency>
+      <!-- dependency>
+        <groupId>servicemix</groupId>
+        <artifactId>jaxp</artifactId>
+        <version>${jaxp_version}</version>
+      </dependency -->
+      <!-- dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-j2ee-connector</artifactId>
+        <version>${geronimo_spec_j2ee_connector_version}</version>
+      </dependency -->
+      <!-- dependency>
+        <groupId>geronimo-spec</groupId>
+        <artifactId>geronimo-spec-jta</artifactId>
+        <version>${geronimo_spec_jta_version}</version>
+      </dependency -->
+      
+
+      <!-- Testing only -->
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-core</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>servicemix-components</artifactId>
+        <version>${pom.currentVersion}</version>
+        <properties>
+          <eclipse.dependency>true</eclipse.dependency>
+        </properties>
+      </dependency>
+      <dependency>
+        <groupId>springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>${spring_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>incubator-activemq</groupId>
+        <artifactId>activemq</artifactId>
+        <version>${activemq_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>activeio</groupId>
+        <artifactId>activeio</artifactId>
+        <version>${activeio_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>concurrent</groupId>
+        <artifactId>concurrent</artifactId>
+        <version>${concurrent_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jencks</groupId>
+        <artifactId>jencks-all</artifactId>
+        <version>${jencks_version}</version>
+      </dependency>
+      <dependency>
+        <id>commons-beanutils</id>
+        <version>${commons_beanutils_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>${commons_pool_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${commons_collections_version}</version>
+      </dependency>
+      <!-- dependency>
+        <groupId>mx4j</groupId>
+        <artifactId>mx4j</artifactId>
+        <version>${mx4j_version}</version>
+      </dependency -->
+      <dependency>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>${xstream_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-spring</artifactId>
+        <version>${xbean_version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>${xml_apis_version}</version>
+      </dependency>
+      
+    </dependencies>    
+</project>

Modified: incubator/servicemix/trunk/servicemix-jsr181/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/maven.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/maven.xml Thu Feb  9 14:11:46 2006
@@ -1,53 +1,53 @@
-<?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.
-    
--->
-
-<project default="default"
-    xmlns:ant="jelly:ant"
-    xmlns:artifact="artifact">
-
-  <!-- redefined "build" goal from parent pom -->
-  <goal name="default" prereqs="jar:install, jbi:install"/>
-        
-  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
-
-  <postGoal name="java:compile">
-    <attainGoal name="xbean:generate" />
-  </postGoal>
-         
-  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
-    <path id="test.classpath">
-      <pathelement path="${maven.build.dest}" />
-      <pathelement path="${basedir}/target/classes" />
-      <pathelement path="${basedir}/target/test-classes" />
-      <path refid="maven.dependency.classpath" />
-    </path>
-
-    <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask">
-      <classpath refid="test.classpath" />
-    </taskdef>
-    <xsdGenerate
-    destFile="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/jsr181/1.0"
-    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
-  	<copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
-    <copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
-  </goal>
-
-</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.
+    
+-->
+
+<project default="default"
+    xmlns:ant="jelly:ant"
+    xmlns:artifact="artifact">
+
+  <!-- redefined "build" goal from parent pom -->
+  <goal name="default" prereqs="jar:install, jbi:install"/>
+        
+  <goal name="nightly" prereqs="clean, jar:install, jbi:install, jar:deploy, jbi:deploy"/>
+
+  <postGoal name="java:compile">
+    <attainGoal name="xbean:generate" />
+  </postGoal>
+         
+  <goal name="xbean:generate" description="Generates the XBean XSD, documentation and META-INF/services files.">
+    <path id="test.classpath">
+      <pathelement path="${maven.build.dest}" />
+      <pathelement path="${basedir}/target/classes" />
+      <pathelement path="${basedir}/target/test-classes" />
+      <path refid="maven.dependency.classpath" />
+    </path>
+
+    <taskdef name="xsdGenerate" classname="org.apache.xbean.spring.generator.MappingGeneratorTask">
+      <classpath refid="test.classpath" />
+    </taskdef>
+    <xsdGenerate
+    destFile="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/jsr181/1.0"
+    		classpathref="test.classpath" srcdir="${basedir}/src/main/java"  metaInfDir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+  	<copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>    
+    <copy file="${basedir}/target/servicemix-jsr181-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+  </goal>
+
+</project>