date:20140912

[2/2] git commit: CXF-5999 Moving JiBX related systests into its own module.

2014-09-12 Thread ningjiang

CXF-5999 Moving JiBX related systests into its own module.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d2dec5b8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d2dec5b8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d2dec5b8

Branch: refs/heads/master
Commit: d2dec5b87788b8cb5059d3719cf3dfd7135a1280
Parents: 0037232
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Sep 12 14:17:39 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Sep 12 14:18:24 2014 +0800

--
 systests/databinding/pom.xml|  32 ---
 .../cxf/systest/jibx/ClientServerJibxTest.java  | 144 --
 .../apache/cxf/systest/jibx/GreeterImpl.java|  76 -
 .../cxf/systest/jibx/PutLastTradePriceImpl.java |  62 
 .../org/apache/cxf/systest/jibx/Server.java |  58 
 .../java/org/apache/cxf/systest/jibx/cxf.xml|  32 ---
 .../jibx/doc_lit_bare.wsdl  | 114 
 .../jibx/hello_world.wsdl   | 169 ---
 systests/jaxrs/pom.xml  |  51 +---
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |  33 +--
 .../cxf/systest/jaxrs/jibx/JibxResource.java|  37 ---
 .../jaxrs_databinding/WEB-INF/beans.xml |  12 +-
 systests/jibx/databinding-jibx/pom.xml  | 274 ++
 .../cxf/systest/jibx/ClientServerJibxTest.java  | 144 ++
 .../apache/cxf/systest/jibx/GreeterImpl.java|  76 +
 .../cxf/systest/jibx/PutLastTradePriceImpl.java |  62 
 .../org/apache/cxf/systest/jibx/Server.java |  58 
 .../java/org/apache/cxf/systest/jibx/cxf.xml|  32 +++
 .../jibx/doc_lit_bare.wsdl  | 114 
 .../jibx/hello_world.wsdl   | 169 +++
 systests/jibx/jaxrs-jibx/pom.xml| 287 +++
 .../systest/jaxrs/BookDataBindingServer.java|  82 ++
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |  54 
 .../cxf/systest/jaxrs/jibx/JibxResource.java|  37 +++
 .../jaxrs_databinding/WEB-INF/beans.xml |  39 +++
 .../resources/jaxrs_databinding/WEB-INF/web.xml |  45 +++
 .../src/test/resources/jibx/types.xsd   |   9 +
 systests/jibx/pom.xml   |  38 +++
 systests/pom.xml|  26 +-
 29 files changed, 1564 insertions(+), 802 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/databinding/pom.xml
--
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index f1fb079..0c99169 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -93,16 +93,6 @@
 dataBindingxmlbeans/dataBinding
 /wsdlOption
 wsdlOption
-
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl/wsdl
-frontEndcxf/frontEnd
-dataBindingjibx/dataBinding
-/wsdlOption
-wsdlOption
-
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/jibx/doc_lit_bare.wsdl/wsdl
-frontEndcxf/frontEnd
-dataBindingjibx/dataBinding
-/wsdlOption
-wsdlOption
 
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/source/hello_world.wsdl/wsdl
 frontEndcxf/frontEnd
 dataBindingdomsource/dataBinding
@@ -120,28 +110,6 @@
 /execution
 /executions
 /plugin
-plugin
-groupIdorg.jibx/groupId
-artifactIdmaven-jibx-plugin/artifactId
-version${cxf.jibx.version}/version
-configuration
-
directorytarget/generated/src/test/java/jibx_bindings/directory
-!--loadtrue/load--
-!--validatetrue/validate--
-!--verifytrue/verify--
-includes
-include${hello.world.binding.file}/include
-include${doc.lit.bare.binding.file}/include
-/includes
-/configuration
-executions
-execution
-goals
-goaltest-bind/goal
-/goals
-/execution
-/executions
-

[1/2] CXF-5999 Moving JiBX related systests into its own module.

2014-09-12 Thread ningjiang

Repository: cxf
Updated Branches:
  refs/heads/master 0037232fb - d2dec5b87


http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
--
diff --git 
a/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
 
b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
new file mode 100644
index 000..f7ec99a
--- /dev/null
+++ 
b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
@@ -0,0 +1,169 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--
+wsdl:definitions xmlns=http://schemas.xmlsoap.org/wsdl/; 
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/; 
xmlns:tns=http://apache.org/hello_world_soap_http_jibx/jibx; 
xmlns:x1=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; name=HelloWorld 
targetNamespace=http://apache.org/hello_world_soap_http_jibx/jibx;
+wsdl:types
+schema xmlns=http://www.w3.org/2001/XMLSchema; 
xmlns:tns=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
targetNamespace=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
elementFormDefault=qualified
+simpleType name=MyStringType
+restriction base=string
+maxLength value=30/
+/restriction
+/simpleType
+element name=sayHi
+complexType/
+/element
+element name=sayHiResponse
+complexType
+sequence
+element name=responseType type=string/
+/sequence
+/complexType
+/element
+element name=greetMe
+complexType
+sequence
+element name=requestType type=tns:MyStringType/
+/sequence
+/complexType
+/element
+element name=greetMeResponse
+complexType
+sequence
+element name=responseType type=string/
+/sequence
+/complexType
+/element
+element name=greetMeOneWay
+complexType
+sequence
+element name=requestType type=string/
+/sequence
+/complexType
+/element
+element name=pingMe
+complexType/
+/element
+element name=pingMeResponse
+complexType/
+/element
+element name=faultDetail
+complexType
+sequence
+element name=minor type=short/
+element name=major type=short/
+/sequence
+/complexType
+/element
+element name=greetMeFaultDetail type=string/
+/schema
+/wsdl:types
+wsdl:message name=sayHiRequest
+wsdl:part element=x1:sayHi name=in/
+/wsdl:message
+wsdl:message name=sayHiResponse
+wsdl:part element=x1:sayHiResponse name=out/
+/wsdl:message
+wsdl:message name=greetMeRequest
+wsdl:part element=x1:greetMe name=in/
+/wsdl:message
+wsdl:message name=greetMeResponse
+wsdl:part element=x1:greetMeResponse name=out/
+/wsdl:message
+wsdl:message name=greetMeOneWayRequest
+wsdl:part element=x1:greetMeOneWay name=in/
+/wsdl:message
+wsdl:message name=pingMeRequest
+wsdl:part name=in element=x1:pingMe/
+/wsdl:message
+wsdl:message name=pingMeResponse
+wsdl:part name=out element=x1:pingMeResponse/
+/wsdl:message
+wsdl:message name=pingMeFault
+wsdl:part name=faultDetail element=x1:faultDetail/
+/wsdl:message
+wsdl:message name=greetMeFault
+wsdl:part name=greetMeFault element=x1:greetMeFaultDetail/
+/wsdl:message
+

[2/2] git commit: CXF-5999 Moving JiBX related systests into its own module.

2014-09-12 Thread ningjiang

CXF-5999 Moving JiBX related systests into its own module.

Conflicts:
systests/jaxrs/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e33fa0c6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e33fa0c6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e33fa0c6

Branch: refs/heads/3.0.x-fixes
Commit: e33fa0c6f2f8cbf1b3d69b6ea47fc53b8e68bfc9
Parents: b435e68
Author: Willem Jiang willem.ji...@gmail.com
Authored: Fri Sep 12 14:17:39 2014 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Fri Sep 12 14:30:55 2014 +0800

--
 systests/databinding/pom.xml|  32 ---
 .../cxf/systest/jibx/ClientServerJibxTest.java  | 144 --
 .../apache/cxf/systest/jibx/GreeterImpl.java|  76 -
 .../cxf/systest/jibx/PutLastTradePriceImpl.java |  62 
 .../org/apache/cxf/systest/jibx/Server.java |  58 
 .../java/org/apache/cxf/systest/jibx/cxf.xml|  32 ---
 .../jibx/doc_lit_bare.wsdl  | 114 
 .../jibx/hello_world.wsdl   | 169 ---
 systests/jaxrs/pom.xml  |  49 +---
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |  33 +--
 .../cxf/systest/jaxrs/jibx/JibxResource.java|  37 ---
 .../jaxrs_databinding/WEB-INF/beans.xml |  12 +-
 systests/jibx/databinding-jibx/pom.xml  | 274 ++
 .../cxf/systest/jibx/ClientServerJibxTest.java  | 144 ++
 .../apache/cxf/systest/jibx/GreeterImpl.java|  76 +
 .../cxf/systest/jibx/PutLastTradePriceImpl.java |  62 
 .../org/apache/cxf/systest/jibx/Server.java |  58 
 .../java/org/apache/cxf/systest/jibx/cxf.xml|  32 +++
 .../jibx/doc_lit_bare.wsdl  | 114 
 .../jibx/hello_world.wsdl   | 169 +++
 systests/jibx/jaxrs-jibx/pom.xml| 287 +++
 .../systest/jaxrs/BookDataBindingServer.java|  82 ++
 .../cxf/systest/jaxrs/JAXRSDataBindingTest.java |  54 
 .../cxf/systest/jaxrs/jibx/JibxResource.java|  37 +++
 .../jaxrs_databinding/WEB-INF/beans.xml |  39 +++
 .../resources/jaxrs_databinding/WEB-INF/web.xml |  45 +++
 .../src/test/resources/jibx/types.xsd   |   9 +
 systests/jibx/pom.xml   |  38 +++
 systests/pom.xml|  26 +-
 29 files changed, 1563 insertions(+), 801 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e33fa0c6/systests/databinding/pom.xml
--
diff --git a/systests/databinding/pom.xml b/systests/databinding/pom.xml
index 9e0b618..53ceb23 100644
--- a/systests/databinding/pom.xml
+++ b/systests/databinding/pom.xml
@@ -93,16 +93,6 @@
 dataBindingxmlbeans/dataBinding
 /wsdlOption
 wsdlOption
-
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl/wsdl
-frontEndcxf/frontEnd
-dataBindingjibx/dataBinding
-/wsdlOption
-wsdlOption
-
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/jibx/doc_lit_bare.wsdl/wsdl
-frontEndcxf/frontEnd
-dataBindingjibx/dataBinding
-/wsdlOption
-wsdlOption
 
wsdl${basedir}/src/test/resources/wsdl_systest_databinding/source/hello_world.wsdl/wsdl
 frontEndcxf/frontEnd
 dataBindingdomsource/dataBinding
@@ -120,28 +110,6 @@
 /execution
 /executions
 /plugin
-plugin
-groupIdorg.jibx/groupId
-artifactIdmaven-jibx-plugin/artifactId
-version${cxf.jibx.version}/version
-configuration
-
directorytarget/generated/src/test/java/jibx_bindings/directory
-!--loadtrue/load--
-!--validatetrue/validate--
-!--verifytrue/verify--
-includes
-include${hello.world.binding.file}/include
-include${doc.lit.bare.binding.file}/include
-/includes
-/configuration
-executions
-execution
-goals
-goaltest-bind/goal
-/goals
-

[1/2] CXF-5999 Moving JiBX related systests into its own module.

2014-09-12 Thread ningjiang

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes b435e6897 - e33fa0c6f


http://git-wip-us.apache.org/repos/asf/cxf/blob/e33fa0c6/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
--
diff --git 
a/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
 
b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
new file mode 100644
index 000..f7ec99a
--- /dev/null
+++ 
b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl
@@ -0,0 +1,169 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--
+wsdl:definitions xmlns=http://schemas.xmlsoap.org/wsdl/; 
xmlns:soap=http://schemas.xmlsoap.org/wsdl/soap/; 
xmlns:tns=http://apache.org/hello_world_soap_http_jibx/jibx; 
xmlns:x1=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
xmlns:wsdl=http://schemas.xmlsoap.org/wsdl/; 
xmlns:xsd=http://www.w3.org/2001/XMLSchema; name=HelloWorld 
targetNamespace=http://apache.org/hello_world_soap_http_jibx/jibx;
+wsdl:types
+schema xmlns=http://www.w3.org/2001/XMLSchema; 
xmlns:tns=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
targetNamespace=http://apache.org/hello_world_soap_http_jibx/jibx/types; 
elementFormDefault=qualified
+simpleType name=MyStringType
+restriction base=string
+maxLength value=30/
+/restriction
+/simpleType
+element name=sayHi
+complexType/
+/element
+element name=sayHiResponse
+complexType
+sequence
+element name=responseType type=string/
+/sequence
+/complexType
+/element
+element name=greetMe
+complexType
+sequence
+element name=requestType type=tns:MyStringType/
+/sequence
+/complexType
+/element
+element name=greetMeResponse
+complexType
+sequence
+element name=responseType type=string/
+/sequence
+/complexType
+/element
+element name=greetMeOneWay
+complexType
+sequence
+element name=requestType type=string/
+/sequence
+/complexType
+/element
+element name=pingMe
+complexType/
+/element
+element name=pingMeResponse
+complexType/
+/element
+element name=faultDetail
+complexType
+sequence
+element name=minor type=short/
+element name=major type=short/
+/sequence
+/complexType
+/element
+element name=greetMeFaultDetail type=string/
+/schema
+/wsdl:types
+wsdl:message name=sayHiRequest
+wsdl:part element=x1:sayHi name=in/
+/wsdl:message
+wsdl:message name=sayHiResponse
+wsdl:part element=x1:sayHiResponse name=out/
+/wsdl:message
+wsdl:message name=greetMeRequest
+wsdl:part element=x1:greetMe name=in/
+/wsdl:message
+wsdl:message name=greetMeResponse
+wsdl:part element=x1:greetMeResponse name=out/
+/wsdl:message
+wsdl:message name=greetMeOneWayRequest
+wsdl:part element=x1:greetMeOneWay name=in/
+/wsdl:message
+wsdl:message name=pingMeRequest
+wsdl:part name=in element=x1:pingMe/
+/wsdl:message
+wsdl:message name=pingMeResponse
+wsdl:part name=out element=x1:pingMeResponse/
+/wsdl:message
+wsdl:message name=pingMeFault
+wsdl:part name=faultDetail element=x1:faultDetail/
+/wsdl:message
+wsdl:message name=greetMeFault
+wsdl:part name=greetMeFault element=x1:greetMeFaultDetail/
+/wsdl:message

git commit: upgrade woodstox-core-asl to 4.4.1

2014-09-12 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master d2dec5b87 - 1141c998f


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/1141c998
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1141c998
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1141c998

Branch: refs/heads/master
Commit: 1141c998f572972e74ea8f7a89275e72041ad12c
Parents: d2dec5b
Author: Akitoshi Yoshida a...@apache.org
Authored: Fri Sep 12 12:48:38 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Fri Sep 12 12:48:38 2014 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/1141c998/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4d4482a..3243cdc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -141,7 +141,7 @@
 cxf.spring.mockspring-test/cxf.spring.mock
 cxf.swagger.version1.3.7/cxf.swagger.version
 cxf.velocity.version1.7/cxf.velocity.version
-cxf.woodstox.core.version4.4.0/cxf.woodstox.core.version
+cxf.woodstox.core.version4.4.1/cxf.woodstox.core.version
 cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version
 cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version
 cxf.wss4j.version2.0.2-SNAPSHOT/cxf.wss4j.version

git commit: Move depends plugin version defintion to parent pom

2014-09-12 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master 1141c998f - 276c2bf08


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/276c2bf0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/276c2bf0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/276c2bf0

Branch: refs/heads/master
Commit: 276c2bf08ad5046175c7e1aae83a657d58412ecb
Parents: 1141c99
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 09:38:41 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/276c2bf0/osgi/itests/pom.xml
--
diff --git a/osgi/itests/pom.xml b/osgi/itests/pom.xml
index 613befb..29936c4 100644
--- a/osgi/itests/pom.xml
+++ b/osgi/itests/pom.xml
@@ -166,7 +166,6 @@
 plugin
 groupIdorg.apache.servicemix.tooling/groupId
 artifactIddepends-maven-plugin/artifactId
-version1.2/version
 executions
 execution
 idgenerate-depends-file/id

http://git-wip-us.apache.org/repos/asf/cxf/blob/276c2bf0/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3243cdc..42d1a07 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -246,6 +246,11 @@
 pluginManagement
 plugins
 plugin
+groupIdorg.apache.servicemix.tooling/groupId
+artifactIddepends-maven-plugin/artifactId
+version1.2/version
+/plugin
+plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-source-plugin/artifactId
 configuration

http://git-wip-us.apache.org/repos/asf/cxf/blob/276c2bf0/services/xkms/xkms-itests/pom.xml
--
diff --git a/services/xkms/xkms-itests/pom.xml 
b/services/xkms/xkms-itests/pom.xml
index 3b10c0b..27a1b7a 100644
--- a/services/xkms/xkms-itests/pom.xml
+++ b/services/xkms/xkms-itests/pom.xml
@@ -103,7 +103,6 @@
 plugin
 groupIdorg.apache.servicemix.tooling/groupId
 artifactIddepends-maven-plugin/artifactId
-version1.2/version
 executions
 execution
phasegenerate-resources/phase

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

2014-09-12 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/master 276c2bf08 - d292979c5


[CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d292979c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d292979c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d292979c

Branch: refs/heads/master
Commit: d292979c57a02dac0c755c3fe176fee89c16e82a
Parents: 276c2bf
Author: Akitoshi Yoshida a...@apache.org
Authored: Fri Sep 12 18:38:59 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Fri Sep 12 18:39:18 2014 +0200

--
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/d292979c/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 080db9e..f936d84 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -330,7 +330,7 @@ public final class TLSParameterJaxBUtils {
 
 String alg = tmc.isSetFactoryAlgorithm()
  ? tmc.getFactoryAlgorithm()
- : KeyManagerFactory.getDefaultAlgorithm();
+ : TrustManagerFactory.getDefaultAlgorithm();
 
 TrustManagerFactory fac =
  tmc.isSetProvider()

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

2014-09-12 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e33fa0c6f - 174e54b92


[CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/174e54b9
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/174e54b9
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/174e54b9

Branch: refs/heads/3.0.x-fixes
Commit: 174e54b922bbe3a27405bd71933ba18e1145dd7a
Parents: e33fa0c
Author: Akitoshi Yoshida a...@apache.org
Authored: Fri Sep 12 18:38:59 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Fri Sep 12 18:40:46 2014 +0200

--
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/174e54b9/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 8996c8b..3ce5fcf 100644
--- 
a/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/core/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -298,7 +298,7 @@ public final class TLSParameterJaxBUtils {
 
 String alg = tmc.isSetFactoryAlgorithm()
  ? tmc.getFactoryAlgorithm()
- : KeyManagerFactory.getDefaultAlgorithm();
+ : TrustManagerFactory.getDefaultAlgorithm();
 
 TrustManagerFactory fac =
  tmc.isSetProvider()

git commit: Create an XJC plugin that can work around https://java.net/jira/browse/JAXB-986

2014-09-12 Thread dkulp

Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master 718f8afa4 - 6ae96ffed


Create an XJC plugin that can work around  https://java.net/jira/browse/JAXB-986


Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/6ae96ffe
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/6ae96ffe
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/6ae96ffe

Branch: refs/heads/master
Commit: 6ae96ffedb82f01c3dab3f76841a10395a5595d1
Parents: 718f8af
Author: Daniel Kulp dk...@apache.org
Authored: Fri Sep 12 12:40:56 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Sep 12 12:40:56 2014 -0400

--
 bug986/pom.xml  |  60 +++
 .../addon/apache_cxf/bug986/Bug986Plugin.java   |  65 
 .../org/apache/cxf/xjc/bug986/Bug986Plugin.java | 103 +++
 .../META-INF/services/com.sun.tools.xjc.Plugin  |   1 +
 pom.xml |  51 +
 5 files changed, 280 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/6ae96ffe/bug986/pom.xml
--
diff --git a/bug986/pom.xml b/bug986/pom.xml
new file mode 100644
index 000..8ea63df
--- /dev/null
+++ b/bug986/pom.xml
@@ -0,0 +1,60 @@
+!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  License); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+--
+project 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;
+modelVersion4.0.0/modelVersion
+groupIdorg.apache.cxf.xjcplugins/groupId
+artifactIdcxf-xjc-bug986/artifactId
+packagingjar/packaging
+nameApache CXF XJC Plugin To Workaround JAXB Bug 986/name
+urlhttp://cxf.apache.org/url
+
+parent
+groupIdorg.apache.cxf.xjc-utils/groupId
+artifactIdxjc-utils/artifactId
+version3.0.2-SNAPSHOT/version
+/parent
+
+
+properties
+maven.test.skiptrue/maven.test.skip
+/properties
+
+dependencies
+dependency
+groupIdcom.sun.xml.bind/groupId
+artifactIdjaxb-xjc/artifactId
+scopeprovided/scope
+/dependency
+dependency
+groupIdcom.sun.xml.bind/groupId
+artifactIdjaxb-core/artifactId
+scopeprovided/scope
+/dependency
+dependency
+groupIdcom.sun.xml.bind/groupId
+artifactIdjaxb-impl/artifactId
+scopeprovided/scope
+/dependency
+dependency
+groupIdcommons-lang/groupId
+artifactIdcommons-lang/artifactId
+/dependency
+/dependencies
+
+/project

http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/6ae96ffe/bug986/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug986/Bug986Plugin.java
--
diff --git 
a/bug986/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug986/Bug986Plugin.java
 
b/bug986/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug986/Bug986Plugin.java
new file mode 100644
index 000..365080d
--- /dev/null
+++ 
b/bug986/src/main/java/com/sun/tools/xjc/addon/apache_cxf/bug986/Bug986Plugin.java
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing

git commit: Fix line length

2014-09-12 Thread dkulp

Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master 6ae96ffed - a1e053180


Fix line length


Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/a1e05318
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/a1e05318
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/a1e05318

Branch: refs/heads/master
Commit: a1e053180a293589badde234b14e3b0c7f23ab35
Parents: 6ae96ff
Author: Daniel Kulp dk...@apache.org
Authored: Fri Sep 12 12:43:50 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Sep 12 12:43:50 2014 -0400

--
 bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/a1e05318/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
--
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java 
b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index 476c39a..b81562d 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -61,7 +61,8 @@ public class Bug986Plugin {
 }
 
 public String getUsage() {
-return   -Xbug986 : Activate plugin remove 
XmlSchemaType(anySimpleType) from fields that shouldn't have it.;
+return   -Xbug986 : Activate plugin remove 
XmlSchemaType(anySimpleType)
++  from fields that shouldn't have it.;
 }
 
 public boolean run(Outline outline, Options opt, ErrorHandler 
errorHandler) {

git commit: [CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting the encryption of JWK sets with the help of password callbacks

2014-09-12 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/master d292979c5 - e3c99deff


[CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting 
the encryption of JWK sets with the help of password callbacks


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e3c99def
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e3c99def
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e3c99def

Branch: refs/heads/master
Commit: e3c99deffc0e391a43b27a31b9f951c7993ebc11
Parents: d292979
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Sep 12 17:47:15 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Sep 12 17:47:15 2014 +0100

--
 rt/rs/security/oauth-parent/oauth2-jwt/pom.xml  |   3 +-
 .../jwe/AbstractWrapKeyEncryptionAlgorithm.java |  10 +-
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  | 151 +++
 .../cxf/rs/security/oauth2/jwt/Algorithm.java   |   7 +
 .../rs/security/oauth2/jwt/JwtConstants.java|   3 +
 .../cxf/rs/security/oauth2/jwt/JwtUtils.java|   8 +
 .../oauth2/jwt/jaxrs/JweWriterInterceptor.java  |   6 +-
 .../oauth2/jwt/jaxrs/JwsWriterInterceptor.java  |   6 +-
 .../oauth2/jwe/JweCompactReaderWriterTest.java  |  17 +++
 .../oauth2/jwe/JwePbeHmacAesWrapTest.java   |  56 +++
 10 files changed, 259 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e3c99def/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml 
b/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
index 5d9d841..aba9eaf 100644
--- a/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
@@ -40,7 +40,8 @@
  groupIdorg.bouncycastle/groupId
  artifactIdbcprov-ext-jdk15on/artifactId
  version1.50/version
- scopetest/scope
+ scopeprovided/scope
+ optionaltrue/optional 
 /dependency
 !--test dependencies--
 dependency

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3c99def/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
index a689529..0d4cb5f 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
@@ -73,23 +73,23 @@ public abstract class AbstractWrapKeyEncryptionAlgorithm 
implements KeyEncryptio
 protected AlgorithmParameterSpec getAlgorithmParameterSpec(JweHeaders 
headers) {
 return null;
 }
-private static String checkAlgorithm(SetString supportedAlgorithms, 
String algo) {
+protected String checkAlgorithm(String algo) {
 if (algo != null  !supportedAlgorithms.contains(algo)) {
 throw new SecurityException();
 }
 return algo;
 }
-private void checkAlgorithms(JweHeaders headers, String defaultAlgo) {
+protected void checkAlgorithms(JweHeaders headers, String defaultAlgo) {
 String providedAlgo = headers.getKeyEncryptionAlgorithm();
 if ((providedAlgo == null  defaultAlgo == null)
 || (providedAlgo != null  defaultAlgo != null  
!providedAlgo.equals(defaultAlgo))) {
 throw new SecurityException();
 }
 if (providedAlgo != null) {
-checkAlgorithm(supportedAlgorithms, providedAlgo);
-} else {
-checkAlgorithms(headers, defaultAlgo);
+checkAlgorithm(providedAlgo);
+} else if (defaultAlgo != null) {
 headers.setKeyEncryptionAlgorithm(defaultAlgo);
+checkAlgorithm(defaultAlgo);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e3c99def/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
new file

git commit: [CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting the encryption of JWK sets with the help of password callbacks

2014-09-12 Thread sergeyb

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 174e54b92 - e9c43c890


[CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting 
the encryption of JWK sets with the help of password callbacks


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e9c43c89
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9c43c89
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9c43c89

Branch: refs/heads/3.0.x-fixes
Commit: e9c43c890e1735cc20bff6dde645d4a68a7e2109
Parents: 174e54b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Fri Sep 12 17:47:15 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Fri Sep 12 17:48:42 2014 +0100

--
 rt/rs/security/oauth-parent/oauth2-jwt/pom.xml  |   3 +-
 .../jwe/AbstractWrapKeyEncryptionAlgorithm.java |  10 +-
 .../PbesHmacAesWrapKeyEncryptionAlgorithm.java  | 151 +++
 .../cxf/rs/security/oauth2/jwt/Algorithm.java   |   7 +
 .../rs/security/oauth2/jwt/JwtConstants.java|   3 +
 .../cxf/rs/security/oauth2/jwt/JwtUtils.java|   8 +
 .../oauth2/jwt/jaxrs/JweWriterInterceptor.java  |   6 +-
 .../oauth2/jwt/jaxrs/JwsWriterInterceptor.java  |   6 +-
 .../oauth2/jwe/JweCompactReaderWriterTest.java  |  17 +++
 .../oauth2/jwe/JwePbeHmacAesWrapTest.java   |  56 +++
 10 files changed, 259 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/e9c43c89/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
--
diff --git a/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml 
b/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
index 0113c4a..d72c91c 100644
--- a/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
+++ b/rt/rs/security/oauth-parent/oauth2-jwt/pom.xml
@@ -40,7 +40,8 @@
  groupIdorg.bouncycastle/groupId
  artifactIdbcprov-ext-jdk15on/artifactId
  version1.50/version
- scopetest/scope
+ scopeprovided/scope
+ optionaltrue/optional 
 /dependency
 !--test dependencies--
 dependency

http://git-wip-us.apache.org/repos/asf/cxf/blob/e9c43c89/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
index a689529..0d4cb5f 100644
--- 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
+++ 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractWrapKeyEncryptionAlgorithm.java
@@ -73,23 +73,23 @@ public abstract class AbstractWrapKeyEncryptionAlgorithm 
implements KeyEncryptio
 protected AlgorithmParameterSpec getAlgorithmParameterSpec(JweHeaders 
headers) {
 return null;
 }
-private static String checkAlgorithm(SetString supportedAlgorithms, 
String algo) {
+protected String checkAlgorithm(String algo) {
 if (algo != null  !supportedAlgorithms.contains(algo)) {
 throw new SecurityException();
 }
 return algo;
 }
-private void checkAlgorithms(JweHeaders headers, String defaultAlgo) {
+protected void checkAlgorithms(JweHeaders headers, String defaultAlgo) {
 String providedAlgo = headers.getKeyEncryptionAlgorithm();
 if ((providedAlgo == null  defaultAlgo == null)
 || (providedAlgo != null  defaultAlgo != null  
!providedAlgo.equals(defaultAlgo))) {
 throw new SecurityException();
 }
 if (providedAlgo != null) {
-checkAlgorithm(supportedAlgorithms, providedAlgo);
-} else {
-checkAlgorithms(headers, defaultAlgo);
+checkAlgorithm(providedAlgo);
+} else if (defaultAlgo != null) {
 headers.setKeyEncryptionAlgorithm(defaultAlgo);
+checkAlgorithm(defaultAlgo);
 }
 }
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/e9c43c89/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
--
diff --git 
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java
 
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java

git commit: Use the new xjc plugin to fix the generated HelloType (and others) so they can actually be marshalled when using Java7/8.

2014-09-12 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master e3c99deff - f02b02934


Use the new xjc plugin to fix the generated HelloType (and others) so they can 
actually be marshalled when using Java7/8.


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f02b0293
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f02b0293
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f02b0293

Branch: refs/heads/master
Commit: f02b02934bf78504ffc462c364dc43e386e727b2
Parents: e3c99de
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 12:49:01 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/f02b0293/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 66486ca..0cb124c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
 properties
 cxf.compiler.forkfalse/cxf.compiler.fork
 cxf.build-utils.version3.0.0/cxf.build-utils.version
-cxf.xjc-utils.version3.0.1/cxf.xjc-utils.version
+cxf.xjc-utils.version3.0.2-SNAPSHOT/cxf.xjc-utils.version
 cxf.jdk.version1.7/cxf.jdk.version
 project.build.sourceEncodingUTF-8/project.build.sourceEncoding
 
site.deploy.urlscp://people.apache.org/www/cxf.apache.org/maven-site/site.deploy.url

http://git-wip-us.apache.org/repos/asf/cxf/blob/f02b0293/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 0389388..1e6d3c1 100644
--- a/services/ws-discovery/ws-discovery-api/pom.xml
+++ b/services/ws-discovery/ws-discovery-api/pom.xml
@@ -82,6 +82,13 @@
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-codegen-plugin/artifactId
 version${project.version}/version
+dependencies
+dependency
+groupIdorg.apache.cxf.xjcplugins/groupId
+artifactIdcxf-xjc-bug986/artifactId
+version${cxf.xjc-utils.version}/version
+/dependency
+/dependencies
 executions
 execution
 phasegenerate-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

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

2014-09-12 Thread ay

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes bbbe73ea4 - 65f7ab5a3


[CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/65f7ab5a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/65f7ab5a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/65f7ab5a

Branch: refs/heads/2.7.x-fixes
Commit: 65f7ab5a3339b0214d7477e659b3f7fff20ea434
Parents: bbbe73e
Author: Akitoshi Yoshida a...@apache.org
Authored: Fri Sep 12 18:38:59 2014 +0200
Committer: Akitoshi Yoshida a...@apache.org
Committed: Fri Sep 12 18:48:25 2014 +0200

--
 .../org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/65f7ab5a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
--
diff --git 
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
 
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
index 8996c8b..3ce5fcf 100644
--- 
a/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
+++ 
b/api/src/main/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
@@ -298,7 +298,7 @@ public final class TLSParameterJaxBUtils {
 
 String alg = tmc.isSetFactoryAlgorithm()
  ? tmc.getFactoryAlgorithm()
- : KeyManagerFactory.getDefaultAlgorithm();
+ : TrustManagerFactory.getDefaultAlgorithm();
 
 TrustManagerFactory fac =
  tmc.isSetProvider()

git commit: Use new plugin to fix the generated code so the tests don't have to be disabled/skipped

2014-09-12 Thread dkulp

Repository: cxf
Updated Branches:
  refs/heads/master f02b02934 - a3d4b6f06


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/a3d4b6f0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a3d4b6f0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a3d4b6f0

Branch: refs/heads/master
Commit: a3d4b6f06ce35e3881cbb9ead7139b4e4957829e
Parents: f02b029
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 13:18:41 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/a3d4b6f0/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;
-}
 ListInteger x = Arrays.asList(1, 2, 3);
 ListInteger yOrig = Arrays.asList(10, 100, 1000);
 HolderListInteger y = new HolderListInteger(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) {
 ListQName 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/a3d4b6f0/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

git commit: Flip to fine logging

2014-09-12 Thread dkulp

Repository: cxf-xjc-utils
Updated Branches:
  refs/heads/master a1e053180 - 640012ac2


Flip to fine logging


Project: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/commit/640012ac
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/640012ac
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/640012ac

Branch: refs/heads/master
Commit: 640012ac28caa0cfa865ae5b2563b83b451d09ac
Parents: a1e0531
Author: Daniel Kulp dk...@apache.org
Authored: Fri Sep 12 13:19:44 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Fri Sep 12 13:19:44 2014 -0400

--
 bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/640012ac/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
--
diff --git a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java 
b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
index b81562d..676308f 100644
--- a/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
+++ b/bug986/src/main/java/org/apache/cxf/xjc/bug986/Bug986Plugin.java
@@ -68,7 +68,7 @@ public class Bug986Plugin {
 public boolean run(Outline outline, Options opt, ErrorHandler 
errorHandler) {
 // kind of a bogus thing to have to do to workaround bug:
 // https://java.net/jira/browse/JAXB-986
-LOG.info(Running Bug986Plugin plugin.);
+LOG.fine(Running Bug986Plugin plugin.);
 for (ClassOutline classOutline : outline.getClasses()) {
 MapString, JFieldVar fields = classOutline.implClass.fields();
 for (JFieldVar field : fields.values()) {

[09/12] git commit: Move depends plugin version defintion to parent pom

2014-09-12 Thread dkulp

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
 groupIdorg.apache.servicemix.tooling/groupId
 artifactIddepends-maven-plugin/artifactId
-version1.2/version
 executions
 execution
 idgenerate-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
+groupIdorg.apache.servicemix.tooling/groupId
+artifactIddepends-maven-plugin/artifactId
+version1.2/version
+/plugin
+plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-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
 groupIdorg.apache.servicemix.tooling/groupId
 artifactIddepends-maven-plugin/artifactId
-version1.2/version
 executions
 execution
phasegenerate-resources/phase

[11/12] git commit: Use new plugin to fix the generated code so the tests don't have to be disabled/skipped

2014-09-12 Thread dkulp

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;
-}
 ListInteger x = Arrays.asList(1, 2, 3);
 ListInteger yOrig = Arrays.asList(10, 100, 1000);
 HolderListInteger y = new HolderListInteger(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) {
 ListQName 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

[05/12] git commit: Update the OSGi test support stuff to add some methods to make it easier to use the testutils

2014-09-12 Thread dkulp

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.
  *

[07/12] git commit: Update some plugin versions

2014-09-12 Thread dkulp

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
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-pmd-plugin/artifactId
-version3.1/version
+version3.2/version
 dependencies
 dependency
 groupIdorg.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
 groupIdorg.codehaus.mojo/groupId
 artifactIdbuild-helper-maven-plugin/artifactId
-version1.8/version
+version1.9.1/version
 /plugin
 plugin
 groupIdorg.codehaus.mojo/groupId
@@ -459,12 +459,12 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-war-plugin/artifactId
-version2.2/version
+version2.4/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-install-plugin/artifactId
-version2.5.1/version
+version2.5.2/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -502,7 +502,7 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-source-plugin/artifactId
-version2.2.1/version
+version2.3/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -547,7 +547,7 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-jar-plugin/artifactId
-version2.4/version
+version2.5/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -560,7 +560,7 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-assembly-plugin/artifactId
-version2.4/version
+version2.4.1/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -570,12 +570,12 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-deploy-plugin/artifactId
-version2.8.1/version
+version2.8.2/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-surefire-report-plugin/artifactId
-version2.16/version
+version2.17/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -585,7 +585,7 @@
 plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-plugin-plugin/artifactId
-version3.2/version
+version3.3/version
 /plugin
 plugin
 groupIdorg.apache.maven.plugins/groupId
@@ -602,7 +602,7 @@
 plugin
 groupIdorg.apache.rat/groupId
 artifactIdapache-rat-plugin/artifactId
-version0.10/version
+version0.11/version
 configuration

[04/12] git commit: Make testutils a bundle so we can use it in the osgi based itests

2014-09-12 Thread dkulp

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;
 modelVersion4.0.0/modelVersion
 artifactIdcxf-testutils/artifactId
-packagingjar/packaging
+packagingbundle/packaging
 nameApache CXF Test Utilities/name
 descriptionApache CXF Test Utilities/description
 urlhttp://cxf.apache.org/url
@@ -50,16 +50,19 @@
 groupIdorg.apache.activemq/groupId
 artifactIdactivemq-broker/artifactId
 scopeprovided/scope
+optionaltrue/optional
 /dependency
 dependency
 groupIdorg.springframework/groupId
 artifactIdspring-core/artifactId
 scopeprovided/scope
+optionaltrue/optional
 /dependency
 dependency
 groupIdorg.springframework/groupId
 artifactIdspring-context/artifactId
 scopeprovided/scope
+optionaltrue/optional
 /dependency
 /dependencies
 build

[01/12] git commit: Updating swagger-jaxrs version to 1.3.7

2014-09-12 Thread dkulp

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 sberyoz...@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.version1.2.1/cxf.spring.osgi.version
 cxf.spring.ldap.version1.3.1.RELEASE/cxf.spring.ldap.version
 cxf.spring.mockspring-test/cxf.spring.mock
-cxf.swagger.version1.3.4/cxf.swagger.version
+cxf.swagger.version1.3.7/cxf.swagger.version
 cxf.velocity.version1.7/cxf.velocity.version
 cxf.woodstox.core.version4.4.0/cxf.woodstox.core.version
 cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version

[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.

2014-09-12 Thread dkulp

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.forkfalse/cxf.compiler.fork
 cxf.build-utils.version3.0.0/cxf.build-utils.version
-cxf.xjc-utils.version3.0.1/cxf.xjc-utils.version
+cxf.xjc-utils.version3.0.2-SNAPSHOT/cxf.xjc-utils.version
 cxf.jdk.version1.6/cxf.jdk.version
 project.build.sourceEncodingUTF-8/project.build.sourceEncoding
 
site.deploy.urlscp://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 @@
 groupIdorg.apache.cxf/groupId
 artifactIdcxf-codegen-plugin/artifactId
 version${project.version}/version
+dependencies
+dependency
+groupIdorg.apache.cxf.xjcplugins/groupId
+artifactIdcxf-xjc-bug986/artifactId
+version${cxf.xjc-utils.version}/version
+/dependency
+/dependencies
 executions
 execution
 phasegenerate-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

[03/12] git commit: Move pax.exam.version to parent pom

2014-09-12 Thread dkulp

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 @@
 nameApache CXF :: OSGi :: Integration Tests pure felix/name
 packagingjar/packaging
 properties
-pax.exam.version3.4.0/pax.exam.version
 pax.url.version1.2.8/pax.url.version
 /properties
 dependencies
@@ -91,19 +90,19 @@
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-container-native/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/scope
 /dependency
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-junit4/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/scope
 /dependency
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-link-mvn/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/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 @@
 nameApache CXF :: OSGi :: Integration Tests/name
 packagingjar/packaging
 properties
-pax.exam.version3.4.0/pax.exam.version
 cxf.surefire.fork.modeonce/cxf.surefire.fork.mode
 /properties
 dependencies
@@ -100,28 +99,28 @@
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-junit4/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/scope
 /dependency
 
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/scope
 /dependency
 
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-container-karaf/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/scope
 /dependency
 
 dependency
 groupIdorg.ops4j.pax.exam/groupId
 artifactIdpax-exam-link-mvn/artifactId
-version${pax.exam.version}/version
+version${cxf.pax.exam.version}/version
 scopetest/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.version4.2.0/cxf.osgi.version
 cxf.karaf.version2.3.6/cxf.karaf.version
 cxf.pax.logging.version1.6.0/cxf.pax.logging.version
+cxf.pax.exam.version3.4.0/cxf.pax.exam.version
 cxf.felix.framework.version2.0.5/cxf.felix.framework.version
 cxf.felix.configadmin.version1.2.4/cxf.felix.configadmin.version
 cxf.xmlbeans.bundle.version2.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
---

[12/12] git commit: Recording .gitmergeinfo Changes

2014-09-12 Thread dkulp

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

[02/12] git commit: Update to Karaf 2.3.6 for testing (at this point, need to move to 3.0.1 shortly)

2014-09-12 Thread dkulp

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 @@
 groupIdorg.slf4j/groupId
 artifactIdslf4j-api/artifactId
 /dependency
-
+
+dependency
+groupIdorg.apache.karaf/groupId
+artifactIdapache-karaf/artifactId
+version${cxf.karaf.version}/version
+typetar.gz/type
+scopetest/scope
+exclusions
+exclusion
+groupIdorg.apache.karaf.shell/groupId
+artifactIdorg.apache.karaf.shell.dev/artifactId
+/exclusion
+exclusion
+groupIdorg.eclipse/groupId
+artifactIdosgi/artifactId
+/exclusion
+exclusion
+groupIdorg.apache.karaf/groupId
+artifactIdorg.apache.karaf.client/artifactId
+/exclusion
+exclusion
+groupIdorg.apache.felix/groupId
+artifactIdorg.apache.felix.framework/artifactId
+/exclusion
+/exclusions
+/dependency
 /dependencies
 build
 plugins
@@ -137,6 +162,7 @@
 plugin
 groupIdorg.apache.servicemix.tooling/groupId
 artifactIddepends-maven-plugin/artifactId
+version1.2/version
 executions
 execution
 idgenerate-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 = 1L;
 static final Long DEFAULT_TIMEOUT = 2L;
 static final Long SERVICE_TIMEOUT = 3L;
@@ -95,20 +98,41 @@ public class CXFOSGiTestSupport {
 return probe;
 }
 
+private static String getKarafVersion() {
+InputStream ins = 
CXFOSGiTestSupport.class.getResourceAsStream(/META-INF/maven/dependencies.properties);

[08/12] git commit: upgrade woodstox-core-asl to 4.4.1

2014-09-12 Thread dkulp

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 a...@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.mockspring-test/cxf.spring.mock
 cxf.swagger.version1.3.7/cxf.swagger.version
 cxf.velocity.version1.7/cxf.velocity.version
-cxf.woodstox.core.version4.4.0/cxf.woodstox.core.version
+cxf.woodstox.core.version4.4.1/cxf.woodstox.core.version
 cxf.woodstox.stax2-api.version3.1.4/cxf.woodstox.stax2-api.version
 cxf.wsdl4j.version1.6.3/cxf.wsdl4j.version
 cxf.wss4j.version2.0.2-SNAPSHOT/cxf.wss4j.version

[06/12] git commit: Add a test for the http-jetty support.

2014-09-12 Thread dkulp

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
 groupIdorg.apache.cxf/groupId
+artifactIdcxf-testutils/artifactId
+version${project.version}/version
+/dependency
+dependency
+groupIdorg.apache.cxf/groupId
 artifactIdcxf-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

[2/2] git commit: CXF-5999 Moving JiBX related systests into its own module.

[1/2] CXF-5999 Moving JiBX related systests into its own module.

[2/2] git commit: CXF-5999 Moving JiBX related systests into its own module.

[1/2] CXF-5999 Moving JiBX related systests into its own module.

git commit: upgrade woodstox-core-asl to 4.4.1

git commit: Move depends plugin version defintion to parent pom

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

git commit: Create an XJC plugin that can work around https://java.net/jira/browse/JAXB-986

git commit: Fix line length

git commit: [CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting the encryption of JWK sets with the help of password callbacks

git commit: [CXF-5954] Experimenting with PbeHmacAesWrap JWE with the view of supporting the encryption of JWK sets with the help of password callbacks

git commit: Use the new xjc plugin to fix the generated HelloType (and others) so they can actually be marshalled when using Java7/8.

git commit: [CXF-6000] Wrong default algorithm is used for TrustManagerFactory instantiation

git commit: Use new plugin to fix the generated code so the tests don't have to be disabled/skipped

git commit: Flip to fine logging

[09/12] git commit: Move depends plugin version defintion to parent pom

[11/12] git commit: Use new plugin to fix the generated code so the tests don't have to be disabled/skipped

[05/12] git commit: Update the OSGi test support stuff to add some methods to make it easier to use the testutils

[07/12] git commit: Update some plugin versions

[04/12] git commit: Make testutils a bundle so we can use it in the osgi based itests

[01/12] git commit: Updating swagger-jaxrs version to 1.3.7

[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.

[03/12] git commit: Move pax.exam.version to parent pom

[12/12] git commit: Recording .gitmergeinfo Changes

[02/12] git commit: Update to Karaf 2.3.6 for testing (at this point, need to move to 3.0.1 shortly)

[08/12] git commit: upgrade woodstox-core-asl to 4.4.1

[06/12] git commit: Add a test for the http-jetty support.

28 matches

Site Navigation

Mail list logo

Footer information