You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/09/12 20:19:18 UTC
[01/12] git commit: Updating swagger-jaxrs version to 1.3.7
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e9c43c890 -> ff4bb478e
Updating swagger-jaxrs version to 1.3.7
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f710ca76
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f710ca76
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f710ca76
Branch: refs/heads/3.0.x-fixes
Commit: f710ca76054b8598cf24aec05778268d71a5a69f
Parents: e9c43c8
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Jul 30 22:41:30 2014 +0300
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:35:52 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f710ca76/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2d39c90..5a376f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,7 +153,7 @@
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
- <cxf.swagger.version>1.3.4</cxf.swagger.version>
+ <cxf.swagger.version>1.3.7</cxf.swagger.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
<cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
[12/12] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff4bb478
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff4bb478
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff4bb478
Branch: refs/heads/3.0.x-fixes
Commit: ff4bb478e66941d3016aeb4f53718eb7ff96d334
Parents: a6a8444
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 12 14:00:08 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 14:00:08 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ff4bb478/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f6d1107..a615d67 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,6 +1,8 @@
origin/master
+B 08d98fbb13440de2da3b19915d8dfe21531cb284
B 0c0555f4ac850ec8e38302d73207170affe4376a
+B 131c3fdba9c4825b739adc3d149d0297175b8a86
B 13dfe0f9fcaa0aee4c603072436d85861a0ab734
B 161e10bb2d87573974b8a1748f023c47ebbe5d49
B 1824d9cae26c3b141d873d0d01036602ac339c37
@@ -9,6 +11,7 @@ B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
B 46838d8a346687e9f8ff2f6e279e3ba83f99c5f3
B 470bdcb40597dce5e5cf957000ab60b0b4c1fce4
B 478de215af2da2c03f439bbbd8341b234bb7bee8
+B 481466c7a42a57c87c992a02ab560be046bf5797
B 4f61ca801deed173c648b2d424ac231663acd704
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 5fbd407bac5af5e55bb280125405d75b7add872b
@@ -17,6 +20,8 @@ B 67432aef1adb8e330c054431de9d0955e3993472
B 6e4f0f60785de1f5774644323edafb4741b9e4a4
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
+B 7e318c4fbfae35680965082a491ca842a23ffd8c
+B 7e95279dd1170f5878687d7eea27f7d7f03a434b
B 87e146fd90e8f860eb7f2a8e99ad792e7fba175b
B 88adfaf2ad97b4968b0dc47194b29c717b138d7a
B 8e028a617f026fca2499f850bb680ada0692d681
@@ -26,11 +31,13 @@ B 91d6630c53f222544e4bb512fb5c918d68518138
B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
+B a2855695896d5084ea288b0fa47457e4b7bfac38
B a4315cb442fa31960cbd47f11e95e81b4a71441d
B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
B a7b79ea692add4f9da0f1232e3bfb338099f4147
B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
B b67537dbace0896073b55b375b8ccdc4cce83365
+B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
@@ -40,5 +47,20 @@ B e242307ad8bbe53788f3e03e9e2f0ca977d01340
B ea778c4f38f882dc97d23bd200683fd9d48b4718
B ecbf4e78586870a507fe4cf91239d51c3f202aad
B f2f6aa016cdd1bb49698b319806a8369f149c8dd
+B f7a091afedbc7ca809a7205d7c053a1f5386865e
B f942e1e15d6c4fa83e305eb7452dca8fc80cbdcf
+B ff742436a3e177dc61106edf08f2509e727362dd
+M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04
+M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
+M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594
M 67201fdde69488e511deb3d24794984afc01fe2d
+M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6
+M 8bcb5133c602b1cbe642cfd5fbb46099a28b3016
+M 98f65f2911e063e70e864e7614b062cc124a0f9d
+M a64ded455c40169665e438ae7a25f17bd4f8047a
+M af2f7d3a52076f60d0f98a2635e2adef256a9efe
+M bee82ba7d1766b555d965a75b3846ead4686239e
+M c55664128b1223667dedacc2011ccd5945d9c8b9
+M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
+M f02b02934bf78504ffc462c364dc43e386e727b2
+M fb0520525f07041f42bc0562b4a15240bb757373
[05/12] git commit: Update the OSGi test support stuff to add some
methods to make it easier to use the testutils
Posted by dk...@apache.org.
Update the OSGi test support stuff to add some methods to make it easier to use the testutils
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/95c38653
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/95c38653
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/95c38653
Branch: refs/heads/3.0.x-fixes
Commit: 95c38653d9bb3cbfd3ee2883782ca63ab33eaf35
Parents: 013abc6
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Sep 4 12:42:25 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:57:13 2014 -0400
----------------------------------------------------------------------
.../cxf/osgi/itests/CXFOSGiTestSupport.java | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/95c38653/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 4249dff..e98ca8e 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -63,6 +63,7 @@ import org.osgi.util.tracker.ServiceTracker;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
@@ -124,12 +125,13 @@ public class CXFOSGiTestSupport {
*
* @return
*/
- protected Option cxfBaseConfig() {
+ protected Option cxfBaseConfig(boolean testUtils) {
karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(getKarafVersion())
.type("tar.gz");
cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
.type("xml").classifier("features");
String localRepo = System.getProperty("localRepository");
+ Object urp = System.getProperty("cxf.useRandomFirstPort");
return composite(karafDistributionConfiguration()
.frameworkUrl(karafUrl)
.karafVersion(getKarafVersion())
@@ -138,12 +140,23 @@ public class CXFOSGiTestSupport {
.unpackDirectory(new File("target/paxexam/")),
features(cxfUrl, "cxf-core", "cxf-jaxws"),
systemProperty("java.awt.headless").value("true"),
+ when(testUtils).useOptions(mavenBundle()
+ .groupId("org.apache.cxf")
+ .artifactId("cxf-testutils")
+ .versionAsInProject()),
when(localRepo != null)
.useOptions(editConfigurationFilePut("etc/org.ops4j.pax.url.mvn.cfg",
"org.ops4j.pax.url.mvn.localRepository",
- localRepo)));
+ localRepo)),
+ when(urp != null).useOptions(systemProperty("cxf.useRandomFirstPort").value("true")));
}
-
+ protected Option cxfBaseConfig() {
+ return cxfBaseConfig(false);
+ }
+ protected Option cxfBaseConfigWithTestUtils() {
+ return cxfBaseConfig(true);
+ }
+
/**
* Executes a shell command and returns output as a String. Commands have a default timeout of 10 seconds.
*
[03/12] git commit: Move pax.exam.version to parent pom
Posted by dk...@apache.org.
Move pax.exam.version to parent pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/985c1421
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/985c1421
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/985c1421
Branch: refs/heads/3.0.x-fixes
Commit: 985c14213ba4d60d911ea7b9bfb705455d85081c
Parents: a34df25
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Sep 2 16:08:37 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:56:26 2014 -0400
----------------------------------------------------------------------
osgi/itests-felix/pom.xml | 7 +++----
osgi/itests/pom.xml | 9 ++++-----
parent/pom.xml | 1 +
services/xkms/xkms-itests/pom.xml | 11 ++++-------
4 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/osgi/itests-felix/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests-felix/pom.xml b/osgi/itests-felix/pom.xml
index 9f39608..2a39044 100644
--- a/osgi/itests-felix/pom.xml
+++ b/osgi/itests-felix/pom.xml
@@ -29,7 +29,6 @@
<name>Apache CXF :: OSGi :: Integration Tests pure felix</name>
<packaging>jar</packaging>
<properties>
- <pax.exam.version>3.4.0</pax.exam.version>
<pax.url.version>1.2.8</pax.url.version>
</properties>
<dependencies>
@@ -91,19 +90,19 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 054f1e2..d2c53d4 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -29,7 +29,6 @@
<name>Apache CXF :: OSGi :: Integration Tests</name>
<packaging>jar</packaging>
<properties>
- <pax.exam.version>3.4.0</pax.exam.version>
<cxf.surefire.fork.mode>once</cxf.surefire.fork.mode>
</properties>
<dependencies>
@@ -100,28 +99,28 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1749879..0cf8b2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -178,6 +178,7 @@
<cxf.osgi.version>4.2.0</cxf.osgi.version>
<cxf.karaf.version>2.3.6</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
+ <cxf.pax.exam.version>3.4.0</cxf.pax.exam.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
<cxf.xmlbeans.bundle.version>2.6.0_2</cxf.xmlbeans.bundle.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/985c1421/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index b761f54..64debcf 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -21,9 +21,6 @@
<version>3.0.2-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <properties>
- <pax.exam.version>3.4.0</pax.exam.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.cxf.services.xkms</groupId>
@@ -65,28 +62,28 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit4</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-karaf</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-link-mvn</artifactId>
- <version>${pax.exam.version}</version>
+ <version>${cxf.pax.exam.version}</version>
<scope>test</scope>
</dependency>
[10/12] git commit: Use the new xjc plugin to fix the generated
HelloType (and others) so they can actually be marshalled when using Java7/8.
Posted by dk...@apache.org.
Use the new xjc plugin to fix the generated HelloType (and others) so they can actually be marshalled when using Java7/8.
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9899ab73
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9899ab73
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9899ab73
Branch: refs/heads/3.0.x-fixes
Commit: 9899ab73b13a0614dd366ae7c8d55482d700d2b6
Parents: 5954950
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 12 12:48:27 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:59:59 2014 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
services/ws-discovery/ws-discovery-api/pom.xml | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9899ab73/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6d343f8..6aa0db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
<cxf.build-utils.version>3.0.0</cxf.build-utils.version>
- <cxf.xjc-utils.version>3.0.1</cxf.xjc-utils.version>
+ <cxf.xjc-utils.version>3.0.2-SNAPSHOT</cxf.xjc-utils.version>
<cxf.jdk.version>1.6</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<site.deploy.url>scp://people.apache.org/www/cxf.apache.org/maven-site</site.deploy.url>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9899ab73/services/ws-discovery/ws-discovery-api/pom.xml
----------------------------------------------------------------------
diff --git a/services/ws-discovery/ws-discovery-api/pom.xml b/services/ws-discovery/ws-discovery-api/pom.xml
index d1cdf9e..0e47900 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -82,6 +82,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug986</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<phase>generate-sources</phase>
@@ -93,6 +100,9 @@
</defaultOptions>
<wsdlOptions>
<wsdlOption>
+ <xjcargs>
+ <xjcarg>-Xbug986</xjcarg>
+ </xjcargs>
<wsdl>${basedir}/src/main/resources/org/apache/cxf/ws/discovery/wsdl/wsdd-discovery-1.1-wsdl-os.wsdl</wsdl>
<extraargs>
<extraArg>-p</extraArg>
[11/12] git commit: Use new plugin to fix the generated code so the
tests don't have to be disabled/skipped
Posted by dk...@apache.org.
Use new plugin to fix the generated code so the tests don't have to be disabled/skipped
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a6a84446
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6a84446
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6a84446
Branch: refs/heads/3.0.x-fixes
Commit: a6a844461cfa3e611359b02ef6b35880243f2ee1
Parents: 9899ab7
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 12 13:18:41 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 14:00:08 2014 -0400
----------------------------------------------------------------------
.../systest/type_test/AbstractTypeTestClient.java | 17 +----------------
.../systest/type_test/AbstractTypeTestClient3.java | 7 -------
testutils/pom.xml | 10 ++++++++++
3 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6a84446/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 76b902b..4b213fc 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.datatype.DatatypeConstants;
import javax.xml.datatype.Duration;
import javax.xml.datatype.XMLGregorianCalendar;
@@ -35,8 +34,6 @@ import javax.xml.ws.soap.SOAPFaultException;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
-import org.apache.type_test.doc.TestNumberList;
-import org.apache.type_test.doc.TestQNameList;
import org.apache.type_test.doc.TypeTestPortType;
import org.apache.type_test.rpc.SOAPService;
import org.apache.type_test.types1.AnyURIEnum;
@@ -2089,11 +2086,6 @@ public abstract class AbstractTypeTestClient
return;
}
if (testDocLiteral || testXMLBinding) {
- if (TestNumberList.class.getDeclaredField("x").getAnnotation(XmlSchemaType.class) != null) {
- //Bug in JAXB 2.2.10 where this annotation is being generated incorrectly for some
- //lists
- return;
- }
List<Integer> x = Arrays.asList(1, 2, 3);
List<Integer> yOrig = Arrays.asList(10, 100, 1000);
Holder<List<Integer>> y = new Holder<List<Integer>>(yOrig);
@@ -2132,14 +2124,7 @@ public abstract class AbstractTypeTestClient
if (!shouldRunTest("QNameList")) {
return;
}
- if (testDocLiteral || testXMLBinding) {
- if (TestQNameList.class.getDeclaredField("x").getAnnotation(XmlSchemaType.class) != null) {
- //Bug in JAXB 2.2.10 where this annotation is being generated incorrectly for some
- //lists
- return;
- }
-
-
+ if (testDocLiteral || testXMLBinding) {
List<QName> x = Arrays.asList(new QName("http://schemas.iona.com/type_test", "testqname1"),
new QName("http://schemas.iona.com/type_test", "testqname2"),
new QName("http://schemas.iona.com/type_test", "testqname3"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6a84446/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
----------------------------------------------------------------------
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
index 0e5e469..e66865e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient3.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.namespace.QName;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPElement;
@@ -34,7 +33,6 @@ import javax.xml.ws.Holder;
import org.w3c.dom.Element;
-import org.apache.type_test.doc.TestAnonEnumList;
import org.apache.type_test.types1.DerivedChoiceBaseArray;
import org.apache.type_test.types1.DerivedChoiceBaseChoice;
import org.apache.type_test.types1.DerivedChoiceBaseStruct;
@@ -2258,11 +2256,6 @@ public abstract class AbstractTypeTestClient3 extends AbstractTypeTestClient2 {
return;
}
if (testDocLiteral || testXMLBinding) {
- if (TestAnonEnumList.class.getDeclaredField("x").getAnnotation(XmlSchemaType.class) != null) {
- //Bug in JAXB 2.2.10 where this annotation is being generated incorrectly for some
- //lists
- return;
- }
List<Short> x = Arrays.asList((short)10, (short)100);
List<Short> yOrig = Arrays.asList((short)1000, (short)10);
http://git-wip-us.apache.org/repos/asf/cxf/blob/a6a84446/testutils/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/pom.xml b/testutils/pom.xml
index 66860c8..4009102 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -158,6 +158,13 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-codegen-plugin</artifactId>
<version>${project.version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
+ <artifactId>cxf-xjc-bug986</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
+ </dependency>
+ </dependencies>
<executions>
<execution>
<id>generate-sources</id>
@@ -171,6 +178,9 @@
<include>rt-javascript/*.wsdl</include>
</includes>
<defaultOptions>
+ <xjcargs>
+ <xjcarg>-Xbug986</xjcarg>
+ </xjcargs>
<!--extraargs>
<extraarg>-verbose</extraarg>
</extraargs-->
[07/12] git commit: Update some plugin versions
Posted by dk...@apache.org.
Update some plugin versions
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/28ce7e14
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/28ce7e14
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/28ce7e14
Branch: refs/heads/3.0.x-fixes
Commit: 28ce7e148f839587d4f0f04263af3bfdf4658342
Parents: 7f06952
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Sep 8 13:49:45 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:58:58 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
pom.xml | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/28ce7e14/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0cf8b2a..da908dc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -340,7 +340,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>3.1</version>
+ <version>3.2</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
http://git-wip-us.apache.org/repos/asf/cxf/blob/28ce7e14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ca4312b..6d343f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -439,7 +439,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
+ <version>1.9.1</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -459,12 +459,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -502,7 +502,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.2.1</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -547,7 +547,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -560,7 +560,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -570,12 +570,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -585,7 +585,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
- <version>3.2</version>
+ <version>3.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -602,7 +602,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
+ <version>0.11</version>
<configuration>
<numUnapprovedLicenses>350</numUnapprovedLicenses>
<excludeSubProjects>false</excludeSubProjects>
@@ -624,7 +624,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
<configuration>
<chmod>true</chmod>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
[06/12] git commit: Add a test for the http-jetty support.
Posted by dk...@apache.org.
Add a test for the http-jetty support.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f069520
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f069520
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f069520
Branch: refs/heads/3.0.x-fixes
Commit: 7f069520125ecf0b759dcc7d76be72d22d966689
Parents: 95c3865
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Sep 4 12:43:17 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:58:11 2014 -0400
----------------------------------------------------------------------
osgi/itests/pom.xml | 5 +++++
.../cxf/osgi/itests/soap/HttpServiceTest.java | 19 ++++++++++++++-----
.../cxf/osgi/itests/soap/HttpTestActivator.java | 13 ++++++++++++-
3 files changed, 31 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f069520/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index d2c53d4..93dce8c 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -45,6 +45,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f069520/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
index 8420a6a..731a40d 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpServiceTest.java
@@ -22,9 +22,11 @@ import java.io.InputStream;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.osgi.itests.CXFOSGiTestSupport;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
@@ -33,6 +35,7 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.tinybundles.core.TinyBundles;
import org.osgi.framework.Constants;
+
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
@@ -43,24 +46,30 @@ public class HttpServiceTest extends CXFOSGiTestSupport {
@Test
public void testHttpEndpoint() throws Exception {
- Greeter greeter = greeterHttp();
+ Greeter greeter = greeterHttp("8181");
+ String res = greeter.greetMe("Chris");
+ Assert.assertEquals("Hi Chris", res);
+ }
+ @Test
+ public void testHttpEndpointJetty() throws Exception {
+ Greeter greeter = greeterHttp(HttpTestActivator.PORT);
String res = greeter.greetMe("Chris");
Assert.assertEquals("Hi Chris", res);
}
- private Greeter greeterHttp() {
+ private Greeter greeterHttp(String port) {
JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
factory.setServiceClass(Greeter.class);
- factory.setAddress("http://localhost:8181/cxf/greeter");
+ factory.setAddress("http://localhost:" + port + "/cxf/greeter");
return factory.create(Greeter.class);
}
@Configuration
public Option[] config() {
return new Option[] {
- cxfBaseConfig(),
+ cxfBaseConfigWithTestUtils(),
logLevel(LogLevel.INFO),
- features(cxfUrl, "cxf-http"),
+ features(cxfUrl, "cxf-http", "cxf-http-jetty"),
provision(serviceBundle())
};
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f069520/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
index 5082508..6fa7226 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/soap/HttpTestActivator.java
@@ -20,12 +20,14 @@ package org.apache.cxf.osgi.itests.soap;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.testutil.common.TestUtil;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
public class HttpTestActivator implements BundleActivator {
-
+ public static final String PORT = TestUtil.getPortNumber(HttpTestActivator.class);
private Server server;
+ private Server serverJetty;
@Override
public void start(BundleContext arg0) throws Exception {
@@ -34,11 +36,20 @@ public class HttpTestActivator implements BundleActivator {
factory.setAddress("/greeter");
factory.setServiceBean(new GreeterImpl());
server = factory.create();
+
+ factory = new JaxWsServerFactoryBean();
+ factory.setServiceClass(Greeter.class);
+ factory.setAddress("http://localhost:" + PORT + "/cxf/greeter");
+ factory.setServiceBean(new GreeterImpl());
+ serverJetty = factory.create();
}
@Override
public void stop(BundleContext arg0) throws Exception {
+ server.stop();
server.destroy();
+ serverJetty.stop();
+ serverJetty.destroy();
}
}
[04/12] git commit: Make testutils a bundle so we can use it in the
osgi based itests
Posted by dk...@apache.org.
Make testutils a bundle so we can use it in the osgi based itests
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/013abc6c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/013abc6c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/013abc6c
Branch: refs/heads/3.0.x-fixes
Commit: 013abc6cc200b44a5cb4db78b7ba35295795380a
Parents: 985c142
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Sep 4 12:41:44 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:56:50 2014 -0400
----------------------------------------------------------------------
testutils/pom.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/013abc6c/testutils/pom.xml
----------------------------------------------------------------------
diff --git a/testutils/pom.xml b/testutils/pom.xml
index d0e44d0..66860c8 100644
--- a/testutils/pom.xml
+++ b/testutils/pom.xml
@@ -20,7 +20,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>cxf-testutils</artifactId>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<name>Apache CXF Test Utilities</name>
<description>Apache CXF Test Utilities</description>
<url>http://cxf.apache.org</url>
@@ -50,16 +50,19 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
</dependencies>
<build>
[09/12] git commit: Move depends plugin version defintion to parent
pom
Posted by dk...@apache.org.
Move depends plugin version defintion to parent pom
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/59549505
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/59549505
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/59549505
Branch: refs/heads/3.0.x-fixes
Commit: 59549505ff5b4baa6e82ad5a1df65445616c18ea
Parents: 985739a
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Sep 12 09:38:41 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:59:25 2014 -0400
----------------------------------------------------------------------
osgi/itests/pom.xml | 1 -
parent/pom.xml | 5 +++++
services/xkms/xkms-itests/pom.xml | 1 -
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/59549505/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 93dce8c..577f92e 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -166,7 +166,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
http://git-wip-us.apache.org/repos/asf/cxf/blob/59549505/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 54e4467..4fc3510 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -260,6 +260,11 @@
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/59549505/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index 64debcf..5f481b4 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -103,7 +103,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<phase>generate-resources</phase>
[08/12] git commit: upgrade woodstox-core-asl to 4.4.1
Posted by dk...@apache.org.
upgrade woodstox-core-asl to 4.4.1
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/985739a9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/985739a9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/985739a9
Branch: refs/heads/3.0.x-fixes
Commit: 985739a9725803b84b489eecf896e6798f40d9e6
Parents: 28ce7e1
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Fri Sep 12 12:48:38 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:59:20 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/985739a9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index da908dc..54e4467 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.swagger.version>1.3.7</cxf.swagger.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
- <cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version>
+ <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>2.0.2-SNAPSHOT</cxf.wss4j.version>
[02/12] git commit: Update to Karaf 2.3.6 for testing (at this point,
need to move to 3.0.1 shortly)
Posted by dk...@apache.org.
Update to Karaf 2.3.6 for testing (at this point, need to move to 3.0.1 shortly)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a34df25e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a34df25e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a34df25e
Branch: refs/heads/3.0.x-fixes
Commit: a34df25e3a78d3a4cf5bb6fa8c51e82e489b614e
Parents: f710ca7
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Sep 2 12:55:20 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Sep 12 13:56:16 2014 -0400
----------------------------------------------------------------------
osgi/itests/pom.xml | 28 +++++++++++++++++-
.../cxf/osgi/itests/CXFOSGiTestSupport.java | 30 ++++++++++++++++++--
osgi/karaf/commands/pom.xml | 2 +-
parent/pom.xml | 2 +-
services/xkms/xkms-itests/pom.xml | 3 +-
.../cxf/xkms/itests/BasicIntegrationTest.java | 2 +-
6 files changed, 58 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/osgi/itests/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 338e95b..054f1e2 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -129,7 +129,32 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${cxf.karaf.version}</version>
+ <type>tar.gz</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.dev</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -137,6 +162,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
----------------------------------------------------------------------
diff --git a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
index 468f4cb..4249dff 100644
--- a/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
+++ b/osgi/itests/src/test/java/org/apache/cxf/osgi/itests/CXFOSGiTestSupport.java
@@ -24,6 +24,7 @@ package org.apache.cxf.osgi.itests;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintStream;
import java.net.DatagramSocket;
import java.net.ServerSocket;
@@ -32,6 +33,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
import java.util.Enumeration;
+import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -43,7 +45,9 @@ import javax.inject.Inject;
import org.apache.felix.service.command.CommandProcessor;
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.features.FeaturesService;
+
import org.junit.Assert;
+
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.ProbeBuilder;
import org.ops4j.pax.exam.TestProbeBuilder;
@@ -69,7 +73,6 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
*
*/
public class CXFOSGiTestSupport {
- static final String KARAF_VERSION = "2.3.5";
static final Long COMMAND_TIMEOUT = 10000L;
static final Long DEFAULT_TIMEOUT = 20000L;
static final Long SERVICE_TIMEOUT = 30000L;
@@ -95,20 +98,41 @@ public class CXFOSGiTestSupport {
return probe;
}
+ private static String getKarafVersion() {
+ InputStream ins = CXFOSGiTestSupport.class.getResourceAsStream("/META-INF/maven/dependencies.properties");
+ Properties p = new Properties();
+ try {
+ p.load(ins);
+ } catch (Throwable t) {
+ //
+ }
+ String karafVersion = p.getProperty("org.apache.karaf/apache-karaf/version");
+ if (karafVersion == null) {
+ karafVersion = System.getProperty("cxf.karaf.version");
+ }
+ if (karafVersion == null) {
+ karafVersion = System.getProperty("karaf.version");
+ }
+ if (karafVersion == null) {
+ // setup the default version of it
+ karafVersion = "2.3.6";
+ }
+ return karafVersion;
+ }
/**
* Create an {@link org.ops4j.pax.exam.Option} for using a .
*
* @return
*/
protected Option cxfBaseConfig() {
- karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(KARAF_VERSION)
+ karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf").version(getKarafVersion())
.type("tar.gz");
cxfUrl = maven().groupId("org.apache.cxf.karaf").artifactId("apache-cxf").versionAsInProject()
.type("xml").classifier("features");
String localRepo = System.getProperty("localRepository");
return composite(karafDistributionConfiguration()
.frameworkUrl(karafUrl)
- .karafVersion(KARAF_VERSION)
+ .karafVersion(getKarafVersion())
.name("Apache Karaf")
.useDeployFolder(false)
.unpackDirectory(new File("target/paxexam/")),
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/osgi/karaf/commands/pom.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml
index e6cc5dc..b315103 100644
--- a/osgi/karaf/commands/pom.xml
+++ b/osgi/karaf/commands/pom.xml
@@ -59,7 +59,7 @@
org.apache.felix.service.command;version="[0.6,1)",
org.apache.felix.gogo.commands;version="[0.6,1)",
org.apache.cxf*;version="[3,4)",
- org.apache.karaf.shell.console;version="[2.2,4)",
+ org.apache.karaf.shell.console;version="[2.3,4)",
*
</Import-Package>
<_nouses>true</_nouses>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5a376f4..1749879 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -176,7 +176,7 @@
<cxf.aries.version>1.0.0</cxf.aries.version>
<cxf.aries.version.range>[1.0,2)</cxf.aries.version.range>
<cxf.osgi.version>4.2.0</cxf.osgi.version>
- <cxf.karaf.version>2.3.3</cxf.karaf.version>
+ <cxf.karaf.version>2.3.6</cxf.karaf.version>
<cxf.pax.logging.version>1.6.0</cxf.pax.logging.version>
<cxf.felix.framework.version>2.0.5</cxf.felix.framework.version>
<cxf.felix.configadmin.version>1.2.4</cxf.felix.configadmin.version>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/services/xkms/xkms-itests/pom.xml
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/pom.xml b/services/xkms/xkms-itests/pom.xml
index c0c1af9..b761f54 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -23,7 +23,6 @@
</parent>
<properties>
<pax.exam.version>3.4.0</pax.exam.version>
- <karaf.version>2.3.5</karaf.version>
</properties>
<dependencies>
<dependency>
@@ -124,7 +123,7 @@
<configuration>
<systemPropertyVariables>
<org.ops4j.pax.logging.DefaultServiceLog.level>WARN</org.ops4j.pax.logging.DefaultServiceLog.level>
- <karaf.version>${karaf.version}</karaf.version>
+ <karaf.version>${cxf.karaf.version}</karaf.version>
<org.ops4j.pax.url.mvn.localRepository>${maven.repo.local}</org.ops4j.pax.url.mvn.localRepository>
</systemPropertyVariables>
</configuration>
http://git-wip-us.apache.org/repos/asf/cxf/blob/a34df25e/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
----------------------------------------------------------------------
diff --git a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
index 3ea621f..81853f3 100644
--- a/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
+++ b/services/xkms/xkms-itests/src/test/java/org/apache/cxf/xkms/itests/BasicIntegrationTest.java
@@ -63,7 +63,7 @@ public class BasicIntegrationTest {
@Configuration
public Option[] getConfig() {
- String karafVersion = System.getProperty("karaf.version", "2.3.5");
+ String karafVersion = System.getProperty("karaf.version", "2.3.6");
String localRepository = System.getProperty("localRepository");
karafUrl = maven().groupId("org.apache.karaf").artifactId("apache-karaf")
.version(karafVersion).type("tar.gz");