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/06/19 11:55:45 UTC
svn commit: r415273 [1/2] - in /incubator/servicemix/trunk: ./ etc/
geronimo-1.0/ geronimo-1.0/servicemix-gbean/ geronimo-1.0/servicemix-gplan/
geronimo-1.1/ geronimo-1.1/configs/servicemix-deployer/
geronimo-1.1/configs/servicemix/ geronimo-1.1/etc/ g...
Author: gnodet
Date: Mon Jun 19 02:55:39 2006
New Revision: 415273
URL: http://svn.apache.org/viewvc?rev=415273&view=rev
Log:
Upgrade to xbean-2.4 and spring-2.0-m5
Remove optional libraries in distribution from lib/optional
Fix examples to download their needed libraries
Fix wsdl-first sample
Remove maven1 files and fix geronimo integration
Added:
incubator/servicemix/trunk/geronimo-1.0/maven.xml
incubator/servicemix/trunk/geronimo-1.0/project.properties
incubator/servicemix/trunk/geronimo-1.0/project.xml
incubator/servicemix/trunk/geronimo-1.1/maven.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/lib/
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/lib/optional/
incubator/servicemix/trunk/samples/wsdl-first/http-su/ (with props)
incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/jbi.xml
incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/xbean.xml
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/ (with props)
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/jbi.xml
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/person.wsdl
incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/xbean.xml
incubator/servicemix/trunk/samples/wsdl-first/sa/ (with props)
incubator/servicemix/trunk/samples/wsdl-first/sa/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/sa/src/
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/assembly/bin.xml
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/
incubator/servicemix/trunk/samples/wsdl-first/sa/src/main/resources/META-INF/jbi.xml
Removed:
incubator/servicemix/trunk/etc/
incubator/servicemix/trunk/incubating-apache-servicemix/maven.xml
incubator/servicemix/trunk/incubating-apache-servicemix/project.properties
incubator/servicemix/trunk/incubating-apache-servicemix/project.xml
incubator/servicemix/trunk/maven
incubator/servicemix/trunk/maven.xml
incubator/servicemix/trunk/project.properties
incubator/servicemix/trunk/project.xml
incubator/servicemix/trunk/samples/wsdl-first-http/
incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/sa.xml
incubator/servicemix/trunk/samples/wsdl-first/src/main/java/
incubator/servicemix/trunk/samples/wsdl-first/src/main/resources/
incubator/servicemix/trunk/samples/wsdl-first/src/main/sa/
incubator/servicemix/trunk/servicemix-bpe/maven.xml
incubator/servicemix/trunk/servicemix-bpe/project.properties
incubator/servicemix/trunk/servicemix-bpe/project.xml
incubator/servicemix/trunk/servicemix-common/maven.xml
incubator/servicemix/trunk/servicemix-common/project.xml
incubator/servicemix/trunk/servicemix-components/maven.xml
incubator/servicemix/trunk/servicemix-components/project.properties
incubator/servicemix/trunk/servicemix-components/project.xml
incubator/servicemix/trunk/servicemix-console/maven.xml
incubator/servicemix/trunk/servicemix-console/project.properties
incubator/servicemix/trunk/servicemix-console/project.xml
incubator/servicemix/trunk/servicemix-core/maven.xml
incubator/servicemix/trunk/servicemix-core/project.properties
incubator/servicemix/trunk/servicemix-core/project.xml
incubator/servicemix/trunk/servicemix-eip/maven.xml
incubator/servicemix/trunk/servicemix-eip/project.properties
incubator/servicemix/trunk/servicemix-eip/project.xml
incubator/servicemix/trunk/servicemix-http/maven.xml
incubator/servicemix/trunk/servicemix-http/project.properties
incubator/servicemix/trunk/servicemix-http/project.xml
incubator/servicemix/trunk/servicemix-jbi/maven.xml
incubator/servicemix/trunk/servicemix-jbi/project.properties
incubator/servicemix/trunk/servicemix-jbi/project.xml
incubator/servicemix/trunk/servicemix-jms/maven.xml
incubator/servicemix/trunk/servicemix-jms/project.properties
incubator/servicemix/trunk/servicemix-jms/project.xml
incubator/servicemix/trunk/servicemix-jsr181/maven.xml
incubator/servicemix/trunk/servicemix-jsr181/project.properties
incubator/servicemix/trunk/servicemix-jsr181/project.xml
incubator/servicemix/trunk/servicemix-lwcontainer/maven.xml
incubator/servicemix/trunk/servicemix-lwcontainer/project.properties
incubator/servicemix/trunk/servicemix-lwcontainer/project.xml
incubator/servicemix/trunk/servicemix-sca/maven.xml
incubator/servicemix/trunk/servicemix-sca/project.properties
incubator/servicemix/trunk/servicemix-sca/project.xml
incubator/servicemix/trunk/servicemix-services/maven.xml
incubator/servicemix/trunk/servicemix-services/project.xml
incubator/servicemix/trunk/servicemix-soap/maven.xml
incubator/servicemix/trunk/servicemix-soap/project.properties
incubator/servicemix/trunk/servicemix-soap/project.xml
incubator/servicemix/trunk/servicemix-web/maven.xml
incubator/servicemix/trunk/servicemix-web/project.properties
incubator/servicemix/trunk/servicemix-web/project.xml
incubator/servicemix/trunk/servicemix-wsn2005/maven.xml
incubator/servicemix/trunk/servicemix-wsn2005/project.properties
incubator/servicemix/trunk/servicemix-wsn2005/project.xml
Modified:
incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml
incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties
incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml
incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
incubator/servicemix/trunk/geronimo-1.1/etc/project.xml
incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml
incubator/servicemix/trunk/geronimo-1.1/project.properties
incubator/servicemix/trunk/geronimo-1.1/project.xml
incubator/servicemix/trunk/incubating-apache-servicemix/pom.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/assembly/bin.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/activemq.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.conf
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/servicemix.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/servicemix.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/servicemix.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/loan-broker/build.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/servicemix.xml
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/README.txt
incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/ws-notification/build.xml
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/samples/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/pom.xml
incubator/servicemix/trunk/samples/wsdl-first/src/main/assembly/src.xml
incubator/servicemix/trunk/servicemix-bpe/pom.xml
incubator/servicemix/trunk/servicemix-eip/pom.xml
incubator/servicemix/trunk/servicemix-http/pom.xml
incubator/servicemix/trunk/servicemix-jms/pom.xml
incubator/servicemix/trunk/servicemix-lwcontainer/pom.xml
incubator/servicemix/trunk/servicemix-soap/pom.xml
incubator/servicemix/trunk/servicemix-wsn2005/pom.xml
Added: incubator/servicemix/trunk/geronimo-1.0/maven.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/maven.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/maven.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.0/maven.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+
+ <!-- Execute default goal on subprojects. -->
+ <goal name="default">
+ <j:set var="goal" value="default"/>
+ <attainGoal name="multiproject:goal"/>
+ </goal>
+
+</project>
Added: incubator/servicemix/trunk/geronimo-1.0/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/project.properties?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/project.properties (added)
+++ incubator/servicemix/trunk/geronimo-1.0/project.properties Mon Jun 19 02:55:39 2006
@@ -0,0 +1,70 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -------------------------------------------------------------------
+# $Rev: 356022 $ $Date: 2005-12-11 12:58:34 -0800 (dim., 11 déc. 2005) $
+# -------------------------------------------------------------------
+# P R O J E C T P R O P E R T I E S
+# -------------------------------------------------------------------
+
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+maven.test.source=1.4
+maven.compile.deprecation=true
+maven.compile.debug=true
+maven.compile.optimize=true
+
+#####################################################
+# repository information
+#####################################################
+
+maven.repo.remote = http://people.apache.org/repository, \
+ http://www.ibiblio.org/maven, \
+ http://dist.codehaus.org, \
+ http://repo.logicblaze.com/maven1, \
+ http://servicemix.org/maven-repo, \
+ http://repo.livetribe.org/maven1, \
+ http://www.apache.org/dist/java-repository
+
+maven.eclipse.resources.addtoclasspath = true
+
+maven.multiproject.includes=\
+ servicemix-gbean/project.xml,\
+ servicemix-gplan/project.xml,\
+
+
+# -------------------------------------------------------------------
+# dependency versions
+# -------------------------------------------------------------------
+
+activeio_version=3.0-beta3
+activemq_version=4.0
+geronimo_version=1.0
+xbean_version=2.4
+commons_logging_version=1.0.4
+spring_version=1.2.6
+jencks_version=1.1.2
+xmlbeans_version=2.0.0
+backport_util_concurrent_version=2.1
+concurrent_version=1.3.4
+wsdl4j_version=1.5.2
+xstream_version=1.1.2
+commons_beanutils_version=1.7.0
+woodstox_version=2.9.3
+geronimo_spec_j2ee_connector_version=1.0
+geronimo_spec_jta_version=1.0
+
+
+
Added: incubator/servicemix/trunk/geronimo-1.0/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/project.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/project.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.0/project.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Copyright 2005-2006 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>
+
+ <pomVersion>3</pomVersion>
+ <name>ServiceMix</name>
+ <id>servicemix-geronimo-1.0</id>
+ <groupId>org.apache.servicemix</groupId>
+ <currentVersion>3.0-SNAPSHOT</currentVersion>
+
+</project>
Modified: incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.0/servicemix-gbean/project.xml Mon Jun 19 02:55:39 2006
@@ -21,7 +21,7 @@
<!DOCTYPE project>
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<name>ServiceMix :: GBeans</name>
<id>servicemix-gbean</id>
@@ -77,60 +77,42 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${geronimo_kernel_version}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${geronimo_deployment_version}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${geronimo_common_version}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${geronimo_j2ee_version}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${geronimo_transaction_version}</version>
+ <version>${geronimo_version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
- <version>${geronimo_spec_jta_version}</version>
+ <version>${geronimo_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>
+ <version>${geronimo_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/geronimo-1.0/servicemix-gplan/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties (original)
+++ incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.properties Mon Jun 19 02:55:39 2006
@@ -27,5 +27,3 @@
geronimo_assembly_plugin_version=1.0.2
geronimo_deployment_plugin_version=1.0.0
geronimo_dependency_plugin_version=1.0.0
-
-geronimo_version=1.0
Modified: incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.0/servicemix-gplan/project.xml Mon Jun 19 02:55:39 2006
@@ -2,7 +2,7 @@
<!DOCTYPE project>
<project>
<pomVersion>3</pomVersion>
- <extend>${basedir}/../../etc/project.xml</extend>
+ <extend>${basedir}/../project.xml</extend>
<name>ServiceMix :: GPlan</name>
<id>servicemix-gplan</id>
@@ -92,7 +92,7 @@
</dependency>
<dependency>
- <groupId>incubator-servicemix</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-jbi</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -100,7 +100,7 @@
</properties>
</dependency>
<dependency>
- <groupId>incubator-servicemix</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-core</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -108,7 +108,7 @@
</properties>
</dependency>
<dependency>
- <groupId>incubator-servicemix</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-gbean</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -116,7 +116,7 @@
</properties>
</dependency>
<dependency>
- <groupId>incubator-servicemix</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>servicemix-components</artifactId>
<version>${pom.currentVersion}</version>
<properties>
@@ -124,7 +124,7 @@
</properties>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
<version>${spring_version}</version>
<properties>
Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix-deployer/project.xml Mon Jun 19 02:55:39 2006
@@ -20,7 +20,7 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>servicemix-deployer</id>
<name>ServiceMix Deployer configuration</name>
Modified: incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/configs/servicemix/project.xml Mon Jun 19 02:55:39 2006
@@ -20,7 +20,7 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>servicemix</id>
<name>ServiceMix configuration</name>
Modified: incubator/servicemix/trunk/geronimo-1.1/etc/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/etc/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/etc/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/etc/project.xml Mon Jun 19 02:55:39 2006
@@ -20,7 +20,6 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
<id>servicemix-geronimo-parent</id>
<name>ServiceMix configuration</name>
Added: incubator/servicemix/trunk/geronimo-1.1/maven.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/maven.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/maven.xml (added)
+++ incubator/servicemix/trunk/geronimo-1.1/maven.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<project default="default"
+ xmlns:j="jelly:core"
+ xmlns:u="jelly:util"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+
+ <!-- Execute default goal on subprojects. -->
+ <goal name="default">
+ <j:set var="goal" value="default"/>
+ <attainGoal name="multiproject:goal"/>
+ </goal>
+
+</project>
Modified: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix-builder/project.xml Mon Jun 19 02:55:39 2006
@@ -20,7 +20,7 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<!-- ===================== -->
<!-- Module Identification -->
Modified: incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/modules/servicemix/project.xml Mon Jun 19 02:55:39 2006
@@ -20,7 +20,7 @@
<project>
<pomVersion>3</pomVersion>
- <extend>../../etc/project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<!-- ===================== -->
<!-- Module Identification -->
Modified: incubator/servicemix/trunk/geronimo-1.1/project.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/project.properties?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/project.properties (original)
+++ incubator/servicemix/trunk/geronimo-1.1/project.properties Mon Jun 19 02:55:39 2006
@@ -23,3 +23,26 @@
modules/servicemix-builder/project.xml,\
configs/servicemix/project.xml,\
configs/servicemix-deployer/project.xml
+
+geronimo_packaging_plugin_version=1.1.0-10
+geronimo_assembly_plugin_version=1.1.0-12
+geronimo_deployment_plugin_version=1.1.0-3
+geronimo_dependency_plugin_version=1.1.0-3
+
+servicemix_version=3.0-SNAPSHOT
+geronimo_version=1.1
+mx4j_version=3.0.1
+commons_logging_version=1.0.4
+jencks_version=1.1.2
+geronimo_spec_j2ee_connector_version=1.0
+geronimo_spec_jta_version=1.0
+xbean_version=2.4
+stax_api_version=1.0.1
+backport_util_concurrent_version=2.1
+concurrent_version=1.3.4
+wsdl4j_version=1.5.2
+xstream_version=1.1.2
+commons_beanutils_version=1.7.0
+woodstox_version=2.9.3
+
+
Modified: incubator/servicemix/trunk/geronimo-1.1/project.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/geronimo-1.1/project.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/geronimo-1.1/project.xml (original)
+++ incubator/servicemix/trunk/geronimo-1.1/project.xml Mon Jun 19 02:55:39 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
+ Copyright 2005-2006 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.
@@ -19,9 +19,10 @@
<!-- $Rev: 373179 $ $Date: 2006-01-28 17:56:43 +0100 (sam., 28 janv. 2006) $ -->
<project>
- <pomVersion>3</pomVersion>
- <extend>../project.xml</extend>
- <id>servicemix-geronimo</id>
- <name>ServiceMix configuration</name>
+
+ <pomVersion>3</pomVersion>
+ <id>servicemix-geronimo-1.1</id>
+ <groupId>org.apache.servicemix</groupId>
+ <name>ServiceMix configuration</name>
</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/pom.xml Mon Jun 19 02:55:39 2006
@@ -101,6 +101,10 @@
<artifactId>wsdl-first</artifactId>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-ejb_2.1_spec</artifactId>
</dependency>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/assembly/bin.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/assembly/bin.xml Mon Jun 19 02:55:39 2006
@@ -48,9 +48,20 @@
<directory>target/samples/wsdl-first-${pom.version}</directory>
<outputDirectory>examples/wsdl-first</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/dummy</directory>
+ <outputDirectory>lib/optional</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
+ <outputDirectory>components/lib</outputDirectory>
+ <includes>
+ <include>org.apache.servicemix:servicemix-components</include>
+ <include>org.apache.servicemix:servicemix-beanflow</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
<include>classworlds:classworlds</include>
@@ -102,6 +113,7 @@
<include>org.apache.derby:derby</include>
</includes>
</dependencySet>
+ <!--
<dependencySet>
<outputDirectory>lib/optional</outputDirectory>
<includes>
@@ -125,5 +137,6 @@
<include>axis:axis-saaj</include>
</includes>
</dependencySet>
+ -->
</dependencySets>
</assembly>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/activemq.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/activemq.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/activemq.xml Mon Jun 19 02:55:39 2006
@@ -4,7 +4,7 @@
<broker useJmx="true">
<persistenceAdapter>
- <journaledJDBC journalLogFiles="5" dataDirectory="./data"/>
+ <journaledJDBC journalLogFiles="5" dataDirectory="file:./data/amq"/>
<!-- To use a different datasource, use th following syntax : -->
<!--
<journaledJDBC journalLogFiles="5" dataDirectory="../data" dataSource="#postgres-ds"/>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.conf
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.conf?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.conf (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.conf Mon Jun 19 02:55:39 2006
@@ -6,7 +6,6 @@
[app]
load ${servicemix.home}/conf
- load ${servicemix.home}/*.jar
load ${servicemix.home}/lib/*.jar
load ${servicemix.home}/lib/optional/*.jar
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/conf/servicemix.xml Mon Jun 19 02:55:39 2006
@@ -19,7 +19,7 @@
<!-- the JBI container -->
<sm:container id="jbi"
- rootDir="./wdir"
+ rootDir="./data/smx"
MBeanServer="#mbeanServer"
installationDirPath="./install"
deploymentDirPath="./deploy"
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/README.txt Mon Jun 19 02:55:39 2006
@@ -3,6 +3,14 @@
This example shows are basic flow of events, started by a Quartz time activating a JMS Message sender
+Before starting this example, run
+
+ant setup
+
+To start the servicemix container, run:
+
+../../bin/servicemix servicemix.xml
+
For more information on running this example please see:
http://incubator.apache.org/servicemix/Basic
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,20 @@
+<project name="basic" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/quartz/quartz/1.5.1/quartz-1.5.1.jar"
+ dest="../../lib/optional/quartz-1.5.1.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
+ dest="../../lib/optional/commons-pool-1.2.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
+ dest="../../lib/optional/commons-collections-3.1.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/servicemix.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/servicemix.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/basic/servicemix.xml Mon Jun 19 02:55:39 2006
@@ -6,7 +6,7 @@
<!-- the JBI container -->
- <sm:container spring:id="jbi" rootDir="./wdir" useMBeanServer="true"
+ <sm:container spring:id="jbi" rootDir="./data/smx" useMBeanServer="true"
createMBeanServer="true" installationDirPath="./install"
monitorInstallationDirectory="true" dumpStats="true"
statsInterval="10" transactionManager="#transactionManager">
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/build.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/build.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/build.xml Mon Jun 19 02:55:39 2006
@@ -1,4 +1,4 @@
-<project name="jms-binding" default="run" basedir=".">
+<project name="bpel-bpe" default="run" basedir=".">
<property name="build.dir" value="build"/>
<property name="comp.build.dir" value="${build.dir}/components"/>
@@ -10,7 +10,7 @@
<property name="su.bpe.src.dir" value="${src.dir}/bpe-su"/>
<property name="su.lw.src.dir" value="${src.dir}/lw-su"/>
<property name="sa.src.dir" value="${src.dir}/sa"/>
-
+
<target name="clean">
<delete dir="target" quiet="true"/>
<delete dir="${build.dir}" quiet="true"/>
@@ -21,6 +21,16 @@
<mkdir dir="${comp.build.dir}"/>
<mkdir dir="${client.build.dir}"/>
+ <get src="http://repo.mergere.com/maven2/lingo/lingo/1.0/lingo-1.0.jar"
+ dest="../../lib/optional/lingo-1.0.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
+ dest="../../lib/optional/commons-pool-1.2.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
+ dest="../../lib/optional/commons-collections-3.1.jar"
+ usetimestamp="true" />
+
<path id="javac.classpath">
<pathelement path="${comp.build.dir}"/>
<pathelement path="${client.build.dir}"/>
@@ -28,10 +38,11 @@
<fileset dir="../../lib">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="../..">
+ <fileset dir="../../lib/optional">
<include name="*.jar"/>
</fileset>
</path>
+
</target>
<target name="build-components" depends="init" description="Build components">
@@ -69,6 +80,9 @@
<fileset dir="../../components" includes="*lwcontainer*"/>
</copy>
<copy file="${build.dir}/bpe-demo-sa.zip" todir="deploy"/>
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
</target>
<target name="build-client" depends="init" description="Build components">
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/servicemix.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/servicemix.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/bpel-bpe/servicemix.xml Mon Jun 19 02:55:39 2006
@@ -3,7 +3,7 @@
<!-- the JBI container -->
<sm:container id="jbi"
- rootDir="./wdir"
+ rootDir="./data/smx"
installationDirPath="./install"
deploymentDirPath="./deploy"
flowName="seda">
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/README.txt Mon Jun 19 02:55:39 2006
@@ -3,6 +3,10 @@
This example uses shows how to connect two ServiceMix containers in a cluster.
+Before starting this example, run
+
+ant setup
+
To start the servicemix servers using the sample configurations, just run:
../../bin/servicemix servicemix-poller.xml
@@ -11,7 +15,7 @@
../../bin/servicemix servicemix-writer.xml
-This will start a the two ServiceMix containers.
+This will start two ServiceMix containers.
One server have a file poller component, and the other one a file writer component.
Just drop the test-file.xml in the inbox directory.
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,14 @@
+<project name="cluster" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ dest="../../lib/optional/jaxen-1.1-beta9.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/cluster/servicemix-writer.xml Mon Jun 19 02:55:39 2006
@@ -1,45 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<spring:beans
- xmlns="http://servicemix.apache.org/config/1.0"
- xmlns:spring="http://xbean.org/schemas/spring/1.0"
- xmlns:foo="http://servicemix.org/demo/">
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+ xmlns:foo="http://servicemix.org/demo/">
<!-- the JBI container -->
- <container spring:id="jbi" name="writer" flowName="jms" useMBeanServer="true"
- createMBeanServer="true" dumpStats="true" statsInterval="10" rmiPort="1111">
+ <sm:container id="jbi"
+ name="writer"
+ flowName="jms"
+ useMBeanServer="true"
+ createMBeanServer="true"
+ dumpStats="true"
+ statsInterval="10"
+ rmiPort="1111">
- <activationSpecs>
+ <sm:activationSpecs>
<!-- Write files to the outbox directory -->
- <activationSpec componentName="fileSender"
- service="foo:fileSender">
- <component>
- <bean xmlns="http://xbean.org/schemas/spring/1.0"
- class="org.apache.servicemix.components.file.FileWriter">
+ <sm:activationSpec componentName="fileSender"
+ service="foo:fileSender">
+ <sm:component>
+ <bean class="org.apache.servicemix.components.file.FileWriter">
<property name="directory" value="outbox" />
<property name="marshaler">
- <bean
- class="org.apache.servicemix.components.util.DefaultFileMarshaler">
+ <bean class="org.apache.servicemix.components.util.DefaultFileMarshaler">
<property name="fileName">
- <bean
- class="org.apache.servicemix.expression.JaxenStringXPathExpression">
- <constructor-arg
- value="concat('sample_', /sample/@id, '.xml')" />
+ <bean class="org.apache.servicemix.expression.JaxenStringXPathExpression">
+ <constructor-arg value="concat('sample_', /sample/@id, '.xml')" />
</bean>
</property>
</bean>
</property>
</bean>
- </component>
- </activationSpec>
+ </sm:component>
+ </sm:activationSpec>
- </activationSpecs>
- </container>
+ </sm:activationSpecs>
+ </sm:container>
<!-- the work manager (thread pool) for this container -->
- <bean xmlns="http://xbean.org/schemas/spring/1.0" id="workManager"
- class="org.jencks.factory.WorkManagerFactoryBean">
+ <bean id="workManager" class="org.jencks.factory.WorkManagerFactoryBean">
<property name="threadPoolSize" value="30" />
</bean>
-</spring:beans>
+</beans>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -4,6 +4,10 @@
This example shows how to use the File bindings to do a simple file
transfer.
+To download the needed dependencies, run
+
+ant setup
+
To start the servicemix server using the sample configuration, just run:
../../bin/servicemix servicemix.xml
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,14 @@
+<project name="file-binding" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ dest="../../lib/optional/jaxen-1.1-beta9.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/servicemix.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/servicemix.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/file-binding/servicemix.xml Mon Jun 19 02:55:39 2006
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xbean.org/schemas/spring/1.0"
- xmlns:spring="http://xbean.org/schemas/spring/1.0"
- xmlns:sm="http://servicemix.apache.org/config/1.0"
- xmlns:foo="http://servicemix.org/demo/">
+<beans xmlns:sm="http://servicemix.apache.org/config/1.0"
+ xmlns:foo="http://servicemix.org/demo/">
<!-- the JBI container -->
<sm:container id="jbi" useMBeanServer="true"
@@ -14,8 +12,7 @@
<sm:activationSpec componentName="fileSender"
service="foo:fileSender">
<sm:component>
- <bean xmlns="http://xbean.org/schemas/spring/1.0"
- class="org.apache.servicemix.components.file.FileWriter">
+ <bean class="org.apache.servicemix.components.file.FileWriter">
<property name="directory" value="outbox" />
<property name="marshaler">
<bean
@@ -37,8 +34,7 @@
<sm:activationSpec componentName="filePoller"
destinationService="foo:fileSender" service="foo:filePoller">
<sm:component>
- <bean xmlns="http://xbean.org/schemas/spring/1.0"
- class="org.apache.servicemix.components.file.FilePoller">
+ <bean class="org.apache.servicemix.components.file.FilePoller">
<property name="workManager" ref="workManager" />
<property name="file" value="inbox" />
<property name="period" value="1000" />
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -6,6 +6,7 @@
To start the servicemix server using the sample configuration, just run:
+ant setup
../../bin/servicemix servicemix.xml
This will start http server on port 8912 and wait for a request to come in
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/build.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/build.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/http-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -1,6 +1,35 @@
-<project name="jms-binding" default="run" basedir=".">
+<project name="http-binding" default="run" basedir=".">
<property name="class.dir" value="classes"/>
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ dest="../../lib/optional/jaxen-1.1-beta9.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/org/mortbay/jetty/jetty/6.0.0beta17/jetty-6.0.0beta17.jar"
+ dest="../../lib/optional/jetty-6.0.0beta17.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/org/mortbay/jetty/jetty-util/6.0.0beta17/jetty-util-6.0.0beta17.jar"
+ dest="../../lib/optional/jetty-util-6.0.0beta17.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"
+ dest="../../lib/optional/axis-jaxrpc-1.4.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.jar"
+ dest="../../lib/optional/axis-saaj-1.4.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/axis/axis/1.4/axis-1.4.jar"
+ dest="../../lib/optional/axis-1.4.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
+ dest="../../lib/optional/commons-discovery-0.2.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
<target name="clean">
<delete dir="target" quiet="true"/>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -5,6 +5,7 @@
To start the servicemix server using the sample configuration, just run:
+ant setup
../../bin/servicemix servicemix.xml
This will start a component which listens for a JMS message on topic 'demo.org.servicemix.source' and then
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/build.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/build.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/jms-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -2,6 +2,20 @@
<property name="class.dir" value="classes"/>
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
+ dest="../../lib/optional/commons-pool-1.2.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
+ dest="../../lib/optional/commons-collections-3.1.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
<target name="clean">
<delete dir="target" quiet="true"/>
<delete dir="${class.dir}" quiet="true"/>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/loan-broker/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/loan-broker/build.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/loan-broker/build.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/loan-broker/build.xml Mon Jun 19 02:55:39 2006
@@ -20,6 +20,10 @@
<mkdir dir="${comp.build.dir}"/>
<mkdir dir="${client.build.dir}"/>
+ <get src="http://repo.mergere.com/maven2/lingo/lingo/1.0/lingo-1.0.jar"
+ dest="../../lib/optional/lingo-1.0.jar"
+ usetimestamp="true" />
+
<path id="javac.classpath">
<pathelement path="${comp.build.dir}"/>
<pathelement path="${client.build.dir}"/>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -6,6 +6,7 @@
To start the servicemix server using the sample configuration, just run:
+ant setup
../../bin/servicemix servicemix.xml
This will send a periodic event every 5 seconds into the container via
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/quartz-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,14 @@
+<project name="basic" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/quartz/quartz/1.5.1/quartz-1.5.1.jar"
+ dest="../../lib/optional/quartz-1.5.1.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -3,5 +3,10 @@
This simple exampleshows RSS feeds being passed to trace component
+To start the servicemix server using the sample configuration, just run:
+
+ant setup
+../../bin/servicemix servicemix.xml
+
For more information see:
http://incubator.apache.org/servicemix/RSS
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,17 @@
+<project name="basic" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/rome/rome/0.8/rome-0.8.jar"
+ dest="../../lib/optional/rome-0.8.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/jdom/jdom/1.0/jdom-1.0.jar"
+ dest="../../lib/optional/jdom-1.0.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/servicemix.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/servicemix.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/servicemix.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/rss-binding/servicemix.xml Mon Jun 19 02:55:39 2006
@@ -16,7 +16,7 @@
<property name="outputType" value="rss_2.0"/>
<property name="period" value="5000"/>
<property name="lastPolledDate">
- <value>2005/aug/10</value>
+ <value>2005/08/10</value>
</property>
@@ -52,7 +52,7 @@
<constructor-arg index="0">
<bean class="java.text.SimpleDateFormat">
<constructor-arg>
- <value>yyyy/MMM/dd</value>
+ <value>yyyy/MM/dd</value>
</constructor-arg>
</bean>
</constructor-arg>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/README.txt?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/README.txt (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/README.txt Mon Jun 19 02:55:39 2006
@@ -4,6 +4,9 @@
This example uses shows how to use the VFS bindings to do a simple
file transfer.
+To download the needed dependencies, run
+ant setup
+
To start the servicemix server using the sample configuration,
just run:
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/vfs-binding/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,17 @@
+<project name="basic" default="setup" basedir=".">
+
+ <target name="setup">
+
+ <get src="http://repo.mergere.com/maven2/commons-vfs/commons-vfs/20050307052300/commons-vfs-20050307052300.jar"
+ dest="../../lib/optional/commons-vfs-20050307052300.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/jaxen/jaxen/1.1-beta-9/jaxen-1.1-beta-9.jar"
+ dest="../../lib/optional/jaxen-1.1-beta-9.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/ws-notification/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/ws-notification/build.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/ws-notification/build.xml (original)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/ws-notification/build.xml Mon Jun 19 02:55:39 2006
@@ -1,9 +1,16 @@
-<project name="ws-notification" default="dep" basedir=".">
+<project name="ws-notification" default="setup" basedir=".">
- <target name="dep">
- <mkdir dir="lib"/>
- <get verbose="true" usetimestamp="true" src="http://repo.mergere.com/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="lib/junit-3.8.1.jar" />
- <unzip dest=".">
+ <target name="setup">
+ <get src="http://repo.mergere.com/maven2/junit/junit/3.8.1/junit-3.8.1.jar"
+ dest="../../lib/optional/junit-3.8.1.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/quartz/quartz/1.5.1/quartz-1.5.1.jar"
+ dest="../../lib/optional/quartz-1.5.1.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
+ <unzip dest="../../lib/optional">
<patternset>
<include name="lib/*.jar"/>
</patternset>
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/README.txt?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/README.txt (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/README.txt Mon Jun 19 02:55:39 2006
@@ -0,0 +1,13 @@
+Welcome to ServiceMix WSDL design first example
+===============================================
+
+To create the Service Assembly, run
+ mvn install
+
+Then, copy the generated SA and needed components running
+ ant setup
+
+ and launch ServiceMix container:
+ ../../bin/servicemix
+
+
Added: incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/build.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/build.xml (added)
+++ incubator/servicemix/trunk/incubating-apache-servicemix/src/main/release/examples/wsdl-first/build.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,15 @@
+<project name="jms-binding" default="setup" basedir=".">
+
+ <target name="setup" description="Setup servicemix">
+ <mkdir dir="data"/>
+ <mkdir dir="install"/>
+ <mkdir dir="deploy"/>
+ <copy todir="install">
+ <fileset dir="../../components" includes="*jsr181*,*http*"/>
+ </copy>
+ <copy todir="deploy">
+ <fileset dir="sa/target" includes="*.jar"/>
+ </copy>
+ </target>
+
+</project>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Jun 19 02:55:39 2006
@@ -279,6 +279,11 @@
<name>ActiveMQ Maven2 Temp Repository</name>
<url>http://people.apache.org/~chirino/incubator-activemq-4.0/maven2</url>
</repository>
+ <!-- XBean 2.4 release -->
+ <repository>
+ <id>xbean-tmp-repo</id>
+ <url>http://people.apache.org/~gnodet/xbean-2.4/m2/</url>
+ </repository>
</repositories>
<dependencies>
@@ -400,6 +405,17 @@
<version>2.0EA3</version>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml</groupId>
+ <artifactId>jsr173</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml</groupId>
<artifactId>jaxws-rt</artifactId>
<version>2.0EA3</version>
@@ -422,6 +438,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.0EA3</version>
+ </dependency>
+ <dependency>
<groupId>xfire</groupId>
<artifactId>xfire-jsr181-api</artifactId>
<version>${xfire.jsr181.api.version}</version>
@@ -1236,7 +1257,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>1.2.6</version>
+ <version>2.0-m5</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
@@ -1383,17 +1404,17 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-kernel</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-server</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>2.3</version>
+ <version>2.4</version>
<exclusions>
<exclusion>
<groupId>qdox</groupId>
Modified: incubator/servicemix/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/pom.xml?rev=415273&r1=415272&r2=415273&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/pom.xml (original)
+++ incubator/servicemix/trunk/samples/pom.xml Mon Jun 19 02:55:39 2006
@@ -37,6 +37,5 @@
<modules>
<module>wsdl-first</module>
- <module>wsdl-first-http</module>
</modules>
</project>
Propchange: incubator/servicemix/trunk/samples/wsdl-first/http-su/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 19 02:55:39 2006
@@ -0,0 +1 @@
+target
Added: incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/http-su/pom.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 dâ©c. 2005) $ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+ <artifactId>http-su</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <name>ServiceMix :: Samples :: WSDL first :: HTTP</name>
+
+</project>
Added: incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/jbi.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/jbi.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/META-INF/jbi.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbi xmlns="http://java.sun.com/xml/ns/jbi" version="1.0">
+
+</jbi>
Added: incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/xbean.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/xbean.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/http-su/src/main/resources/xbean.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<beans xmlns:http="http://servicemix.apache.org/http/1.0"
+ xmlns:person="http://servicemix.apache.org/samples/wsdl-first">
+
+ <http:endpoint service="person:PersonService"
+ endpoint="soap"
+ role="consumer"
+ locationURI="http://localhost:8192/PersonService/" />
+
+</beans>
Propchange: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 19 02:55:39 2006
@@ -0,0 +1 @@
+target
Added: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/pom.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+<!-- $Rev: 356052 $ $Date: 2005-12-11 14:41:20 -0800 (dim., 11 dâ©c. 2005) $ -->
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+ <artifactId>jsr181-su</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ <name>ServiceMix :: Samples :: WSDL first :: JSR181</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xfire</groupId>
+ <artifactId>xfire-jsr181-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxws-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>wsimport</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+ <wsdlFiles>person.wsdl</wsdlFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/java/org/apache/servicemix/samples/wsdl_first/PersonImpl.java Mon Jun 19 02:55:39 2006
@@ -0,0 +1,22 @@
+package org.apache.servicemix.samples.wsdl_first;
+
+import org.apache.servicemix.samples.wsdl_first.types.GetPersonRequest;
+import org.apache.servicemix.samples.wsdl_first.types.GetPersonResponse;
+
+public class PersonImpl implements Person {
+
+ public GetPersonResponse getPerson(GetPersonRequest payload) throws UnknownPersonFault {
+ String personId = payload.getPersonId();
+ if (personId == null || personId.length() == 0) {
+ org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault fault = new org.apache.servicemix.samples.wsdl_first.types.UnknownPersonFault();
+ fault.setPersonId(personId);
+ throw new UnknownPersonFault(null, fault);
+ }
+ GetPersonResponse response = new GetPersonResponse();
+ response.setPersonId(payload.getPersonId());
+ response.setName("Guillaume");
+ response.setSsn("000-000-0000");
+ return null;
+ }
+
+}
Added: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/jbi.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/jbi.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/jbi.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/META-INF/jbi.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbi xmlns="http://java.sun.com/xml/ns/jbi" version="1.0">
+
+</jbi>
Added: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/person.wsdl
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/person.wsdl?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/person.wsdl (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/person.wsdl Mon Jun 19 02:55:39 2006
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<wsdl:definitions name="wsdl-first"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tns="http://servicemix.apache.org/samples/wsdl-first"
+ xmlns:typens="http://servicemix.apache.org/samples/wsdl-first/types"
+ targetNamespace="http://servicemix.apache.org/samples/wsdl-first">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://servicemix.apache.org/samples/wsdl-first/types">
+ <xsd:element name="getPersonRequest">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="getPersonResponse">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="xsd:string"/>
+ <xsd:element name="ssn" type="xsd:string"/>
+ <xsd:element name="name" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="unknownPersonFault">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="personId" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://servicemix.apache.org/samples/wsdl-first">
+ <xsd:element name="getPersonRequest" type="xsd:string"></xsd:element></xsd:schema>
+ </wsdl:types>
+
+ <wsdl:message name="getPersonRequest">
+ <wsdl:part name="payload" element="typens:getPersonRequest"/>
+ </wsdl:message>
+ <wsdl:message name="getPersonResponse">
+ <wsdl:part name="payload" element="typens:getPersonResponse"/>
+ </wsdl:message>
+ <wsdl:message name="unknownPersonFault">
+ <wsdl:part name="payload" element="typens:unknownPersonFault"/>
+ </wsdl:message>
+
+ <wsdl:portType name="Person">
+ <wsdl:operation name="getPerson">
+ <wsdl:input message="tns:getPersonRequest"/>
+ <wsdl:output message="tns:getPersonResponse"/>
+ <wsdl:fault name="UnknownPerson" message="tns:unknownPersonFault"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="PersonSOAPBinding" type="tns:Person">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+ <wsdl:operation name="getPerson">
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ <wsdl:fault name="UnknownPerson">
+ <soap:fault use="literal" name="UnknownPerson" />
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:service name="PersonService">
+ <wsdl:port binding="tns:PersonSOAPBinding" name="soap">
+ <soap:address location="http://www.example.org/" />
+ </wsdl:port>
+ </wsdl:service>
+
+</wsdl:definitions>
Added: incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/xbean.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/xbean.xml?rev=415273&view=auto
==============================================================================
--- incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/xbean.xml (added)
+++ incubator/servicemix/trunk/samples/wsdl-first/jsr181-su/src/main/resources/xbean.xml Mon Jun 19 02:55:39 2006
@@ -0,0 +1,10 @@
+<beans xmlns:jsr181="http://servicemix.apache.org/jsr181/1.0">
+
+ <classpath>
+ <location>.</location>
+ </classpath>
+
+ <jsr181:endpoint pojoClass="org.apache.servicemix.samples.wsdl_first.PersonImpl"
+ wsdlResource="classpath:person.wsdl" />
+
+</beans>
\ No newline at end of file