svn commit: r984850 - in /websites/production/cxf/content: cache/main.pageCache cxf-2718-release-notes.html
Author: buildbot Date: Tue Apr 5 21:47:19 2016 New Revision: 984850 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/main.pageCache websites/production/cxf/content/cxf-2718-release-notes.html Modified: websites/production/cxf/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/cxf-2718-release-notes.html == --- websites/production/cxf/content/cxf-2718-release-notes.html (original) +++ websites/production/cxf/content/cxf-2718-release-notes.html Tue Apr 5 21:47:19 2016 @@ -99,7 +99,7 @@ Apache CXF -- CXF 2.7.18 Release Notes -CXF 2.7.18 Release NotesOverviewApache CXF 2.7.18 delivers the latest set of patches and bug fixes for Apache CXF 2.7.x. This release fixes over 20 JIRA issues that have been reported by users.This is the last planned release on the 2.7.x branch. Users are strongly encouraged to migrate to a newer version of CXF.DownloadDescriptionFileMD5Source distributionhttp://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz";>apache-cxf-2.7.18-src.tar.gzhttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz.md5";>apache-cxf-2.7.18-src.tar.gz.md5 http://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18-src.zip";>apache-cxf-2.7.18-src.ziphttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.zip.md5";>a pache-cxf-2.7.18-src.zip.md5Binary distributionhttp://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18.tar.gz";>apache-cxf-2.7.18.tar.gzhttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.tar.gz.md5";>apache-cxf-2.7.18.tar.gz.md5 http://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18.zip";>apache-cxf-2.7.18.ziphttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.zip.md5";>apach e-cxf-2.7.18.zip.md5Installation PrerequisitesBefore installing Apache CXF, make sure the following products, with the specified versions, are installed on your system:Java 6 Development KitMaven 2.2.1 or laterJava 6 Development KitYou must install the J2SE Development Kit (JDK) 6.0, which can be downloaded from:http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase6-419409.html"; rel="nofollow">http://www.oracle.com/technetwork/java/javasebusiness/downloads/java-archive-downloads-javase6-419409.htmlAfter installing the JDK, set or modify the following environment variables:JAVA_HOME – set this environment variable to point a t the root directory of the JDK 6.0 installation.PATH – make sure that your PATH includes: %JAVA_HOME%\bin (Windows) $JAVA_HOME/bin (UNIX)Building the SamplesBuilding the samples included in the binary distribution is easy. Change to the samples directory and follow the build instructions in the README.txt file included with each sample.Reporting ProblemsIf you have any problems or want to send feedback of any kind, please e-mail the cxf dev list, d...@cxf.apache.org. You can also file issues in JIRA at:http://issues.apache.org/jira/browse/CXF";>http://issues.apache.org/jira/browse/CXFChangelogFor a more detailed view of new features and bug f ixes, see the https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12332275&styleName=Text&projectId=12333121";>release notes. +OverviewApache CXF 2.7.18 delivers the latest set of patches and bug fixes for Apache CXF 2.7.x. This release fixes over 20 JIRA issues that have been reported by users.This is the last planned release on the 2.7.x branch. Users are strongly encouraged to migrate to a newer version of CXF.DownloadDescriptionFileMD5Sour ce distributionhttp://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz";>apache-cxf-2.7.18-src.tar.gzhttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.tar.gz.md5";>apache-cxf-2.7.18-src.tar.gz.md5 http://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18-src.zip";>apache-cxf-2.7.18-src.ziphttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18-src.zip.md5";>apache-cxf-2.7.18-src.zip.md5Binary distributionhttp://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18.tar.gz";>apache-cxf-2.7.18.tar.gzhttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.tar.gz.md5";>apache-cxf-2.7.18.tar.gz.md5 http://www.apache.org/dyn/closer.cgi?path=/cxf/2.7.18/apache-cxf-2.7.18.zip";>apache-cxf-2.7.18.ziphttp://www.apache.org/dist/cxf/2.7.18/apache-cxf-2.7.18.zip.md5";>apache-cxf-2.7.18.zip.md5Installation PrerequisitesBefore installing Apache CXF, make sure the following products, with the specified versions, are installed on your system:Java 6 Development KitMaven 2.2.1 or laterJava 6 Development KitYou must install the J2SE Development Kit (JDK) 6.0, which can be downloaded from:http://www.oracl
cxf git commit: replace the old method usage with the new one
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes d7bdfe5f1 -> b4870788d
replace the old method usage with the new one
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4870788
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4870788
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4870788
Branch: refs/heads/3.0.x-fixes
Commit: b4870788d04c2da796fac61f119d5f14298a508d
Parents: d7bdfe5
Author: Akitoshi Yoshida
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 23:16:51 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b4870788/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 867faae..5a188f4 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -160,12 +159,7 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
AsyncIOWriter writer = res.getAsyncIOWriter();
if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters =
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
}
}
cxf git commit: replace the old method usage with the new one
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 1b30b3c83 -> 3fac6a1dd
replace the old method usage with the new one
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3fac6a1d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3fac6a1d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3fac6a1d
Branch: refs/heads/3.1.x-fixes
Commit: 3fac6a1dd724f3524eda742a01f8d1ffbcc55d0f
Parents: 1b30b3c
Author: Akitoshi Yoshida
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 23:13:22 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3fac6a1d/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 54d8645..41e3ccb 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -244,12 +243,7 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
AsyncIOWriter writer = res.getAsyncIOWriter();
if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters =
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
}
}
cxf git commit: replace the old method usage with the new one
Repository: cxf
Updated Branches:
refs/heads/master 1cb545acd -> 435a0c7da
replace the old method usage with the new one
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/435a0c7d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/435a0c7d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/435a0c7d
Branch: refs/heads/master
Commit: 435a0c7dad8c4e8c15a6bf39f469cce2047fa365
Parents: 1cb545a
Author: Akitoshi Yoshida
Authored: Tue Apr 5 23:12:51 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 23:12:51 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/435a0c7d/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index e019cf9..02e0863 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -22,7 +22,6 @@ package org.apache.cxf.transport.websocket.atmosphere;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.Deque;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -246,12 +245,7 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
AsyncIOWriter writer = res.getAsyncIOWriter();
if (writer instanceof AtmosphereInterceptorWriter) {
-//REVIST need a better way to add a custom filter at the first
entry and not at the last as
-// e.g. interceptor(AsyncIOInterceptor interceptor, int position)
-Deque filters =
AtmosphereInterceptorWriter.class.cast(writer).filters();
-if (!filters.contains(interceptor)) {
-filters.addFirst(interceptor);
-}
+
AtmosphereInterceptorWriter.class.cast(writer).interceptor(interceptor, 0);
}
}
cxf git commit: intercept SSE's close for CXF-5855
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes ab1e3ebf0 -> 1b30b3c83
intercept SSE's close for CXF-5855
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1b30b3c8
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1b30b3c8
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1b30b3c8
Branch: refs/heads/3.1.x-fixes
Commit: 1b30b3c83db2ae9a236d4c91285bae161fcc6f4f
Parents: ab1e3eb
Author: Akitoshi Yoshida
Authored: Tue Apr 5 18:26:00 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 19:41:15 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1b30b3c8/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index 2631d51..54d8645 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -142,6 +142,10 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
suspendedResponse.flushBuffer();
return this;
}
+
+@Override
+public void close(AtmosphereResponse response) throws
IOException {
+}
});
// REVISIT we need to keep this response's asyncwriter alive so
that data can be written to the
// suspended response, but investigate if there is a better
alternative.
@@ -158,10 +162,6 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
suspendedResponses.put(srid,
event.getResource().getResponse());
AsyncIOWriter writer =
event.getResource().getResponse().getAsyncIOWriter();
-if (writer == null) {
-writer = new AtmosphereInterceptorWriter();
-r.getResponse().asyncIOWriter(writer);
-}
if (writer instanceof AtmosphereInterceptorWriter) {
((AtmosphereInterceptorWriter)writer).interceptor(interceptor);
}
svn commit: r984830 - in /websites/production/cxf/content: cache/docs.pageCache docs/ws-securitypolicy.html
Author: buildbot Date: Tue Apr 5 16:47:29 2016 New Revision: 984830 Log: Production update by buildbot for cxf Modified: websites/production/cxf/content/cache/docs.pageCache websites/production/cxf/content/docs/ws-securitypolicy.html Modified: websites/production/cxf/content/cache/docs.pageCache == Binary files - no diff available. Modified: websites/production/cxf/content/docs/ws-securitypolicy.html == --- websites/production/cxf/content/docs/ws-securitypolicy.html (original) +++ websites/production/cxf/content/docs/ws-securitypolicy.html Tue Apr 5 16:47:29 2016 @@ -117,7 +117,7 @@ Apache CXF -- WS-SecurityPolicy -WS-SecurityPolicyCXF 2.2 introduced support for using http://docs.oasis-open.org/ws-sx/ws-securitypolicy/v1.3/ws-securitypolicy.html"; rel="nofollow">WS-SecurityPolicy to configure WSS4J instead of the custom configuration documented on the WS-Security page. However, all of the "background" material on the WS-Security page still applies and is important to know. WS-SecurityPolicy just provides an easier and more standards based way to configure and control the security requirements. With the security requirements documented in the WSDL as WS-Policy fragments, other tools such as .NET can easily know how to configure themselves to inter-operate with CXF services.CXF supports WS-SecurityPolicy versions 1.1 and later. It does not support WS-SecurityPolicy 1.0.Backwards compatibility configuration noteFrom Apache CXF 3.1.0, some of the WS-Security based configuration tags have been changed to just start with "security-". This is so that they can be shared with the JAX-RS XML Security component. Apart from the prefix change, the tags are exactly the same. Older "ws-security-" values continue to be accepted in CXF 3.1.0. See the Security Configuration page for information on the new shared configuration tags.Enabling WS-SecurityPolicyIn CXF 2.2, if the cxf-rt-ws-policy and cxf-rt-ws-security modules are available on the classpath, the WS-SecurityPolicy stuff is automatically enabled. Since the entire security runtime is policy driven, the only requirement is t hat the policy engine and security policies be available.If you are using the full "bundle" jar, all the security and policy stuff is already included.Policy descriptionWith WS-SecurityPolicy, the binding and/or operation in the wsdl references a WS-Policy fragment that describes the basic security requirements for interacting with that service. The http://docs.oasis-open.org/ws-sx/ws-securitypolicy/v1.3/ws-securitypolicy.html"; rel="nofollow">WS-SecurityPolicy specification allows for specifying things like asymmetric/symmetric keys, using transports (https) for encryption, which parts/headers to encrypt or sign, whether to sign then encrypt or encrypt then sign, whether to include timestamps, whether to use derived keys, etc... Basically, it describes what actions are necessary to securely interact with the service described in th e WSDL.However, the WS-SecurityPolicy fragment does not include "everything" that is required for a runtime to be able to able to create the messages. It does not describe things such as locations of key stores, user names and passwords, etc... Those need to be configured in at runtime to augment the WS-SecurityPolicy fragment.Configuring the extra propertiesThere are several extra properties that may need to be set to provide the additional bits of information to the runtime. Note that you should check that a particular property is supported in the version of CXF you are using. First, see the Security Configuration page for information on the configuration tags that are shared with the JAX-RS XML Security component. Here are configuration tags that only apply to the WS-SecurityPolicy layer, and hence all start with "ws-security" (as opposed to the commo n tags which now start with "security-"). Boolean WS-Security configuration tags, e.g. the value should be "true" or "false".constantdefaultdefinitionws-security.validate.tokentrueWhether to validate the password of a received UsernameToken or not.ws-security.username-token.always.encryptedtr ueWhether to always encrypt UsernameTokens that are defined as a SupportingToken. This should not be set to false in a production environment, as it exposes the password (or the digest of the password) on the wire.ws-security.is-bsp-complianttrueWhether to ensure compliance with the Basic Security Profile (BSP) 1.1 or not.ws-security.self-sign-saml-assertionfalseWhether to self-sign a SAML Assertion or not. If this is set to true, then an enveloped signature will be generated when the SAML Assertion is constructed. Only applies up to CXF 2.7.x.ws-security.enable.nonce.cache(varies)Whether to cache UsernameToken nonces. Se
cxf git commit: intercept SSE's close for CXF-5855
Repository: cxf
Updated Branches:
refs/heads/master 698a3ca50 -> 1cb545acd
intercept SSE's close for CXF-5855
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1cb545ac
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1cb545ac
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1cb545ac
Branch: refs/heads/master
Commit: 1cb545acdaf0257cad6aff1445ba3ba41ce27673
Parents: 698a3ca
Author: Akitoshi Yoshida
Authored: Tue Apr 5 18:26:00 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 18:26:34 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptor.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/1cb545ac/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
--
diff --git
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
index b687d57..e019cf9 100644
---
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
+++
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptor.java
@@ -144,6 +144,10 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
suspendedResponse.flushBuffer();
return this;
}
+
+@Override
+public void close(AtmosphereResponse response) throws
IOException {
+}
});
// REVISIT we need to keep this response's asyncwriter alive so
that data can be written to the
// suspended response, but investigate if there is a better
alternative.
@@ -160,10 +164,6 @@ public class DefaultProtocolInterceptor extends
AtmosphereInterceptorAdapter {
suspendedResponses.put(srid,
event.getResource().getResponse());
AsyncIOWriter writer =
event.getResource().getResponse().getAsyncIOWriter();
-if (writer == null) {
-writer = new AtmosphereInterceptorWriter();
-r.getResponse().asyncIOWriter(writer);
-}
if (writer instanceof AtmosphereInterceptorWriter) {
((AtmosphereInterceptorWriter)writer).interceptor(interceptor);
}
cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 4ecaacfc9 -> d7bdfe5f1 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/d7bdfe5f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d7bdfe5f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d7bdfe5f Branch: refs/heads/3.0.x-fixes Commit: d7bdfe5f164b04468bd6b165afa0395cff49 Parents: 4ecaacf Author: Colm O hEigeartaigh Authored: Tue Apr 5 17:17:24 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 5 17:17:24 2016 +0100 -- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/d7bdfe5f/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index b74c67c..95e999e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -584,6 +584,7 @@ B aa5ef9fc7ed198021a246f99429d00863f336948 B aac1196c9e2ad02b596e24cc6f18cdb7ec30a21d B aafbcde58a0ef31e76bdb99592ef685456a7 B ab05845f33e5744f9ed9c2b3569a1001c269f923 +B ab1e3ebf03c142df876be561e6720e788b7c6dac B ab20d353990b20e72500d00e128c0a72d5dcf329 B ab3817f5068d88c60dc15ce52504435f9b715c1b B ab4eaac0be87291b7f053d144dc8fbf9d98634c3
cxf git commit: Add support to disable inclusive prefixes with WS-SecurityPolicy
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes a0bb3cc1b -> ab1e3ebf0
Add support to disable inclusive prefixes with WS-SecurityPolicy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ab1e3ebf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ab1e3ebf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ab1e3ebf
Branch: refs/heads/3.1.x-fixes
Commit: ab1e3ebf03c142df876be561e6720e788b7c6dac
Parents: a0bb3cc
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 17:11:37 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 17:12:25 2016 +0100
--
.../cxf/ws/security/SecurityConstants.java | 6
.../policyhandlers/AbstractBindingBuilder.java | 7 +
.../AbstractStaxBindingHandler.java | 5
.../AsymmetricBindingHandler.java | 7 +
.../policyhandlers/SymmetricBindingHandler.java | 15 ++
.../cxf/systest/ws/x509/X509TokenTest.java | 29
6 files changed, 69 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab1e3ebf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index f431a14..e13dff3 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -139,6 +139,12 @@ public final class SecurityConstants extends
org.apache.cxf.rt.security.Security
* hence set this configuration option to "false" in this case.
*/
public static final String USE_STR_TRANSFORM =
"ws-security.use.str.transform";
+
+/**
+ * Whether to add an InclusiveNamespaces PrefixList as a
CanonicalizationMethod child when generating
+ * Signatures using WSConstants.C14N_EXCL_OMIT_COMMENTS. Default is "true".
+ */
+public static final String ADD_INCLUSIVE_PREFIXES =
"ws-security.add.inclusive.prefixes";
//
// Non-boolean WS-Security Configuration parameters
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab1e3ebf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 4d2f2c5..27254df 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1808,6 +1808,13 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
AlgorithmSuiteType algType =
binding.getAlgorithmSuite().getAlgorithmSuiteType();
sig.setDigestAlgo(algType.getDigest());
sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue());
+
+boolean includePrefixes =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.ADD_INCLUSIVE_PREFIXES, true
+);
+sig.setAddInclusivePrefixes(includePrefixes);
+
try {
sig.prepare(saaj.getSOAPPart(), crypto, secHeader);
} catch (WSSecurityException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/ab1e3ebf/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
index 70d377f..4b71628 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
@@ -548,6 +548,11 @@ public abstract class AbstractStaxBindingHandler extends
AbstractCommonBindingHa
properties.setSignatureDigestAlgorithm(algType.getDigest());
//
sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue());
+boolean includePrefixes =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.ADD_INCLUSIVE_PREFIX
cxf git commit: Add support to disable inclusive prefixes with WS-SecurityPolicy
Repository: cxf
Updated Branches:
refs/heads/master e9fa213b9 -> 698a3ca50
Add support to disable inclusive prefixes with WS-SecurityPolicy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/698a3ca5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/698a3ca5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/698a3ca5
Branch: refs/heads/master
Commit: 698a3ca50a686eb72521f2ae5f8fe919b03be37e
Parents: e9fa213
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 17:11:37 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 17:12:07 2016 +0100
--
.../cxf/ws/security/SecurityConstants.java | 6
.../policyhandlers/AbstractBindingBuilder.java | 7 +
.../AbstractStaxBindingHandler.java | 5
.../AsymmetricBindingHandler.java | 7 +
.../policyhandlers/SymmetricBindingHandler.java | 15 ++
.../cxf/systest/ws/x509/X509TokenTest.java | 29
6 files changed, 69 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/698a3ca5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index f431a14..e13dff3 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -139,6 +139,12 @@ public final class SecurityConstants extends
org.apache.cxf.rt.security.Security
* hence set this configuration option to "false" in this case.
*/
public static final String USE_STR_TRANSFORM =
"ws-security.use.str.transform";
+
+/**
+ * Whether to add an InclusiveNamespaces PrefixList as a
CanonicalizationMethod child when generating
+ * Signatures using WSConstants.C14N_EXCL_OMIT_COMMENTS. Default is "true".
+ */
+public static final String ADD_INCLUSIVE_PREFIXES =
"ws-security.add.inclusive.prefixes";
//
// Non-boolean WS-Security Configuration parameters
http://git-wip-us.apache.org/repos/asf/cxf/blob/698a3ca5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
index 4d2f2c5..27254df 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
@@ -1808,6 +1808,13 @@ public abstract class AbstractBindingBuilder extends
AbstractCommonBindingHandle
AlgorithmSuiteType algType =
binding.getAlgorithmSuite().getAlgorithmSuiteType();
sig.setDigestAlgo(algType.getDigest());
sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue());
+
+boolean includePrefixes =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.ADD_INCLUSIVE_PREFIXES, true
+);
+sig.setAddInclusivePrefixes(includePrefixes);
+
try {
sig.prepare(saaj.getSOAPPart(), crypto, secHeader);
} catch (WSSecurityException e) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/698a3ca5/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
index 70d377f..4b71628 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractStaxBindingHandler.java
@@ -548,6 +548,11 @@ public abstract class AbstractStaxBindingHandler extends
AbstractCommonBindingHa
properties.setSignatureDigestAlgorithm(algType.getDigest());
//
sig.setSigCanonicalization(binding.getAlgorithmSuite().getC14n().getValue());
+boolean includePrefixes =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.ADD_INCLUSIVE_PREFIXES, true
+
cxf git commit: Experimenting with saving the access tokens
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 3678640f1 -> a0bb3cc1b
Experimenting with saving the access tokens
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a0bb3cc1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a0bb3cc1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a0bb3cc1
Branch: refs/heads/3.1.x-fixes
Commit: a0bb3cc1ba2303ea13ba52da28c9edde22408398
Parents: 3678640
Author: Sergey Beryozkin
Authored: Tue Apr 5 16:50:56 2016 +0100
Committer: Sergey Beryozkin
Committed: Tue Apr 5 16:53:00 2016 +0100
--
.../rs/security/oauth2/common/AccessToken.java | 9 +++
.../oauth2/common/ServerAccessToken.java| 13 +-
.../oauth2/provider/JPAOAuthDataProvider.java | 27 ++--
.../oauth2/tokens/bearer/BearerAccessToken.java | 3 +++
.../grants/code/JPACodeDataProviderTest.java| 26 +++
.../src/test/resources/META-INF/persistence.xml | 4 +++
6 files changed, 79 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a0bb3cc1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
index dd0415f..ade93b4 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
@@ -22,9 +22,15 @@ import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.persistence.ElementCollection;
+import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.MappedSuperclass;
+
/**
* Base Access Token representation
*/
+@MappedSuperclass
public abstract class AccessToken implements Serializable {
private static final long serialVersionUID = -5750544301887053480L;
@@ -80,6 +86,7 @@ public abstract class AccessToken implements Serializable {
* Returns the token key
* @return the key
*/
+@Id
public String getTokenKey() {
return tokenKey;
}
@@ -110,6 +117,8 @@ public abstract class AccessToken implements Serializable {
* Gets token parameters
* @return
*/
+@ElementCollection
+@MapKeyColumn(name = "propName")
public Map getParameters() {
return parameters;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a0bb3cc1/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
index 1f13877..ac2ae7b 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
@@ -23,6 +23,11 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.persistence.ElementCollection;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
@@ -30,6 +35,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
/**
* Server Access Token representation
*/
+@MappedSuperclass
public abstract class ServerAccessToken extends AccessToken {
private static final long serialVersionUID = 638776204861456064L;
@@ -86,6 +92,7 @@ public abstract class ServerAccessToken extends AccessToken {
* Returns the Client associated with this token
* @return the client
*/
+@OneToOne
public Client getClient() {
return client;
}
@@ -98,6 +105,7 @@ public abstract class ServerAccessToken extends AccessToken {
* Returns a list of opaque permissions/scopes
* @return the scopes
*/
+@ElementCollection
public List getScopes() {
return scopes;
}
@@ -126,6 +134,7 @@ public abstract class ServerAccessToken extends AccessToken
{
* when authorizing a g
[1/2] cxf git commit: Experimenting with saving the access tokens
Repository: cxf
Updated Branches:
refs/heads/master b2e5fb658 -> e9fa213b9
Experimenting with saving the access tokens
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b66bb192
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b66bb192
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b66bb192
Branch: refs/heads/master
Commit: b66bb192efca493f376f09c99f0d8630bf1c
Parents: 0b9cb3d
Author: Sergey Beryozkin
Authored: Tue Apr 5 16:50:56 2016 +0100
Committer: Sergey Beryozkin
Committed: Tue Apr 5 16:50:56 2016 +0100
--
.../rs/security/oauth2/common/AccessToken.java | 9 +++
.../oauth2/common/ServerAccessToken.java| 13 +-
.../oauth2/provider/JPAOAuthDataProvider.java | 27 ++--
.../oauth2/tokens/bearer/BearerAccessToken.java | 3 +++
.../grants/code/JPACodeDataProviderTest.java| 26 +++
.../src/test/resources/META-INF/persistence.xml | 4 +++
6 files changed, 79 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b66bb192/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
index dd0415f..ade93b4 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/AccessToken.java
@@ -22,9 +22,15 @@ import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.Map;
+import javax.persistence.ElementCollection;
+import javax.persistence.Id;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.MappedSuperclass;
+
/**
* Base Access Token representation
*/
+@MappedSuperclass
public abstract class AccessToken implements Serializable {
private static final long serialVersionUID = -5750544301887053480L;
@@ -80,6 +86,7 @@ public abstract class AccessToken implements Serializable {
* Returns the token key
* @return the key
*/
+@Id
public String getTokenKey() {
return tokenKey;
}
@@ -110,6 +117,8 @@ public abstract class AccessToken implements Serializable {
* Gets token parameters
* @return
*/
+@ElementCollection
+@MapKeyColumn(name = "propName")
public Map getParameters() {
return parameters;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/b66bb192/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
--
diff --git
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
index 1f13877..ac2ae7b 100644
---
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
+++
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/ServerAccessToken.java
@@ -23,6 +23,11 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import javax.persistence.ElementCollection;
+import javax.persistence.MapKeyColumn;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.OneToOne;
+
import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
@@ -30,6 +35,7 @@ import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
/**
* Server Access Token representation
*/
+@MappedSuperclass
public abstract class ServerAccessToken extends AccessToken {
private static final long serialVersionUID = 638776204861456064L;
@@ -86,6 +92,7 @@ public abstract class ServerAccessToken extends AccessToken {
* Returns the Client associated with this token
* @return the client
*/
+@OneToOne
public Client getClient() {
return client;
}
@@ -98,6 +105,7 @@ public abstract class ServerAccessToken extends AccessToken {
* Returns a list of opaque permissions/scopes
* @return the scopes
*/
+@ElementCollection
public List getScopes() {
return scopes;
}
@@ -126,6 +134,7 @@ public abstract class ServerAccessToken extends AccessToken
{
* when authorizing a given clien
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e9fa213b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9fa213b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9fa213b Branch: refs/heads/master Commit: e9fa213b9b6a4df35daaa77a7eaaf74f639e7e13 Parents: b66bb19 b2e5fb6 Author: Sergey Beryozkin Authored: Tue Apr 5 16:51:21 2016 +0100 Committer: Sergey Beryozkin Committed: Tue Apr 5 16:51:21 2016 +0100 -- .gitignore | 1 + .../samples/jax_rs/websocket_osgi/README.txt| 94 +++ .../samples/jax_rs/websocket_osgi/pom.xml | 96 +++ .../main/java/demo/jaxrs/server/Customer.java | 43 +++ .../java/demo/jaxrs/server/CustomerService.java | 271 +++ .../src/main/java/demo/jaxrs/server/Order.java | 69 + .../main/java/demo/jaxrs/server/Product.java| 43 +++ .../resources/OSGI-INF/blueprint/context.xml| 47 .../websocket_osgi/src/test/resources/client.js | 234 .../AsymmetricBindingHandler.java | 1 + .../StaxAsymmetricBindingHandler.java | 4 + .../StaxSymmetricBindingHandler.java| 4 + .../policyhandlers/SymmetricBindingHandler.java | 1 + .../https/ciphersuites/CipherSuitesTest.java| 31 +++ .../src/test/resources/keys/wss40exp.jks| Bin 0 -> 3941 bytes .../src/test/resources/keys/wss40expCA.jks | Bin 0 -> 858 bytes .../ciphersuites-client-expired-cert.xml| 37 +++ .../https/ciphersuites/ciphersuites-server.xml | 28 ++ .../org/apache/cxf/systest/ws/gcm/GCMTest.java | 48 .../ws/gcm/MGF256AlgorithmSuiteLoader.java | 18 ++ .../apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl | 61 + .../apache/cxf/systest/ws/gcm/mgf-client.xml| 10 + .../apache/cxf/systest/ws/gcm/mgf-server.xml| 9 + .../cxf/systest/ws/gcm/mgf-stax-server.xml | 10 + 24 files changed, 1160 insertions(+) --
cxf-fediz git commit: Disable Jetty plugin when tests are skipped
Repository: cxf-fediz
Updated Branches:
refs/heads/1.2.x-fixes 73fd56fb0 -> 994fcc8f2
Disable Jetty plugin when tests are skipped
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/994fcc8f
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/994fcc8f
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/994fcc8f
Branch: refs/heads/1.2.x-fixes
Commit: 994fcc8f27df2e690280162d42403373d1a08471
Parents: 73fd56f
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 15:33:08 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 15:33:58 2016 +0100
--
pom.xml | 2 +-
services/idp/pom.xml| 3 ++-
services/sts/pom.xml| 3 ++-
systests/cxf/pom.xml| 2 +-
systests/federation/samlsso/pom.xml | 2 +-
systests/federation/wsfed/pom.xml | 2 +-
systests/idp/pom.xml| 2 +-
systests/jetty8/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/spring/pom.xml | 2 +-
systests/tomcat7/pom.xml| 2 +-
systests/websphere/pom.xml | 2 +-
12 files changed, 14 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9caf4d1..3caa2dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -793,7 +793,7 @@
fastinstall
-true
+true
true
true
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 44a5c43..f179e9d 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -366,6 +366,7 @@
jetty-maven-plugin
8.1.16.v20140903
+${skipTests}
${idp.stop.port}
STOP
@@ -432,7 +433,7 @@
integration-test
-false
+${skipTests}
${idp.https.port}
${realm}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 5b6c9c9..7ddf7ee 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -208,6 +208,7 @@
STOP
+${skipTests}
@@ -242,7 +243,7 @@
integration-test
-false
+${skipTests}
${sts.https.port}
target
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/systests/cxf/pom.xml
--
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index e45b878..cf3c408 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -244,7 +244,7 @@
integration-test
-false
+${skipTests}
true
${idp.https.port}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/systests/federation/samlsso/pom.xml
--
diff --git a/systests/federation/samlsso/pom.xml
b/systests/federation/samlsso/pom.xml
index 6fd3ef8..13bc942 100644
--- a/systests/federation/samlsso/pom.xml
+++ b/systests/federation/samlsso/pom.xml
@@ -240,7 +240,7 @@
integration-test
-false
+${skipTests}
true
${idp.https.port}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/994fcc8f/systests/federation/wsfed/pom.xml
--
diff --git a/systests/federation/wsfed/pom.xml
b/systests/federation/wsfed/pom.xml
index 6a58ecf..d2d479b 100
cxf-fediz git commit: Disable Jetty plugin when tests are skipped
Repository: cxf-fediz
Updated Branches:
refs/heads/master 12e5c2331 -> d132e1b53
Disable Jetty plugin when tests are skipped
Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/d132e1b5
Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/d132e1b5
Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/d132e1b5
Branch: refs/heads/master
Commit: d132e1b53bbefc61cc79c549de972c73931b41e2
Parents: 12e5c23
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 15:33:08 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 15:33:08 2016 +0100
--
pom.xml | 2 +-
services/idp/pom.xml| 3 ++-
services/sts/pom.xml| 3 ++-
systests/cxf/pom.xml| 2 +-
systests/federation/oidc/pom.xml| 2 +-
systests/federation/samlsso/pom.xml | 2 +-
systests/federation/wsfed/pom.xml | 2 +-
systests/idp/pom.xml| 2 +-
systests/jetty8/pom.xml | 2 +-
systests/jetty9/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/oidc/pom.xml | 2 +-
systests/samlsso/pom.xml| 2 +-
systests/spring/pom.xml | 2 +-
systests/tomcat7/pom.xml| 2 +-
systests/tomcat8/pom.xml| 2 +-
systests/websphere/pom.xml | 2 +-
17 files changed, 19 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ddb5da8..1f411e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,7 +748,7 @@
fastinstall
-true
+true
true
true
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/services/idp/pom.xml
--
diff --git a/services/idp/pom.xml b/services/idp/pom.xml
index 2322c2e..7a02f6a 100644
--- a/services/idp/pom.xml
+++ b/services/idp/pom.xml
@@ -459,6 +459,7 @@
jetty-maven-plugin
8.1.16.v20140903
+${skipTests}
${idp.stop.port}
STOP
@@ -525,7 +526,7 @@
integration-test
-false
+${skipTests}
${idp.https.port}
${realm}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/services/sts/pom.xml
--
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index cb35aa5..e4e6d8c 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -208,6 +208,7 @@
STOP
+${skipTests}
@@ -242,7 +243,7 @@
integration-test
-false
+${skipTests}
${sts.https.port}
target
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/systests/cxf/pom.xml
--
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index bc5c851..98133a1 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -244,7 +244,7 @@
integration-test
-false
+${skipTests}
true
${idp.https.port}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/systests/federation/oidc/pom.xml
--
diff --git a/systests/federation/oidc/pom.xml b/systests/federation/oidc/pom.xml
index 9987c43..0ce2ceb 100644
--- a/systests/federation/oidc/pom.xml
+++ b/systests/federation/oidc/pom.xml
@@ -259,7 +259,7 @@
integration-test
-false
+${skipTests}
true
${idp.https.port}
http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/d132e1b5/systests/federation/s
cxf git commit: add node_modules in .gitignore
Repository: cxf Updated Branches: refs/heads/master 7e5bd4cf5 -> b2e5fb658 add node_modules in .gitignore Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2e5fb65 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2e5fb65 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2e5fb65 Branch: refs/heads/master Commit: b2e5fb6583d64deeb8a42d2eeb6935c5f33dc0c6 Parents: 7e5bd4c Author: Akitoshi Yoshida Authored: Tue Apr 5 15:45:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 15:46:42 2016 +0200 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b2e5fb65/.gitignore -- diff --git a/.gitignore b/.gitignore index 9329527..14e79f9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ target/ velocity.log bin/ +node_modules/
[1/2] cxf git commit: Upgrade atmosphere to 2.3.7 (for cxf-3.0.x)
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 8dda906e3 -> 4ecaacfc9 Upgrade atmosphere to 2.3.7 (for cxf-3.0.x) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/66362282 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/66362282 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/66362282 Branch: refs/heads/3.0.x-fixes Commit: 66362282cf232b389a66e66299a0d9f7774c07a1 Parents: 8dda906 Author: Akitoshi Yoshida Authored: Tue Apr 5 15:23:54 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 15:50:20 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/66362282/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 19d0a00..6fb829f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -76,8 +76,8 @@ 5.9.1 1.8.5 2.0.0-M19 -2.2.7 -[2.0,3.0) +2.3.7 +[2.0,2.4) 1.2.14 1.54 2.2_2
[2/2] cxf git commit: add node_modules in .gitignore
add node_modules in .gitignore Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4ecaacfc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4ecaacfc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4ecaacfc Branch: refs/heads/3.0.x-fixes Commit: 4ecaacfc93aba9b9e16b0e6869b3d432b1d6e207 Parents: 6636228 Author: Akitoshi Yoshida Authored: Tue Apr 5 15:45:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 15:50:28 2016 +0200 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/4ecaacfc/.gitignore -- diff --git a/.gitignore b/.gitignore index dbf1353..808ed60 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ target/ velocity.log bin/ +node_modules/
cxf git commit: add node_modules in .gitignore
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes e51e9006d -> 3678640f1 add node_modules in .gitignore Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3678640f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3678640f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3678640f Branch: refs/heads/3.1.x-fixes Commit: 3678640f15e3df8439c45a3cbae7ce12854b8a37 Parents: e51e900 Author: Akitoshi Yoshida Authored: Tue Apr 5 15:45:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 15:48:15 2016 +0200 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/3678640f/.gitignore -- diff --git a/.gitignore b/.gitignore index 51c4cdd..4b6fccd 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ target/ velocity.log bin/ *~ +node_modules/
[3/3] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8dda906e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8dda906e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8dda906e
Branch: refs/heads/3.0.x-fixes
Commit: 8dda906e3b62fc8e76f0a5e3115fb61490890ce1
Parents: 02c4c31
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 14:07:17 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 14:07:17 2016 +0100
--
.../cxf/systest/https/ciphersuites/CipherSuitesTest.java | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/8dda906e/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index f253618..c86817d 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -51,6 +51,7 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
+static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
private static final boolean UNRESTRICTED_POLICIES_INSTALLED;
static {
@@ -73,15 +74,6 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
UNRESTRICTED_POLICIES_INSTALLED = ok;
}
-<<< HEAD
-===
-static final String PORT = allocatePort(CipherSuitesServer.class);
-static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
-static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
-static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
-static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
-
->>> 3235f4b... Adding a TLS test for an expired cert
@BeforeClass
public static void startServers() throws Exception {
assertTrue(
[2/3] cxf 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/02c4c318 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02c4c318 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02c4c318 Branch: refs/heads/3.0.x-fixes Commit: 02c4c31878841f4c37e46be486d3158a6f589a15 Parents: 02d6bdb Author: Colm O hEigeartaigh Authored: Tue Apr 5 14:04:52 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 5 14:04:52 2016 +0100 -- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/02c4c318/.gitmergeinfo -- diff --git a/.gitmergeinfo b/.gitmergeinfo index aac79c2..b74c67c 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -436,6 +436,7 @@ B 7e4eb471fd6b19d73b2e91748a736f6205fc393f B 7e82d2f10a1ca14a939d2c63ca4e620f8870e256 B 7e8d0b4b1cd868272380ca5779e67a15e46cf799 B 7e95279dd1170f5878687d7eea27f7d7f03a434b +B 7f17ddd264a0085cde00e06a22400aad43c304cd B 7f7cc3c390b95f9d7589eb192538551416c313db B 7faee992154aadf83dde26942f424db4c764b5fd B 7fb966c9150652273c69852af79d90c3ed7b030e @@ -790,6 +791,7 @@ B e4858d27b356f577eb31908dd43817681f007a4b B e4b2e746d6a70d02f64daab7aca79142e62709ca B e4bfc1647e12b39b25bc363bdb9fe8beb2372a3b B e4cab6471a5dafedcd5b69418266f03235adf5d6 +B e51e9006d8a6312f21bd782c908190fc27c3640b B e545379cdc71ba79bd6c60b4ee788d11db678d24 B e548a02fa04313fd1b6ec5d9ac78c774e8ad935a B e54e39740fdb360f84a74638db1d6ca71490b01a @@ -944,6 +946,7 @@ M 2e701bcd1cabcc7ae4cb69346eacb8ab278e2827 M 2fc62cf0f53912b53a93409802f43418d067faf1 M 318cfdaeb15b8d230829d120f894bec6f15bc836 M 3228637a5070a25f625fb18fc21a7dd54ce16dfd +M 3235f4be3d12aee0088910d69bb67bc5db554df9 M 3348a2999d2693edfeaf1fdd62a94222774186fd M 3520a87c8b207f911cdd5e139cc84f2d20634a4e M 3656b40f215f9904ea3649163bf2444eeab0c9cc
[1/3] cxf git commit: Adding a TLS test for an expired cert
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes dc5025766 -> 8dda906e3
Adding a TLS test for an expired cert
# Conflicts:
#
systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/02d6bdbf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/02d6bdbf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/02d6bdbf
Branch: refs/heads/3.0.x-fixes
Commit: 02d6bdbf3079d8dfbef1dad5e7d5a9514dd0ac34
Parents: dc50257
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 12:46:26 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 14:04:50 2016 +0100
--
.../https/ciphersuites/CipherSuitesTest.java| 39 +++
.../src/test/resources/keys/wss40exp.jks| Bin 0 -> 3941 bytes
.../src/test/resources/keys/wss40expCA.jks | Bin 0 -> 858 bytes
.../ciphersuites-client-expired-cert.xml| 37 ++
.../https/ciphersuites/ciphersuites-server.xml | 28 +
5 files changed, 104 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/02d6bdbf/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index 13257f9..f253618 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -73,6 +73,15 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
UNRESTRICTED_POLICIES_INSTALLED = ok;
}
+<<< HEAD
+===
+static final String PORT = allocatePort(CipherSuitesServer.class);
+static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
+static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
+static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
+static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
+
+>>> 3235f4b... Adding a TLS test for an expired cert
@BeforeClass
public static void startServers() throws Exception {
assertTrue(
@@ -620,6 +629,36 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+// Test an expired cert
+@org.junit.Test
+public void testExpiredCert() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
CipherSuitesTest.class.getResource("ciphersuites-client-expired-cert.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL url = SOAPService.WSDL_LOCATION;
+SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+assertNotNull("Service is null", service);
+final Greeter port = service.getHttpsPort();
+assertNotNull("Port is null", port);
+
+updateAddressPort(port, PORT5);
+
+try {
+port.greetMe("Kitty");
+fail("Failure expected on not being able to negotiate a cipher
suite");
+} catch (Exception ex) {
+// expected
+}
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
private static class NoOpX509TrustManager implements X509TrustManager {
public NoOpX509TrustManager() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/02d6bdbf/systests/transports/src/test/resources/keys/wss40exp.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40exp.jks
b/systests/transports/src/test/resources/keys/wss40exp.jks
new file mode 100644
index 000..1ee7be7
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40exp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/02d6bdbf/systests/transports/src/test/resources/keys/wss40expCA.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40expCA.jks
b/systests/transports/src/test/resources/keys/wss40expCA.jks
new file mode 100644
index 000..886d85c
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40expCA.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/02d6bdbf/systests/transports/src/test/re
[3/3] cxf git commit: Support DigestMethod for EncryptionMethod
Support DigestMethod for EncryptionMethod
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7f17ddd2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7f17ddd2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7f17ddd2
Branch: refs/heads/3.1.x-fixes
Commit: 7f17ddd264a0085cde00e06a22400aad43c304cd
Parents: 75edfe9
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 11:36:33 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 14:03:45 2016 +0100
--
.../AsymmetricBindingHandler.java | 1 +
.../StaxAsymmetricBindingHandler.java | 4 ++
.../StaxSymmetricBindingHandler.java| 4 ++
.../policyhandlers/SymmetricBindingHandler.java | 1 +
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 48 +++
.../ws/gcm/MGF256AlgorithmSuiteLoader.java | 18 ++
.../apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl | 61
.../apache/cxf/systest/ws/gcm/mgf-client.xml| 10
.../apache/cxf/systest/ws/gcm/mgf-server.xml| 9 +++
.../cxf/systest/ws/gcm/mgf-stax-server.xml | 10
10 files changed, 166 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f17ddd2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index d16b521..078a10d 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -494,6 +494,7 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
encr.setSymmetricEncAlgorithm(algType.getEncryption());
encr.setKeyEncAlgo(algType.getAsymmetricKeyWrap());
encr.setMGFAlgorithm(algType.getMGFAlgo());
+encr.setDigestAlgorithm(algType.getEncryptionDigest());
encr.prepare(saaj.getSOAPPart(), crypto);
Element encryptedKeyElement =
encr.getEncryptedKeyElement();
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f17ddd2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
index a826606..e6d4a09 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
@@ -382,6 +382,10 @@ public class StaxAsymmetricBindingHandler extends
AbstractStaxBindingHandler {
algorithmSuite.getAlgorithmSuiteType().getAsymmetricKeyWrap());
properties.setEncryptionSymAlgorithm(
algorithmSuite.getAlgorithmSuiteType().getEncryption());
+properties.setEncryptionKeyTransportDigestAlgorithm(
+
algorithmSuite.getAlgorithmSuiteType().getEncryptionDigest());
+properties.setEncryptionKeyTransportMGFAlgorithm(
+ algorithmSuite.getAlgorithmSuiteType().getMGFAlgo());
String encUser =
(String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.ENCRYPT_USERNAME,
message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/7f17ddd2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index 97e4c65..a23ad09 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -475,6 +475,10 @@ public class StaxSymmetricBindingHandler extends
AbstractStaxBindingHandler {
algorithmSuite.getAlgori
[1/3] cxf git commit: Updating to pick up the latest WSS4J
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 75edfe9d2 -> e51e9006d Updating to pick up the latest WSS4J Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e51e9006 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e51e9006 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e51e9006 Branch: refs/heads/3.1.x-fixes Commit: e51e9006d8a6312f21bd782c908190fc27c3640b Parents: 3235f4b Author: Colm O hEigeartaigh Authored: Tue Apr 5 12:55:27 2016 +0100 Committer: Colm O hEigeartaigh Committed: Tue Apr 5 14:03:45 2016 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/e51e9006/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index b9cac8a..e69876b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -151,7 +151,7 @@ 4.4.1 3.1.4 1.6.3 -2.1.5 +2.1.6-SNAPSHOT 2.11.0 2.6.0 2.2.1
[2/3] cxf git commit: Adding a TLS test for an expired cert
Adding a TLS test for an expired cert
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3235f4be
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3235f4be
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3235f4be
Branch: refs/heads/3.1.x-fixes
Commit: 3235f4be3d12aee0088910d69bb67bc5db554df9
Parents: 7f17ddd
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 12:46:26 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 14:03:45 2016 +0100
--
.../https/ciphersuites/CipherSuitesTest.java| 31
.../src/test/resources/keys/wss40exp.jks| Bin 0 -> 3941 bytes
.../src/test/resources/keys/wss40expCA.jks | Bin 0 -> 858 bytes
.../ciphersuites-client-expired-cert.xml| 37 +++
.../https/ciphersuites/ciphersuites-server.xml | 28 ++
5 files changed, 96 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/3235f4be/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index dd3ced4..d85c75a 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -72,6 +72,7 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
+static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
@BeforeClass
public static void startServers() throws Exception {
@@ -621,6 +622,36 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+// Test an expired cert
+@org.junit.Test
+public void testExpiredCert() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
CipherSuitesTest.class.getResource("ciphersuites-client-expired-cert.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL url = SOAPService.WSDL_LOCATION;
+SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+assertNotNull("Service is null", service);
+final Greeter port = service.getHttpsPort();
+assertNotNull("Port is null", port);
+
+updateAddressPort(port, PORT5);
+
+try {
+port.greetMe("Kitty");
+fail("Failure expected on not being able to negotiate a cipher
suite");
+} catch (Exception ex) {
+// expected
+}
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
private static class NoOpX509TrustManager implements X509TrustManager {
NoOpX509TrustManager() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/3235f4be/systests/transports/src/test/resources/keys/wss40exp.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40exp.jks
b/systests/transports/src/test/resources/keys/wss40exp.jks
new file mode 100644
index 000..1ee7be7
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40exp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/3235f4be/systests/transports/src/test/resources/keys/wss40expCA.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40expCA.jks
b/systests/transports/src/test/resources/keys/wss40expCA.jks
new file mode 100644
index 000..886d85c
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40expCA.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/3235f4be/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml
--
diff --git
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml
new file mode 100644
index 000..0
[7/8] cxf git commit: add a blueprint version of websocket sample for karaf
add a blueprint version of websocket sample for karaf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5ce68277 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5ce68277 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5ce68277 Branch: refs/heads/3.1.x-fixes Commit: 5ce682771ae91eab61e25eaa90ef416168eb4402 Parents: de9b793 Author: Akitoshi Yoshida Authored: Tue Apr 5 10:38:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 13:36:58 2016 +0200 -- .../samples/jax_rs/websocket_osgi/README.txt| 94 +++ .../samples/jax_rs/websocket_osgi/pom.xml | 94 +++ .../main/java/demo/jaxrs/server/Customer.java | 43 +++ .../java/demo/jaxrs/server/CustomerService.java | 271 +++ .../src/main/java/demo/jaxrs/server/Order.java | 69 + .../main/java/demo/jaxrs/server/Product.java| 43 +++ .../resources/OSGI-INF/blueprint/context.xml| 47 .../websocket_osgi/src/test/resources/client.js | 234 8 files changed, 895 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/5ce68277/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt new file mode 100644 index 000..60d7705 --- /dev/null +++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt @@ -0,0 +1,94 @@ +JAX-RS WebSocket OSGi Blueprint Demo += + +This is an OSGi Blueprint version of JAX-RS WebSocket Demo. + +Building and running the demo using maven +--- + +From the base directory of this sample (i.e., where this README file is +located), the maven pom.xml file can be used to build and run the demo. + + +Using either UNIX or Windows: + + mvn install + +This will produce a war file in the target folder. + + +Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html) + + bin/karaf + + + __ __ + / //_/ __ _/ __/ +/ ,< / __ `/ ___/ __ `/ /_ + / /| |/ /_/ / / / /_/ / __/ + /_/ |_|\__,_/_/ \__,_/_/ + +Apache Karaf (3.0.4) + + Hit '' for a list of available commands + and '[cmd] --help' for help on a specific command. + Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf. + + +In order to install CXF's features, you need to add the CXF's features repo using + + feature:repo-add cxf 3.n.m + + where 3.n.m corresponds to a valid CXF version number + +Install CXF's cxf-jaxrs and cxf-transports-websocket-server features that installs all the required bundles +for this demo bundle. + + feature:install cxf-jaxrs cxf-transports-websocket-server + +Install this demo bundle (using the appropriate bundle version number) + + install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.n.m + +And verify the bundles are installed. + +karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT +Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features +karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server +karaf@root()> list -t 0 | grep CXF + 80 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Core + 81 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime Management +100 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime HTTP Transport +102 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers +103 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Search +104 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Service Description +105 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime JAX-RS Frontend +106 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Client +108 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime WebSocket Transport +karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi +Bundle ID: 109 +karaf@root()> list +START LEVEL 100 , List Threshold: 50 + ID | State | Lvl | Version| Name +- +107 | Active | 80 | 2.4.3 | atmosphere-runtime +109 | Active | 80 | 3.2.0.SNAPSHOT | JAX-RS WebSocket Blueprint Demo +karaf@root
[6/8] cxf git commit: use a non-empty context-path for samples/jax_rs/websocket sample
use a non-empty context-path for samples/jax_rs/websocket sample Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b52157a3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b52157a3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b52157a3 Branch: refs/heads/3.1.x-fixes Commit: b52157a330d9ef4daab8d2826579cb68ca171c69 Parents: f12eb1a Author: Akitoshi Yoshida Authored: Wed Mar 23 14:23:03 2016 +0100 Committer: Akitoshi Yoshida Committed: Tue Apr 5 13:36:58 2016 +0200 -- .../release/samples/jax_rs/websocket/README.txt | 26 - .../src/main/java/demo/jaxrs/client/Client.java | 29 --- .../src/main/java/demo/jaxrs/server/Server.java | 4 ++- .../websocket/src/main/resources/index.html | 4 +-- .../websocket/src/test/resources/client.js | 30 +++- 5 files changed, 46 insertions(+), 47 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/b52157a3/distribution/src/main/release/samples/jax_rs/websocket/README.txt -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt b/distribution/src/main/release/samples/jax_rs/websocket/README.txt index f1d3455..8df709e 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt +++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt @@ -3,7 +3,7 @@ JAX-RS WebSocket Demo This is a websocket transport version of JAX-RS Basic Demo. -A RESTful customer service is provided on URL ws://localhost:9000/customers. +A RESTful customer service is provided on URL ws://localhost:9000/demo Users access this URI to operate on customer. This sample includes two convenient clients: a plain javascript browser client @@ -13,12 +13,12 @@ and a node.js client based on atmosphere. Connecting to the server --- -Open a websocket to ws://localhost:9000/ and send requests over the websocket. +Open a websocket to ws://localhost:9000/demo and send requests over the websocket. -A GET request to path /customerservice/customers/123 +A GET request to path /demo/customerservice/customers/123 -GET /customerservice/customers/123 +GET /demo/customerservice/customers/123 returns a customer instance whose id is 123. The XML document returned: @@ -30,10 +30,10 @@ returns a customer instance whose id is 123. The XML document returned: -A GET request to path /customerservice/orders/223/products/323 +A GET request to path /demo/customerservice/orders/223/products/323 -GET /customerservice/orders/223/products/323 +GET /demo/customerservice/orders/223/products/323 returns product 323 that belongs to order 223. The XML document returned: @@ -48,7 +48,7 @@ returns product 323 that belongs to order 223. The XML document returned: A POST request to path /customerservice/customers -POST /customerservice/customers +POST /demo/customerservice/customers Content-Type: text/xml; charset="utf-8" @@ -63,7 +63,7 @@ with the data: adds a customer whose name is Jack -A PUT request to path /customerservice/customers +A PUT request to path /demo/customerservice/customers PUT /customerservice/customers @@ -82,20 +82,20 @@ with the data: updates the customer instance whose id is 123 -A GET request to path /monitor with id monitor-12345 +A GET request to path /demo/monitor with id monitor-12345 -GET /customerservice/monitor +GET /demo/customerservice/monitor requestId: monitor-12345 returns a continuous event stream on the customer activities. Try invoking some customer related operations. -A GET request to path /unmonitor with id monitor-12345 +A GET request to path /demo/unmonitor with id monitor-12345 -GET /customerservice/unmonitor/monitor-12345 +GET /demo/customerservice/unmonitor/monitor-12345 unregisters the event stream and returns its status. @@
[5/8] cxf git commit: add a webapp version of samples/jax_rs/websocket (for cxf-3.1.x)
add a webapp version of samples/jax_rs/websocket (for cxf-3.1.x)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/de9b7936
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/de9b7936
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/de9b7936
Branch: refs/heads/3.1.x-fixes
Commit: de9b7936156d622c284df7f055acac80b920b7d0
Parents: b52157a
Author: Akitoshi Yoshida
Authored: Wed Mar 23 14:40:00 2016 +0100
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 13:36:58 2016 +0200
--
.../samples/jax_rs/websocket_web/README.txt | 32 +++
.../samples/jax_rs/websocket_web/pom.xml| 123 +
.../main/java/demo/jaxrs/server/Customer.java | 43 +++
.../java/demo/jaxrs/server/CustomerService.java | 271 +++
.../src/main/java/demo/jaxrs/server/Order.java | 69 +
.../main/java/demo/jaxrs/server/Product.java| 43 +++
.../src/main/webapp/WEB-INF/beans.xml | 46
.../src/main/webapp/WEB-INF/web.xml | 42 +++
8 files changed, 669 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/de9b7936/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
new file mode 100644
index 000..36008ed
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/README.txt
@@ -0,0 +1,32 @@
+JAX-RS WebSocket WebApp Demo
+=
+
+This is an WebApp version of JAX-RS WebSocket Demo.
+
+Building and running the demo using maven
+---
+
+From the base directory of this sample (i.e., where this README file is
+located), the maven pom.xml file can be used to build and run the demo.
+
+
+Using either UNIX or Windows:
+
+ mvn install
+
+This will produce a war file in the target folder.
+
+To run the war file using jetty9
+
+ mvn jetty:run-war (from one command line window)
+
+To run the war file using tomcat7
+
+ mvn tomcat7:run-war (from one command line window)
+
+To remove the target dir, run mvn clean".
+
+
+You can use the same clients included in JAX-RS WebSockt Demo.
+Refer to samples/jax_rs/websocket/README.txt for more information.
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/de9b7936/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
new file mode 100644
index 000..7b76bbc
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -0,0 +1,123 @@
+
+
+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";>
+4.0.0
+jax_rs_websocket_web
+JAX-RS WebSocket Demo
+JAX-RS WebSocket WebApp Demo
+war
+
+org.apache.cxf.samples
+cxf-samples
+3.1.7-SNAPSHOT
+../..
+
+
+${project.version}
+
+2.3.7
+9.2.15.v20160210
+9.3.5.v20151012
+${cxf.jetty92.version}
+
+
+
+
+org.eclipse.jetty
+jetty-maven-plugin
+${cxf.jetty.version}
+
+
${project.build.directory}/${project.name}
+1
+
+9000
+
+
+/
+
+
+
+
+org.apache.tomcat.maven
+tomcat7-maven-plugin
+2.2
+
+
${project.build.directory}/${project.artifactId}
+9000
+/
+
+
+
+run-tomcat
+
+true
+
+
+run
+
+
+
+
+
+
+
+
+
+org.apache.cxf
+cxf-rt-transports-http
+3.1.7-SNAPSHOT
+
+
+org.apache.cxf
+cxf-rt-transports-websocket
+3.1.7-SNAPSHOT
+
+
+org.apache.cxf
+cxf-rt-frontend-jaxrs
+3.1.7-SNAPSHOT
+
+
+javax.ws.r
[1/8] cxf git commit: add the stacktrace output in CustomerService for CXF-5855
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 91197fdb2 -> 75edfe9d2
add the stacktrace output in CustomerService for CXF-5855
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f12eb1a2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f12eb1a2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f12eb1a2
Branch: refs/heads/3.1.x-fixes
Commit: f12eb1a2a2eb2220550cb25dcc54d62127d55244
Parents: 35f01c9
Author: Akitoshi Yoshida
Authored: Thu Mar 17 10:08:25 2016 +0100
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 13:36:57 2016 +0200
--
.../src/main/java/demo/jaxrs/server/CustomerService.java | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/f12eb1a2/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index cc039ff..f77f8aa 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -186,6 +186,8 @@ public class CustomerService {
} catch (IOException e) {
System.out.println("error writing to " +
wh.getValue() + " " + wh.get());
if (wh.increment()) {
+// the max error count reached; purging the
output resource
+e.printStackTrace();
try {
wh.getValue().close();
} catch (IOException e2) {
@@ -205,6 +207,8 @@ public class CustomerService {
} catch (IOException e) {
System.out.println("error writing to " +
wh.getValue() + " " + wh.get());
if (wh.increment()) {
+// the max error count reached; purging the
output resource
+e.printStackTrace();
try {
wh.getValue().getOutputStream().close();
} catch (IOException e2) {
[2/8] cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample
[CXF-5855] enable atmosphere's sse handling; update the sample
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/35f01c94
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/35f01c94
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/35f01c94
Branch: refs/heads/3.1.x-fixes
Commit: 35f01c94841870afa8331e0591aec8a3bc4ca94d
Parents: 897d81d
Author: Akitoshi Yoshida
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 13:36:57 2016 +0200
--
.../jax_rs/websocket/src/test/resources/client.js | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/35f01c94/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
index 7eb55f3..8e8d653 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/test/resources/client.js
@@ -8,7 +8,7 @@
"use strict";
-var HOST_URL = 'http://localhost:9100/';
+var HOST_URL = 'http://localhost:9000/';
var reader = require('readline');
var prompt = reader.createInterface(process.stdin, process.stdout);
@@ -25,13 +25,13 @@ var isopen = false;
const TRANSPORT_NAMES = ["websocket", "sse"];
const COMMAND_LIST =
-[["add name", "Add a new consumer and return the customer
instance."],
- ["delete id", "Delete the customer."],
- ["get id", "Return the customere."],
+[["add name", "Add a new consumer and return the customer instance.
(e.g., add green)"],
+ ["delete id", "Delete the customer. (e.g., delete 124)"],
+ ["get id", "Return the customere. (e.g., get 123)"],
["quit", "Quit the application."],
- ["subscribe", "Subscribe to the customer updatese."],
- ["unsubscribe","Unsubscribe from the customer updatese."],
- ["update id name", "Update the customer."]];
+ ["subscribe", "Subscribe to the customer queries."],
+ ["unsubscribe","Unsubscribe from the customer queries."],
+ ["update id name", "Update the customer. (e.g., update 125 red)"]];
function selectOption(c, opts) {
var i = parseInt(c);
[4/8] cxf git commit: [CXF-5855] enable atmosphere's sse handling; update the sample
[CXF-5855] enable atmosphere's sse handling; update the sample
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a529d270
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a529d270
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a529d270
Branch: refs/heads/3.1.x-fixes
Commit: a529d270668dabd1cfa6b040769cb25af97973db
Parents: 91197fd
Author: Akitoshi Yoshida
Authored: Thu Mar 17 00:11:58 2016 +0100
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 13:36:57 2016 +0200
--
.../release/samples/jax_rs/websocket/README.txt | 26 ++-
.../release/samples/jax_rs/websocket/pom.xml| 10 +-
.../java/demo/jaxrs/server/CustomerService.java | 105 -
.../websocket/src/test/resources/client.js | 232 +++
.../websocket/atmosphere/AtmosphereUtils.java | 18 ++
.../AtmosphereWebSocketJettyDestination.java| 3 +-
.../AtmosphereWebSocketServletDestination.java | 3 +-
.../atmosphere/DefaultProtocolInterceptor.java | 90 ++-
8 files changed, 463 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/README.txt
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
index 09c43e8..f1d3455 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket/README.txt
@@ -6,6 +6,13 @@ This is a websocket transport version of JAX-RS Basic Demo.
A RESTful customer service is provided on URL ws://localhost:9000/customers.
Users access this URI to operate on customer.
+This sample includes two convenient clients: a plain javascript browser client
+and a node.js client based on atmosphere.
+
+
+Connecting to the server
+---
+
Open a websocket to ws://localhost:9000/ and send requests over the websocket.
A GET request to path /customerservice/customers/123
@@ -102,7 +109,6 @@ Please review the README in the samples directory before
continuing.
-
Building and running the demo using maven
---
@@ -118,6 +124,8 @@ Using either UNIX or Windows:
To remove the target dir, run mvn clean".
+Using Javascript client in Browser
+
Using a web browser that natively supports WebSocket (Safari, Chrome, Firefox):
After starting the server (see above), open the index.html page located at
@@ -140,3 +148,19 @@ Content-Type: text/xml; charset="utf-8"
Jack
+
+
+Using Node.js client
+
+
+Go to samples/jax_rs/websocket/src/test/resources and at the console
+
+Assuming node (>=v4) and npm are installed, execute the following shell
commands.
+
+% npm install atmosphere.js
+% node client.js
+
+This client program supports websocket and sse and allows
+you to choose your preferred protocol.
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
index abe9d3b..353e544 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket/pom.xml
@@ -32,6 +32,7 @@
${project.version}
1.8.5
+2.3.7
8.1.15.v20140411
9.2.2.v20140723
${cxf.jetty8.version}
@@ -207,6 +208,13 @@
org.springframework
spring-core
-
+
+
+
+org.atmosphere
+atmosphere-runtime
+${cxf.atmosphere.version}
+
+
http://git-wip-us.apache.org/repos/asf/cxf/blob/a529d270/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index 967e978..cc039ff 100644
---
a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++
b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -25,6 +25,9 @@ import java.util.Iterator;
import java.util.Map;
[3/8] cxf git commit: fix the test error by adjusting its setup for CXF-5855
fix the test error by adjusting its setup for CXF-5855
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/897d81dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/897d81dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/897d81dc
Branch: refs/heads/3.1.x-fixes
Commit: 897d81dc292eb6159aab96390cb3fbfed1c34a6b
Parents: a529d27
Author: Akitoshi Yoshida
Authored: Thu Mar 17 11:17:57 2016 +0100
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 13:36:57 2016 +0200
--
.../websocket/atmosphere/DefaultProtocolInterceptorTest.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/897d81dc/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
--
diff --git
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
index e6b70af..1dee1de 100644
---
a/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
+++
b/rt/transports/websocket/src/test/java/org/apache/cxf/transport/websocket/atmosphere/DefaultProtocolInterceptorTest.java
@@ -25,7 +25,10 @@ import java.util.Map;
import org.apache.cxf.transport.websocket.WebSocketUtils;
import org.atmosphere.cpr.AtmosphereRequest;
+import org.atmosphere.cpr.AtmosphereResource;
+import org.atmosphere.cpr.AtmosphereResourceImpl;
import org.atmosphere.cpr.AtmosphereResponse;
+import org.atmosphere.cpr.FrameworkConfig;
import org.junit.Assert;
import org.junit.Test;
@@ -40,6 +43,9 @@ public class DefaultProtocolInterceptorTest extends Assert {
DefaultProtocolInterceptor dpi = new DefaultProtocolInterceptor();
AtmosphereRequest request = AtmosphereRequest.newInstance();
AtmosphereResponse response = AtmosphereResponse.newInstance();
+AtmosphereResourceImpl resource = new AtmosphereResourceImpl();
+resource.transport(AtmosphereResource.TRANSPORT.WEBSOCKET);
+request.localAttributes().put(FrameworkConfig.ATMOSPHERE_RESOURCE,
resource);
response.request(request);
String payload = "hello cxf";
String contentType = "text/plain";
[8/8] cxf git commit: make websocket_osgi sample also work for both karaf 4.0.x (for cxf-3.1.x)
make websocket_osgi sample also work for both karaf 4.0.x (for cxf-3.1.x) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/75edfe9d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/75edfe9d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/75edfe9d Branch: refs/heads/3.1.x-fixes Commit: 75edfe9d21fd654d844e24038a72206b4e15457d Parents: 5ce6827 Author: Akitoshi Yoshida Authored: Tue Apr 5 10:38:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 14:33:29 2016 +0200 -- .../samples/jax_rs/websocket_osgi/README.txt| 58 ++-- .../samples/jax_rs/websocket_osgi/pom.xml | 10 ++-- 2 files changed, 35 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/75edfe9d/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt index 60d7705..09cf100 100644 --- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt +++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt @@ -16,23 +16,22 @@ Using either UNIX or Windows: This will produce a war file in the target folder. +Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html. +You can also use Karaf 4.0.x for this demo.) -Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html) +$ bin/karaf +__ __ + / //_/ __ _/ __/ + / ,< / __ `/ ___/ __ `/ /_ + / /| |/ /_/ / / / /_/ / __/ +/_/ |_|\__,_/_/ \__,_/_/ - bin/karaf + Apache Karaf (3.0.4) +Hit '' for a list of available commands +and '[cmd] --help' for help on a specific command. +Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf. - __ __ - / //_/ __ _/ __/ -/ ,< / __ `/ ___/ __ `/ /_ - / /| |/ /_/ / / / /_/ / __/ - /_/ |_|\__,_/_/ \__,_/_/ - -Apache Karaf (3.0.4) - - Hit '' for a list of available commands - and '[cmd] --help' for help on a specific command. - Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf. In order to install CXF's features, you need to add the CXF's features repo using @@ -52,28 +51,29 @@ Install this demo bundle (using the appropriate bundle version number) And verify the bundles are installed. -karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT -Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features + +karaf@root()> feature:repo-add cxf 3.1.7-SNAPSHOT +Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.1.7-SNAPSHOT/xml/features karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server -karaf@root()> list -t 0 | grep CXF - 80 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Core - 81 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime Management -100 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime HTTP Transport -102 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers -103 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Search -104 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Service Description -105 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime JAX-RS Frontend -106 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Client -108 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime WebSocket Transport -karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi +karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.1.7-SNAPSHOT Bundle ID: 109 +karaf@root()> list -t 0 | grep CXF + 80 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Core + 81 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime Management +100 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime HTTP Transport +102 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers +103 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Extensions: Search
cxf git commit: Adding a TLS test for an expired cert
Repository: cxf
Updated Branches:
refs/heads/master 4e6c5e480 -> 7e5bd4cf5
Adding a TLS test for an expired cert
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7e5bd4cf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7e5bd4cf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7e5bd4cf
Branch: refs/heads/master
Commit: 7e5bd4cf55f503f039d72d12313c509a814ae9c1
Parents: 4e6c5e4
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 12:46:26 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 12:46:26 2016 +0100
--
.../https/ciphersuites/CipherSuitesTest.java| 31
.../src/test/resources/keys/wss40exp.jks| Bin 0 -> 3941 bytes
.../src/test/resources/keys/wss40expCA.jks | Bin 0 -> 858 bytes
.../ciphersuites-client-expired-cert.xml| 37 +++
.../https/ciphersuites/ciphersuites-server.xml | 28 ++
5 files changed, 96 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5bd4cf/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
--
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
index dd3ced4..d85c75a 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java
@@ -72,6 +72,7 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
static final String PORT2 = allocatePort(CipherSuitesServer.class, 2);
static final String PORT3 = allocatePort(CipherSuitesServer.class, 3);
static final String PORT4 = allocatePort(CipherSuitesServer.class, 4);
+static final String PORT5 = allocatePort(CipherSuitesServer.class, 5);
@BeforeClass
public static void startServers() throws Exception {
@@ -621,6 +622,36 @@ public class CipherSuitesTest extends
AbstractBusClientServerTestBase {
bus.shutdown(true);
}
+// Test an expired cert
+@org.junit.Test
+public void testExpiredCert() throws Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
CipherSuitesTest.class.getResource("ciphersuites-client-expired-cert.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+SpringBusFactory.setDefaultBus(bus);
+SpringBusFactory.setThreadDefaultBus(bus);
+
+URL url = SOAPService.WSDL_LOCATION;
+SOAPService service = new SOAPService(url, SOAPService.SERVICE);
+assertNotNull("Service is null", service);
+final Greeter port = service.getHttpsPort();
+assertNotNull("Port is null", port);
+
+updateAddressPort(port, PORT5);
+
+try {
+port.greetMe("Kitty");
+fail("Failure expected on not being able to negotiate a cipher
suite");
+} catch (Exception ex) {
+// expected
+}
+
+((java.io.Closeable)port).close();
+bus.shutdown(true);
+}
+
private static class NoOpX509TrustManager implements X509TrustManager {
NoOpX509TrustManager() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5bd4cf/systests/transports/src/test/resources/keys/wss40exp.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40exp.jks
b/systests/transports/src/test/resources/keys/wss40exp.jks
new file mode 100644
index 000..1ee7be7
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40exp.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5bd4cf/systests/transports/src/test/resources/keys/wss40expCA.jks
--
diff --git a/systests/transports/src/test/resources/keys/wss40expCA.jks
b/systests/transports/src/test/resources/keys/wss40expCA.jks
new file mode 100644
index 000..886d85c
Binary files /dev/null and
b/systests/transports/src/test/resources/keys/wss40expCA.jks differ
http://git-wip-us.apache.org/repos/asf/cxf/blob/7e5bd4cf/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml
--
diff --git
a/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/ciphersuites-client-expired-cert.xml
b/systests/transports/src/test/resources/org/apache/cxf/systest/https/ciphersuites/
cxf git commit: Upgrade atmosphere to 2.3.7 (for cxf-3.1.x)
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes d3a97b35a -> 91197fdb2 Upgrade atmosphere to 2.3.7 (for cxf-3.1.x) Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91197fdb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91197fdb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91197fdb Branch: refs/heads/3.1.x-fixes Commit: 91197fdb2cfc52c62f63aae1113b387423c8c387 Parents: d3a97b3 Author: Akitoshi Yoshida Authored: Tue Apr 5 13:36:31 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 13:36:31 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/91197fdb/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 715201a..b9cac8a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,8 +69,8 @@ 5.12.0 1.9.8 2.0.0-M21 -2.3.5 -[2.0,3.0) +2.3.7 +[2.0,2.4) 1.2.14 1.54 2.2_2
cxf git commit: Support DigestMethod for EncryptionMethod
Repository: cxf
Updated Branches:
refs/heads/master b2c10cc6c -> 4e6c5e480
Support DigestMethod for EncryptionMethod
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4e6c5e48
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4e6c5e48
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4e6c5e48
Branch: refs/heads/master
Commit: 4e6c5e480bd1930f3200e7ee99daa627aa16a7a5
Parents: b2c10cc
Author: Colm O hEigeartaigh
Authored: Tue Apr 5 11:36:33 2016 +0100
Committer: Colm O hEigeartaigh
Committed: Tue Apr 5 11:37:05 2016 +0100
--
.../AsymmetricBindingHandler.java | 1 +
.../StaxAsymmetricBindingHandler.java | 4 ++
.../StaxSymmetricBindingHandler.java| 4 ++
.../policyhandlers/SymmetricBindingHandler.java | 1 +
.../org/apache/cxf/systest/ws/gcm/GCMTest.java | 48 +++
.../ws/gcm/MGF256AlgorithmSuiteLoader.java | 18 ++
.../apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl | 61
.../apache/cxf/systest/ws/gcm/mgf-client.xml| 10
.../apache/cxf/systest/ws/gcm/mgf-server.xml| 9 +++
.../cxf/systest/ws/gcm/mgf-stax-server.xml | 10
10 files changed, 166 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e6c5e48/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
index 564cece..ea62f2d 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AsymmetricBindingHandler.java
@@ -494,6 +494,7 @@ public class AsymmetricBindingHandler extends
AbstractBindingBuilder {
encr.setSymmetricEncAlgorithm(algType.getEncryption());
encr.setKeyEncAlgo(algType.getAsymmetricKeyWrap());
encr.setMGFAlgorithm(algType.getMGFAlgo());
+encr.setDigestAlgorithm(algType.getEncryptionDigest());
encr.prepare(saaj.getSOAPPart(), crypto);
Element encryptedKeyElement =
encr.getEncryptedKeyElement();
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e6c5e48/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
index a826606..e6d4a09 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxAsymmetricBindingHandler.java
@@ -382,6 +382,10 @@ public class StaxAsymmetricBindingHandler extends
AbstractStaxBindingHandler {
algorithmSuite.getAlgorithmSuiteType().getAsymmetricKeyWrap());
properties.setEncryptionSymAlgorithm(
algorithmSuite.getAlgorithmSuiteType().getEncryption());
+properties.setEncryptionKeyTransportDigestAlgorithm(
+
algorithmSuite.getAlgorithmSuiteType().getEncryptionDigest());
+properties.setEncryptionKeyTransportMGFAlgorithm(
+ algorithmSuite.getAlgorithmSuiteType().getMGFAlgo());
String encUser =
(String)SecurityUtils.getSecurityPropertyValue(SecurityConstants.ENCRYPT_USERNAME,
message);
http://git-wip-us.apache.org/repos/asf/cxf/blob/4e6c5e48/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
--
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
index 97e4c65..a23ad09 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
@@ -475,6 +475,10 @@ public class StaxSymmetricBindingHandler extends
Abst
cxf git commit: make websocket_osgi sample also work for both karaf 4.0.x
Repository: cxf
Updated Branches:
refs/heads/master 64e7c75d2 -> b2c10cc6c
make websocket_osgi sample also work for both karaf 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2c10cc6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2c10cc6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2c10cc6
Branch: refs/heads/master
Commit: b2c10cc6c18a6e6589d258436303c46b3f682f7e
Parents: 64e7c75
Author: Akitoshi Yoshida
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida
Committed: Tue Apr 5 11:04:55 2016 +0200
--
.../src/main/release/samples/jax_rs/websocket_osgi/README.txt| 4 ++--
.../src/main/release/samples/jax_rs/websocket_osgi/pom.xml | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
index 60d7705..efc7000 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -16,8 +16,8 @@ Using either UNIX or Windows:
This will produce a war file in the target folder.
-
-Starting Karaf (refer to
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+Starting Karaf (refer to
http://karaf.apache.org/manual/latest-3.0.x/quick-start.html.
+You can also use Karaf 4.0.x for this demo.)
bin/karaf
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
--
diff --git
a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index e0d1234..3dac0f3 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -48,6 +48,8 @@
${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false
+javax.servlet;version="[2.6,4)",
+javax.servlet.http;version="[2.6,4)",
javax.ws.rs,
javax.ws.rs.core,
org.apache.cxf.jaxrs.provider,
cxf git commit: add a blueprint version of websocket sample for karaf
Repository: cxf Updated Branches: refs/heads/master 0b9cb3da9 -> 64e7c75d2 add a blueprint version of websocket sample for karaf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/64e7c75d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/64e7c75d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/64e7c75d Branch: refs/heads/master Commit: 64e7c75d2176a39abfd9de40196e7c6eb02cf127 Parents: 0b9cb3d Author: Akitoshi Yoshida Authored: Tue Apr 5 10:38:42 2016 +0200 Committer: Akitoshi Yoshida Committed: Tue Apr 5 10:38:42 2016 +0200 -- .../samples/jax_rs/websocket_osgi/README.txt| 94 +++ .../samples/jax_rs/websocket_osgi/pom.xml | 94 +++ .../main/java/demo/jaxrs/server/Customer.java | 43 +++ .../java/demo/jaxrs/server/CustomerService.java | 271 +++ .../src/main/java/demo/jaxrs/server/Order.java | 69 + .../main/java/demo/jaxrs/server/Product.java| 43 +++ .../resources/OSGI-INF/blueprint/context.xml| 47 .../websocket_osgi/src/test/resources/client.js | 234 8 files changed, 895 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/64e7c75d/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt -- diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt new file mode 100644 index 000..60d7705 --- /dev/null +++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt @@ -0,0 +1,94 @@ +JAX-RS WebSocket OSGi Blueprint Demo += + +This is an OSGi Blueprint version of JAX-RS WebSocket Demo. + +Building and running the demo using maven +--- + +From the base directory of this sample (i.e., where this README file is +located), the maven pom.xml file can be used to build and run the demo. + + +Using either UNIX or Windows: + + mvn install + +This will produce a war file in the target folder. + + +Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html) + + bin/karaf + + + __ __ + / //_/ __ _/ __/ +/ ,< / __ `/ ___/ __ `/ /_ + / /| |/ /_/ / / / /_/ / __/ + /_/ |_|\__,_/_/ \__,_/_/ + +Apache Karaf (3.0.4) + + Hit '' for a list of available commands + and '[cmd] --help' for help on a specific command. + Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf. + + +In order to install CXF's features, you need to add the CXF's features repo using + + feature:repo-add cxf 3.n.m + + where 3.n.m corresponds to a valid CXF version number + +Install CXF's cxf-jaxrs and cxf-transports-websocket-server features that installs all the required bundles +for this demo bundle. + + feature:install cxf-jaxrs cxf-transports-websocket-server + +Install this demo bundle (using the appropriate bundle version number) + + install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.n.m + +And verify the bundles are installed. + +karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT +Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features +karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server +karaf@root()> list -t 0 | grep CXF + 80 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Core + 81 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime Management +100 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime HTTP Transport +102 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers +103 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Search +104 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Service Description +105 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime JAX-RS Frontend +106 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Client +108 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime WebSocket Transport +karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi +Bundle ID: 109 +karaf@root()> list +START LEVEL 100 , List Threshold: 50 + ID | State | Lvl | Version| Name +- +107 | Active | 80 | 2.4.3 | atmosphere-runtime +109 | A
