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 2011/06/29 14:18:57 UTC
svn commit: r1141067 - in /cxf/trunk: distribution/
distribution/src/main/assembly/
distribution/src/main/release/samples/integration/JBI/
distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/
distribution/src/main/release/sa...
Author: ffang
Date: Wed Jun 29 12:18:57 2011
New Revision: 1141067
URL: http://svn.apache.org/viewvc?rev=1141067&view=rev
Log:
[CXF-3599]remove JBI stuff
Removed:
cxf/trunk/distribution/src/main/assembly/jbi.xml
cxf/trunk/distribution/src/main/release/samples/integration/JBI/
cxf/trunk/integration/jbi/
cxf/trunk/rt/bindings/jbi/
cxf/trunk/rt/transports/jbi/
cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/jbi/
cxf/trunk/testutils/src/main/java/org/apache/hello_world/jbi/GreeterImpl.java
cxf/trunk/testutils/src/main/resources/wsdl/hello_world_jbi.wsdl
Modified:
cxf/trunk/distribution/pom.xml
cxf/trunk/distribution/src/main/assembly/bin.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml
cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound/build.xml
cxf/trunk/integration/pom.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/bindings/pom.xml
cxf/trunk/rt/pom.xml
cxf/trunk/systests/uncategorized/pom.xml
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Wed Jun 29 12:18:57 2011
@@ -375,29 +375,11 @@
<artifactItems>
<artifactItem>
<groupId>${project.groupId}</groupId>
- <artifactId>cxf-integration-jbi</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
<artifactId>cxf-integration-jca</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cxf-rt-bindings-jbi</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>cxf-rt-transports-jbi</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/additional-libs</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${cxf.jaxb22.version}</version>
@@ -456,11 +438,6 @@
<echo file="${basedir}/target/srcbuild_env${output.ext}" message="${output.cp}" />
<echo file="${basedir}/target/srcbuild_env.ant" message="${cp}" />
<echo file="${basedir}/target/version.properties" message="cxf.version=${project.version}" />
- <copy file="${basedir}/src/main/assembly/jbi.xml" tofile="${basedir}/target/jbi.xml" overwrite="yes">
- <filterset>
- <filter token="CXF_VERSION" value="${project.version}" />
- </filterset>
- </copy>
<delete file="build.xml" />
</tasks>
</configuration>
Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Wed Jun 29 12:18:57 2011
@@ -133,13 +133,6 @@
<include>ra.xml</include>
</includes>
</fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>apache-cxf-${cxf.version}/samples/integration/JBI/service-engine/etc</outputDirectory>
- <includes>
- <include>jbi.xml</include>
- </includes>
- </fileSet>
<!-- include the JavaScript client utilities for users who don't want to use ?js. -->
<fileSet>
<directory>../rt/javascript/src/main/resources/org/apache/cxf/javascript</directory>
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch-wsdl/build.xml Wed Jun 29 12:18:57 2011
@@ -70,7 +70,6 @@
</fileset>
<fileset dir="${cxf.home}/modules/integration">
<include name="*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb-dispatch/build.xml Wed Jun 29 12:18:57 2011
@@ -65,7 +65,6 @@
</fileset>
<fileset dir="${cxf.home}/modules/integration">
<include name="*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound-mdb/build.xml Wed Jun 29 12:18:57 2011
@@ -65,7 +65,6 @@
</fileset>
<fileset dir="${cxf.home}/modules/integration">
<include name="*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/inbound/build.xml Wed Jun 29 12:18:57 2011
@@ -99,7 +99,6 @@
</fileset>
<fileset dir="${cxf.home}/modules/integration">
<include name="*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound.was61/build.xml Wed Jun 29 12:18:57 2011
@@ -69,16 +69,13 @@
<fileset dir="${cxf.home}/lib">
<include name="*.jar"/>
<exclude name="*manifest*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
<fileset dir="${module.jar.dir}">
<include name="cxf*.jar"/>
<exclude name="*manifest*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
<fileset dir="${integration.jar.dir}">
<include name="*-jca-*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound/build.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound/build.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound/build.xml (original)
+++ cxf/trunk/distribution/src/main/release/samples/integration/jca/outbound/build.xml Wed Jun 29 12:18:57 2011
@@ -105,16 +105,13 @@
<include name="*.jar"/>
<exclude name="cxf*.jar"/>
<exclude name="*manifest*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
<fileset dir="${module.jar.dir}">
<include name="cxf*.jar"/>
<exclude name="*manifest*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
<fileset dir="${integration.jar.dir}">
<include name="*-jca-*.jar"/>
- <exclude name="*-jbi-*.jar"/>
</fileset>
</copy>
<jar destfile="${build.classes.dir}/lib/cxf.rar"
Modified: cxf/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/integration/pom.xml (original)
+++ cxf/trunk/integration/pom.xml Wed Jun 29 12:18:57 2011
@@ -33,7 +33,6 @@
<modules>
- <module>jbi</module>
<module>jca</module>
</modules>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Jun 29 12:18:57 2011
@@ -539,13 +539,6 @@
<version>2.7.7</version>
</dependency>
<dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <version>1.7.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${cxf.neethi.version}</version>
Modified: cxf/trunk/rt/bindings/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/pom.xml (original)
+++ cxf/trunk/rt/bindings/pom.xml Wed Jun 29 12:18:57 2011
@@ -36,7 +36,6 @@
<module>http</module>
<module>object</module>
<module>coloc</module>
- <module>jbi</module>
<module>corba</module>
</modules>
Modified: cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/rt/pom.xml (original)
+++ cxf/trunk/rt/pom.xml Wed Jun 29 12:18:57 2011
@@ -48,7 +48,6 @@
<module>transports/http</module>
<module>transports/http-jetty</module>
<module>transports/jms</module>
- <module>transports/jbi</module>
<module>ws/policy</module>
<module>ws/addr</module>
<module>ws/rm</module>
Modified: cxf/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=1141067&r1=1141066&r2=1141067&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Wed Jun 29 12:18:57 2011
@@ -177,22 +177,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-jbi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-jbi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-integration-jbi</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-http</artifactId>
<version>${project.version}</version>
</dependency>