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 [3/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-jsr181/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Thu Feb 9 14:11:46 2006
@@ -1,336 +1,336 @@
-<?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 :: JSR-181 Service Engine</name>
- <id>servicemix-jsr181</id>
- <shortDescription>JSR-181 service engine</shortDescription>
- <description>JSR-181 service engine</description>
-
- <package>org.apache.servicemix.jsr181</package>
- <packageGroups>
- <packageGroup>
- <title>JSR-181 service engine</title>
- <packages>org.apache.servicemix.jsr181</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>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>xfire-all</artifactId>
- <version>${xfire_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>xfire-jaxws</artifactId>
- <version>${xfire_jaxws_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>${stax_api_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-server</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-kernel</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <version>${woodstox_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean</artifactId>
- <version>${xmlbeans_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
-
- <!-- Commons attribute -->
- <dependency>
- <groupId>commons-attributes</groupId>
- <artifactId>commons-attributes-api</artifactId>
- <version>${commons_attributes_version}</version>
- <url>http://jakarta.apache.org/commons/attributes/</url>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-attributes</groupId>
- <artifactId>commons-attributes-plugin</artifactId>
- <version>${commons_attributes_version}</version>
- <type>plugin</type>
- <url>http://jakarta.apache.org/commons/attributes/</url>
- </dependency>
-
- <!-- Backport 175 -->
- <dependency>
- <groupId>backport175</groupId>
- <artifactId>backport175</artifactId>
- <version>${backport175_version}</version>
- <url>http://backport175.codehaus.org</url>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
-
- <!-- JAXB -->
- <dependency>
- <groupId>servicemix</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
-
- <!-- Provided dependencies -->
- <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>${pom.groupId}</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_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>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
- <groupId>jencks</groupId>
- <artifactId>jencks-all</artifactId>
- <version>${jencks_version}</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${concurrent_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons_beanutils_version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- </dependency>
-
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>${annogen_version}</version>
- <properties>
- <scope>compile</scope>
- </properties>
- </dependency>
- <dependency>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- <version>${qdox_version}</version>
- <properties>
- <scope>compile</scope>
- </properties>
- </dependency>
- <dependency>
- <groupId>beehive</groupId>
- <artifactId>wsm</artifactId>
- <version>${beehive_wsm_version}</version>
- <url>http://incubator.apache.org/beehive/</url>
- </dependency>
- </dependencies>
-
- <build>
- <unitTest>
- <includes>
- <include>**/*Test.*</include>
- </includes>
- <excludes>
- </excludes>
- </unitTest>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.xml</include>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>target/generated</directory>
- <includes>
- <include>**/*</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
-
-</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 :: JSR-181 Service Engine</name>
+ <id>servicemix-jsr181</id>
+ <shortDescription>JSR-181 service engine</shortDescription>
+ <description>JSR-181 service engine</description>
+
+ <package>org.apache.servicemix.jsr181</package>
+ <packageGroups>
+ <packageGroup>
+ <title>JSR-181 service engine</title>
+ <packages>org.apache.servicemix.jsr181</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>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>xfire-all</artifactId>
+ <version>${xfire_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>xfire-jaxws</artifactId>
+ <version>${xfire_jaxws_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax_api_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>${jdom_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>${woodstox_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ <version>${xmlbeans_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+
+ <!-- Commons attribute -->
+ <dependency>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-api</artifactId>
+ <version>${commons_attributes_version}</version>
+ <url>http://jakarta.apache.org/commons/attributes/</url>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>commons-attributes</groupId>
+ <artifactId>commons-attributes-plugin</artifactId>
+ <version>${commons_attributes_version}</version>
+ <type>plugin</type>
+ <url>http://jakarta.apache.org/commons/attributes/</url>
+ </dependency>
+
+ <!-- Backport 175 -->
+ <dependency>
+ <groupId>backport175</groupId>
+ <artifactId>backport175</artifactId>
+ <version>${backport175_version}</version>
+ <url>http://backport175.codehaus.org</url>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+
+ <!-- JAXB -->
+ <dependency>
+ <groupId>servicemix</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+
+ <!-- Provided dependencies -->
+ <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>${pom.groupId}</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${xfire_xmlschema_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>incubator-activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jencks</groupId>
+ <artifactId>jencks-all</artifactId>
+ <version>${jencks_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons_beanutils_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>annogen</groupId>
+ <artifactId>annogen</artifactId>
+ <version>${annogen_version}</version>
+ <properties>
+ <scope>compile</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>${qdox_version}</version>
+ <properties>
+ <scope>compile</scope>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>beehive</groupId>
+ <artifactId>wsm</artifactId>
+ <version>${beehive_wsm_version}</version>
+ <url>http://incubator.apache.org/beehive/</url>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ </excludes>
+ </unitTest>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.xml</include>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>target/generated</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
+
+</project>
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181Endpoint.java Thu Feb 9 14:11:46 2006
@@ -60,7 +60,7 @@
*
* @author gnodet
* @version $Revision$
- * @org.xbean.XBean element="endpoint"
+ * @org.apache.xbean.XBean element="endpoint"
* description="A jsr181 endpoint"
*
*/
@@ -130,7 +130,7 @@
/* (non-Javadoc)
* @see org.servicemix.common.Endpoint#getRole()
- * @org.xbean.XBean hide="true"
+ * @org.apache.xbean.XBean hide="true"
*/
public Role getRole() {
return Role.PROVIDER;
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181SpringComponent.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181SpringComponent.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181SpringComponent.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/apache/servicemix/jsr181/Jsr181SpringComponent.java Thu Feb 9 14:11:46 2006
@@ -24,7 +24,7 @@
*
* @author gnodet
* @version $Revision$
- * @org.xbean.XBean element="component"
+ * @org.apache.xbean.XBean element="component"
* description="A jsr181 component"
*/
public class Jsr181SpringComponent extends BaseComponent {
Modified: incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.java (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/test/java/org/apache/servicemix/jsr181/Jsr181SpringTest.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 Jsr181SpringTest extends SpringTestSupport {
Modified: incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/project.xml Thu Feb 9 14:11:46 2006
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
<!--
Copyright 2005 The Apache Software Foundation
@@ -16,187 +16,187 @@
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 :: LightWeight Container</name>
- <id>servicemix-lwcontainer</id>
- <shortDescription>LightWeight Container</shortDescription>
- <description>LightWeight Container</description>
-
- <package>org.apache.servicemix.lwcontainer</package>
- <packageGroups>
- <packageGroup>
- <title>JLightWeight Container</title>
- <packages>org.apache.servicemix.lwcontainer</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>org.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-server</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>org.xbean</groupId>
- <artifactId>xbean-kernel</artifactId>
- <version>${xbean_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
- <dependency>
- <groupId>springframework</groupId>
- <artifactId>spring</artifactId>
- <version>${spring_version}</version>
- <properties>
- <jbi.bundle>true</jbi.bundle>
- </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>${pom.groupId}</groupId>
- <artifactId>servicemix-components</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- <jbi.bundle>true</jbi.bundle>
- </properties>
- </dependency>
-
- <!-- Provided dependencies -->
- <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>${pom.groupId}</groupId>
- <artifactId>servicemix-jbi</artifactId>
- <version>${pom.currentVersion}</version>
- <properties>
- <eclipse.dependency>true</eclipse.dependency>
- </properties>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>${mx4j_version}</version>
- </dependency>
- <dependency>
- <groupId>xfire</groupId>
- <artifactId>XmlSchema</artifactId>
- <version>${xfire_xmlschema_version}</version>
- </dependency>
-
-
- <!-- Testing only -->
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>${activemq_version}</version>
- </dependency>
- <dependency>
- <groupId>jencks</groupId>
- <artifactId>jencks-all</artifactId>
- <version>${jencks_version}</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${concurrent_version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons_beanutils_version}</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j_version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <unitTest>
- <includes>
- <include>**/*Test.*</include>
- </includes>
- <excludes></excludes>
- </unitTest>
- </build>
-</project>
+-->
+
+<!DOCTYPE project>
+<project>
+ <pomVersion>3</pomVersion>
+ <extend>${basedir}/../etc/project.xml</extend>
+
+ <name>ServiceMix :: LightWeight Container</name>
+ <id>servicemix-lwcontainer</id>
+ <shortDescription>LightWeight Container</shortDescription>
+ <description>LightWeight Container</description>
+
+ <package>org.apache.servicemix.lwcontainer</package>
+ <packageGroups>
+ <packageGroup>
+ <title>JLightWeight Container</title>
+ <packages>org.apache.servicemix.lwcontainer</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>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-server</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-kernel</artifactId>
+ <version>${xbean_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>${spring_version}</version>
+ <properties>
+ <jbi.bundle>true</jbi.bundle>
+ </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>${pom.groupId}</groupId>
+ <artifactId>servicemix-components</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ <jbi.bundle>true</jbi.bundle>
+ </properties>
+ </dependency>
+
+ <!-- Provided dependencies -->
+ <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>${pom.groupId}</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <eclipse.dependency>true</eclipse.dependency>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ <version>${mx4j_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>XmlSchema</artifactId>
+ <version>${xfire_xmlschema_version}</version>
+ </dependency>
+
+
+ <!-- Testing only -->
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq</artifactId>
+ <version>${activemq_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jencks</groupId>
+ <artifactId>jencks-all</artifactId>
+ <version>${jencks_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${concurrent_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons_beanutils_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j_version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <unitTest>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes></excludes>
+ </unitTest>
+ </build>
+</project>
Modified: incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerXBeanDeployer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerXBeanDeployer.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerXBeanDeployer.java (original)
+++ incubator/servicemix/trunk/servicemix-lwcontainer/src/main/java/org/apache/servicemix/lwcontainer/LwContainerXBeanDeployer.java Thu Feb 9 14:11:46 2006
@@ -22,8 +22,8 @@
import org.apache.servicemix.common.xbean.AbstractXBeanDeployer;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.jbi.container.SpringServiceUnitContainer;
-import org.xbean.kernel.Kernel;
-import org.xbean.kernel.StringServiceName;
+import org.apache.xbean.kernel.Kernel;
+import org.apache.xbean.kernel.StringServiceName;
public class LwContainerXBeanDeployer extends AbstractXBeanDeployer {
Modified: incubator/servicemix/trunk/servicemix-sca/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/maven.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/maven.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/maven.xml Thu Feb 9 14:11:46 2006
@@ -1,54 +1,54 @@
-<?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 "default" 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-sca-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/sca/1.0"
- classpathref="test.classpath" srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
- <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
- <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>
- <copy file="${basedir}/target/servicemix-sca-${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 "default" 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-sca-${pom.currentVersion}.xsd" namespace="http://servicemix.apache.org/sca/1.0"
+ classpathref="test.classpath" srcdir="${basedir}/src/main/java" metaInfDir="${basedir}/target/generated/"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/target/generated/"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd" todir="${basedir}/../xdocs"/>
+ <copy file="${basedir}/target/servicemix-sca-${pom.currentVersion}.xsd.html" todir="${basedir}/../xdocs"/>
+ </goal>
+
+</project>
Modified: incubator/servicemix/trunk/servicemix-sca/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-sca/project.xml Thu Feb 9 14:11:46 2006
@@ -307,7 +307,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-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java (original)
+++ incubator/servicemix/trunk/servicemix-sca/src/main/java/org/apache/servicemix/sca/ScaEndpoint.java Thu Feb 9 14:11:46 2006
@@ -48,7 +48,7 @@
*
* @author gnodet
* @version $Revision: 366467 $
- * @org.xbean.XBean element="endpoint"
+ * @org.apache.xbean.XBean element="endpoint"
* description="A sca endpoint"
*
*/
Modified: incubator/servicemix/trunk/servicemix-wsn2005/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsn2005/project.xml?rev=376451&r1=376450&r2=376451&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsn2005/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsn2005/project.xml Thu Feb 9 14:11:46 2006
@@ -136,7 +136,7 @@
</properties>
</dependency>
<dependency>
- <groupId>org.xbean</groupId>
+ <groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean_version}</version>
</dependency>