You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2013/03/11 15:17:29 UTC
svn commit: r1455154 - in /servicemix/smx5/trunk: ./
assemblies/apache-servicemix/src/main/filtered-resources/
examples/cxf/cxf-osgi/
examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/
examples/cxf/cxf-ws-rm/ examples/cxf/cxf-w...
Author: gertv
Date: Mon Mar 11 14:17:29 2013
New Revision: 1455154
URL: http://svn.apache.org/r1455154
Log:
SM-2177: Remove servicemix-utils as dependency
Modified:
servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml
servicemix/smx5/trunk/examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java
servicemix/smx5/trunk/examples/cxf/cxf-ws-rm/pom.xml
servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/pom.xml
servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/Client.java
servicemix/smx5/trunk/itests/cxf-ws-security-osgi/pom.xml
servicemix/smx5/trunk/itests/tests/pom.xml
servicemix/smx5/trunk/parent/pom.xml
servicemix/smx5/trunk/pom.xml
Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml Mon Mar 11 14:17:29 2013
@@ -47,7 +47,7 @@
<feature name="examples-cxf-osgi" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-osgi/${version}</bundle>
</feature>
@@ -83,28 +83,25 @@
<feature name="examples-cxf-ws-addressing" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-addressing/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-osgi" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-osgi/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-blueprint" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-blueprint/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-security-signature" version="${version}" resolver="(obr)">
<feature version="${cxf.version}">cxf</feature>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle dependency="true">mvn:org.apache.servicemix/servicemix-utils/${servicemix.utils.version}</bundle>
<bundle dependency="true">mvn:org.springframework/spring-beans/${spring.version}</bundle>
+ <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle>
<bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
</feature>
<feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
Modified: servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml Mon Mar 11 14:17:29 2013
@@ -38,14 +38,14 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
Modified: servicemix/smx5/trunk/examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-osgi/src/main/java/org/apache/servicemix/samples/cxf_osgi/Client.java Mon Mar 11 14:17:29 2013
@@ -19,11 +19,13 @@ package org.apache.servicemix.samples.cx
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.servicemix.util.FileUtil;
+import org.apache.commons.io.IOUtils;
+
+
+
public class Client{
public static void main(String[] args) {
@@ -42,11 +44,11 @@ public class Client{
OutputStream os = connection.getOutputStream();
// Post the request file.
InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/samples/cxf_osgi/request.xml");
- FileUtil.copyInputStream(fis, os);
+ IOUtils.copy(fis, os);
// Read the response.
InputStream is = connection.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- FileUtil.copyInputStream(is, baos);
+ IOUtils.copy(is, baos);
System.out.println("the response is =====>");
System.out.println(baos.toString());
}
Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-rm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-rm/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-rm/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-rm/pom.xml Mon Mar 11 14:17:29 2013
@@ -38,10 +38,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml Mon Mar 11 14:17:29 2013
@@ -37,10 +37,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml Mon Mar 11 14:17:29 2013
@@ -37,10 +37,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/pom.xml Mon Mar 11 14:17:29 2013
@@ -38,13 +38,13 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -75,7 +75,8 @@
org.apache.ws.security,
org.apache.servicemix.util,
org.apache.ws.security.processor,
- org.apache.cxf.binding.soap.saaj
+ org.apache.cxf.binding.soap.saaj,
+ org.apache.commons.io
</Import-Package>
<Export-Package>org.apache.servicemix.examples.cxf</Export-Package>
<Require-Bundle>org.apache.cxf.bundle</Require-Bundle>
Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/Client.java
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/Client.java?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/Client.java (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-signature/src/main/java/org/apache/servicemix/examples/cxf/Client.java Mon Mar 11 14:17:29 2013
@@ -19,11 +19,11 @@ package org.apache.servicemix.examples.c
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
-import org.apache.servicemix.util.FileUtil;
+import org.apache.commons.io.IOUtils;
+
public class Client{
public static void main(String[] args) {
@@ -42,11 +42,11 @@ public class Client{
OutputStream os = connection.getOutputStream();
// Post the request file.
InputStream fis = getClass().getClassLoader().getResourceAsStream("org/apache/servicemix/examples/cxf/request.xml");
- FileUtil.copyInputStream(fis, os);
+ IOUtils.copy(fis, os);
// Read the response.
InputStream is = connection.getInputStream();
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- FileUtil.copyInputStream(is, baos);
+ IOUtils.copy(is, baos);
System.out.println("the response is =====>");
System.out.println(baos.toString());
}
Modified: servicemix/smx5/trunk/itests/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/cxf-ws-security-osgi/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx5/trunk/itests/cxf-ws-security-osgi/pom.xml Mon Mar 11 14:17:29 2013
@@ -37,10 +37,6 @@
<artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
</dependency>
Modified: servicemix/smx5/trunk/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/tests/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/tests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/tests/pom.xml Mon Mar 11 14:17:29 2013
@@ -324,10 +324,6 @@
<artifactId>spring-tx</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.bcel</artifactId>
</dependency>
Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Mon Mar 11 14:17:29 2013
@@ -48,11 +48,7 @@
<aries.version>1.0.0</aries.version>
<aries.transaction.version>1.0.0</aries.transaction.version>
<pax.logging.version>1.7.0</pax.logging.version>
-
<servicemix.specs.version>2.2.0</servicemix.specs.version>
-
- <!-- TODO: figure out why/if we need this for the CXF examples -->
- <servicemix.utils.version>1.6.0</servicemix.utils.version>
</properties>
<!-- Managed dependencies -->
@@ -419,13 +415,6 @@
<artifactId>cxf-xml2fastinfoset-plugin</artifactId>
<version>${cxf.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-utils</artifactId>
- <version>${servicemix.utils.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1455154&r1=1455153&r2=1455154&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Mon Mar 11 14:17:29 2013
@@ -161,6 +161,7 @@
<commons-lang.bundle.version>2.4_4</commons-lang.bundle.version>
<commons-net.bundle.version>2.2</commons-net.bundle.version>
<commons-pool.version>1.6</commons-pool.version>
+ <commons-io.version>2.4</commons-io.version>
<commons-vfs.bundle.version>1.0_5</commons-vfs.bundle.version>
<dom4j.bundle.version>1.6.1_5</dom4j.bundle.version>
<drools.bundle.version>${drools.version}</drools.bundle.version>
@@ -362,6 +363,11 @@
<artifactId>commons-net</artifactId>
<version>${commons-net.bundle.version}</version>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -940,7 +946,7 @@
<profile>
<id>setup.eclipse</id>
<modules>
- <module>assembly</module>
+ <module>assemblies</module>
</modules>
<properties>
<eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>