JBossWS SVN: r18206 - stack/cxf/branches/jbossws-cxf-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-18 07:58:29 -0500 (Wed, 18 Dec 2013)
New Revision: 18206
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
Log:
Using latest common and framework
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/pom.xml 2013-12-18 12:58:29 UTC (rev 18206)
@@ -44,8 +44,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.common.version>1.1.0.SP11</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP14</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP8</jbossws.spi.version>
<!-- JBWS-2505 -->
<!-- START -->
11 years
- 1
- 0
JBossWS SVN: r18205 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-18 07:56:31 -0500 (Wed, 18 Dec 2013)
New Revision: 18205
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Preparing for next dev cycle
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 10:04:28 UTC (rev 18204)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 12:56:31 UTC (rev 18205)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2.SP16</version>
+ <version>3.1.2-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
</scm>
<!-- Modules -->
11 years
- 1
- 0
JBossWS SVN: r18204 - stack/native/tags.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-18 05:04:28 -0500 (Wed, 18 Dec 2013)
New Revision: 18204
Added:
stack/native/tags/jbossws-native-3.1.2.SP16/
Log:
Tagging jbossws-native-3.1.2.SP16
11 years
- 1
- 0
JBossWS SVN: r18203 - in stack/native/branches/jbossws-native-3.1.2: modules/client and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-18 05:03:20 -0500 (Wed, 18 Dec 2013)
New Revision: 18203
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Preparing for tagging 3.1.2.SP16
Modified: stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/client/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/endorsed/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/management/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/resources/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/framework-tests/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native-testsuite</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ws.native</groupId>
<artifactId>jbossws-native</artifactId>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 10:03:20 UTC (rev 18203)
@@ -17,7 +17,7 @@
<artifactId>jbossws-native</artifactId>
<packaging>pom</packaging>
- <version>3.1.2-SNAPSHOT</version>
+ <version>3.1.2.SP16</version>
<!-- Parent -->
<parent>
@@ -28,9 +28,9 @@
<!-- Source Control Management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/branches/jbos...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/branches/jbossws...</developerConnection>
- <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/branches/jbossws-na...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/native/tags/jbossws-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/native/tags/jbossws-nat...</developerConnection>
+ <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/native/tags/jbossws-native...</url>
</scm>
<!-- Modules -->
11 years
- 1
- 0
JBossWS SVN: r18202 - stack/native/branches/jbossws-native-3.1.2.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-18 04:47:57 -0500 (Wed, 18 Dec 2013)
New Revision: 18202
Modified:
stack/native/branches/jbossws-native-3.1.2/pom.xml
Log:
Using latest versions of common and spi
Modified: stack/native/branches/jbossws-native-3.1.2/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 08:55:58 UTC (rev 18201)
+++ stack/native/branches/jbossws-native-3.1.2/pom.xml 2013-12-18 09:47:57 UTC (rev 18202)
@@ -44,8 +44,8 @@
<!-- Properties -->
<properties>
- <jbossws.common.version>1.1.0-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.1.2-SNAPSHOT</jbossws.framework.version>
+ <jbossws.common.version>1.1.0.SP11</jbossws.common.version>
+ <jbossws.framework.version>3.1.2.SP14</jbossws.framework.version>
<jbossws.spi.version>1.1.2.SP8</jbossws.spi.version>
<!-- [JBWS-2505] -->
<!-- START -->
11 years
- 1
- 0
JBossWS SVN: r18201 - in stack/cxf/branches/jaspi/modules: server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-12-18 03:55:58 -0500 (Wed, 18 Dec 2013)
New Revision: 18201
Added:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml
Removed:
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/interceptor/
Modified:
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConstants.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceImpl.java
Log:
More cleanup and refactor
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConfigProvider.java 2013-12-18 08:55:58 UTC (rev 18201)
@@ -33,34 +33,36 @@
/**
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
-public class JBossWSAuthConfigProvider implements AuthConfigProvider {
- private Properties contextProperties;
-
- public JBossWSAuthConfigProvider(Properties props, AuthConfigFactory factory) {
- contextProperties = props;
- if (factory != null) {
- factory.registerConfigProvider(this, "soap", null,"JBossWS AuthConfigProvider");
- }
+public class JBossWSAuthConfigProvider implements AuthConfigProvider
+{
+ private Properties contextProperties;
- }
-
- @Override
- public ClientAuthConfig getClientAuthConfig(String layer,
- String appContext, CallbackHandler handler) throws AuthException, SecurityException {
- return new JBossWSClientAuthConfig(layer, appContext, handler, contextProperties);
- }
+ public JBossWSAuthConfigProvider(Properties props, AuthConfigFactory factory)
+ {
+ contextProperties = props;
+ if (factory != null)
+ {
+ factory.registerConfigProvider(this, "soap", null, "JBossWS AuthConfigProvider");
+ }
- @Override
- public ServerAuthConfig getServerAuthConfig(String layer,
- String appContext, CallbackHandler handler) throws AuthException,
- SecurityException {
- return new JBossWSServerAuthConfig(layer, appContext, handler, contextProperties);
- }
+ }
- @Override
- public void refresh() {
-
-
- }
-
+ @Override
+ public ClientAuthConfig getClientAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, SecurityException
+ {
+ return new JBossWSClientAuthConfig(layer, appContext, handler, contextProperties);
+ }
+
+ @Override
+ public ServerAuthConfig getServerAuthConfig(String layer, String appContext, CallbackHandler handler) throws AuthException, SecurityException
+ {
+ return new JBossWSServerAuthConfig(layer, appContext, handler, contextProperties);
+ }
+
+ @Override
+ public void refresh()
+ {
+
+ }
+
}
\ No newline at end of file
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConstants.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConstants.java 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSAuthConstants.java 2013-12-18 08:55:58 UTC (rev 18201)
@@ -20,11 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.wsf.stack.cxf.jaspi.config;
+
/**
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
-public class JBossWSAuthConstants {
- public static final String WSS4J_CONFIG = "wss4j.config";
- public static final String SOAP_LAYER = "soap";
+public class JBossWSAuthConstants
+{
+ public static final String SOAP_LAYER = "soap";
}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2013-12-18 08:55:58 UTC (rev 18201)
@@ -32,8 +32,6 @@
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.message.AuthException;
import javax.security.auth.message.MessageInfo;
-import javax.security.auth.message.config.AuthConfig;
-import javax.security.auth.message.config.ServerAuthConfig;
import javax.security.auth.message.config.ServerAuthContext;
import javax.security.auth.message.module.ServerAuthModule;
import javax.xml.namespace.QName;
@@ -50,29 +48,22 @@
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.auth.container.config.AuthModuleEntry;
import org.jboss.security.auth.login.JASPIAuthenticationInfo;
+import org.jboss.security.auth.message.config.JBossServerAuthConfig;
import org.jboss.security.config.ControlFlag;
import org.jboss.security.plugins.ClassLoaderLocator;
import org.jboss.security.plugins.ClassLoaderLocatorFactory;
/**
* @author <a href="ema(a)redhat.com">Jim Ma</a>
*/
-//TODO: Refactor JBossServerAuthConfig, this class should extend JBossServerAuthConfig,
-public class JBossWSServerAuthConfig implements ServerAuthConfig {
- private String layer;
- private String appContextId;
+public class JBossWSServerAuthConfig extends JBossServerAuthConfig {
private CallbackHandler callbackHandler = new JBossCallbackHandler();
@SuppressWarnings("rawtypes")
private List modules = new ArrayList();
- @SuppressWarnings({"rawtypes" })
- private Map contextProperties;
@SuppressWarnings("rawtypes")
public JBossWSServerAuthConfig(String layer, String appContext,
CallbackHandler handler, Map properties) {
- this.layer = layer;
- this.appContextId = appContext;
- this.callbackHandler = handler;
- this.contextProperties = properties;
+ super(layer, appContext, handler, properties);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -141,32 +132,6 @@
return serverAuthContext;
}
- /**
- * @see AuthConfig#getAppContext()
- */
- public String getAppContext() {
- return this.appContextId;
- }
-
- /**
- * @see AuthConfig#getMessageLayer()
- */
- public String getMessageLayer() {
- return this.layer;
- }
-
- /**
- * @see AuthConfig#refresh()
- */
- public void refresh() {
- }
-
- // Custom Methods
- @SuppressWarnings({ "rawtypes" })
- public List getServerAuthModules() {
- return this.modules;
- }
-
@SuppressWarnings("rawtypes")
public String getAuthContextID(MessageInfo messageInfo)
{
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2013-12-18 08:55:58 UTC (rev 18201)
@@ -553,7 +553,8 @@
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/jaxws/*.class"/>
</classes>
<webinf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaspi/WEB-INF">
- <include name="jboss-*.xml"/>
+ <!--include name="jboss-*.xml"/-->
+ <include name="jaxws-*.xml"/>
<include name="wsdl/*"/>
</webinf>
<manifest>
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2013-12-18 08:55:58 UTC (rev 18201)
@@ -26,6 +26,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
+import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
Modified: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceImpl.java
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceImpl.java 2013-12-18 03:54:30 UTC (rev 18200)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaspi/ServiceImpl.java 2013-12-18 08:55:58 UTC (rev 18201)
@@ -23,6 +23,8 @@
import javax.jws.WebService;
+import org.jboss.ws.api.annotation.EndpointConfig;
+
@WebService
(
portName = "SecurityServicePort",
@@ -31,6 +33,8 @@
targetNamespace = "http://www.jboss.org/jbossws/ws-extensions/wssecuritypolicy",
endpointInterface = "org.jboss.test.ws.jaxws.samples.wsse.policy.jaspi.ServiceIface"
)
+@EndpointConfig(configFile = "WEB-INF/jaxws-endpoint-config.xml", configName = "jaspiSecurityDomain")
+
public class ServiceImpl implements ServiceIface
{
public String sayHello()
Added: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml
===================================================================
--- stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml (rev 0)
+++ stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml 2013-12-18 08:55:58 UTC (rev 18201)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jaxws-config xmlns="urn:jboss:jbossws-jaxws-config:4.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:javaee="http://java.sun.com/xml/ns/javaee"
+ xsi:schemaLocation="urn:jboss:jbossws-jaxws-config:4.0 schema/jbossws-jaxws-config_4_0.xsd">
+ <endpoint-config>
+ <config-name>jaspiSecurityDomain</config-name>
+ <property>
+ <property-name>jaspi.security.domain</property-name>
+ <property-value>jaspi</property-value>
+ </property>
+ </endpoint-config>
+</jaxws-config>
\ No newline at end of file
Property changes on: stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaspi/WEB-INF/jaxws-endpoint-config.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years
- 1
- 0
JBossWS SVN: r18200 - in stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf: jaspi/config and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2013-12-17 22:54:30 -0500 (Tue, 17 Dec 2013)
New Revision: 18200
Modified:
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java
Log:
Configure the jaspi security domain in jaxws-endpoint-config.xml
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-17 17:00:35 UTC (rev 18199)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/ServerBeanCustomizer.java 2013-12-18 03:54:30 UTC (rev 18200)
@@ -23,8 +23,20 @@
import java.io.IOException;
import java.util.List;
+import java.util.Properties;
+import javax.security.auth.message.config.AuthConfigFactory;
+import javax.security.auth.message.config.AuthConfigProvider;
+import javax.security.auth.message.config.ServerAuthConfig;
+import javax.security.auth.message.config.ServerAuthContext;
+
import org.apache.cxf.frontend.ServerFactoryBean;
+import org.jboss.security.auth.callback.JBossCallbackHandler;
+import org.jboss.security.auth.login.AuthenticationInfo;
+import org.jboss.security.auth.login.BaseAuthenticationInfo;
+import org.jboss.security.auth.login.JASPIAuthenticationInfo;
+import org.jboss.security.config.ApplicationPolicy;
+import org.jboss.security.config.SecurityConfiguration;
import org.jboss.ws.api.annotation.EndpointConfig;
import org.jboss.ws.common.management.AbstractServerConfig;
import org.jboss.wsf.spi.deployment.Endpoint;
@@ -33,10 +45,15 @@
import org.jboss.wsf.spi.metadata.config.ConfigMetaDataParser;
import org.jboss.wsf.spi.metadata.config.ConfigRoot;
import org.jboss.wsf.stack.cxf.JBossWSInvoker;
+import org.jboss.wsf.stack.cxf.Loggers;
import org.jboss.wsf.stack.cxf.Messages;
import org.jboss.wsf.stack.cxf.client.configuration.BeanCustomizer;
import org.jboss.wsf.stack.cxf.deployment.EndpointImpl;
import org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher;
+import org.jboss.wsf.stack.cxf.interceptor.JaspiSeverInInterceptor;
+import org.jboss.wsf.stack.cxf.jaspi.JaspiServerAuthenticator;
+import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConfigProvider;
+import org.jboss.wsf.stack.cxf.jaspi.config.JBossWSAuthConstants;
/**
*
@@ -151,13 +168,19 @@
{
UnifiedVirtualFile vf = deploymentRoot.findChild(configFile);
ConfigRoot config = ConfigMetaDataParser.parse(vf.toURL());
- endpoint.setEndpointConfig(config.getEndpointConfigByName(configName));
+ endpoint.setEndpointConfig(config.getEndpointConfigByName(configName));
}
catch (IOException e)
{
throw Messages.MESSAGES.couldNotReadConfigFile(configFile);
}
}
+
+ if (endpoint.getProperties().get(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN) !=null) {
+ String jaspiSecurityDomain = (String)endpoint.getProperties().get(JaspiServerAuthenticator.JASPI_SECURITY_DOMAIN);
+ addJaspiInterceptor(endpoint, jaspiSecurityDomain);
+ }
+
}
}
@@ -185,5 +208,48 @@
{
this.epConfigFile = epConfigFile;
}
+
+
+ private void addJaspiInterceptor(EndpointImpl endpoint, String securityDomain) {
+ if (securityDomain == null) {
+ return;
+ }
+ ApplicationPolicy appPolicy = SecurityConfiguration.getApplicationPolicy(securityDomain);
+ if (appPolicy == null) {
+ Loggers.ROOT_LOGGER.noApplicationPolicy(securityDomain);
+ return;
+ }
+ BaseAuthenticationInfo bai = appPolicy.getAuthenticationInfo();
+ if (bai == null || bai instanceof AuthenticationInfo) {
+ Loggers.ROOT_LOGGER.noJaspiApplicationPolicy(securityDomain);
+ return;
+ }
+ JASPIAuthenticationInfo jai = (JASPIAuthenticationInfo) bai;
+ String contextRoot = depEndpoints.get(0).getService().getContextRoot();
+ String appId = "localhost " + contextRoot;
+ AuthConfigFactory factory = AuthConfigFactory.getFactory();
+ Properties properties = new Properties();
+ AuthConfigProvider provider = new JBossWSAuthConfigProvider(properties, factory);
+ provider = factory.getConfigProvider(JBossWSAuthConstants.SOAP_LAYER, appId, null);
+ JBossCallbackHandler callbackHandler = new JBossCallbackHandler();
+ JaspiServerAuthenticator serverAuthenticator = null;
+ try
+ {
+ ServerAuthConfig serverConfig = provider.getServerAuthConfig(JBossWSAuthConstants.SOAP_LAYER, appId, callbackHandler);
+ Properties serverContextProperties = new Properties();
+ serverContextProperties.put("security-domain", securityDomain);
+ serverContextProperties.put("jaspi-policy", jai);
+ serverContextProperties.put(javax.xml.ws.Endpoint.class, endpoint);
+ String authContextID = endpoint.getBeanName();
+ ServerAuthContext sctx = serverConfig.getAuthContext(authContextID, null, serverContextProperties);
+ serverAuthenticator = new JaspiServerAuthenticator(sctx);
+ endpoint.getInInterceptors().add(new JaspiSeverInInterceptor(serverAuthenticator));
+ }
+ catch (Exception e)
+ {
+ Loggers.DEPLOYMENT_LOGGER.cannotCreateServerAuthContext(securityDomain);
+ }
+ }
+
}
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2013-12-17 17:00:35 UTC (rev 18199)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/config/JBossWSServerAuthConfig.java 2013-12-18 03:54:30 UTC (rev 18200)
@@ -47,7 +47,6 @@
import org.apache.cxf.Bus;
import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.interceptor.InterceptorProvider;
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.auth.container.config.AuthModuleEntry;
import org.jboss.security.auth.login.JASPIAuthenticationInfo;
@@ -94,7 +93,6 @@
moduleCL = locator.get(jbossModule);
}
- InterceptorProvider ip = (InterceptorProvider)contextProperties.get(InterceptorProvider.class);
for (AuthModuleEntry ame : amearr)
{
if (ame.getLoginModuleStackHolderName() != null)
@@ -106,9 +104,10 @@
ServerAuthModule sam = this.createSAM(moduleCL, ame.getAuthModuleName(), ame.getLoginModuleStackHolderName());
Map options = new HashMap();
- options.put(InterceptorProvider.class, ip);
Bus bus = (Bus)properties.get(Bus.class);
options.put(Bus.class, bus);
+ javax.xml.ws.Endpoint endpoint = (javax.xml.ws.Endpoint)properties.get(javax.xml.ws.Endpoint.class);
+ options.put(javax.xml.ws.Endpoint.class, endpoint);
sam.initialize(null, null, callbackHandler, options);
modules.add(sam);
Modified: stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java
===================================================================
--- stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java 2013-12-17 17:00:35 UTC (rev 18199)
+++ stack/cxf/branches/jaspi/modules/server/src/main/java/org/jboss/wsf/stack/cxf/jaspi/module/UsernameTokenServerAuthModule.java 2013-12-18 03:54:30 UTC (rev 18200)
@@ -32,7 +32,6 @@
import javax.xml.soap.SOAPMessage;
import org.apache.cxf.Bus;
-import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.InterceptorProvider;
import org.apache.cxf.ws.security.SecurityConstants;
import org.jboss.security.auth.container.modules.AbstractServerAuthModule;
@@ -44,7 +43,7 @@
public class UsernameTokenServerAuthModule extends AbstractServerAuthModule
{
private String securityDomainName = null;
- private Endpoint endpoint = null;
+ private javax.xml.ws.Endpoint endpoint = null;
private Bus bus = null;
private InterceptorProvider ip = null;
@@ -52,7 +51,7 @@
public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy, CallbackHandler handler, Map options) throws AuthException
{
super.initialize(requestPolicy, responsePolicy, handler, options);
- endpoint = (Endpoint)options.get(Endpoint.class);
+ endpoint = (javax.xml.ws.Endpoint)options.get(javax.xml.ws.Endpoint.class);
if (endpoint == null && options.get(Bus.class) != null)
{
bus = (Bus)options.get(Bus.class);
@@ -60,7 +59,7 @@
ip = (InterceptorProvider)bus;
}
if (endpoint != null) {
- endpoint.put(SecurityConstants.VALIDATE_TOKEN, false);
+ endpoint.getProperties().put(SecurityConstants.VALIDATE_TOKEN, false);
ip = (InterceptorProvider)endpoint;
}
if (ip != null)
11 years
- 1
- 0
JBossWS SVN: r18199 - in stack/cxf/branches/jbossws-cxf-3.1.2/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/socket and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-17 12:00:35 -0500 (Tue, 17 Dec 2013)
New Revision: 18199
Added:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
Modified:
stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBPAPP-10911] Allow disabling Nagle's Algorithm on ws clients
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java 2013-12-17 17:00:35 UTC (rev 18199)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wsf.stack.cxf.client.socket.tcp;
+
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+/**
+ * A wrapper SocketFactory implementation that will call setTcpNoDelay(true) whenever createSocket() is called. This
+ * is done as a feature for the JIRA issue: JBWS-3745.
+ *
+ * @author navssurtani
+ */
+public class SSLNoDelaySocketFactory extends SSLSocketFactory
+{
+
+ private final SSLSocketFactory targetFactory;
+
+ public SSLNoDelaySocketFactory(SSLSocketFactory targetFactory)
+ {
+ this.targetFactory = targetFactory;
+ }
+
+
+ @Override
+ public String[] getDefaultCipherSuites()
+ {
+ return targetFactory.getDefaultCipherSuites();
+ }
+
+ @Override
+ public String[] getSupportedCipherSuites()
+ {
+ return targetFactory.getSupportedCipherSuites();
+ }
+
+ @Override
+ public Socket createSocket() throws IOException {
+ Socket toReturn = targetFactory.createSocket();
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(Socket socket, String s, int i, boolean b) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(socket, s, i, b);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i) throws IOException, UnknownHostException
+ {
+ Socket toReturn = targetFactory.createSocket(s, i);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i, InetAddress inetAddress, int i2) throws IOException, UnknownHostException
+ {
+ Socket toReturn = targetFactory.createSocket(s, i, inetAddress, i2);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(inetAddress, i);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress2, int i2) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(inetAddress, i, inetAddress2, i2);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+}
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-17 16:40:07 UTC (rev 18198)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-17 17:00:35 UTC (rev 18199)
@@ -109,7 +109,15 @@
</metainf>
</jar>
- <!-- saaj-soap-connection -->
+ <!-- jaxws-cxf-jbws3745 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3745.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3745/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService*.class" />
+ </classes>
+ </war>
+
+ <!-- saaj-soap-connection -->
<war
warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war"
webxml="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/web.xml">
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java 2013-12-17 17:00:35 UTC (rev 18199)
@@ -0,0 +1,141 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import junit.framework.Test;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.jboss.wsf.stack.cxf.client.socket.tcp.SSLNoDelaySocketFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+import javax.net.ssl.SSLSocketFactory;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import java.net.InetAddress;
+import java.net.Socket;
+
+/**
+ * Simple test case for {@link org.jboss.wsf.stack.cxf.client.socket.tcp.SSLNoDelaySocketFactory}
+ * <p/>
+ * We will get an {@link javax.net.ssl.SSLSocketFactory} from the client. This should be an instance of an
+ * SSLNoDelaySocketFactory. Once we have this we will simply create the socket and check if the tcp no delay flag has
+ * been enabled.
+ *
+ * @author navssurtani
+ */
+public class SSLNoDelaySocketFactoryTestCase extends JBossWSTest
+{
+ /* The SocketFactory instance that will be used to get hold of the socket to be tested */
+ private SSLSocketFactory fromClient = null;
+
+ private static final int SERVER_PORT = 8080;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SSLNoDelaySocketFactoryTestCase.class, "jaxws-cxf-jbws3745.war");
+ }
+
+ public void setUp() throws Exception
+ {
+ Bus orig = BusFactory.getThreadDefaultBus(false);
+ try
+ {
+ BusFactory.setThreadDefaultBus(BusFactory.newInstance().createBus());
+ // First we need the client parameters
+ Client client = ClientProxy.getClient(getPort());
+ HTTPConduit conduit = (HTTPConduit)client.getConduit();
+ TLSClientParameters tls = conduit.getTlsClientParameters();
+ if (tls == null) {
+ tls = new TLSClientParameters();
+ conduit.setTlsClientParameters(tls);
+ }
+
+ // Now we need to build the socket factory
+ SSLSocketFactory defaultSocketFactory = (SSLSocketFactory)SSLSocketFactory.getDefault();
+ SSLNoDelaySocketFactory noDelay = new SSLNoDelaySocketFactory(defaultSocketFactory);
+
+ // Now set the socket factory and make a simple check.
+ tls.setSSLSocketFactory(noDelay);
+ fromClient = tls.getSSLSocketFactory();
+ assertEquals(fromClient.getClass(), SSLNoDelaySocketFactory.class);
+ }
+ finally
+ {
+ if (orig != null)
+ BusFactory.setThreadDefaultBus(orig);
+ }
+ }
+
+ public void tearDown() throws Exception {
+ fromClient = null;
+ }
+
+ public void testCreateSocket0() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket();
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ public void testCreateSocket1() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket(getServerHost(), SERVER_PORT);
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ public void testCreateSocket3() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket(InetAddress.getByName(getServerHost()), SERVER_PORT);
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ private SimpleService getPort() throws Exception
+ {
+ final QName qname = new QName("http://org.jboss.ws/jaxws/cxf/jbws3745", "SimpleService");
+ final Service service = Service.create(qname);
+ return service.getPort(SimpleService.class);
+ }
+}
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java 2013-12-17 17:00:35 UTC (rev 18199)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import javax.jws.WebService;
+
+/**
+ * A simple, dummy web service
+ *
+ * @author navssurtani
+ */
+@WebService (name = "SimpleService", targetNamespace = "http://org.jboss.ws.jaxws/cxf/jbws3745",
+ serviceName = "simple")
+public interface SimpleService
+{
+ public String sayHi();
+}
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java 2013-12-17 17:00:35 UTC (rev 18199)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import javax.jws.WebService;
+
+/**
+ * Implementation for {@link org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleService}
+ *
+ * @author navssurtani
+ */
+@WebService (name = "SimpleService", targetNamespace = "http://org.jboss.ws.jaxws/cxf/jbws3745",
+ serviceName = "simple")
+public class SimpleServiceImpl implements SimpleService
+{
+ @Override
+ public String sayHi()
+ {
+ return "Hi!";
+ }
+}
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml (rev 0)
+++ stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml 2013-12-17 17:00:35 UTC (rev 18199)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>SimpleService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SimpleService</servlet-name>
+ <url-pattern>/SimpleService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: stack/cxf/branches/jbossws-cxf-3.1.2/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years
- 1
- 0
JBossWS SVN: r18198 - stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-17 11:40:07 -0500 (Tue, 17 Dec 2013)
New Revision: 18198
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
Log:
[JBPAPP-10905] Prevent NPE
Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2013-12-17 16:03:49 UTC (rev 18197)
+++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/extensions/addressing/jaxws/WSAddressingServerHandler.java 2013-12-17 16:40:07 UTC (rev 18198)
@@ -201,7 +201,12 @@
// supply the response action
OperationMetaData opMetaData = ((CommonMessageContext)msgContext).getOperationMetaData();
-
+ if (opMetaData == null)
+ {
+ // Apparently the operation couldn't be determined
+ return;
+ }
+
if (!isFault && !opMetaData.isOneWay())
{
11 years
- 1
- 0
JBossWS SVN: r18197 - in stack/cxf/trunk/modules: client/src/main/java/org/jboss/wsf/stack/cxf/client/socket and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: asoldano
Date: 2013-12-17 11:03:49 -0500 (Tue, 17 Dec 2013)
New Revision: 18197
Added:
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/
stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
Log:
[JBWS-3745] Allow disabling Nagle's algorithm on Web Service calls (patch from Navin Surtani, modifyied to use a new Bus for each client creation, to stop the deployment when the test is done and other minor things)
Added: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
===================================================================
--- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java (rev 0)
+++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java 2013-12-17 16:03:49 UTC (rev 18197)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.wsf.stack.cxf.client.socket.tcp;
+
+import javax.net.ssl.SSLSocketFactory;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+
+/**
+ * A wrapper SocketFactory implementation that will call setTcpNoDelay(true) whenever createSocket() is called. This
+ * is done as a feature for the JIRA issue: JBWS-3745.
+ *
+ * @author navssurtani
+ */
+public class SSLNoDelaySocketFactory extends SSLSocketFactory
+{
+
+ private final SSLSocketFactory targetFactory;
+
+ public SSLNoDelaySocketFactory(SSLSocketFactory targetFactory)
+ {
+ this.targetFactory = targetFactory;
+ }
+
+
+ @Override
+ public String[] getDefaultCipherSuites()
+ {
+ return targetFactory.getDefaultCipherSuites();
+ }
+
+ @Override
+ public String[] getSupportedCipherSuites()
+ {
+ return targetFactory.getSupportedCipherSuites();
+ }
+
+ @Override
+ public Socket createSocket() throws IOException {
+ Socket toReturn = targetFactory.createSocket();
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(Socket socket, String s, int i, boolean b) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(socket, s, i, b);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i) throws IOException, UnknownHostException
+ {
+ Socket toReturn = targetFactory.createSocket(s, i);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(String s, int i, InetAddress inetAddress, int i2) throws IOException, UnknownHostException
+ {
+ Socket toReturn = targetFactory.createSocket(s, i, inetAddress, i2);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(inetAddress, i);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+
+ @Override
+ public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress2, int i2) throws IOException
+ {
+ Socket toReturn = targetFactory.createSocket(inetAddress, i, inetAddress2, i2);
+ toReturn.setTcpNoDelay(true);
+ return toReturn;
+ }
+}
Property changes on: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/socket/tcp/SSLNoDelaySocketFactory.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-17 11:35:35 UTC (rev 18196)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2013-12-17 16:03:49 UTC (rev 18197)
@@ -488,6 +488,14 @@
</fileset>
</jar>
+ <!-- jaxws-cxf-jbws3745 -->
+ <war destfile="${tests.output.dir}/test-libs/jaxws-cxf-jbws3745.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/cxf/jbws3745/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService*.class" />
+ </classes>
+ </war>
+
<!-- jaxws-cxf-logging -->
<jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-logging.jar">
<fileset dir="${tests.output.dir}/test-classes">
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java 2013-12-17 16:03:49 UTC (rev 18197)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import java.net.InetAddress;
+import java.net.Socket;
+
+import javax.net.ssl.SSLSocketFactory;
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.jboss.wsf.stack.cxf.client.UseNewBusFeature;
+import org.jboss.wsf.stack.cxf.client.socket.tcp.SSLNoDelaySocketFactory;
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Simple test case for {@link org.jboss.wsf.stack.cxf.client.socket.tcp.SSLNoDelaySocketFactory}
+ * <p/>
+ * We will get an {@link javax.net.ssl.SSLSocketFactory} from the client. This should be an instance of an
+ * SSLNoDelaySocketFactory. Once we have this we will simply create the socket and check if the tcp no delay flag has
+ * been enabled.
+ *
+ * @author navssurtani
+ */
+public class SSLNoDelaySocketFactoryTestCase extends JBossWSTest
+{
+ /* The SocketFactory instance that will be used to get hold of the socket to be tested */
+ private SSLSocketFactory fromClient = null;
+
+ private static final int SERVER_PORT = 8080;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(SSLNoDelaySocketFactoryTestCase.class, "jaxws-cxf-jbws3745.war");
+ }
+
+ public void setUp() throws Exception
+ {
+ // First we need the client parameters
+ Client client = ClientProxy.getClient(getPort());
+ HTTPConduit conduit = (HTTPConduit) client.getConduit();
+ TLSClientParameters tls = conduit.getTlsClientParameters();
+
+ // Now we need to build the socket factory
+ SSLSocketFactory defaultSocketFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
+ SSLNoDelaySocketFactory noDelay = new SSLNoDelaySocketFactory(defaultSocketFactory);
+
+ // Now set the socket factory and make a simple check.
+ tls.setSSLSocketFactory(noDelay);
+ fromClient = tls.getSSLSocketFactory();
+ assertEquals(fromClient.getClass(), SSLNoDelaySocketFactory.class);
+ }
+
+ public void tearDown() throws Exception {
+ fromClient = null;
+ }
+
+ public void testCreateSocket0() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket();
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ public void testCreateSocket1() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket(getServerHost(), SERVER_PORT);
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ public void testCreateSocket3() throws Exception
+ {
+ Socket toTest = null;
+ try {
+ toTest = fromClient.createSocket(InetAddress.getByName(getServerHost()), SERVER_PORT);
+ assertTrue(toTest.getTcpNoDelay());
+ } finally {
+ if (toTest != null)
+ toTest.close();
+ }
+ }
+
+ private SimpleService getPort() throws Exception
+ {
+ final QName qname = new QName("http://org.jboss.ws/jaxws/cxf/jbws3745", "SimpleService");
+ final Service service = Service.create(qname, new UseNewBusFeature());
+ return service.getPort(SimpleService.class);
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SSLNoDelaySocketFactoryTestCase.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java 2013-12-17 16:03:49 UTC (rev 18197)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import javax.jws.WebService;
+
+/**
+ * A simple, dummy web service
+ *
+ * @author navssurtani
+ */
+@WebService (name = "SimpleService", targetNamespace = "http://org.jboss.ws.jaxws/cxf/jbws3745",
+ serviceName = "simple")
+public interface SimpleService
+{
+ public String sayHi();
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleService.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java 2013-12-17 16:03:49 UTC (rev 18197)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2013, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.test.ws.jaxws.cxf.jbws3745;
+
+import javax.jws.WebService;
+
+/**
+ * Implementation for {@link org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleService}
+ *
+ * @author navssurtani
+ */
+@WebService (name = "SimpleService", targetNamespace = "http://org.jboss.ws.jaxws/cxf/jbws3745",
+ serviceName = "simple")
+public class SimpleServiceImpl implements SimpleService
+{
+ @Override
+ public String sayHi()
+ {
+ return "Hi!";
+ }
+}
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3745/SimpleServiceImpl.java
___________________________________________________________________
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml 2013-12-17 16:03:49 UTC (rev 18197)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <servlet>
+ <servlet-name>SimpleService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.cxf.jbws3745.SimpleServiceImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>SimpleService</servlet-name>
+ <url-pattern>/SimpleService</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/jbws3745/WEB-INF/web.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Rev Date
Added: svn:eol-style
+ native
11 years
- 1
- 0