JBossWS SVN: r8581 - in stack/native/branches/ropalka/modules/core/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:21:17 -0400 (Wed, 29 Oct 2008)
New Revision: 8581
Modified:
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/ws/extensions/wsrm/server/RMDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -28,7 +28,6 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.InvocationHandler;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* Registers RMInvocationHandler if WS-RM is detected
@@ -41,7 +40,7 @@
{
@Override
- public final void start(Deployment dep, WSFRuntime runtime)
+ public final void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -61,7 +60,7 @@
}
@Override
- public final void destroy(Deployment dep, WSFRuntime runtime)
+ public final void destroy(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -24,7 +24,6 @@
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that initializes the UMDM
@@ -35,7 +34,7 @@
public class EagerInitializeDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep, WSFRuntime runtime)
+ public void start(Deployment dep)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/EventingDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -30,7 +30,6 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that creates event sources and register them with the
@@ -42,7 +41,7 @@
public class EventingDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep, WSFRuntime runtime)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
@@ -71,7 +70,7 @@
}
@Override
- public void destroy(Deployment dep, WSFRuntime runtime)
+ public void destroy(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/JAXBIntroDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -29,7 +29,6 @@
import org.jboss.ws.core.jaxws.JAXBBindingCustomization;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.*;
-import org.jboss.wsf.spi.WSFRuntime;
import java.io.IOException;
import java.io.InputStream;
@@ -43,7 +42,7 @@
private static final String META_INF_JAXB_INTROS_XML = "META-INF/jaxb-intros.xml";
private static final String WEB_INF_JAXB_INTROS_XML = "WEB-INF/jaxb-intros.xml";
- public void start(Deployment deployment, WSFRuntime runtime)
+ public void start(Deployment deployment)
{
// assert ArchiveDeployment
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -28,7 +28,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.WSFDeploymentException;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that publishes the wsdl
@@ -39,7 +38,7 @@
public class PublishContractDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep, WSFRuntime runtime)
+ public void start(Deployment dep)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/ServiceEndpointInvokerDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -27,7 +27,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that associates the ServiceEndpointInvoker with the endpoint
@@ -38,7 +37,7 @@
public class ServiceEndpointInvokerDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep, WSFRuntime runtime)
+ public void start(Deployment dep)
{
for (Endpoint ep : dep.getService().getEndpoints())
{
Modified: stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java
===================================================================
--- stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-10-29 14:12:45 UTC (rev 8580)
+++ stack/native/branches/ropalka/modules/core/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2008-10-29 14:21:17 UTC (rev 8581)
@@ -33,7 +33,6 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.WSFRuntime;
/**
* A deployer that builds the UnifiedDeploymentInfo
@@ -44,7 +43,7 @@
public class UnifiedMetaDataDeploymentAspect extends DeploymentAspect
{
@Override
- public void start(Deployment dep, WSFRuntime runtime)
+ public void start(Deployment dep)
{
UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class);
if (umd == null)
15 years, 6 months
JBossWS SVN: r8580 - stack/native/branches/ropalka.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:12:45 -0400 (Wed, 29 Oct 2008)
New Revision: 8580
Modified:
stack/native/branches/ropalka/pom.xml
Log:
switch to new spi, common and framework
Modified: stack/native/branches/ropalka/pom.xml
===================================================================
--- stack/native/branches/ropalka/pom.xml 2008-10-29 14:10:31 UTC (rev 8579)
+++ stack/native/branches/ropalka/pom.xml 2008-10-29 14:12:45 UTC (rev 8580)
@@ -49,8 +49,8 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.0.4.GA</jbossws.framework.version>
- <jbossws.spi.version>1.0.6.GA</jbossws.spi.version>
+ <jbossws.framework.version>3.0.5-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.4.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.4.GA</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.4.GA</jbossws.jboss424.version>
15 years, 6 months
JBossWS SVN: r8579 - stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:10:31 -0400 (Wed, 29 Oct 2008)
New Revision: 8579
Modified:
stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java
===================================================================
--- stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-10-29 14:09:31 UTC (rev 8578)
+++ stack/cxf/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-10-29 14:10:31 UTC (rev 8579)
@@ -32,7 +32,6 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.cxf.metadata.services.DDBeans;
import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint;
@@ -61,7 +60,7 @@
}
@Override
- public void create(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
URL cxfURL = getCXFConfigFromClassLoader(dep);
if (cxfURL == null)
@@ -76,7 +75,7 @@
}
@Override
- public void destroy(Deployment dep, WSFRuntime runtime)
+ public void destroy(Deployment dep)
{
DDBeans dd = dep.getAttachment(DDBeans.class);
if (dd != null)
15 years, 6 months
JBossWS SVN: r8578 - stack/cxf/branches/ropalka.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:09:31 -0400 (Wed, 29 Oct 2008)
New Revision: 8578
Modified:
stack/cxf/branches/ropalka/pom.xml
Log:
switch to new spi, common and framework
Modified: stack/cxf/branches/ropalka/pom.xml
===================================================================
--- stack/cxf/branches/ropalka/pom.xml 2008-10-29 14:04:23 UTC (rev 8577)
+++ stack/cxf/branches/ropalka/pom.xml 2008-10-29 14:09:31 UTC (rev 8578)
@@ -45,8 +45,8 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.0.4.GA</jbossws.framework.version>
- <jbossws.spi.version>1.0.6.GA</jbossws.spi.version>
+ <jbossws.framework.version>3.0.5-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.4.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.4.GA</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.4.GA</jbossws.jboss424.version>
15 years, 6 months
JBossWS SVN: r8577 - in stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro: metadata and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:04:23 -0400 (Wed, 29 Oct 2008)
New Revision: 8577
Modified:
stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
Log:
[JBWS-2338] removing WSFRuntime abstraction
Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-10-29 14:00:04 UTC (rev 8576)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/SunJaxwsDeploymentAspect.java 2008-10-29 14:04:23 UTC (rev 8577)
@@ -24,7 +24,6 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoint;
import org.jboss.wsf.stack.metro.metadata.sunjaxws.DDEndpoints;
import org.jboss.wsf.stack.metro.metadata.RuntimeModelDeploymentAspect;
@@ -46,7 +45,7 @@
{
@Override
@SuppressWarnings("unchecked")
- public void create(Deployment dep, WSFRuntime runtime)
+ public void create(Deployment dep)
{
DDEndpoints ddEndpoints = dep.getAttachment(DDEndpoints.class);
if (ddEndpoints == null)
@@ -79,7 +78,7 @@
}
@Override
- public void destroy(Deployment dep, WSFRuntime runtime)
+ public void destroy(Deployment dep)
{
DDEndpoints dd = dep.getAttachment(DDEndpoints.class);
if (dd != null)
Modified: stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java
===================================================================
--- stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-29 14:00:04 UTC (rev 8576)
+++ stack/metro/branches/ropalka/modules/server/src/main/java/org/jboss/wsf/stack/metro/metadata/RuntimeModelDeploymentAspect.java 2008-10-29 14:04:23 UTC (rev 8577)
@@ -38,7 +38,6 @@
import org.jboss.wsf.spi.deployment.DeploymentAspect;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.WSFRuntime;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserExt;
import org.jboss.wsf.stack.metro.DeploymentDescriptorParserJBWS;
import org.jboss.wsf.stack.metro.MessageStreamAdapter;
@@ -73,7 +72,7 @@
protected static final String JAXWS_RI_RUNTIME = "/WEB-INF/sun-jaxws.xml";
public static final String PARAM_SUN_JAXWS_URL = "jbossws-sun-jaxws-url";
- public void start(Deployment deployment, WSFRuntime runtime)
+ public void start(Deployment deployment)
{
ClassLoader runtimeLoader = deployment.getRuntimeClassLoader();
if(null == runtimeLoader)
15 years, 6 months
JBossWS SVN: r8576 - stack/metro/branches/ropalka.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-10-29 10:00:04 -0400 (Wed, 29 Oct 2008)
New Revision: 8576
Modified:
stack/metro/branches/ropalka/pom.xml
Log:
switch to new spi, common and framework
Modified: stack/metro/branches/ropalka/pom.xml
===================================================================
--- stack/metro/branches/ropalka/pom.xml 2008-10-28 23:13:05 UTC (rev 8575)
+++ stack/metro/branches/ropalka/pom.xml 2008-10-29 14:00:04 UTC (rev 8576)
@@ -46,8 +46,8 @@
<!-- Properties -->
<properties>
<jbossws.common.version>1.0.8-SNAPSHOT</jbossws.common.version>
- <jbossws.framework.version>3.0.4.GA</jbossws.framework.version>
- <jbossws.spi.version>1.0.6.GA</jbossws.spi.version>
+ <jbossws.framework.version>3.0.5-SNAPSHOT</jbossws.framework.version>
+ <jbossws.spi.version>1.0.7-SNAPSHOT</jbossws.spi.version>
<jbossws.jboss422.version>3.0.4.GA</jbossws.jboss422.version>
<jbossws.jboss423.version>3.0.4.GA</jbossws.jboss423.version>
<jbossws.jboss424.version>3.0.4.GA</jbossws.jboss424.version>
15 years, 6 months
JBossWS SVN: r8575 - stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-28 19:13:05 -0400 (Tue, 28 Oct 2008)
New Revision: 8575
Added:
stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2346.xml
Log:
[JBWS-2346] Adding missing xml file
Added: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2346.xml
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2346.xml (rev 0)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2346.xml 2008-10-28 23:13:05 UTC (rev 8575)
@@ -0,0 +1,15 @@
+<ns1:elementA xmlns:ns1='http://org.jboss.ws/testNS'>
+ <ns1:String_1>Strawberry</ns1:String_1>
+ <ns1:elementB xmlns:ns1='http://org.jboss.ws/testNS'>
+ <ns1:String_1>Apple</ns1:String_1>
+ <ns1:elementC xmlns:ns1='http://org.jboss.ws/testNS'>
+ <ns1:String_1>Banana</ns1:String_1>
+ </ns1:elementC>
+ </ns1:elementB>
+ <ns1:elementC xmlns:ns1='http://org.jboss.ws/testNS'>
+ <ns1:String_1>Orange</ns1:String_1>
+ </ns1:elementC>
+ <ns2:elementA xmlns:ns1='http://org.jboss.ws/testNS' xmlns:ns2='http://org.jboss.ws/testNS2'>
+ <ns1:String_1>Raspberry</ns1:String_1>
+ </ns2:elementA>
+</ns1:elementA>
Property changes on: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/common/soap/jbws2346.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
15 years, 6 months
JBossWS SVN: r8574 - in stack/native/trunk/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-28 11:37:10 -0400 (Tue, 28 Oct 2008)
New Revision: 8574
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
Log:
[JBWS-2346] SOAPBody.getElementsByTagNameNS() has to be recursive
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2008-10-28 15:34:25 UTC (rev 8573)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPElementImpl.java 2008-10-28 15:37:10 UTC (rev 8574)
@@ -738,7 +738,7 @@
public NodeList getElementsByTagName(String name)
{
- return new NodeListImpl(DOMUtils.getChildElements(this, name));
+ return new NodeListImpl(DOMUtils.getChildElements(this, name, true));
}
public String getAttributeNS(String namespaceURI, String localName)
@@ -764,7 +764,7 @@
public NodeList getElementsByTagNameNS(String namespaceURI, String localName)
{
- return new NodeListImpl(DOMUtils.getChildElements(this, new QName(namespaceURI, localName)));
+ return new NodeListImpl(DOMUtils.getChildElements(this, new QName(namespaceURI, localName), true));
}
public TypeInfo getSchemaTypeInfo()
Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java
===================================================================
--- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2008-10-28 15:34:25 UTC (rev 8573)
+++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPElementTestCase.java 2008-10-28 15:37:10 UTC (rev 8574)
@@ -22,8 +22,11 @@
package org.jboss.test.ws.common.soap;
import java.io.ByteArrayInputStream;
+import java.io.InputStream;
import java.util.Iterator;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.soap.MessageFactory;
import javax.xml.soap.Name;
import javax.xml.soap.SOAPBody;
@@ -33,6 +36,9 @@
import javax.xml.soap.SOAPMessage;
import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
* Test the SOAPElement
@@ -89,6 +95,33 @@
SOAPElement se2 = (SOAPElement)body.getChildElements().next();
assertEquals(se, se2);
}
+
+ //JBWS-2346
+ public void testGetElementByTagNameNS() throws Exception
+ {
+ InputStream is = getResourceURL("common/soap/jbws2346.xml").openStream();
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document doc = db.parse(is);
+ MessageFactory factory = MessageFactory.newInstance();
+ SOAPMessage msg = factory.createMessage();
+ msg.getSOAPBody().addDocument(doc);
+ SOAPBody body = msg.getSOAPBody();
+ NodeList list = body.getElementsByTagNameNS("http://org.jboss.ws/testNS", "elementA");
+ assertEquals(1, list.getLength());
+ list = body.getElementsByTagNameNS("http://org.jboss.ws/testNS", "elementC");
+ assertEquals(2, list.getLength());
+ list = body.getElementsByTagNameNS("http://org.jboss.ws/testNS", "String_1");
+ StringBuilder sb = new StringBuilder();
+ for (int i=0; i<list.getLength(); i++)
+ {
+ Node n = list.item(i);
+ sb.append(n.getFirstChild().getNodeValue());
+ sb.append(" ");
+ }
+ assertEquals("Strawberry Apple Banana Orange Raspberry ", sb.toString());
+ }
// http://jira.jboss.com/jira/browse/JBWS-773
public void testGetNamespaceURI() throws Exception
15 years, 6 months
JBossWS SVN: r8573 - common/trunk/src/main/java/org/jboss/wsf/common.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-28 11:34:25 -0400 (Tue, 28 Oct 2008)
New Revision: 8573
Modified:
common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
Log:
[JBWS-2346] Adding recursive flavour to many DOMUtil methods
Modified: common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java
===================================================================
--- common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2008-10-28 09:33:38 UTC (rev 8572)
+++ common/trunk/src/main/java/org/jboss/wsf/common/DOMUtils.java 2008-10-28 15:34:25 UTC (rev 8573)
@@ -62,6 +62,7 @@
* DOM2 utilites
*
* @author Thomas.Diesler(a)jboss.org
+ * @author alessio.soldano(a)jboss.com
*/
public final class DOMUtils
{
@@ -483,32 +484,53 @@
}
return (hasTextContent ? buffer.toString() : null);
}
-
+
/** Gets the first child element
*/
public static Element getFirstChildElement(Node node)
{
- return getFirstChildElementIntern(node, null);
+ return getFirstChildElement(node, false);
}
+ /** Gets the first child element
+ */
+ public static Element getFirstChildElement(Node node, boolean recursive)
+ {
+ return getFirstChildElementIntern(node, null, recursive);
+ }
+
/** Gets the first child element for a given local name without namespace
*/
public static Element getFirstChildElement(Node node, String nodeName)
{
- return getFirstChildElementIntern(node, new QName(nodeName));
+ return getFirstChildElement(node, nodeName, false);
}
-
+
+ /** Gets the first child element for a given local name without namespace
+ */
+ public static Element getFirstChildElement(Node node, String nodeName, boolean recursive)
+ {
+ return getFirstChildElementIntern(node, new QName(nodeName), recursive);
+ }
+
/** Gets the first child element for a given qname
*/
public static Element getFirstChildElement(Node node, QName nodeName)
{
- return getFirstChildElementIntern(node, nodeName);
+ return getFirstChildElement(node, nodeName, false);
}
- private static Element getFirstChildElementIntern(Node node, QName nodeName)
+ /** Gets the first child element for a given qname
+ */
+ public static Element getFirstChildElement(Node node, QName nodeName, boolean recursive)
{
+ return getFirstChildElementIntern(node, nodeName, recursive);
+ }
+
+ private static Element getFirstChildElementIntern(Node node, QName nodeName, boolean recursive)
+ {
Element childElement = null;
- Iterator it = getChildElementsIntern(node, nodeName);
+ Iterator it = getChildElementsIntern(node, nodeName, recursive);
if (it.hasNext())
{
childElement = (Element)it.next();
@@ -520,28 +542,52 @@
*/
public static Iterator getChildElements(Node node, String nodeName)
{
- return getChildElementsIntern(node, new QName(nodeName));
+ return getChildElements(node, nodeName, false);
}
-
+
+ /** Gets the child elements for a given local name without namespace
+ */
+ public static Iterator getChildElements(Node node, String nodeName, boolean recursive)
+ {
+ return getChildElementsIntern(node, new QName(nodeName), recursive);
+ }
+
/** Gets the child element for a given qname
*/
public static Iterator getChildElements(Node node, QName nodeName)
{
- return getChildElementsIntern(node, nodeName);
+ return getChildElements(node, nodeName, false);
}
+
+ /** Gets the child element for a given qname
+ */
+ public static Iterator getChildElements(Node node, QName nodeName, boolean recursive)
+ {
+ return getChildElementsIntern(node, nodeName, recursive);
+ }
public static List<Element> getChildElementsAsList(Node node, String nodeName)
{
- return getChildElementsAsListIntern(node, new QName(nodeName));
+ return getChildElementsAsList(node, nodeName, false);
}
+ public static List<Element> getChildElementsAsList(Node node, String nodeName, boolean recursive)
+ {
+ return getChildElementsAsListIntern(node, new QName(nodeName), recursive);
+ }
+
public static List<Element> getChildElementsAsList(Node node, QName nodeName)
{
- return getChildElementsAsListIntern(node, nodeName);
+ return getChildElementsAsList(node, nodeName, false);
}
- private static List<Element> getChildElementsAsListIntern(Node node, QName nodeName)
+ public static List<Element> getChildElementsAsList(Node node, QName nodeName, boolean recursive)
{
+ return getChildElementsAsListIntern(node, nodeName, recursive);
+ }
+
+ private static List<Element> getChildElementsAsListIntern(Node node, QName nodeName, boolean recursive)
+ {
List<Element> list = new LinkedList<Element>();
NodeList nlist = node.getChildNodes();
for (int i = 0; i < nlist.getLength(); i++)
@@ -549,34 +595,51 @@
Node child = nlist.item(i);
if (child.getNodeType() == Node.ELEMENT_NODE)
{
- if (nodeName == null)
+ search(list, (Element)child, nodeName, recursive);
+ }
+ }
+ return list;
+ }
+
+ private static void search(List<Element> list, Element baseElement, QName nodeName, boolean recursive)
+ {
+ if (nodeName == null)
+ {
+ list.add(baseElement);
+ }
+ else
+ {
+ QName qname;
+ if (nodeName.getNamespaceURI().length() > 0)
+ {
+ qname = new QName(baseElement.getNamespaceURI(), baseElement.getLocalName());
+ }
+ else
+ {
+ qname = new QName(baseElement.getLocalName());
+ }
+ if (qname.equals(nodeName))
+ {
+ list.add(baseElement);
+ }
+ }
+ if (recursive)
+ {
+ NodeList nlist = baseElement.getChildNodes();
+ for (int i = 0; i < nlist.getLength(); i++)
+ {
+ Node child = nlist.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE)
{
- list.add((Element)child);
+ search(list, (Element)child, nodeName, recursive);
}
- else
- {
- QName qname;
- if (nodeName.getNamespaceURI().length() > 0)
- {
- qname = new QName(child.getNamespaceURI(), child.getLocalName());
- }
- else
- {
- qname = new QName(child.getLocalName());
- }
- if (qname.equals(nodeName))
- {
- list.add((Element)child);
- }
- }
}
}
- return list;
}
-
- private static Iterator getChildElementsIntern(Node node, QName nodeName)
+
+ private static Iterator getChildElementsIntern(Node node, QName nodeName, boolean recursive)
{
- return getChildElementsAsListIntern(node, nodeName).iterator();
+ return getChildElementsAsListIntern(node, nodeName, recursive).iterator();
}
/** Gets parent element or null if there is none
15 years, 6 months
JBossWS SVN: r8572 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-10-28 05:33:38 -0400 (Tue, 28 Oct 2008)
New Revision: 8572
Modified:
stack/native/trunk/pom.xml
Log:
Using snapshot version for jboss 5 trunk container integration
Modified: stack/native/trunk/pom.xml
===================================================================
--- stack/native/trunk/pom.xml 2008-10-28 09:30:12 UTC (rev 8571)
+++ stack/native/trunk/pom.xml 2008-10-28 09:33:38 UTC (rev 8572)
@@ -57,7 +57,7 @@
<!-- [JBWS-2263] -->
<!-- START -->
<jbossws.jboss500.version>3.0.4.GA</jbossws.jboss500.version>
- <jbossws.jboss501.version>3.0.4.GA</jbossws.jboss501.version>
+ <jbossws.jboss501.version>3.0.5-SNAPSHOT</jbossws.jboss501.version>
<!-- END -->
<codehaus.jettison.version>1.0-RC2</codehaus.jettison.version>
<commons.logging.version>1.1.1</commons.logging.version>
15 years, 6 months