svn commit: r922242 - in /websites/production/cxf/content: cache/main.pageCache xjc-utils.html
Author: buildbot Date: Mon Sep 15 10:46:59 2014 New Revision: 922242 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/main.pageCache websites/production/cxf/content/xjc-utils.html Modified: websites/production/cxf/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/xjc-utils.html == --- websites/production/cxf/content/xjc-utils.html (original) +++ websites/production/cxf/content/xjc-utils.html Mon Sep 15 10:46:59 2014 @@ -108,33 +108,16 @@ Apache CXF -- XJC Utils td height=100% !-- Content -- div class=wiki-content -div id=ConfluenceContentpThe Apache CXF XJC-Utils subproject provides a bunch of utilities for working with JAXB to generate better or more usable code./p - -pCurrently, it consists of the following modules:/p - -div class=table-wraptable class=confluenceTabletbodytrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-plugin.htmlcxf-xjc-plugin/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Provides a maven wrapper around the JAXB XJC utility /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-dv.htmlcxf-xjc-dv/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Initialize fields mapped from elements/attributes with their default values /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-ts.htmlcxf-xjc-ts/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Implements the toString() method /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-boolean.htmlcxf-xjc-boolean/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Generate getters nam ed getXXX() for Booleans instead of isXXX() /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-wsdlextension.htmlcxf-xjc-wsdlextension/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Adds extensions methods to allow generated beans to be used as WSDL4J extensors /p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdp a shape=rect href=cxf-xjc-bug671.htmlcxf-xjc-bug671/a /p/tdtd colspan=1 rowspan=1 class=confluenceTdp Provides a workaround for /p -a shape=rect class=external-link href=https://jaxb.dev.java.net/issues/show_bug.cgi?id=671; rel=nofollowhttps://jaxb.dev.java.net/issues/show_bug.cgi?id=671/a -p - Not needed for JAXB gt;=2.1.12 /p/td/tr/tbody/table/div - - - -div class=aui-message hint shadowed information-macro +div id=ConfluenceContentpThe Apache CXF XJC-Utils subproject provides a bunch of utilities for working with JAXB to generate better or more usable code./ppCurrently, it consists of the following modules:/pdiv class=table-wraptable class=confluenceTabletbodytrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-plugin.htmlcxf-xjc-plugin/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpProvides a maven wrapper around the JAXB XJC utility/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-dv.htmlcxf-xjc-dv/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpInitialize fields mapped from elements/attributes with their default values/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-ts.htmlcxf-xjc-ts/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpImplements the toString() method/p/td/tr trtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-boolean.htmlcxf-xjc-boolean/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpGenerate getters named getXXX() for Booleans instead of isXXX()/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-wsdlextension.htmlcxf-xjc-wsdlextension/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpAdds extensions methods to allow generated beans to be used as WSDL4J extensors/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect href=cxf-xjc-bug671.htmlcxf-xjc-bug671/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpProvides a workaround for/pa shape=rect class=external-link href=https://jaxb.dev.java.net/issues/show_bug.cgi?id=671; rel=nofollowhttps://jaxb.dev.java.net/issues/show_bug.cgi?id=671/ap- Not needed for JAXB gt;=2.1.12/p/td/tr/tbody/table/divd iv class=aui-message hint shadowed information-macro span class=aui-icon icon-hintIcon/span div class=message-content - -pIn CXF versions prior to 2.3.0, the xjc plugins were shaded directly into the big cxf bundle jar. In 2.3.0, they were removed from the jar and are placed individually into the lib directory of the distribution. The xjc plugins are only code generation utilities and not used at all at runtime which is why they were pulled out. /p +pIn CXF versions
git commit: Test optionalSignatureParts
Repository: cxf
Updated Branches:
refs/heads/master a3d4b6f06 - bc00a781c
Test optionalSignatureParts
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bc00a781
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bc00a781
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bc00a781
Branch: refs/heads/master
Commit: bc00a781cda125b815297a2829991430be877146
Parents: a3d4b6f
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Sep 15 12:29:08 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Sep 15 12:29:08 2014 +0100
--
.../CryptoCoverageCheckerTest.java | 48
1 file changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/bc00a781/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index f521436..990b177 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -560,6 +560,54 @@ public class CryptoCoverageCheckerTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+@org.junit.Test
+public void testWSAddressingOptionalSignatureParts() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
CryptoCoverageCheckerTest.class.getResource(client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
CryptoCoverageCheckerTest.class.getResource(DoubleItCoverageChecker.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, DoubleItWSAPort);
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+
+MapString, Object outProps = new HashMapString, Object();
+outProps.put(action, Timestamp Signature);
+outProps.put(signaturePropFile, alice.properties);
+outProps.put(user, alice);
+outProps.put(passwordCallbackClass,
+
org.apache.cxf.systest.ws.common.KeystorePasswordCallback);
+outProps.put(optionalSignatureParts,
+ {}{http://schemas.xmlsoap.org/soap/envelope/}Body;;
+ + {}{http://docs.oasis-open.org/wss/2004/01/oasis-;
+ + 200401-wss-wssecurity-utility-1.0.xsd}Timestamp;
+ + {}{http://www.w3.org/2005/08/addressing}ReplyTo;;);
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(port);
+}
+
+WSS4JStaxOutInterceptor staxOutInterceptor = null;
+WSS4JOutInterceptor outInterceptor = null;
+if (test.isStreaming()) {
+staxOutInterceptor = new WSS4JStaxOutInterceptor(outProps);
+bus.getOutInterceptors().add(staxOutInterceptor);
+} else {
+outInterceptor = new WSS4JOutInterceptor(outProps);
+bus.getOutInterceptors().add(outInterceptor);
+}
+
+port.doubleIt(25);
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
// Here the service is sending an secured message back to the client. For
a server Fault
// message it returns the original fault, as the CryptoCoverageChecker is
configured not
// to check a fault (see CXF-4954)
git commit: Another SCT system test + a NPE fix
Repository: cxf
Updated Branches:
refs/heads/master bc00a781c - 288259b27
Another SCT system test + a NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/288259b2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/288259b2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/288259b2
Branch: refs/heads/master
Commit: 288259b274c9ac59803c6c5016467413be980400
Parents: bc00a78
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Sep 15 15:20:00 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Sep 15 15:20:00 2014 +0100
--
.../policy/interceptors/NegotiationUtils.java | 10 ++--
.../sts/secure_conv/SecureConversationTest.java | 21 +++
.../cxf/systest/sts/secure_conv/DoubleIt.wsdl | 61
.../cxf/systest/sts/secure_conv/cxf-client.xml | 6 ++
.../cxf/systest/sts/secure_conv/cxf-service.xml | 19 ++
5 files changed, 113 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/288259b2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
index 6d7c0cd..68c05b8 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
@@ -275,11 +275,13 @@ final class NegotiationUtils {
getTokenStore(message).add(token);
}
}
-final SecurityContext sc = token.getSecurityContext();
-if (sc != null) {
-message.put(SecurityContext.class, sc);
+if (token != null) {
+final SecurityContext sc = token.getSecurityContext();
+if (sc != null) {
+message.put(SecurityContext.class, sc);
+}
+return true;
}
-return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/288259b2/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
--
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
index ec88ad8..921998b 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
@@ -110,6 +110,27 @@ public class SecureConversationTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+@org.junit.Test
+public void testSecureConversationSupporting() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
SecureConversationTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = SecureConversationTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE,
DoubleItTransportSupportingPort);
+DoubleItPortType transportPort =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportPort, PORT);
+
+doubleIt(transportPort, 25);
+
+bus.shutdown(true);
+}
+
private static void doubleIt(DoubleItPortType port, int numToDouble) {
int resp = port.doubleIt(numToDouble);
assertTrue(resp == 2 * numToDouble);
http://git-wip-us.apache.org/repos/asf/cxf/blob/288259b2/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
--
diff --git
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
index 66185cc..d860e53 100644
---
[2/2] git commit: Another SCT system test + a NPE fix
Another SCT system test + a NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ae19059
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ae19059
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ae19059
Branch: refs/heads/3.0.x-fixes
Commit: 5ae190595f03bab2c9d9e41c7d7d6c4cad59086e
Parents: 74e64bf
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Sep 15 15:20:00 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Sep 15 15:31:43 2014 +0100
--
.../policy/interceptors/NegotiationUtils.java | 10 ++--
.../sts/secure_conv/SecureConversationTest.java | 21 +++
.../cxf/systest/sts/secure_conv/DoubleIt.wsdl | 61
.../cxf/systest/sts/secure_conv/cxf-client.xml | 6 ++
.../cxf/systest/sts/secure_conv/cxf-service.xml | 19 ++
5 files changed, 113 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ae19059/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
index 6d7c0cd..68c05b8 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/NegotiationUtils.java
@@ -275,11 +275,13 @@ final class NegotiationUtils {
getTokenStore(message).add(token);
}
}
-final SecurityContext sc = token.getSecurityContext();
-if (sc != null) {
-message.put(SecurityContext.class, sc);
+if (token != null) {
+final SecurityContext sc = token.getSecurityContext();
+if (sc != null) {
+message.put(SecurityContext.class, sc);
+}
+return true;
}
-return true;
}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ae19059/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
--
diff --git
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
index ec88ad8..921998b 100644
---
a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
+++
b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/SecureConversationTest.java
@@ -110,6 +110,27 @@ public class SecureConversationTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+@org.junit.Test
+public void testSecureConversationSupporting() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
SecureConversationTest.class.getResource(cxf-client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl = SecureConversationTest.class.getResource(DoubleIt.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE,
DoubleItTransportSupportingPort);
+DoubleItPortType transportPort =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(transportPort, PORT);
+
+doubleIt(transportPort, 25);
+
+bus.shutdown(true);
+}
+
private static void doubleIt(DoubleItPortType port, int numToDouble) {
int resp = port.doubleIt(numToDouble);
assertTrue(resp == 2 * numToDouble);
http://git-wip-us.apache.org/repos/asf/cxf/blob/5ae19059/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
--
diff --git
a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/secure_conv/DoubleIt.wsdl
index 66185cc..d860e53 100644
---
[1/2] git commit: Test optionalSignatureParts
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ff4bb478e - 5ae190595
Test optionalSignatureParts
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/74e64bfe
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/74e64bfe
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/74e64bfe
Branch: refs/heads/3.0.x-fixes
Commit: 74e64bfec6b338d57f19e825c95e42bc636b2993
Parents: ff4bb47
Author: Colm O hEigeartaigh cohei...@apache.org
Authored: Mon Sep 15 12:29:08 2014 +0100
Committer: Colm O hEigeartaigh cohei...@apache.org
Committed: Mon Sep 15 15:31:41 2014 +0100
--
.../CryptoCoverageCheckerTest.java | 48
1 file changed, 48 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/74e64bfe/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
--
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
index f521436..990b177 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java
@@ -560,6 +560,54 @@ public class CryptoCoverageCheckerTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+@org.junit.Test
+public void testWSAddressingOptionalSignatureParts() throws Exception {
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
CryptoCoverageCheckerTest.class.getResource(client.xml);
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
CryptoCoverageCheckerTest.class.getResource(DoubleItCoverageChecker.wsdl);
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, DoubleItWSAPort);
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+
+MapString, Object outProps = new HashMapString, Object();
+outProps.put(action, Timestamp Signature);
+outProps.put(signaturePropFile, alice.properties);
+outProps.put(user, alice);
+outProps.put(passwordCallbackClass,
+
org.apache.cxf.systest.ws.common.KeystorePasswordCallback);
+outProps.put(optionalSignatureParts,
+ {}{http://schemas.xmlsoap.org/soap/envelope/}Body;;
+ + {}{http://docs.oasis-open.org/wss/2004/01/oasis-;
+ + 200401-wss-wssecurity-utility-1.0.xsd}Timestamp;
+ + {}{http://www.w3.org/2005/08/addressing}ReplyTo;;);
+
+if (test.isStreaming()) {
+SecurityTestUtil.enableStreaming(port);
+}
+
+WSS4JStaxOutInterceptor staxOutInterceptor = null;
+WSS4JOutInterceptor outInterceptor = null;
+if (test.isStreaming()) {
+staxOutInterceptor = new WSS4JStaxOutInterceptor(outProps);
+bus.getOutInterceptors().add(staxOutInterceptor);
+} else {
+outInterceptor = new WSS4JOutInterceptor(outProps);
+bus.getOutInterceptors().add(outInterceptor);
+}
+
+port.doubleIt(25);
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
// Here the service is sending an secured message back to the client. For
a server Fault
// message it returns the original fault, as the CryptoCoverageChecker is
configured not
// to check a fault (see CXF-4954)
git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 65f7ab5a3 - a2e7f1a01 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/a2e7f1a0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a2e7f1a0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a2e7f1a0 Branch: refs/heads/2.7.x-fixes Commit: a2e7f1a01481897ffb273795cb978c75a40f858f Parents: 65f7ab5 Author: Colm O hEigeartaigh cohei...@apache.org Authored: Mon Sep 15 16:22:03 2014 +0100 Committer: Colm O hEigeartaigh cohei...@apache.org Committed: Mon Sep 15 16:22:03 2014 +0100 -- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a2e7f1a0/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index e2e24f3..d215f07 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -485,6 +485,7 @@ B 5947e596913a409f560c1c5db75c73d044f1d8ca B 59c84eb28b8e3338e985c6c961dea0bcfbb9a573 B 5a0d5de27c3d83e82f18ebed908f0624c8b7585a B 5a140bb6d402976dba1e87924da86ca4d4390d2d +B 5ae190595f03bab2c9d9e41c7d7d6c4cad59086e B 5b82381fb9958c43c7b196d514abd3cc3f40a15e B 5bd695d0df1535a1859a72db1fd85922873f02a4 B 5c6e0e2ba83fa048405f5c2143c064434f4cc203 @@ -625,6 +626,7 @@ B 73ba9acd5f57940d687760e39db3f44dabbe0a38 B 73caf0ed33e3a57ae700651ee4f89102c7f3e4ee B 73ea6c5ce6b86e1b28d3eef94c8ba878e4babffa B 7454e5a34be4e0d8770d917defa6c11c78ca460a +B 74e64bfec6b338d57f19e825c95e42bc636b2993 B 751953cde2e691140bd7d61584ffccc42c2c17c0 B 7521ad685276b02af30a5fa145dbced0b91058fd B 7524807b1dc58e4052eac67d623835f9eeb2b458
[3/3] git commit: Fix poms so the 3.0.x branch will build
Fix poms so the 3.0.x branch will build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e1885f1a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e1885f1a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e1885f1a
Branch: refs/heads/3.0.x-fixes
Commit: e1885f1a25cbfb199b58da407e5c07a174401635
Parents: a7d1d62
Author: Daniel Kulp dk...@apache.org
Authored: Mon Sep 15 11:27:23 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Mon Sep 15 11:27:23 2014 -0400
--
parent/pom.xml | 20
systests/jibx/databinding-jibx/pom.xml | 2 +-
systests/jibx/jaxrs-jibx/pom.xml | 2 +-
systests/jibx/pom.xml | 2 +-
4 files changed, 23 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/e1885f1a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4fc3510..a72f3b9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -897,10 +897,30 @@
/dependency
dependency
groupIdorg.eclipse.jetty/groupId
+artifactIdjetty-webapp/artifactId
+version${cxf.jetty.version}/version
+/dependency
+dependency
+groupIdorg.eclipse.jetty/groupId
artifactIdjetty-servlet/artifactId
version${cxf.jetty.version}/version
/dependency
dependency
+groupIdorg.eclipse.jetty/groupId
+artifactIdjetty-io/artifactId
+version${cxf.jetty.version}/version
+/dependency
+dependency
+groupIdorg.eclipse.jetty/groupId
+artifactIdjetty-plus/artifactId
+version${cxf.jetty.version}/version
+/dependency
+dependency
+groupIdorg.eclipse.jetty/groupId
+artifactIdjetty-security/artifactId
+version${cxf.jetty.version}/version
+/dependency
+dependency
groupIdxalan/groupId
artifactIdxalan/artifactId
version2.7.1/version
http://git-wip-us.apache.org/repos/asf/cxf/blob/e1885f1a/systests/jibx/databinding-jibx/pom.xml
--
diff --git a/systests/jibx/databinding-jibx/pom.xml
b/systests/jibx/databinding-jibx/pom.xml
index 55a9af6..8e79030 100644
--- a/systests/jibx/databinding-jibx/pom.xml
+++ b/systests/jibx/databinding-jibx/pom.xml
@@ -21,7 +21,7 @@
parent
artifactIdcxf-systests-jibx/artifactId
groupIdorg.apache.cxf.systests/groupId
-version3.1.0-SNAPSHOT/version
+version3.0.2-SNAPSHOT/version
relativePath../pom.xml/relativePath
/parent
modelVersion4.0.0/modelVersion
http://git-wip-us.apache.org/repos/asf/cxf/blob/e1885f1a/systests/jibx/jaxrs-jibx/pom.xml
--
diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml
index 82b9f74..6e6f836 100644
--- a/systests/jibx/jaxrs-jibx/pom.xml
+++ b/systests/jibx/jaxrs-jibx/pom.xml
@@ -21,7 +21,7 @@
parent
artifactIdcxf-systests-jibx/artifactId
groupIdorg.apache.cxf.systests/groupId
-version3.1.0-SNAPSHOT/version
+version3.0.2-SNAPSHOT/version
relativePath../pom.xml/relativePath
/parent
modelVersion4.0.0/modelVersion
http://git-wip-us.apache.org/repos/asf/cxf/blob/e1885f1a/systests/jibx/pom.xml
--
diff --git a/systests/jibx/pom.xml b/systests/jibx/pom.xml
index f370f3d..23c28a8 100644
--- a/systests/jibx/pom.xml
+++ b/systests/jibx/pom.xml
@@ -21,7 +21,7 @@
parent
artifactIdcxf-parent/artifactId
groupIdorg.apache.cxf/groupId
-version3.1.0-SNAPSHOT/version
+version3.0.2-SNAPSHOT/version
relativePath../../parent/pom.xml/relativePath
/parent
modelVersion4.0.0/modelVersion
[2/3] git commit: Recording .gitmergeinfo Changes
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/a7d1d628 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a7d1d628 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a7d1d628 Branch: refs/heads/3.0.x-fixes Commit: a7d1d628624a4f48f13066d42eb99eb7dd498ce9 Parents: 1558524 Author: Daniel Kulp dk...@apache.org Authored: Fri Sep 12 14:32:39 2014 -0400 Committer: Daniel Kulp dk...@apache.org Committed: Mon Sep 15 11:17:14 2014 -0400 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/a7d1d628/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index 8751e85..de0212c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -63,6 +63,7 @@ B d54a21628143bc15f51cbe5d63fa42c09d0ab8ac B e242307ad8bbe53788f3e03e9e2f0ca977d01340 B ea778c4f38f882dc97d23bd200683fd9d48b4718 B eba07e615684e475772a7a2d23d7e93a0b099485 +B ec4435d70cb0097e34f38bc0f47c0faca03b4bb0 B ecbf4e78586870a507fe4cf91239d51c3f202aad B eee2a947d867c403c212677cf942b3d07fa06fd7 B f18acbcdfc48aca354610614c0ba3a46dcb8332a
git commit: Update to use all the various repositories for resolving extensions
Repository: cxf-xjc-utils
Updated Branches:
refs/heads/master 640012ac2 - 85252a559
Update to use all the various repositories for resolving extensions
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/85252a55
Tree: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/tree/85252a55
Diff: http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/diff/85252a55
Branch: refs/heads/master
Commit: 85252a559cdc97a7fb98cd47954de433904d26ac
Parents: 640012a
Author: Daniel Kulp dk...@apache.org
Authored: Mon Sep 15 12:28:00 2014 -0400
Committer: Daniel Kulp dk...@apache.org
Committed: Mon Sep 15 12:28:00 2014 -0400
--
.../org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-xjc-utils/blob/85252a55/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
--
diff --git
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
index 782a8bb..72397e0 100644
---
a/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
+++
b/cxf-xjc-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractXSDToJavaMojo.java
@@ -31,6 +31,7 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.execution.MavenSession;
@@ -261,7 +262,12 @@ public abstract class AbstractXSDToJavaMojo extends
AbstractMojo {
request.setMirrors(session.getRequest().getMirrors());
request.setProxies(session.getRequest().getProxies());
request.setLocalRepository(session.getLocalRepository());
-
request.setRemoteRepositories(session.getRequest().getRemoteRepositories());
+ListArtifactRepository r = new ArrayListArtifactRepository();
+r.addAll(project.getPluginArtifactRepositories());
+r.addAll(project.getRemoteArtifactRepositories());
+r.addAll(session.getRequest().getRemoteRepositories());
+r.addAll(session.getRequest().getPluginArtifactRepositories());
+request.setRemoteRepositories(r);
ArtifactResolutionResult result = repository.resolve(request);
ListFile files = new ArrayListFile();
for (Artifact a : result.getArtifacts()) {
git commit: [CXF-5954] Completing the initial PbesHmacAesWrap code
Repository: cxf
Updated Branches:
refs/heads/master 288259b27 - f563a0576
[CXF-5954] Completing the initial PbesHmacAesWrap code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f563a057
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f563a057
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f563a057
Branch: refs/heads/master
Commit: f563a0576f1b22d5f35dbacbdd388829dd702f2d
Parents: 288259b
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Sep 15 17:30:58 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Sep 15 17:30:58 2014 +0100
--
.../oauth2/jwe/AbstractJweEncryption.java | 7 +++-
.../PbesHmacAesWrapKeyEncryptionAlgorithm.java | 43 +++-
.../oauth2/jwe/WrappedKeyJweDecryption.java | 4 +-
.../jwt/AbstractJwtObjectReaderWriter.java | 2 +-
.../oauth2/jwe/JweCompactReaderWriterTest.java | 17
.../oauth2/jwe/JwePbeHmacAesWrapTest.java | 26 +++-
6 files changed, 55 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f563a057/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
index 885e29d..cd21354 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
@@ -151,13 +151,16 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
String contentEncryptionAlgoJavaName =
Algorithm.toJavaName(theHeaders.getContentEncryptionAlgorithm());
KeyProperties keyProps = new
KeyProperties(contentEncryptionAlgoJavaName);
keyProps.setCompressionSupported(compressionRequired(theHeaders));
-byte[] additionalEncryptionParam = getAAD(theHeaders);
-keyProps.setAdditionalData(additionalEncryptionParam);
byte[] theIv = contentEncryptionAlgo.getInitVector();
AlgorithmParameterSpec specParams = getAlgorithmParameterSpec(theIv);
keyProps.setAlgoSpec(specParams);
byte[] jweContentEncryptionKey =
getEncryptedContentEncryptionKey(theCek);
+
+byte[] additionalEncryptionParam = getAAD(theHeaders);
+keyProps.setAdditionalData(additionalEncryptionParam);
+
+
JweEncryptionInternal state = new JweEncryptionInternal();
state.theHeaders = theHeaders;
state.jweContentEncryptionKey = jweContentEncryptionKey;
http://git-wip-us.apache.org/repos/asf/cxf/blob/f563a057/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
index 892086e..b5ffa53 100644
---
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
@@ -81,11 +81,9 @@ public class PbesHmacAesWrapKeyEncryptionAlgorithm
implements KeyEncryptionAlgor
@Override
public byte[] getEncryptedContentEncryptionKey(JweHeaders headers, byte[]
cek) {
-int keySize = DERIVED_KEY_SIZE_MAP.get(keyAlgoJwt);
-byte[] saltInput = createSaltInputValue(keySize);
-PKCS5S2ParametersGenerator gen = new
PKCS5S2ParametersGenerator(createShaDigest());
-gen.init(password, saltInput, pbesCount);
-byte[] derivedKey = ((KeyParameter)
gen.generateDerivedParameters(keySize * 8)).getKey();
+int keySize = getKeySize(keyAlgoJwt);
+byte[] saltInput = CryptoUtils.generateSecureRandomBytes(keySize);
+byte[] derivedKey = createDerivedKey(keyAlgoJwt, keySize, password,
saltInput, pbesCount);
headers.setHeader(p2s, Base64UrlUtility.encode(saltInput));
headers.setHeader(p2c, Integer.valueOf(pbesCount));
@@ -101,46 +99,51 @@ public class
git commit: [CXF-5954] Completing the initial PbesHmacAesWrap code
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes e1885f1a2 - 103a6aef9
[CXF-5954] Completing the initial PbesHmacAesWrap code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/103a6aef
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/103a6aef
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/103a6aef
Branch: refs/heads/3.0.x-fixes
Commit: 103a6aef91a0760a4bf78e53c94f5624a0af30f4
Parents: e1885f1
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Sep 15 17:30:58 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Sep 15 17:33:13 2014 +0100
--
.../oauth2/jwe/AbstractJweEncryption.java | 7 +++-
.../PbesHmacAesWrapKeyEncryptionAlgorithm.java | 43 +++-
.../oauth2/jwe/WrappedKeyJweDecryption.java | 4 +-
.../jwt/AbstractJwtObjectReaderWriter.java | 2 +-
.../oauth2/jwe/JweCompactReaderWriterTest.java | 17
.../oauth2/jwe/JwePbeHmacAesWrapTest.java | 26 +++-
6 files changed, 55 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/103a6aef/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
index 885e29d..cd21354 100644
---
a/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
+++
b/rt/rs/security/oauth-parent/oauth2-jwt/src/main/java/org/apache/cxf/rs/security/oauth2/jwe/AbstractJweEncryption.java
@@ -151,13 +151,16 @@ public abstract class AbstractJweEncryption implements
JweEncryptionProvider {
String contentEncryptionAlgoJavaName =
Algorithm.toJavaName(theHeaders.getContentEncryptionAlgorithm());
KeyProperties keyProps = new
KeyProperties(contentEncryptionAlgoJavaName);
keyProps.setCompressionSupported(compressionRequired(theHeaders));
-byte[] additionalEncryptionParam = getAAD(theHeaders);
-keyProps.setAdditionalData(additionalEncryptionParam);
byte[] theIv = contentEncryptionAlgo.getInitVector();
AlgorithmParameterSpec specParams = getAlgorithmParameterSpec(theIv);
keyProps.setAlgoSpec(specParams);
byte[] jweContentEncryptionKey =
getEncryptedContentEncryptionKey(theCek);
+
+byte[] additionalEncryptionParam = getAAD(theHeaders);
+keyProps.setAdditionalData(additionalEncryptionParam);
+
+
JweEncryptionInternal state = new JweEncryptionInternal();
state.theHeaders = theHeaders;
state.jweContentEncryptionKey = jweContentEncryptionKey;
http://git-wip-us.apache.org/repos/asf/cxf/blob/103a6aef/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
index 892086e..b5ffa53 100644
---
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
@@ -81,11 +81,9 @@ public class PbesHmacAesWrapKeyEncryptionAlgorithm
implements KeyEncryptionAlgor
@Override
public byte[] getEncryptedContentEncryptionKey(JweHeaders headers, byte[]
cek) {
-int keySize = DERIVED_KEY_SIZE_MAP.get(keyAlgoJwt);
-byte[] saltInput = createSaltInputValue(keySize);
-PKCS5S2ParametersGenerator gen = new
PKCS5S2ParametersGenerator(createShaDigest());
-gen.init(password, saltInput, pbesCount);
-byte[] derivedKey = ((KeyParameter)
gen.generateDerivedParameters(keySize * 8)).getKey();
+int keySize = getKeySize(keyAlgoJwt);
+byte[] saltInput = CryptoUtils.generateSecureRandomBytes(keySize);
+byte[] derivedKey = createDerivedKey(keyAlgoJwt, keySize, password,
saltInput, pbesCount);
headers.setHeader(p2s, Base64UrlUtility.encode(saltInput));
headers.setHeader(p2c, Integer.valueOf(pbesCount));
@@ -101,46 +99,51 @@ public class
git commit: [CXF-6003] Trying to create the beans from discovered classes with the auto wire support, the patch from Hesam Talebi applied
Repository: cxf
Updated Branches:
refs/heads/master f563a0576 - aecc29f4d
[CXF-6003] Trying to create the beans from discovered classes with the auto
wire support, the patch from Hesam Talebi applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aecc29f4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aecc29f4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aecc29f4
Branch: refs/heads/master
Commit: aecc29f4d1bde9a50c91f3612f2c0049ed594f03
Parents: f563a05
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Sep 15 18:07:36 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Sep 15 18:07:36 2014 +0100
--
.../spring/JAXRSServerFactoryBeanDefinitionParser.java | 10 +-
.../spring/JAXRSClientFactoryBeanDefinitionParser.java | 13 +++--
2 files changed, 20 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aecc29f4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index ee68a61..40b6286 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -44,6 +44,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -208,9 +209,16 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
}
}
private ListObject createBeans(CollectionClass? classes) {
+AutowireCapableBeanFactory beanFactory =
context.getAutowireCapableBeanFactory();
final List Object providers = new ArrayList Object ();
for (final Class ? clazz: classes) {
-
providers.add(context.getAutowireCapableBeanFactory().createBean(clazz));
+Object bean = null;
+try {
+bean = beanFactory.createBean(clazz,
AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
+} catch (Exception ex) {
+bean = beanFactory.createBean(clazz);
+}
+providers.add(bean);
}
return providers;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/aecc29f4/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index 14b7678..661d621 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
@@ -40,6 +40,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.context.ApplicationContext;
@@ -130,9 +131,17 @@ public class JAXRSClientFactoryBeanDefinitionParser
extends AbstractFactoryBeanD
if (classes.get(Path.class).size() 1) {
throw new NoUniqueBeanDefinitionException(Path.class,
classes.get(Path.class).size(),
More than one service class (@Path) has been
discovered);
-} else {
+} else {
+AutowireCapableBeanFactory
git commit: [CXF-6003] Trying to create the beans from discovered classes with the auto wire support, the patch from Hesam Talebi applied
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 103a6aef9 - 0f3d4a6f0
[CXF-6003] Trying to create the beans from discovered classes with the auto
wire support, the patch from Hesam Talebi applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0f3d4a6f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0f3d4a6f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0f3d4a6f
Branch: refs/heads/3.0.x-fixes
Commit: 0f3d4a6f0b6469e89fa1a3338c40ce54c47fbc2e
Parents: 103a6ae
Author: Sergey Beryozkin sberyoz...@talend.com
Authored: Mon Sep 15 18:07:36 2014 +0100
Committer: Sergey Beryozkin sberyoz...@talend.com
Committed: Mon Sep 15 18:09:53 2014 +0100
--
.../spring/JAXRSServerFactoryBeanDefinitionParser.java | 10 +-
.../spring/JAXRSClientFactoryBeanDefinitionParser.java | 13 +++--
2 files changed, 20 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/0f3d4a6f/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
--
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
index 7adfaa5..4ab0137 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/JAXRSServerFactoryBeanDefinitionParser.java
@@ -44,6 +44,7 @@ import org.apache.cxf.jaxrs.utils.ResourceUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -209,9 +210,16 @@ public class JAXRSServerFactoryBeanDefinitionParser
extends AbstractBeanDefiniti
}
}
private ListObject createBeans(CollectionClass? classes) {
+AutowireCapableBeanFactory beanFactory =
context.getAutowireCapableBeanFactory();
final List Object providers = new ArrayList Object ();
for (final Class ? clazz: classes) {
-
providers.add(context.getAutowireCapableBeanFactory().createBean(clazz));
+Object bean = null;
+try {
+bean = beanFactory.createBean(clazz,
AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, true);
+} catch (Exception ex) {
+bean = beanFactory.createBean(clazz);
+}
+providers.add(bean);
}
return providers;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/0f3d4a6f/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
--
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
index c35f25b..6bb80f8 100644
---
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
+++
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
@@ -40,6 +40,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.NoUniqueBeanDefinitionException;
+import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.context.ApplicationContext;
@@ -131,9 +132,17 @@ public class JAXRSClientFactoryBeanDefinitionParser
extends AbstractFactoryBeanD
if (classes.get(Path.class).size() 1) {
throw new NoUniqueBeanDefinitionException(Path.class,
classes.get(Path.class).size(),
More than one service class (@Path) has been
discovered);
-} else {
+} else {
+AutowireCapableBeanFactory
svn commit: r922340 - /websites/production/cxf/content/cache/main.pageCache
Author: ningjiang Date: Tue Sep 16 02:30:00 2014 New Revision: 922340 Log: Force to export the pages Removed: websites/production/cxf/content/cache/main.pageCache
svn commit: r922341 [3/3] - in /websites/production/cxf/content: ./ 2008/10/23/ cache/
Modified: websites/production/cxf/content/security-advisories.html == --- websites/production/cxf/content/security-advisories.html (original) +++ websites/production/cxf/content/security-advisories.html Tue Sep 16 02:47:52 2014 @@ -99,7 +99,7 @@ Apache CXF -- Security Advisories td height=100% !-- Content -- div class=wiki-content -div id=ConfluenceContenth3 id=SecurityAdvisories-20142014/h3ullia shape=rect href=security-advisories.data/CVE-2014-0109.txt.asc?version=1amp;modificationDate=1398873370740amp;api=v2CVE-2014-0109/a: HTML content posted to SOAP endpoint could cause OOM errors/lilia shape=rect href=security-advisories.data/CVE-2014-0110.txt.asc?version=1amp;modificationDate=1398873378628amp;api=v2CVE-2014-0110/a: Large invalid content could cause temporary space to fill/lilia shape=rect href=security-advisories.data/CVE-2014-0034.txt.asc?version=1amp;modificationDate=1398873385252amp;api=v2CVE-2014-0034/a: The SecurityTokenService accepts certain invalid SAML Tokens as valid/lilia shape=rect href=security-advisories.data/CVE-2014-0035.txt.asc?version=1amp;modificationDate=1398873391788amp;api=v2CVE-2014-0035/a: UsernameTokens are sent in plaintext with a Symmetric EncryptBeforeSigning policy/li/ulh3 id=SecurityAdvisories-2013201 3/h3ullia shape=rect href=security-advisories.data/CVE-2013-2160.txt.asc?version=1amp;modificationDate=1372324301000amp;api=v2CVE-2013-2160/a - Denial of Service Attacks on Apache CXF/lilia shape=rect href=cve-2012-5575.htmlNote on CVE-2012-5575/a - XML Encryption backwards compatibility attack on Apache CXF./lilia shape=rect href=cve-2013-0239.htmlCVE-2013-0239/a - Authentication bypass in the case of WS-SecurityPolicy enabled plaintext UsernameTokens./li/ulh3 id=SecurityAdvisories-20122012/h3ullia shape=rect href=cve-2012-5633.htmlCVE-2012-5633/a - WSS4JInInterceptor always allows HTTP Get requests from browser./lilia shape=rect href=note-on-cve-2011-2487.htmlNote on CVE-2011-2487/a - Bleichenbacher attack against distributed symmetric key in WS-Security./lilia shape=rect href=cve-2012-3451.htmlCVE-2012-3451/a - Apache CXF is vulnerable to SOAP Action spoofing attacks on Document Literal web serv ices./lilia shape=rect href=cve-2012-2379.htmlCVE-2012-2379/a - Apache CXF does not verify that elements were signed or encrypted by a particular Supporting Token./lilia shape=rect href=cve-2012-2378.htmlCVE-2012-2378/a - Apache CXF does not pick up some child policies of WS-SecurityPolicy 1.1 SupportingToken policy assertions on the client side./lilia shape=rect href=note-on-cve-2011-1096.htmlNote on CVE-2011-1096/a - XML Encryption flaw / Character pattern encoding attack./lilia shape=rect href=cve-2012-0803.htmlCVE-2012-0803/a - Apache CXF does not validate UsernameToken policies correctly./li/ulh3 id=SecurityAdvisories-20102010/h3ullia shape=rect class=external-link href=http://svn.apache.org/repos/asf/cxf/trunk/security/CVE-2010-2076.pdf;CVE-2010-2076/a - DTD based XML attacks./li/ul/div +div id=ConfluenceContenth3 id=SecurityAdvisories-20142014/h3ullia shape=rect href=security-advisories.data/CVE-2014-0109.txt.asc?version=1amp;modificationDate=139887337amp;api=v2CVE-2014-0109/a: HTML content posted to SOAP endpoint could cause OOM errors/lilia shape=rect href=security-advisories.data/CVE-2014-0110.txt.asc?version=1amp;modificationDate=1398873378000amp;api=v2CVE-2014-0110/a: Large invalid content could cause temporary space to fill/lilia shape=rect href=security-advisories.data/CVE-2014-0034.txt.asc?version=1amp;modificationDate=1398873385000amp;api=v2CVE-2014-0034/a: The SecurityTokenService accepts certain invalid SAML Tokens as valid/lilia shape=rect href=security-advisories.data/CVE-2014-0035.txt.asc?version=1amp;modificationDate=1398873391000amp;api=v2CVE-2014-0035/a: UsernameTokens are sent in plaintext with a Symmetric EncryptBeforeSigning policy/li/ulh3 id=SecurityAdvisories-2013201 3/h3ullia shape=rect href=security-advisories.data/CVE-2013-2160.txt.asc?version=1amp;modificationDate=1372324301000amp;api=v2CVE-2013-2160/a - Denial of Service Attacks on Apache CXF/lilia shape=rect href=cve-2012-5575.htmlNote on CVE-2012-5575/a - XML Encryption backwards compatibility attack on Apache CXF./lilia shape=rect href=cve-2013-0239.htmlCVE-2013-0239/a - Authentication bypass in the case of WS-SecurityPolicy enabled plaintext UsernameTokens./li/ulh3 id=SecurityAdvisories-20122012/h3ullia shape=rect href=cve-2012-5633.htmlCVE-2012-5633/a - WSS4JInInterceptor always allows HTTP Get requests from browser./lilia shape=rect href=note-on-cve-2011-2487.htmlNote on CVE-2011-2487/a - Bleichenbacher attack against distributed symmetric key in WS-Security./lilia shape=rect href=cve-2012-3451.htmlCVE-2012-3451/a - Apache CXF is vulnerable to SOAP Action spoofing attacks on Document Literal web serv
svn commit: r922341 [1/3] - in /websites/production/cxf/content: ./ 2008/10/23/ cache/
Author: buildbot Date: Tue Sep 16 02:47:52 2014 New Revision: 922341 Log: Production update by buildbot for cxf Added: websites/production/cxf/content/2008/10/23/ websites/production/cxf/content/2008/10/23/cxf-209-and-213-are-released.html websites/production/cxf/content/cache/main.pageCache (with props) Modified: websites/production/cxf/content/apache-cxf-2010-release-notes.html websites/production/cxf/content/apache-cxf-2011-release-notes.html websites/production/cxf/content/apache-cxf-2012-release-notes.html websites/production/cxf/content/apache-cxf-209-release-notes.html websites/production/cxf/content/apache-cxf-213-release-notes.html websites/production/cxf/content/apache-cxf-214-release-notes.html websites/production/cxf/content/apache-cxf-216-release-notes.html websites/production/cxf/content/apache-cxf-217-release-notes.html websites/production/cxf/content/apache-cxf-218-release-notes.html websites/production/cxf/content/apache-cxf-219-release-notes.html websites/production/cxf/content/apache-cxf-221-release-notes.html websites/production/cxf/content/apache-cxf-2210-release-notes.html websites/production/cxf/content/apache-cxf-2211-release-notes.html websites/production/cxf/content/apache-cxf-2212-release-notes.html websites/production/cxf/content/apache-cxf-222-release-notes.html websites/production/cxf/content/apache-cxf-223-release-notes.html websites/production/cxf/content/apache-cxf-224-release-notes.html websites/production/cxf/content/apache-cxf-225-release-notes.html websites/production/cxf/content/apache-cxf-226-release-notes.html websites/production/cxf/content/apache-cxf-227-release-notes.html websites/production/cxf/content/apache-cxf-231-release-notes.html websites/production/cxf/content/apache-cxf-2310-release-notes.html websites/production/cxf/content/apache-cxf-2311-release-notes.html websites/production/cxf/content/apache-cxf-232-release-notes.html websites/production/cxf/content/apache-cxf-233-release-notes.html websites/production/cxf/content/apache-cxf-234-release-notes.html websites/production/cxf/content/apache-cxf-235-release-notes.html websites/production/cxf/content/apache-cxf-237-release-notes.html websites/production/cxf/content/apache-cxf-238-release-notes.html websites/production/cxf/content/apache-cxf-241-release-notes.html websites/production/cxf/content/custom-cxf-transport.html websites/production/cxf/content/cxf-2410-release-notes.html websites/production/cxf/content/cxf-245-release-notes.html websites/production/cxf/content/cxf-247-release-notes.html websites/production/cxf/content/cxf-248-release-notes.html websites/production/cxf/content/cxf-249-release-notes.html websites/production/cxf/content/cxf-251-release-notes.html websites/production/cxf/content/cxf-2510-release-notes.html websites/production/cxf/content/cxf-2511-release-notes.html websites/production/cxf/content/cxf-252-release-notes.html websites/production/cxf/content/cxf-254-release-notes.html websites/production/cxf/content/cxf-255-release-notes.html websites/production/cxf/content/cxf-256-release-notes.html websites/production/cxf/content/cxf-257-release-notes.html websites/production/cxf/content/cxf-258-release-notes.html websites/production/cxf/content/cxf-259-release-notes.html websites/production/cxf/content/cxf-261-release-notes.html websites/production/cxf/content/cxf-2610-release-notes.html websites/production/cxf/content/cxf-2611-release-notes.html websites/production/cxf/content/cxf-262-release-notes.html websites/production/cxf/content/cxf-264-release-notes.html websites/production/cxf/content/cxf-265-release-notes.html websites/production/cxf/content/cxf-266-release-notes.html websites/production/cxf/content/cxf-267-release-notes.html websites/production/cxf/content/cxf-268-release-notes.html websites/production/cxf/content/cxf-269-release-notes.html websites/production/cxf/content/cxf-271-release-notes.html websites/production/cxf/content/cxf-272-release-notes.html websites/production/cxf/content/cxf-274-release-notes.html websites/production/cxf/content/cxf-275-release-notes.html websites/production/cxf/content/cxf-276-release-notes.html websites/production/cxf/content/cxf-277-release-notes.html websites/production/cxf/content/distributed-osgi-reference.html websites/production/cxf/content/dosgi-architecture.html websites/production/cxf/content/download.html websites/production/cxf/content/faq.html websites/production/cxf/content/scalable-cxf-applications-using-jms-transport.html websites/production/cxf/content/security-advisories.html websites/production/cxf/content/using-ws-policy-in-cxf-projects.html Added: websites/production/cxf/content/2008/10/23/cxf-209-and-213-are-released.html
svn commit: r922341 [2/3] - in /websites/production/cxf/content: ./ 2008/10/23/ cache/
Modified: websites/production/cxf/content/cxf-259-release-notes.html == --- websites/production/cxf/content/cxf-259-release-notes.html (original) +++ websites/production/cxf/content/cxf-259-release-notes.html Tue Sep 16 02:47:52 2014 @@ -500,10 +500,10 @@ cxf dev list, d...@cxf.apache.org. You c a shape=rect href=https://issues.apache.org/jira/browse/CXF-4753;stax outTransform cannot deep-drop an element that has some attributes/a /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap img src=https://issues.apache.org/jira/images/icons/priorities/major.png; alt=Major border=0 @@ -533,7 +533,7 @@ cxf dev list, d...@cxf.apache.org. You c a shape=rect href=https://issues.apache.org/jira/browse/CXF-4752;TransformOutInterceptor does not transform SoapFaults/a /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap Oliver Moser Modified: websites/production/cxf/content/cxf-261-release-notes.html == --- websites/production/cxf/content/cxf-261-release-notes.html (original) +++ websites/production/cxf/content/cxf-261-release-notes.html Tue Sep 16 02:47:52 2014 @@ -533,10 +533,10 @@ cxf dev list, d...@cxf.apache.org. You c a shape=rect href=https://issues.apache.org/jira/browse/CXF-4336;org.apache.cxf.bus.blueprint.ConfigurerImpl may get IllegalStateException: Execution container has not been set/a /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap img src=https://issues.apache.org/jira/images/icons/priorities/minor.png; alt=Minor border=0 Modified: websites/production/cxf/content/cxf-2610-release-notes.html == --- websites/production/cxf/content/cxf-2610-release-notes.html (original) +++ websites/production/cxf/content/cxf-2610-release-notes.html Tue Sep 16 02:47:52 2014 @@ -211,10 +211,10 @@ cxf dev list, d...@cxf.apache.org. You c a shape=rect href=https://issues.apache.org/jira/browse/CXF-5280;wsdl2java may fail to extract the wsma:Action attribute value/a /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida /tdtd colspan=1 nowrap - Aki Yoshida + Akitoshi Yoshida
svn commit: r922345 - in /websites/production/cxf/content: cache/docs.pageCache docs/soap-over-jms-10-support.html
Author: buildbot Date: Tue Sep 16 03:47:39 2014 New Revision: 922345 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/soap-over-jms-10-support.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/soap-over-jms-10-support.html == --- websites/production/cxf/content/docs/soap-over-jms-10-support.html (original) +++ websites/production/cxf/content/docs/soap-over-jms-10-support.html Tue Sep 16 03:47:39 2014 @@ -149,13 +149,8 @@ jms:queue:ExampleQueueName?timeToLive=10 lt;/wsdl11:portgt; lt;/wsdl11:servicegt; ]]/script -/div/divpIf a property is specified at multiple levels, the setting at the most granular level takes precedence (port first, then service, then binding). In the above example, notice the timeToLive property #8212; for the quickPort port, the value will be 10ms (specified at the port level). For the slowPort port, the value will be 100ms (specified at the service level). In this example, the setting in the binding will always be overridden./ph2 id=SOAPoverJMS1.0support-WSDLUsageWSDL Usage/h2pFor this example:/pdiv class=code panel pdl style=border-width: 1px; - div class=codeHeader panelHeader pdl hide-border-bottom style=border-bottom-width: 1px; - b class=code-titleGreeter Service with JMS transaport/b - span class=collapse-source expand-controlspan class=expand-control-icon icon#160;/spanspan class=expand-control-textExpand source/span/span - /div - div class=codeContent panelContent pdl hide-toolbar - script class=theme: Default; brush: xml; collapse: true; gutter: false type=syntaxhighlighter![CDATA[lt;wsdl:definitions name=quot;JMSGreeterServicequot; xmlns:soap=quot;http://schemas.xmlsoap.org/wsdl/soap/quot; xmlns:tns=quot;http://cxf.apache.org/jms_greeterquot; xmlns:xsd=quot;http://www.w3.org/2001/XMLSchemaquot; xmlns:wsdl=quot;http://schemas.xmlsoap.org/wsdl/quot; xmlns:x1=quot;http://cxf.apache.org/jms_greeter/typesquot; xmlns:soapjms=quot;http://www.w3.org/2010/soapjms/quot; name=quot;JMSGreeterServicequot; targetNamespace=quot;http://cxf.apache.org/jms_greeterquot;gt; +/div/divpIf a property is specified at multiple levels, the setting at the most granular level takes precedence (port first, then service, then binding). In the above example, notice the timeToLive property #8212; for the quickPort port, the value will be 10ms (specified at the port level). For the slowPort port, the value will be 100ms (specified at the service level). In this example, the setting in the binding will always be overridden./ph2 id=SOAPoverJMS1.0support-WSDLUsageWSDL Usage/h2pFor this example:/pdiv class=code panel pdl style=border-width: 1px;div class=codeHeader panelHeader pdl style=border-bottom-width: 1px;bGreeter Service with JMS transaport/b/divdiv class=codeContent panelContent pdl +script class=theme: Default; brush: xml; gutter: false type=syntaxhighlighter![CDATA[lt;wsdl:definitions name=quot;JMSGreeterServicequot; xmlns:soap=quot;http://schemas.xmlsoap.org/wsdl/soap/quot; xmlns:tns=quot;http://cxf.apache.org/jms_greeterquot; xmlns:xsd=quot;http://www.w3.org/2001/XMLSchemaquot; xmlns:wsdl=quot;http://schemas.xmlsoap.org/wsdl/quot; xmlns:x1=quot;http://cxf.apache.org/jms_greeter/typesquot; xmlns:soapjms=quot;http://www.w3.org/2010/soapjms/quot; name=quot;JMSGreeterServicequot; targetNamespace=quot;http://cxf.apache.org/jms_greeterquot;gt; ... lt;wsdl:binding name=quot;JMSGreeterPortBindingquot; type=quot;tns:JMSGreeterPortTypequot;gt; lt;soap:binding style=quot;documentquot; transport=quot;http://www.w3.org/2010/soapjms/quot; /gt; @@ -184,10 +179,8 @@ jms:queue:ExampleQueueName?timeToLive=10 lt;/wsdl:portgt; lt;/wsdl:servicegt; lt;/wsdl:definitionsgt; -]] - /script - /div -/divulliThe transport URI (a shape=rect class=external-link href=http://www.w3.org/2010/soapjms/; rel=nofollowhttp://www.w3.org/2010/soapjms//a) is defined in the lt;soap:bindinggt;./liliThe jms: URI is defined in the lt;soap:addressgt;/liliThe extension properties are in the lt;soap:bindinggt;/li/ulh2 id=SOAPoverJMS1.0support-DefineserviceendpointorproxyinspringorblueprintDefine service endpoint or proxy in spring or blueprint/h2pThe JAXWS endpoint or proxy can be defined like in the SOAP/HTTP case. Just use a jms: uri like described above./ppIn CXF 3 it is possible to omit the jndi settings. Just specify an endpoint like this:/pdiv class=code panel pdl style=border-width: 1px;div class=codeHeader panelHeader pdl style=border-bottom-width: 1px;bEndpoint in spring/b/divdiv class=codeContent panelContent pdl +]]/script +/div/divulliThe transport URI (a
svn commit: r922350 - in /websites/production/cxf/content: cache/docs.pageCache docs/soap-over-jms-10-support.html
Author: buildbot Date: Tue Sep 16 05:46:51 2014 New Revision: 922350 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/soap-over-jms-10-support.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/soap-over-jms-10-support.html == --- websites/production/cxf/content/docs/soap-over-jms-10-support.html (original) +++ websites/production/cxf/content/docs/soap-over-jms-10-support.html Tue Sep 16 05:46:51 2014 @@ -124,7 +124,7 @@ Apache CXF -- SOAP over JMS 1.0 support script class=theme: Default; brush: java; gutter: false type=syntaxhighlighter![CDATA[jms:jndi:SomeJndiNameForDestination?jndiInitialContextFactory=org.apache.activemq.jndi.ActiveMQInitialContextFactoryamp;jndiURL=tcp://localhost:61616amp;priority=3 jms:queue:ExampleQueueName?timeToLive=1000 ]]/script -/div/divh3 id=SOAPoverJMS1.0support-JMSparametersJMS parameters/h3div class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpQuery Parameter/p/thth colspan=1 rowspan=1 class=confluenceThFrom br clear=noneVersion/thth colspan=1 rowspan=1 class=confluenceThpDefaultValue/p/thth colspan=1 rowspan=1 class=confluenceThpDescription/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdconduitIdSelectorPrefix/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.0/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdIf set then this string will be the prefix for all correlation ids the conduit creates and also be used in the selector for listening to replies/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpdeliveryMode/p/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd co lspan=1 rowspan=1 class=confluenceTdpPERSISTENT/p/tdtd colspan=1 rowspan=1 class=confluenceTdpNON_PERSISTENT messages will kept only in memory br clear=none PERSISTENT messages will be saved to disk/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTddurableSubscriptionClientId/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.1/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdOptional Client identifier for the connection. The purpose is to associate a connection with a state maintained on behalf of the client by a provider. The only such state identified by the JMS API is that required to support durable subscriptions./td/trtrtd colspan=1 rowspan=1 class=confluenceTddurableSubscriptionName/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.0/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTd #160;/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpjndiConnectionFactoryName/p/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdpConnectionFactory/p/tdtd colspan=1 rowspan=1 class=confluenceTdpSpecifies the JNDI name bound to the JMS connection factory to use when connecting to the JMS destination./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpjndiInitialContextFactory/p/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1 class=confluenceTdpSpecifies the fully qualified Java class name of the InitialContextFactory implementation class to use./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdjndiTransactionManagerName/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.0/tdtd colspan=1 rowspan=1 class=confluenceTd #160;/tdtd colspan=1 rowspan=1 class=confluenceTdpName of the JTA TransactionManager. Will be searched in spring, blueprint and jndi.br clear=none If a transaction manager is found then JTA transactions will be enabled. See details below./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpjndiURL/p/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdp#160;/p/tdtd colspan=1 rowspan=1 class=confluenceTdpSpecifies the JNDI provider URL/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdjndi-*/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdAdditional parameters for a JNDI provider/td/trtrtd colspan=1 rowspan=1 class=confluenceTdmessageType/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.0/tdtd colspan=1 rows pan=1 class=confluenceTdbyte/tdtd colspan=1 rowspan=1 class=confluenceTdJMS message type used by CXF (byte, text or binary)/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpassword/tdtd colspan=1 rowspan=1 class=confluenceTd3.0.0/tdtd colspan=1 rowspan=1 class=confluenceTd#160;/tdtd colspan=1 rowspan=1 class=confluenceTdPassword for creating the connection. Using
