JBossWS SVN: r12523 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-25 11:18:11 -0400 (Fri, 25 Jun 2010)
New Revision: 12523
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3002] Enable passing tests
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 15:00:33 UTC (rev 12522)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 15:18:11 UTC (rev 12523)
@@ -79,6 +79,3 @@
org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.*
org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.*
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 15:00:33 UTC (rev 12522)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 15:18:11 UTC (rev 12523)
@@ -79,6 +79,3 @@
org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.*
org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.*
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 15:00:33 UTC (rev 12522)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 15:18:11 UTC (rev 12523)
@@ -74,6 +74,3 @@
org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.*
org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.*
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 15:00:33 UTC (rev 12522)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 15:18:11 UTC (rev 12523)
@@ -74,6 +74,3 @@
org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.*
org/jboss/test/ws/jaxws/jbws2999/JBWS2999TestCase.*
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
13 years, 10 months
JBossWS SVN: r12522 - in stack/cxf/trunk/modules: testsuite and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-25 11:00:33 -0400 (Fri, 25 Jun 2010)
New Revision: 12522
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
Log:
[JBWS-3002] pojo endpoint shared
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-25 14:12:09 UTC (rev 12521)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-25 15:00:33 UTC (rev 12522)
@@ -143,8 +143,9 @@
Invocation inv = invHandler.createInvocation();
InvocationContext invContext = inv.getInvocationContext();
- inv.getInvocationContext().addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
+ invContext.addAttachment(WebServiceContext.class, getWebServiceContext(ctx));
invContext.addAttachment(MessageContext.class, ctx);
+ invContext.setTargetBean(ep.getAttachment(Object.class)); //JBWS-2486 - JBWS-3002
inv.setJavaMethod(m);
inv.setArgs(params);
@@ -179,6 +180,14 @@
exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
throw createFault(e, m, paramList, false);
}
+ finally
+ {
+ // JBWS-2486
+ if (ep.getAttachment(Object.class) == null)
+ {
+ ep.addAttachment(Object.class, inv.getInvocationContext().getTargetBean());
+ }
+ }
return retObj;
}
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 14:12:09 UTC (rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2010-06-25 15:00:33 UTC (rev 12522)
@@ -53,9 +53,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 14:12:09 UTC (rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2010-06-25 15:00:33 UTC (rev 12522)
@@ -53,9 +53,6 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available
# on AS 5.x
org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 14:12:09 UTC (rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss600.txt 2010-06-25 15:00:33 UTC (rev 12522)
@@ -47,8 +47,5 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
Modified: stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt
===================================================================
--- stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 14:12:09 UTC (rev 12521)
+++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss601.txt 2010-06-25 15:00:33 UTC (rev 12522)
@@ -47,8 +47,5 @@
# [JBWS-2987] Review JMS integration
org/jboss/test/ws/jaxws/samples/jmstransport/**
-# [JBWS-3002] Verify POJO endpoints are shared
-org/jboss/test/ws/jaxws/jbws2486/**
-
# [JBWS-3039] Spring 3 classpath scanning fails on AS 6
org/jboss/test/ws/jaxws/cxf/webserviceref/WebServiceRefServletTestCase.*
13 years, 10 months
JBossWS SVN: r12521 - stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/element.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-25 10:12:09 -0400 (Fri, 25 Jun 2010)
New Revision: 12521
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
Log:
[JBPAPP-4502] Correct namespace for 'Created' element within 'UsernameToken'.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2010-06-25 12:26:25 UTC (rev 12520)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2010-06-25 14:12:09 UTC (rev 12521)
@@ -98,7 +98,7 @@
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
- Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Created"));
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSU_NS, "Created"));
if (itCreated != null && itCreated.hasNext())
{
this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
@@ -165,7 +165,7 @@
}
if (created != null)
{
- child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Created");
+ child = doc.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Created");
child.appendChild(doc.createTextNode(created));
element.appendChild(child);
}
13 years, 10 months
JBossWS SVN: r12520 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-25 08:26:25 -0400 (Fri, 25 Jun 2010)
New Revision: 12520
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
Log:
[JBWS-2640] Created element within UsernameToken using incorrect namespace.
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2010-06-25 11:26:36 UTC (rev 12519)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/extensions/security/element/UsernameToken.java 2010-06-25 12:26:25 UTC (rev 12520)
@@ -96,7 +96,7 @@
this.nonce = XMLUtils.getFullTextChildrenFromElement(elem);
}
- Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSSE_NS, "Created"));
+ Iterator<Element> itCreated = DOMUtils.getChildElements(element, new QName(Constants.WSU_NS, "Created"));
if (itCreated != null && itCreated.hasNext())
{
this.created = XMLUtils.getFullTextChildrenFromElement(itCreated.next());
@@ -163,7 +163,7 @@
}
if (created != null)
{
- child = doc.createElementNS(Constants.WSSE_NS, Constants.WSSE_PREFIX + ":" + "Created");
+ child = doc.createElementNS(Constants.WSU_NS, Constants.WSU_PREFIX + ":" + "Created");
child.appendChild(doc.createTextNode(created));
element.appendChild(child);
}
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2010-06-25 11:26:36 UTC (rev 12519)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/MessageTestCase.java 2010-06-25 12:26:25 UTC (rev 12520)
@@ -112,7 +112,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce EncodingType='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-secu...'>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -148,7 +148,7 @@
"<wsse:Username>kermit</wsse:Username>" +
"<wsse:Password Type='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...'>IEeuDaP/NTozwiyJHzTgBoCCDjg=</wsse:Password>" +
"<wsse:Nonce>gHGIdDEWjX1Ay/LiVd3qJ1ua8VbjXis8CJwNDQh1ySA=</wsse:Nonce>" +
- "<wsse:Created>CREATED</wsse:Created>" +
+ "<wsu:Created>CREATED</wsu:Created>" +
"</wsse:UsernameToken>" +
"</wsse:Security>" +
"</env:Header>" +
@@ -196,7 +196,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
@@ -218,7 +218,7 @@
assertNotNull(nonceEl);
assertNotNull(DOMUtils.getTextContent(nonceEl));
assertEquals(nonceEl.getAttribute("EncodingType"), Constants.WSS_SOAP_NS+"#Base64Binary");
- assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).hasNext());
+ assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).hasNext());
}
public void testEncodeMessageWithCreated() throws Exception
@@ -235,7 +235,7 @@
Element usernameTokenEl = (Element)DOMUtils.getChildElements(securityEl, new QName(Constants.WSSE_NS, "UsernameToken")).next();
assertPassword(usernameTokenEl);
assertFalse(DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Nonce")).hasNext());
- Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSSE_NS, "Created")).next();
+ Element createdEl = (Element)DOMUtils.getChildElements(usernameTokenEl, new QName(Constants.WSU_NS, "Created")).next();
assertNotNull(createdEl);
assertNotNull(DOMUtils.getTextContent(createdEl));
}
13 years, 10 months
JBossWS SVN: r12519 - in stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws and 10 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-25 07:26:36 -0400 (Fri, 25 Jun 2010)
New Revision: 12519
Added:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
Modified:
stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
Log:
Added test case to reproduce issues with relative imports.
Modified: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-25 11:25:02 UTC (rev 12518)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2010-06-25 11:26:36 UTC (rev 12519)
@@ -644,6 +644,18 @@
</classes>
</war>
+ <!-- jaxws-jbws3070 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3070.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/jbws3070/*.class" />
+ <exclude name="org/jboss/test/ws/jaxws/jbws3070/*TestCase*.class" />
+ </classes>
+ <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3070/WEB-INF">
+ <include name="**/*.wsdl"/>
+ <include name="**/*.xsd"/>
+ </webinf>
+ </war>
+
<!-- jaxws-webserviceref -->
<war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,66 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * Test case to test JBWS-3070 for the correct publising of imported schemas.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+public class JBWS3070TestCase extends JBossWSTest
+{
+
+ public static Test suite() throws Exception
+ {
+ return new JBossWSTestSetup(JBWS3070TestCase.class, "jaxws-jbws3070.war");
+ }
+
+ private TestEndpoint getPort() throws Exception
+ {
+
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3070?wsdl");
+ QName serviceName = new QName("http://org.jboss.test.ws/jbws3070", "TestEndpointService");
+
+ Service service = Service.create(wsdlURL, serviceName);
+
+ return service.getPort(TestEndpoint.class);
+ }
+
+ public void testCall() throws Exception
+ {
+ String message = "Hi";
+ String response = getPort().echo(message);
+ assertEquals(message, response);
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/JBWS3070TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+@WebService(name = "TestEndpoint", targetNamespace = "http://org.jboss.test.ws/jbws3070")
+public interface TestEndpoint
+{
+
+ public String echo(final String message);
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, 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.jbws3070;
+
+import javax.jws.WebService;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 24th June 2010
+ */
+@WebService(name = "TestEndpoint", serviceName="TestEndpointService", targetNamespace = "http://org.jboss.test.ws/jbws3070", wsdlLocation="WEB-INF/wsdl/a/wsdl/b/TestService.wsdl")
+public class TestEndpointImpl implements TestEndpoint
+{
+
+ public String echo(String message)
+ {
+ return message;
+ }
+
+}
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3070/TestEndpointImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.4" 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">
+
+ <servlet>
+ <servlet-name>TestEndpoint</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws3070.TestEndpointImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>TestEndpoint</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+
+</web-app>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,50 @@
+<definitions name='TestEndpointService' targetNamespace='http://org.jboss.test.ws/jbws3070' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <xs:schema targetNamespace='http://org.jboss.test.ws/jbws3070' version='1.0' xmlns:tns='http://org.jboss.test.ws/jbws3070' xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+
+ <xs:import namespace="http://org.jboss.test.ws/jbws3070/schema1" schemaLocation="../../xsd/schema1.xsd"/>
+
+ <xs:element name='echo' type='tns:echo'/>
+ <xs:element name='echoResponse' type='tns:echoResponse'/>
+ <xs:complexType name='echo'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='arg0' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name='echoResponse'>
+ <xs:sequence>
+ <xs:element minOccurs='0' name='return' type='xs:string'/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:schema>
+ </types>
+ <message name='TestEndpoint_echoResponse'>
+ <part element='tns:echoResponse' name='echoResponse'></part>
+ </message>
+ <message name='TestEndpoint_echo'>
+ <part element='tns:echo' name='echo'></part>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echo' parameterOrder='echo'>
+ <input message='tns:TestEndpoint_echo'></input>
+ <output message='tns:TestEndpoint_echoResponse'></output>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpointService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='http://127.0.0.1:8080/jaxws-jbws3070'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/wsdl/b/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws3070/schema1'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+ <import namespace="http://org.jboss.test.ws/jbws3070/schema2" schemaLocation="../../b/schema2.xsd"/>
+</schema>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/a/xsd/schema1.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
===================================================================
--- stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd (rev 0)
+++ stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd 2010-06-25 11:26:36 UTC (rev 12519)
@@ -0,0 +1,4 @@
+<schema targetNamespace='http://org.jboss.test.ws/jbws2412/schema2'
+ xmlns='http://www.w3.org/2001/XMLSchema'>
+
+</schema>
\ No newline at end of file
Property changes on: stack/native/branches/dlofthouse/JBWS-3070/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3070/WEB-INF/wsdl/b/schema2.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
13 years, 10 months
JBossWS SVN: r12518 - stack/native/branches/dlofthouse.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-25 07:25:02 -0400 (Fri, 25 Jun 2010)
New Revision: 12518
Added:
stack/native/branches/dlofthouse/JBWS-3070/
Log:
Branch for working area.
Copied: stack/native/branches/dlofthouse/JBWS-3070 (from rev 12517, stack/native/trunk)
13 years, 10 months
JBossWS SVN: r12517 - stack/cxf/branches/no-spring-support/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-24 14:14:55 -0400 (Thu, 24 Jun 2010)
New Revision: 12517
Removed:
stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml
Log:
Removing file not needed any more
Deleted: stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml
===================================================================
--- stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml 2010-06-24 18:12:27 UTC (rev 12516)
+++ stack/cxf/branches/no-spring-support/src/main/scripts/assembly-deploy-spring.xml 2010-06-24 18:14:55 UTC (rev 12517)
@@ -1,41 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
- <id>deploy-spring</id>
- <formats>
- <format>dir</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.cxf:jbossws-cxf-client</include>
- <include>org.jboss.ws.cxf:jbossws-cxf-server</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <includes>
- <include>org.springframework:spring-aop:jar</include>
- <include>org.springframework:spring-asm:jar</include>
- <include>org.springframework:spring-beans:jar</include>
- <include>org.springframework:spring-context:jar</include>
- <include>org.springframework:spring-core:jar</include>
- <include>org.springframework:spring-expression:jar</include>
- <include>org.springframework:spring-jms:jar</include>
- <include>org.springframework:spring-tx:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-</assembly>
13 years, 10 months
JBossWS SVN: r12516 - in stack/cxf/branches/no-spring-support: modules/resources/src/main/resources/resources and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-06-24 14:12:27 -0400 (Thu, 24 Jun 2010)
New Revision: 12516
Modified:
stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/no-spring-support/pom.xml
stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml
Log:
-Dspring=true for including spring libs when deploying the stack
Modified: stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-06-23 13:38:48 UTC (rev 12515)
+++ stack/cxf/branches/no-spring-support/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2010-06-24 18:12:27 UTC (rev 12516)
@@ -92,6 +92,9 @@
<include name="**/jbossws-cxf-client*.jar"/>
<include name="**/jbossws-cxf-factories.jar"/>
<include name="**/jbossws-cxf-server*.jar"/>
+ </patternset>
+
+ <patternset id="spring.patternset">
<include name="**/spring-aop.jar"/>
<include name="**/spring-asm.jar"/>
<include name="**/spring-beans.jar"/>
@@ -329,7 +332,30 @@
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
+
<!-- ================================================================== -->
+ <!-- Install Spring -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-install-spring">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="spring.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <target name="deploy-spring">
+ <macro-install-spring targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/>
+ <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
Modified: stack/cxf/branches/no-spring-support/pom.xml
===================================================================
--- stack/cxf/branches/no-spring-support/pom.xml 2010-06-23 13:38:48 UTC (rev 12515)
+++ stack/cxf/branches/no-spring-support/pom.xml 2010-06-24 18:12:27 UTC (rev 12516)
@@ -1258,29 +1258,6 @@
</profile>
<!--
- Name: deploy-spring
- Descr: Deploy Spring artifacts
- -->
- <profile>
- <id>deploy-spring</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>deploy-spring</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-deploy-spring.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: srcdist
Descr: Build the source distribution
-->
Modified: stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml 2010-06-23 13:38:48 UTC (rev 12515)
+++ stack/cxf/branches/no-spring-support/src/main/distro/build-deploy.xml 2010-06-24 18:12:27 UTC (rev 12516)
@@ -24,7 +24,6 @@
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modifyjbossintegration" value="true"/>
</antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
<!-- ================================================================== -->
@@ -36,7 +35,8 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501">
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
<copy todir="${jboss501.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
@@ -66,7 +66,6 @@
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modifyjbossintegration" value="true"/>
</antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
<!-- ================================================================== -->
@@ -78,7 +77,8 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510">
+ <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510">
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/>
<copy todir="${jboss510.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
@@ -108,7 +108,6 @@
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
</antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
<!-- ================================================================== -->
@@ -120,7 +119,8 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600">
+ <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600">
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
<copy todir="${jboss600.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
@@ -150,7 +150,6 @@
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
<param name="modifyjbossintegration" value="false"/><!-- [JBWS-2505] -->
</antcall>
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
</target>
<!-- ================================================================== -->
@@ -162,7 +161,8 @@
<echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
</target>
- <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601" description="Deploy jbossws to jboss601">
+ <target name="deploy-jboss601" depends="undeploy-jboss601,deploy-structure-jboss601,check-spring,install-spring" description="Deploy jbossws to jboss601">
+ <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
<fail message="Not available: ${jboss601.available.file}" unless="jboss601.available"/>
<copy todir="${jboss601.home}" overwrite="true" verbose="true">
<fileset dir="${deploy.structure}"/>
@@ -180,6 +180,24 @@
</target>
<!-- ================================================================== -->
+ <!-- Spring -->
+ <!-- ================================================================== -->
+ <target name="check-spring">
+ <condition property="spring-required">
+ <and>
+ <istrue value="${spring}"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="install-spring" if="spring-required">
+ <antcall target="deploy-spring" inheritall="false">
+ <param name="installserver" value="${deploy.structure}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf -->
<!-- ================================================================== -->
13 years, 10 months
JBossWS SVN: r12515 - stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2010-06-23 09:38:48 -0400 (Wed, 23 Jun 2010)
New Revision: 12515
Modified:
stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/Constants.java
Log:
[JBPAPP-4502] PasswordType element uses wss-wssecurity-secext NS instead of wss-username-token-profile.
Modified: stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/Constants.java
===================================================================
--- stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/Constants.java 2010-06-23 11:37:48 UTC (rev 12514)
+++ stack/native/branches/jbossws-native-2.0.1.SP2_CP08_JBPAPP-4502/src/main/java/org/jboss/ws/extensions/security/Constants.java 2010-06-23 13:38:48 UTC (rev 12515)
@@ -58,9 +58,9 @@
public static final String BASE64_ENCODING_TYPE = WSS_SOAP_NS + "#Base64Binary";
- public static final String PASSWORD_TEXT_TYPE = WSSE_NS + "#PasswordText";
+ public static final String PASSWORD_TEXT_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
- public static final String PASSWORD_DIGEST_TYPE = WSSE_NS + "#PasswordDigest";
+ public static final String PASSWORD_DIGEST_TYPE = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-pr...";
public static final String WSSE_HEADER = WSSE_PREFIX + ":Security";
13 years, 10 months
JBossWS SVN: r12514 - in stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf: security/authentication and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: sergeyb
Date: 2010-06-23 07:37:48 -0400 (Wed, 23 Jun 2010)
New Revision: 12514
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
Log:
[JBWS-3028] Some minor clean up
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-23 09:20:45 UTC (rev 12513)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2010-06-23 11:37:48 UTC (rev 12514)
@@ -75,7 +75,6 @@
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationContext;
import org.jboss.wsf.spi.invocation.InvocationHandler;
-import org.jboss.wsf.spi.invocation.SecurityAdaptor;
/**
* An abstract CXF invoker
@@ -113,12 +112,6 @@
{
//clear the WebServiceContextImpl's ThreadLocal variable
WebServiceContextImpl.clear();
- // clear SecurityContext in case it has been propagated
- SecurityAdaptor adaptor = exchange.getInMessage().getContent(SecurityAdaptor.class);
- if (adaptor != null) {
- //TODO: release the propagated state
- }
-
}
return new MessageContentsList(retObj);
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-06-23 09:20:45 UTC (rev 12513)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/security/authentication/SubjectCreatingInterceptor.java 2010-06-23 11:37:48 UTC (rev 12514)
@@ -32,9 +32,7 @@
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
-import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.common.security.SimplePrincipal;
-import org.apache.cxf.phase.PhaseInterceptorChain;
import org.apache.cxf.ws.security.wss4j.AbstractUsernameTokenAuthenticatingInterceptor;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
@@ -159,7 +157,9 @@
{
if (isDigest)
{
- // how do we remove the handler from the thread local storage ?
+ // does not remove the TL entry completely but limits the potential
+ // growth to a number of available threads in a container
+ CallbackHandlerPolicyContextHandler.setCallbackHandler(null);
}
}
@@ -169,11 +169,7 @@
if (propagateContext)
{
SecurityAdaptor adaptor = secAdaptorFactory.newSecurityAdapter();
- adaptor.setPrincipal(principal);
- adaptor.setCredential(password);
adaptor.pushSubjectContext(subject, principal, password);
-
- PhaseInterceptorChain.getCurrentMessage().setContent(SecurityAdaptor.class, adaptor);
if (TRACE)
log.trace("Security Context has been propagated");
}
@@ -207,14 +203,6 @@
this.timestampThreshold = timestampThreshold;
}
- @Override
- public void handleFault(SoapMessage message) {
- SecurityAdaptor adaptor = message.getContent(SecurityAdaptor.class);
- if (adaptor != null) {
- //TODO: release the propagated state
- }
- }
-
public void setNonceStore(NonceStore nonceStore) {
this.nonceStore = nonceStore;
}
13 years, 10 months