You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2007/06/08 09:48:57 UTC
svn commit: r545449 - in /incubator/cxf/trunk/distribution/src/main:
assembly/
release/samples/integration/JBI/external_provider_external_consumer/
release/samples/integration/JBI/external_provider_external_consumer/service-engine/
release/samples/inte...
Author: ffang
Date: Fri Jun 8 00:48:56 2007
New Revision: 545449
URL: http://svn.apache.org/viewvc?view=rev&rev=545449
Log:
[CXF-715] extract service engine commom module for JBI sample
Added:
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (with props)
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml (with props)
Removed:
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/service-engine/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/service-engine/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/service-engine/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/service-engine/
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/service-engine/
Modified:
incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.xml
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.xml
Modified: incubator/cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/assembly/bin.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/assembly/bin.xml Fri Jun 8 00:48:56 2007
@@ -127,35 +127,7 @@
</fileSet>
<fileSet>
<directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/internal_provider_internal_consumer/service-engine/etc</outputDirectory>
- <includes>
- <include>jbi.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/internal_provider_external_consumer/service-engine/etc</outputDirectory>
- <includes>
- <include>jbi.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/external_provider_internal_consumer/service-engine/etc</outputDirectory>
- <includes>
- <include>jbi.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/external_provider_external_consumer/service-engine/etc</outputDirectory>
- <includes>
- <include>jbi.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/handlers/service-engine/etc</outputDirectory>
+ <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/service-engine/etc</outputDirectory>
<includes>
<include>jbi.xml</include>
</includes>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/README.txt Fri Jun 8 00:48:56 2007
@@ -63,7 +63,9 @@
Installation & Deployment
-------------------------
Ensure that the $SERVICEMIX_HOME/bin is on the path.
-
+To avoid wsdl4j version conflict, we need replace wsdl4j-1.5.1.jar in
+$SERVICEMIX_HOME/lib with
+wsdl4j-1.6.1.jar in $CXF_HOME/lib
Start ServiceMix
>servicemix
And then you can see logs from the shell which you start servicemix, including
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_external_consumer/build.xml Fri Jun 8 00:48:56 2007
@@ -21,14 +21,14 @@
<project name="cxf-jbi-demo" default="build">
<target name="build">
- <ant dir="service-engine"/>
+ <ant dir="../service-engine"/>
<ant dir="service-unit"/>
<ant dir="service-assembly"/>
</target>
<target name="clean">
<ant dir="service-unit" target="clean"/>
- <ant dir="service-engine" target="clean"/>
+ <ant dir="../service-engine" target="clean"/>
<ant dir="service-assembly" target="clean"/>
</target>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/README.txt Fri Jun 8 00:48:56 2007
@@ -60,7 +60,9 @@
Installation & Deployment
-------------------------
Ensure that the $SERVICEMIX_HOME/bin is on the path.
-
+To avoid wsdl4j version conflict, we need replace wsdl4j-1.5.1.jar in
+$SERVICEMIX_HOME/lib with
+wsdl4j-1.6.1.jar in $CXF_HOME/lib
Start ServiceMix
>servicemix
And then you can see logs from the shell which you start servicemix, including
@@ -74,7 +76,7 @@
> ant server -Dthirdparty.classpath=$SERVICEMIX_HOME/lib/activemq-core-4.0.2.jar:$SERVICEMIX_HOME/lib/backport-util-concurrent-2.1.jar:$SERVICEMIX_HOME/lib/activeio-core-3.0-beta4.jar:$SERVICEMIX_HOME/lib/geronimo-j2ee-management_1.0_spec-1.0.1.jar
Install and start the CXF Service Engine:
- > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=./service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
+ > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Install and start the ServiceMix jms binding component
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/external_provider_internal_consumer/build.xml Fri Jun 8 00:48:56 2007
@@ -22,14 +22,14 @@
<project name="cxf-jbi-demo" default="build">
<target name="build">
- <ant dir="service-engine"/>
+ <ant dir="../service-engine"/>
<ant dir="service-unit"/>
<ant dir="service-assembly"/>
</target>
<target name="clean">
<ant dir="service-unit" target="clean"/>
- <ant dir="service-engine" target="clean"/>
+ <ant dir="../service-engine" target="clean"/>
<ant dir="service-assembly" target="clean"/>
</target>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/README.txt Fri Jun 8 00:48:56 2007
@@ -53,7 +53,9 @@
Installation & Deployment
-------------------------
Ensure that the $SERVICEMIX_HOME/bin is on the path.
-
+To avoid wsdl4j version conflict, we need replace wsdl4j-1.5.1.jar in
+$SERVICEMIX_HOME/lib with
+wsdl4j-1.6.1.jar in $CXF_HOME/lib
Start ServiceMix
>servicemix
And then you can see logs from the shell which you start servicemix, including
@@ -65,7 +67,7 @@
Install the CXF Service Engine:
- > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=./service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
+ > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Deploy the CXF demo service assembly
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/build.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/handlers/build.xml Fri Jun 8 00:48:56 2007
@@ -20,13 +20,13 @@
<target name="build">
<ant dir="service-unit"/>
- <ant dir="service-engine"/>
+ <ant dir="../service-engine"/>
<ant dir="service-assembly"/>
</target>
<target name="clean">
<ant dir="service-unit" target="clean"/>
- <ant dir="service-engine" target="clean"/>
+ <ant dir="../service-engine" target="clean"/>
<ant dir="service-assembly" target="clean"/>
</target>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/README.txt Fri Jun 8 00:48:56 2007
@@ -62,7 +62,9 @@
Installation & Deployment
-------------------------
Ensure that the $SERVICEMIX_HOME/bin is on the path.
-
+To avoid wsdl4j version conflict, we need replace wsdl4j-1.5.1.jar in
+$SERVICEMIX_HOME/lib with
+wsdl4j-1.6.1.jar in $CXF_HOME/lib
Start ServiceMix
>servicemix
And then you can see logs from the shell which you start servicemix, including
@@ -74,7 +76,7 @@
Install and start the CXF Service Engine:
- > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=./service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
+ > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Install and start the ServiceMix soap binding component
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_external_consumer/build.xml Fri Jun 8 00:48:56 2007
@@ -21,14 +21,14 @@
<project name="cxf-jbi-demo" default="build">
<target name="build">
- <ant dir="service-engine"/>
+ <ant dir="../service-engine"/>
<ant dir="service-unit"/>
<ant dir="service-assembly"/>
</target>
<target name="clean">
<ant dir="service-unit" target="clean"/>
- <ant dir="service-engine" target="clean"/>
+ <ant dir="../service-engine" target="clean"/>
<ant dir="service-assembly" target="clean"/>
</target>
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/README.txt Fri Jun 8 00:48:56 2007
@@ -57,7 +57,9 @@
Installation & Deployment
-------------------------
Ensure that the $SERVICEMIX_HOME/bin is on the path.
-
+To avoid wsdl4j version conflict, we need replace wsdl4j-1.5.1.jar in
+$SERVICEMIX_HOME/lib with
+wsdl4j-1.6.1.jar in $CXF_HOME/lib
Start ServiceMix
>servicemix
And then you can see logs from the shell which you start servicemix, including
@@ -69,7 +71,7 @@
Install and start the CXF Service Engine:
- > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=./service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
+ > ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml install-component -Dsm.install.file=../service-engine/build/lib/cxf-service-engine.jar -Dsm.username=smx -Dsm.password=smx
> ant -f $SERVICEMIX_HOME/ant/servicemix-ant-task.xml start-component -Dsm.component.name=CXFServiceEngine -Dsm.username=smx -Dsm.password=smx
Deploy and start the CXF demo service assembly
Modified: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.xml?view=diff&rev=545449&r1=545448&r2=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.xml (original)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/internal_provider_internal_consumer/build.xml Fri Jun 8 00:48:56 2007
@@ -20,14 +20,14 @@
<project name="cxf-jbi-demo" default="build">
<target name="build">
- <ant dir="service-engine"/>
+ <ant dir="../service-engine"/>
<ant dir="service-unit"/>
<ant dir="service-assembly"/>
</target>
<target name="clean">
<ant dir="service-unit" target="clean"/>
- <ant dir="service-engine" target="clean"/>
+ <ant dir="../service-engine" target="clean"/>
<ant dir="service-assembly" target="clean"/>
</target>
Added: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml?view=auto&rev=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml Fri Jun 8 00:48:56 2007
@@ -0,0 +1,60 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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 name="jbi-demo-service-engine" default="build">
+
+ <property name="build.dir" location="./build"/>
+ <property name="build.classes.dir" location="${build.dir}/classes"/>
+ <property name="build.lib.dir" location="${build.dir}/lib"/>
+ <property name="src.dir" location="./src"/>
+
+ <property environment="env"/>
+ <path id="build.classpath">
+ <fileset dir="${env.CXF_HOME}/modules">
+ <include name="cxf-manifest-incubator.jar"/>
+ </fileset>
+ <pathelement location="./build/classes"/>
+ </path>
+
+ <target name="build" depends="build-service-engine"/>
+
+ <target name="build-service-engine">
+ <mkdir dir="${build.lib.dir}"/>
+
+ <jar destfile="${build.lib.dir}/cxf-service-engine.jar">
+ <fileset dir="${env.CXF_HOME}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${env.CXF_HOME}/modules/integration">
+ <include name="*.jar"/>
+ </fileset>
+ <metainf dir="./etc">
+ <include name="jbi.xml"/>
+ <include name="cxf-config.xml"/>
+ </metainf>
+ </jar>
+ </target>
+
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ </target>
+
+</project>
+
+
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml?view=auto&rev=545449
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml (added)
+++ incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml Fri Jun 8 00:48:56 2007
@@ -0,0 +1,19 @@
+<!--/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+-->
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: incubator/cxf/trunk/distribution/src/main/release/samples/integration/JBI/service-engine/etc/cxf-config.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml