JBossWS SVN: r16692 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-09-03 11:43:54 -0400 (Mon, 03 Sep 2012)
New Revision: 16692
Added:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
Log:
[JBWS-3542] Removing usage of ws-security.sts.disable-wsmex-call-using-epr-address option (do not disable WS-MEX client aggressive behaviour) and adding web.xml to have jboss web also process http requests to STS endpoint URL subpaths (e.g. /mex, for improved Metro interoperability)
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-03 15:36:42 UTC (rev 16691)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2012-09-03 15:43:54 UTC (rev 16692)
@@ -271,7 +271,8 @@
<!-- jaxws-samples-wsse-policy-trust-sts -->
<war
- warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts.war" needxmlfile='false'>
+ warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-trust-sts.war"
+ webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/SampleSTS.class"/>
<include name="org/jboss/test/ws/jaxws/samples/wsse/policy/trust/STSCallbackHandler.class"/>
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2012-09-03 15:36:42 UTC (rev 16691)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustTestUtils.java 2012-09-03 15:43:54 UTC (rev 16692)
@@ -93,7 +93,6 @@
ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USERNAME), "myclientkey");
ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_PROPERTIES), Thread.currentThread().getContextClassLoader().getResource("META-INF/clientKeystore.properties"));
ctx.put(appendIssuedTokenSuffix(SecurityConstants.STS_TOKEN_USE_CERT_FOR_KEYINFO), "true");
- ctx.put("ws-security.sts.disable-wsmex-call-using-epr-address", "true");
}
private static String appendIssuedTokenSuffix(String prop)
Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml (rev 0)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/trust/WEB-INF/web.xml 2012-09-03 15:43:54 UTC (rev 16692)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app
+ version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <servlet>
+ <servlet-name>TestSecurityTokenService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.samples.wsse.policy.trust.SampleSTS</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestSecurityTokenService</servlet-name>
+ <url-pattern>/SecurityTokenService/*</url-pattern>
+ </servlet-mapping>
+</web-app>
12 years, 4 months
JBossWS SVN: r16691 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2012-09-03 11:36:42 -0400 (Mon, 03 Sep 2012)
New Revision: 16691
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
Log:
[JBWS-3543] Relaxing SubjectCreatingPolicyInterceptor reaction to missing SecurityContext
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-09-03 13:54:10 UTC (rev 16690)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingPolicyInterceptor.java 2012-09-03 15:36:42 UTC (rev 16691)
@@ -68,7 +68,8 @@
SecurityContext context = message.get(SecurityContext.class);
if (context == null || context.getUserPrincipal() == null)
{
- reportSecurityException("User Principal is not available on the current message");
+ LOG.error("User Principal is not available on the current message"); //TODO i18n
+ return;
}
SecurityToken token = message.get(SecurityToken.class);
12 years, 4 months
JBossWS SVN: r16690 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-09-03 09:54:10 -0400 (Mon, 03 Sep 2012)
New Revision: 16690
Modified:
stack/cxf/trunk/pom.xml
Log:
use latest shared-testsuite trunk
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2012-09-03 13:42:35 UTC (rev 16689)
+++ stack/cxf/trunk/pom.xml 2012-09-03 13:54:10 UTC (rev 16690)
@@ -63,7 +63,7 @@
<jbossws.spi.version>2.1.0.Beta3</jbossws.spi.version>
<jbossws.common.version>2.1.0.Beta3</jbossws.common.version>
<jbossws.common.tools.version>1.0.1.GA</jbossws.common.tools.version>
- <jbossws.shared.testsuite.version>4.1.0.Beta2</jbossws.shared.testsuite.version>
+ <jbossws.shared.testsuite.version>4.1.0-SNAPSHOT</jbossws.shared.testsuite.version>
<jbossws.jboss710.version>4.1.0-SNAPSHOT</jbossws.jboss710.version>
<jbossws.jboss711.version>4.1.0-SNAPSHOT</jbossws.jboss711.version>
<jbossws.jboss712.version>4.1.0-SNAPSHOT</jbossws.jboss712.version>
12 years, 4 months
JBossWS SVN: r16689 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2074/handler and 4 other directories.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2012-09-03 09:42:35 -0400 (Mon, 03 Sep 2012)
New Revision: 16689
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml
Log:
[JBWS-2074] extending test case to cover manual JNDI lookups - BTW this never worked in prior to AS7 series for EJB3 endpoints :)
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-09-03 07:58:13 UTC (rev 16688)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2012-09-03 13:42:35 UTC (rev 16689)
@@ -591,6 +591,7 @@
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/POJOImpl.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml" />
</classes>
<manifest>
@@ -624,6 +625,7 @@
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase4/service/EJB3Impl.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/handler/DescriptorResourcesHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/handler/JavaResourcesHandler.class" />
+ <include name="org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.class" />
<include name="org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml" />
</fileset>
<metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2074/usecase4/META-INF">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/handler/ManualResourcesHandler.java 2012-09-03 13:42:35 UTC (rev 16689)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.jbws2074.handler;
+
+import javax.annotation.PostConstruct;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPException;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.handler.MessageContext;
+import javax.xml.ws.handler.soap.SOAPMessageContext;
+
+import org.jboss.logging.Logger;
+import org.jboss.ws.api.handler.GenericSOAPHandler;
+
+/**
+ * This handler is initialized using manual JNDI lookup
+ * and refer to the ejb-jar.xml or web.xml defined
+ * environment entries.
+ *
+ * @author ropalka(a)redhat.com
+ */
+public class ManualResourcesHandler extends GenericSOAPHandler
+{
+ // provide logging
+ private static final Logger log = Logger.getLogger(ManualResourcesHandler.class);
+
+ /**
+ * java.lang.Boolean
+ */
+
+ private Boolean boolean0;
+
+ /**
+ * java.lang.Byte
+ */
+
+ private Byte byte0;
+
+ /**
+ * java.lang.Character
+ */
+
+ private Character character0;
+
+ /**
+ * java.lang.Short
+ */
+
+ private Short short0;
+
+ /**
+ * java.lang.Integer
+ */
+
+ private Integer integer0;
+
+ /**
+ * java.lang.Long
+ */
+
+ private Long long0;
+
+ /**
+ * java.lang.Float
+ */
+
+ private Float float0;
+
+ /**
+ * java.lang.Double
+ */
+
+ private Double double0;
+
+ /**
+ * java.lang.String
+ */
+
+ private String string;
+
+ /**
+ * Indicates whether handler is in correct state.
+ */
+ private boolean correctState;
+
+ @PostConstruct
+ private void init()
+ {
+ doManualJndiLookup();
+ }
+
+ private void doManualJndiLookup() {
+ this.boolean0 = null;
+ this.byte0 = null;
+ this.character0 = null;
+ this.short0 = null;
+ this.integer0 = null;
+ this.long0 = null;
+ this.float0 = null;
+ this.double0 = null;
+ this.string = null;
+ boolean correctInitialization = true;
+ try {
+ final InitialContext env = new InitialContext();
+
+ // java.lang.Boolean
+ this.boolean0 = (Boolean)env.lookup("java:comp/env/boolean");
+ if (this.boolean0 == null || this.boolean0 != true)
+ {
+ log.error("Manual JNDI lookup for boolean0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Byte
+ this.byte0 = (Byte)env.lookup("java:comp/env/byte");
+ if (this.byte0 == null || this.byte0 != (byte)1)
+ {
+ log.error("Manual JNDI lookup for byte0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Character
+ this.character0 = (Character)env.lookup("java:comp/env/character");
+ if (this.character0 == null || this.character0 != 'c')
+ {
+ log.error("Manual JNDI lookup for character0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Short
+ this.short0 = (Short)env.lookup("java:comp/env/short");
+ if (this.short0 == null || this.short0 != (short)5)
+ {
+ log.error("Manual JNDI lookup for short0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Integer
+ this.integer0 = (Integer)env.lookup("java:comp/env/integer");
+ if (this.integer0 == null || this.integer0 != 7)
+ {
+ log.error("Manual JNDI lookup for integer0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Long
+ this.long0 = (Long)env.lookup("java:comp/env/long");
+ if (this.long0 == null || this.long0 != 11L)
+ {
+ log.error("Manual JNDI lookup for long0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Float
+ this.float0 = (Float)env.lookup("java:comp/env/float");
+ if (this.float0 == null || this.float0 != 13.0f)
+ {
+ log.error("Manual JNDI lookup for float0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.Double
+ this.double0 = (Double)env.lookup("java:comp/env/double");
+ if (this.double0 == null || this.double0 != 17.0)
+ {
+ log.error("Manual JNDI lookup for double0 failed");
+ correctInitialization = false;
+ }
+
+ // java.lang.String
+ this.string = (String)env.lookup("java:comp/env/string");
+ if ("s".equals(this.string) == false)
+ {
+ log.error("Manual JNDI lookup for string0 failed");
+ correctInitialization = false;
+ }
+
+ this.correctState = correctInitialization;
+ } catch (final NamingException e) {
+ this.correctState = false;
+ }
+ }
+
+ @Override
+ public boolean handleOutbound(MessageContext msgContext)
+ {
+ return ensureInjectionsAndInitialization(msgContext, "Outbound");
+ }
+
+ @Override
+ public boolean handleInbound(MessageContext msgContext)
+ {
+ return ensureInjectionsAndInitialization(msgContext, "Inbound");
+ }
+
+ private boolean ensureInjectionsAndInitialization(MessageContext msgContext, String direction)
+ {
+ if (!this.correctState)
+ {
+ throw new WebServiceException("Unfunctional manual JNDI lookups in @PostConstruct annotated methods");
+ }
+ doManualJndiLookup();
+ if (!this.correctState)
+ {
+ throw new WebServiceException("Unfunctional manual JNDI lookups in handler execution methods");
+ }
+
+ try
+ {
+ SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage();
+ SOAPElement soapElement = (SOAPElement)soapMessage.getSOAPBody().getChildElements().next();
+ soapElement = (SOAPElement)soapElement.getChildElements().next();
+
+ String oldValue = soapElement.getValue();
+ String newValue = oldValue + ":" + direction + ":ManualResourcesHandler";
+ soapElement.setValue(newValue);
+
+ log.debug("oldValue: " + oldValue);
+ log.debug("newValue: " + newValue);
+
+ return true;
+ }
+ catch (SOAPException ex)
+ {
+ throw new WebServiceException(ex);
+ }
+ }
+
+}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2012-09-03 07:58:13 UTC (rev 16688)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2012-09-03 13:42:35 UTC (rev 16689)
@@ -54,11 +54,13 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
+ expStr.append(":Inbound:ManualResourcesHandler");
expStr.append(":Inbound:JavaResourcesHandler");
expStr.append(":Inbound:DescriptorResourcesHandler");
expStr.append(":POJOImpl");
expStr.append(":Outbound:DescriptorResourcesHandler");
expStr.append(":Outbound:JavaResourcesHandler");
+ expStr.append(":Outbound:ManualResourcesHandler");
assertEquals(expStr.toString(), retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml 2012-09-03 07:58:13 UTC (rev 16688)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/service/jaxws-service-handlers.xml 2012-09-03 13:42:35 UTC (rev 16689)
@@ -19,4 +19,11 @@
</handler>
</handler-chain>
-</handler-chains>
\ No newline at end of file
+ <handler-chain>
+ <handler>
+ <handler-name>ManualResourcesHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2012-09-03 07:58:13 UTC (rev 16688)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2012-09-03 13:42:35 UTC (rev 16689)
@@ -55,11 +55,13 @@
String retStr = port.echo("hello");
StringBuffer expStr = new StringBuffer("hello");
+ expStr.append(":Inbound:ManualResourcesHandler");
expStr.append(":Inbound:JavaResourcesHandler");
expStr.append(":Inbound:DescriptorResourcesHandler");
expStr.append(":EJB3Impl");
expStr.append(":Outbound:DescriptorResourcesHandler");
expStr.append(":Outbound:JavaResourcesHandler");
+ expStr.append(":Outbound:ManualResourcesHandler");
assertEquals(expStr.toString(), retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml 2012-09-03 07:58:13 UTC (rev 16688)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/service/jaxws-service-handlers.xml 2012-09-03 13:42:35 UTC (rev 16689)
@@ -19,4 +19,11 @@
</handler>
</handler-chain>
-</handler-chains>
\ No newline at end of file
+ <handler-chain>
+ <handler>
+ <handler-name>ManualResourcesHandler</handler-name>
+ <handler-class>org.jboss.test.ws.jaxws.jbws2074.handler.ManualResourcesHandler</handler-class>
+ </handler>
+ </handler-chain>
+
+</handler-chains>
12 years, 4 months
JBossWS SVN: r16688 - in stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12: basedoc/utf16 and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2012-09-03 03:58:13 -0400 (Mon, 03 Sep 2012)
New Revision: 16688
Modified:
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/IBaseDataTypesDocLitW.java
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/IBaseDataTypesDocLitW.java
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/IBaseDataTypesRpcLit.java
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexdoc/IComplexDataTypesDocLitW.java
stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexrpc/IComplexDataTypesRpcLit.java
Log:
Enable WSA and UTF16 encoding
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/IBaseDataTypesDocLitW.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/IBaseDataTypesDocLitW.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/IBaseDataTypesDocLitW.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -29,10 +29,12 @@
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
+import javax.xml.ws.soap.Addressing;
@WebService(targetNamespace = "http://tempuri.org/", name = "IBaseDataTypesDocLitW")
@XmlSeeAlso({ObjectFactory.class})
+@Addressing
public interface IBaseDataTypesDocLitW {
@WebResult(name = "RetIntResult", targetNamespace = "http://tempuri.org/")
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/BaseTypesDocTestCase.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -54,7 +54,8 @@
Service service = Service.create(wsdlURL, serviceName);
IBaseDataTypesDocLitW port = (IBaseDataTypesDocLitW) service.getPort(IBaseDataTypesDocLitW.class);
// invoke method
- ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost/jaxws-bp12basedoc-utf16/BPBaseDoc");
+ //((BindingProvider)port).getRequestContext().put("org.apache.cxf.message.Message.ENCODING", "UTF-16");
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:9090/jaxws-bp12basedoc-utf16/BPBaseDoc");
System.out.println("Invoking retInt...");
int _retInt_inInt = 10;
int _retInt__return = port.retInt(_retInt_inInt);
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/IBaseDataTypesDocLitW.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/IBaseDataTypesDocLitW.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/basedoc/utf16/IBaseDataTypesDocLitW.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -28,11 +28,13 @@
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
+import javax.xml.ws.soap.Addressing;
import org.jboss.test.ws.jaxws.bp12.basedoc.utf16.ObjectFactory;
@WebService(targetNamespace = "http://tempuri.org/", name = "IBaseDataTypesDocLitW")
@XmlSeeAlso({ObjectFactory.class})
+@Addressing
public interface IBaseDataTypesDocLitW {
@WebResult(name = "RetIntResult", targetNamespace = "http://tempuri.org/")
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/IBaseDataTypesRpcLit.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/IBaseDataTypesRpcLit.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/baserpc/IBaseDataTypesRpcLit.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -27,9 +27,11 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.xml.ws.Action;
+import javax.xml.ws.soap.Addressing;
@WebService(targetNamespace = "http://tempuri.org/", name = "IBaseDataTypesRpcLit")
@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Addressing
public interface IBaseDataTypesRpcLit {
@WebResult(name = "RetIntResult", targetNamespace = "http://tempuri.org/", partName = "RetIntResult")
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexdoc/IComplexDataTypesDocLitW.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexdoc/IComplexDataTypesDocLitW.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexdoc/IComplexDataTypesDocLitW.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -29,9 +29,11 @@
import javax.xml.ws.Action;
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
+import javax.xml.ws.soap.Addressing;
@WebService(targetNamespace = "http://tempuri.org/", name = "IComplexDataTypesDocLitW")
@XmlSeeAlso({ObjectFactory.class})
+@Addressing
public interface IComplexDataTypesDocLitW {
@WebResult(name = "RetArrayString1DResult", targetNamespace = "http://tempuri.org/")
Modified: stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexrpc/IComplexDataTypesRpcLit.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexrpc/IComplexDataTypesRpcLit.java 2012-08-30 16:28:22 UTC (rev 16687)
+++ stack/cxf/branches/jbossws-cxf-bp-test/modules/testsuite/bp12-tests/src/test/java/org/jboss/test/ws/jaxws/bp12/complexrpc/IComplexDataTypesRpcLit.java 2012-09-03 07:58:13 UTC (rev 16688)
@@ -28,16 +28,12 @@
import javax.jws.soap.SOAPBinding;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.ws.Action;
+import javax.xml.ws.soap.Addressing;
-/**
- * This class was generated by Apache CXF 2.6.0-SNAPSHOT
- * 2012-08-30T15:04:33.797+08:00
- * Generated source version: 2.6.0-SNAPSHOT
- *
- */
@WebService(targetNamespace = "http://tempuri.org/", name = "IComplexDataTypesRpcLit")
@XmlSeeAlso({ObjectFactory.class})
@SOAPBinding(style = SOAPBinding.Style.RPC)
+@Addressing
public interface IComplexDataTypesRpcLit {
@WebResult(name = "RetArrayString1DResult", targetNamespace = "http://tempuri.org/", partName = "RetArrayString1DResult")
12 years, 4 months