Author: sergeyb
Date: Fri Jan 2 07:16:32 2009
New Revision: 730752
URL: http://svn.apache.org/viewvc?rev=730752&view=rev
Log:
DOSGI : adding wss4j and xmlsec bundle dependencies
Modified:
cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
cxf/sandbox/dosgi/felix/profiles/pom.xml
cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
cxf/sandbox/dosgi/parent/pom.xml
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
cxf/sandbox/dosgi/systests/pom.xml
Modified: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml Fri Jan 2 07:16:32 2009
@@ -173,9 +173,19 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>${xmlsec.bundle.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
+ <version>${wss4j.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxbimpl.bundle.version}</version>
</dependency>
Modified:
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
---
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
(original)
+++
cxf/sandbox/dosgi/distribution/multi-bundle/src/main/resources/distro_bundles.xml
Fri Jan 2 07:16:32 2009
@@ -22,6 +22,8 @@
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.specs.locator-1.1.1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.jaxb-impl-2.1.6_1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.wsdl4j-1.6.1_1.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.xmlsec-1.3.0_1.jar</bundle>
+
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.wss4j-1.5.4_1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.xmlschema-1.4.2_1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.asm-2.2.3_1.jar</bundle>
<bundle>cxf-dosgi-ri-multibundle-distribution-1.0-SNAPSHOT-dosgi-ri-multi-bundle-assembly.dir/bundles/org.apache.servicemix.bundles.xmlresolver-1.2_1.jar</bundle>
Modified: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/pom.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/single-bundle/pom.xml Fri Jan 2 07:16:32
2009
@@ -173,8 +173,18 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>${xmlsec.bundle.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
+ <version>${wss4j.bundle.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
<version>${jaxbimpl.bundle.version}</version>
Modified: cxf/sandbox/dosgi/felix/profiles/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/pom.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/pom.xml (original)
+++ cxf/sandbox/dosgi/felix/profiles/pom.xml Fri Jan 2 07:16:32 2009
@@ -133,7 +133,19 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.bundle.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>${xmlsec.bundle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
+ <version>${wss4j.bundle.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/client_bundles.txt Fri
Jan 2 07:16:32 2009
@@ -48,6 +48,10 @@
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
+
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
+
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/dosgi_bundles.txt Fri
Jan 2 07:16:32 2009
@@ -48,6 +48,10 @@
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
+
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
+
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
Modified: cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt
(original)
+++ cxf/sandbox/dosgi/felix/profiles/src/main/resources/server_bundles.txt Fri
Jan 2 07:16:32 2009
@@ -48,6 +48,10 @@
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.bundle.version}/org.apache.servicemix.bundles.wsdl4j-${wsdl4j.bundle.version}.jar
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlsec/${xmlsec.bundle.version}/org.apache.servicemix.bundles.xmlsec-${xmlsec.bundle.version}.jar
+
+start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.wss4j/${wss4j.bundle.version}/org.apache.servicemix.bundles.wss4j-${wss4j.bundle.version}.jar
+
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.xmlschema/${xmlschema.bundle.version}/org.apache.servicemix.bundles.xmlschema-${xmlschema.bundle.version}.jar
start
file:${maven.repo.local}/org/apache/servicemix/bundles/org.apache.servicemix.bundles.asm/${asm.bundle.version}/org.apache.servicemix.bundles.asm-${asm.bundle.version}.jar
Modified: cxf/sandbox/dosgi/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/parent/pom.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/parent/pom.xml (original)
+++ cxf/sandbox/dosgi/parent/pom.xml Fri Jan 2 07:16:32 2009
@@ -27,6 +27,8 @@
<xmlresolver.bundle.version>1.2_1</xmlresolver.bundle.version>
<neethi.bundle.version>2.0.4_1</neethi.bundle.version>
<wsdl4j.bundle.version>1.6.1_1</wsdl4j.bundle.version>
+ <wss4j.bundle.version>1.5.4_1</wss4j.bundle.version>
+ <xmlsec.bundle.version>1.3.0_1</xmlsec.bundle.version>
<asm.bundle.version>2.2.3_1</asm.bundle.version>
<woodstox.bundle.version>3.2.7_1</woodstox.bundle.version>
<jaxbimpl.bundle.version>2.1.6_1</jaxbimpl.bundle.version>
Modified:
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
---
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
(original)
+++
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/BasicPublishHookTest.java
Fri Jan 2 07:16:32 2009
@@ -80,6 +80,8 @@
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wss4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi"),
Modified:
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
---
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
(original)
+++
cxf/sandbox/dosgi/systests/basic/src/test/java/org/apache/cxf/dosgi/systests/basic/ListenerHookServiceListenerTest.java
Fri Jan 2 07:16:32 2009
@@ -81,6 +81,8 @@
getBundle("org.apache.servicemix.specs",
"org.apache.servicemix.specs.jaxws-api-2.1"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.woodstox"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
+ getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wss4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.wsdl4j"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlresolver"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.neethi"),
Modified: cxf/sandbox/dosgi/systests/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/systests/pom.xml?rev=730752&r1=730751&r2=730752&view=diff
==============================================================================
--- cxf/sandbox/dosgi/systests/pom.xml (original)
+++ cxf/sandbox/dosgi/systests/pom.xml Fri Jan 2 07:16:32 2009
@@ -251,7 +251,30 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
<version>${wsdl4j.bundle.version}</version>
- </dependency>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlsec</artifactId>
+ <version>${xmlsec.bundle.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wss4j</artifactId>
+ <version>${wss4j.bundle.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
