JBossWS SVN: r4788 - stack/native/trunk.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-18 08:15:30 -0400 (Thu, 18 Oct 2007)
New Revision: 4788
Modified:
stack/native/trunk/version.properties
Log:
Fix JBWS-1854, requires a update to snapshot of jbossws-jboss40.jar
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-10-18 12:14:05 UTC (rev 4787)
+++ stack/native/trunk/version.properties 2007-10-18 12:15:30 UTC (rev 4788)
@@ -27,7 +27,7 @@
jbossws-spi=1.0.0.GA
jbossws-common=snapshot
jbossws-framework=snapshot
-jbossws-jboss40=2.0.1.GA
+jbossws-jboss40=snapshot
jbossws-jboss42=2.0.1.GA
# JBossAS-5.0
17 years
JBossWS SVN: r4787 - in container/jboss40/trunk: src/main/java/org/jboss/wsf/container/jboss40 and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-18 08:14:05 -0400 (Thu, 18 Oct 2007)
New Revision: 4787
Modified:
container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java
container/jboss40/trunk/version.properties
Log:
Fix JBWS-1854, forces a snapshot release
Modified: container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java
===================================================================
--- container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java 2007-10-18 10:26:36 UTC (rev 4786)
+++ container/jboss40/trunk/src/main/java/org/jboss/wsf/container/jboss40/JSEArchiveMetaDataAdapter.java 2007-10-18 12:14:05 UTC (rev 4787)
@@ -60,12 +60,15 @@
if (di.parent != null)
{
J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData;
- Iterator it = appmd.getModules();
- while (it.hasNext())
+ if(appmd!=null) // I.e. *.war inside *.esb
{
- J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
- if (module.getFileName().equals(dep.getSimpleName()))
- contextRoot = module.getWebContext();
+ Iterator it = appmd.getModules();
+ while (it.hasNext())
+ {
+ J2eeModuleMetaData module = (J2eeModuleMetaData)it.next();
+ if (module.getFileName().equals(dep.getSimpleName()))
+ contextRoot = module.getWebContext();
+ }
}
}
Modified: container/jboss40/trunk/version.properties
===================================================================
--- container/jboss40/trunk/version.properties 2007-10-18 10:26:36 UTC (rev 4786)
+++ container/jboss40/trunk/version.properties 2007-10-18 12:14:05 UTC (rev 4787)
@@ -6,7 +6,7 @@
specification.version=jbossws-2.0
version.id=2.0.1.GA
-repository.id=2.0.1.GA
+repository.id=snapshot
implementation.title=JBoss Web Services - Integration JBoss40
implementation.url=http://www.jboss.org/products/jbossws
17 years
JBossWS SVN: r4786 - in stack/native/trunk: src/main/java/org/jboss/wsf/stack/jbws and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-10-18 06:26:36 -0400 (Thu, 18 Oct 2007)
New Revision: 4786
Modified:
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/trunk/version.properties
Log:
rollback servlet API update to 2.5: Incompatible with 4.0 containers
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-10-17 18:28:41 UTC (rev 4785)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-10-18 10:26:36 UTC (rev 4786)
@@ -23,31 +23,31 @@
// $Id$
-import java.io.IOException;
-
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
+import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
-import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
+import java.io.IOException;
+
/**
* A servlet that is installed for every web service endpoint.
*
@@ -67,14 +67,16 @@
super.init(servletConfig);
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
-
- servletConfig.getServletContext().getContextPath();
- String contextPath = servletConfig.getServletContext().getContextPath();
- initServiceEndpoint(contextPath);
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
+ if (endpoint == null)
+ {
+ String contextPath = req.getContextPath();
+ initServiceEndpoint(contextPath);
+ }
+
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -131,8 +133,10 @@
if (this.endpoint == null)
{
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + ","
- + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName());
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
+ Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
+ Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
+ );
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
Modified: stack/native/trunk/version.properties
===================================================================
--- stack/native/trunk/version.properties 2007-10-17 18:28:41 UTC (rev 4785)
+++ stack/native/trunk/version.properties 2007-10-18 10:26:36 UTC (rev 4786)
@@ -72,5 +72,5 @@
sun-hudson=1.93
sun-jaf=1.1
sun-javamail=1.4
-sun-servlet=2.5
+sun-servlet=2.4
xmlunit=1.0
17 years
JBossWS SVN: r4785 - in stack/native/branches/ropalka/trunk/src: main/java/org/jboss/ws/metadata/config and 6 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-17 14:28:41 -0400 (Wed, 17 Oct 2007)
New Revision: 4785
Modified:
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java
stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/ReliableMessagingMetaData.java
stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
Log:
adding WSRM Policy port specific configuration support
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/extensions/wsrm/policy/WSRMPolicyAssertionDeployer.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -79,10 +79,11 @@
EndpointMetaData endpointMD = (EndpointMetaData) extMetaData;
// prepare wsrm metadata
- ReliableMessagingMetaData wsrmMD = endpointMD.getConfig().getReliableMessaging();
- if (wsrmMD == null)
+ ReliableMessagingMetaData rmMD = endpointMD.getConfig().getRMMetaData();
+ if (rmMD == null)
{
- wsrmMD = new ReliableMessagingMetaData();
+ rmMD = new ReliableMessagingMetaData();
+ endpointMD.getConfig().setRMMetaData(rmMD);
}
// construct new port metadata
@@ -92,13 +93,13 @@
portMD.setDeliveryAssurance(constructDeliveryAssurance(wsrmpAssertions));
// ensure port does not exists yet
- for (PortMetaData pMD : wsrmMD.getPorts())
+ for (PortMetaData pMD : rmMD.getPorts())
{
assert ! pMD.getPortName().equals(portMD.getPortName());
}
// set up port WSRMP metadata
- wsrmMD.getPorts().add(portMD);
+ rmMD.getPorts().add(portMD);
}
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/CommonConfig.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -76,12 +76,12 @@
features.remove(nameToURI(type));
}
- public void setReliableMessaging(ReliableMessagingMetaData wsrmCfg)
+ public void setRMMetaData(ReliableMessagingMetaData wsrmCfg)
{
this.wsrmCfg = wsrmCfg;
}
- public ReliableMessagingMetaData getReliableMessaging()
+ public ReliableMessagingMetaData getRMMetaData()
{
return this.wsrmCfg;
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/config/binding/OMFactoryJAXWS.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -135,7 +135,7 @@
if ("reliable-messaging".equals(localName))
{
ReliableMessagingMetaData wsrmCfg = new ReliableMessagingMetaData();
- commonConfig.setReliableMessaging(wsrmCfg);
+ commonConfig.setRMMetaData(wsrmCfg);
return wsrmCfg;
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -62,6 +62,8 @@
import org.jboss.ws.metadata.config.ConfigurationProvider;
import org.jboss.ws.metadata.config.EndpointFeature;
import org.jboss.ws.metadata.config.JBossWSConfigFactory;
+import org.jboss.ws.metadata.wsrm.PortMetaData;
+import org.jboss.ws.metadata.wsrm.ReliableMessagingMetaData;
import org.jboss.wsf.common.JavaUtils;
import org.jboss.wsf.spi.binding.BindingCustomization;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -702,11 +704,57 @@
{
log.debug("Create new config [name=" + getConfigName() + ",file=" + getConfigFile() + "]");
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
+ List<PortMetaData> rmPortMetaData = backupRMMD();
config = factory.getConfig(getRootFile(), getConfigName(), getConfigFile());
+ propagateRMMD(rmPortMetaData);
reconfigHandlerMetaData();
}
+
+ private List<PortMetaData> backupRMMD()
+ {
+ if ((config != null) && (config.getRMMetaData() != null))
+ return config.getRMMetaData().getPorts();
+ return null;
+ }
+
+ private void propagateRMMD(List<PortMetaData> backedUpMD)
+ {
+ if ((backedUpMD != null) && (backedUpMD.size() > 0))
+ {
+ if (config.getRMMetaData() == null)
+ {
+ config.setRMMetaData(new ReliableMessagingMetaData());
+ config.getRMMetaData().getPorts().addAll(backedUpMD);
+ }
+ else
+ {
+ // RM policy specified in config file will be always used
+ List<PortMetaData> ports = config.getRMMetaData().getPorts();
+ for (PortMetaData portMD : backedUpMD)
+ {
+ QName portName = portMD.getPortName();
+ if (!contains(ports, portName))
+ {
+ ports.add(portMD);
+ }
+ }
+ }
+ }
+ }
+
+ private boolean contains(List<PortMetaData> ports, QName portName)
+ {
+ for (PortMetaData pMD : ports)
+ {
+ if (pMD.getPortName().equals(portName))
+ return true;
+ }
+
+ return false;
+ }
+
private void reconfigHandlerMetaData()
{
log.debug("Configure EndpointMetaData");
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/DeliveryAssuranceMetaData.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -62,5 +62,5 @@
{
return "inOrder=\"" + this.inOrder + "\", quality=\"" + this.quality + "\"";
}
-
+
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/PortMetaData.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -64,5 +64,5 @@
{
return "portName=\"" + this.portName + "\", deliveryAssurance={" + this.deliveryAssurance + "}";
}
-
+
}
Modified: stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/ReliableMessagingMetaData.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/ReliableMessagingMetaData.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/java/org/jboss/ws/metadata/wsrm/ReliableMessagingMetaData.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -21,9 +21,11 @@
*/
package org.jboss.ws.metadata.wsrm;
+import java.util.List;
import java.util.LinkedList;
-import java.util.List;
+import javax.xml.namespace.QName;
+
/**
* Reliable messaging configuration metadata
*
Modified: stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd
===================================================================
--- stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/main/resources/schema/jaxws-config_2_0.xsd 2007-10-17 18:28:41 UTC (rev 4785)
@@ -163,11 +163,11 @@
<xsd:annotation>
<xsd:documentation>
This WSDL port specific WS-RM delivery assurance configuration
- applies to all operations on this port.
+ applies to all its operations.
This configuration always overrides the global configuration.
- If there is the WS-Policy with attached WS-RM assertion in WSDL
+ If there is a WS-Policy with attached WS-RM assertion in WSDL
associated with this port or its associated binding it
- will always override this port specific configuration.
+ will be always overriden this port specific configuration.
</xsd:documentation>
</xsd:annotation>
</xsd:element>
Modified: stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2007-10-17 18:28:41 UTC (rev 4785)
@@ -137,7 +137,7 @@
JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance();
ConfigRootJAXWS config = (ConfigRootJAXWS)factory.parse(confFile.toURL());
EndpointConfigJAXWS epConfig = (EndpointConfigJAXWS)config.getConfigByName("Standard WSRM Endpoint");
- ReliableMessagingMetaData wsrmConfig = epConfig.getReliableMessaging();
+ ReliableMessagingMetaData wsrmConfig = epConfig.getRMMetaData();
assertNotNull(wsrmConfig);
DeliveryAssuranceMetaData deliveryAssurance = wsrmConfig.getDeliveryAssurance();
assertEquals(deliveryAssurance.getInOrder(), "true");
Modified: stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml
===================================================================
--- stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-10-17 13:00:58 UTC (rev 4784)
+++ stack/native/branches/ropalka/trunk/src/test/resources/jaxws/wsrm/META-INF/wsrm-jaxws-client-config.xml 2007-10-17 18:28:41 UTC (rev 4785)
@@ -11,14 +11,9 @@
<reliable-messaging>
<delivery-assurance inOrder="true" quality="AtLeastOnce"/>
<provider specVersion="http://docs.oasis-open.org/ws-rx/wsrm/200702"/>
- <message-store
- id="wsrmStoreId"
- class="custom.MessageStoreImpl">
+ <message-store id="wsrmStoreId" class="custom.MessageStoreImpl">
<config-file>META-INF/config.xml</config-file>
</message-store>
- <port name="{http://org.jboss.ws/jaxws/wsrm}ReqResPort">
- <delivery-assurance inOrder="false" quality="AtMostOnce"/>
- </port>
</reliable-messaging>
</client-config>
17 years
JBossWS SVN: r4784 - in stack/native/trunk: ant-import-tests and 8 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-17 09:00:58 -0400 (Wed, 17 Oct 2007)
New Revision: 4784
Added:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java
stack/native/trunk/src/test/resources/jaxws/jbws1797/
stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF/
stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF/web.xml
Modified:
stack/native/trunk/.classpath
stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt
stack/native/trunk/src/test/resources/test-excludes-jboss40.txt
stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
Log:
[JBWS-1797] Setting .NET friendly Endpoint in web.xml
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/.classpath 2007-10-17 13:00:58 UTC (rev 4784)
@@ -39,6 +39,6 @@
<classpathentry kind="lib" path="thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-jaxb-intros.jar"/>
<classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: stack/native/trunk/ant-import-tests/build-jars-jaxws.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/ant-import-tests/build-jars-jaxws.xml 2007-10-17 13:00:58 UTC (rev 4784)
@@ -380,6 +380,14 @@
</fileset>
</copy>
+ <!-- jaxws-jbws1797 -->
+ <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws1798 -->
<war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSProviderMetaDataBuilder.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -134,7 +134,7 @@
processHandlerChain(sepMetaData, sepClass);
// process config
- processEndpointConfig(sepClass, linkName, sepMetaData);
+ processEndpointConfig(dep, sepMetaData, sepClass, linkName);
// Set the endpoint address
processWebContext(dep, sepClass, linkName, sepMetaData);
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -1,24 +1,24 @@
/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.
-*/
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.ws.metadata.builder.jaxws;
// $Id$
@@ -33,6 +33,8 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
/**
* Builds ServiceEndpointMetaData for a JAX-WS endpoint.
@@ -56,22 +58,39 @@
}
}
- protected void processEndpointConfig(Class<?> wsClass, String linkName, ServerEndpointMetaData sepMetaData)
+ protected void processEndpointConfig(Deployment dep, ServerEndpointMetaData sepMetaData, Class<?> wsClass, String linkName)
{
- EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
-
- if (anEndpointConfig== null)
- return;
-
String configName = null;
String configFile = null;
- if (anEndpointConfig.configName().length() > 0)
- configName = anEndpointConfig.configName();
+ EndpointConfig anEndpointConfig = wsClass.getAnnotation(EndpointConfig.class);
+ if (anEndpointConfig != null)
+ {
+ if (anEndpointConfig.configName().length() > 0)
+ configName = anEndpointConfig.configName();
- if (anEndpointConfig.configFile().length() > 0)
- configFile = anEndpointConfig.configFile();
-
+ if (anEndpointConfig.configFile().length() > 0)
+ configFile = anEndpointConfig.configFile();
+ }
+
+ JSEArchiveMetaData jseMetaData = dep.getAttachment(JSEArchiveMetaData.class);
+ if (jseMetaData != null)
+ {
+ if (jseMetaData.getConfigName() != null)
+ configName = jseMetaData.getConfigName();
+ if (jseMetaData.getConfigFile() != null)
+ configFile = jseMetaData.getConfigFile();
+ }
+
+ EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+ if (ejbMetaData != null)
+ {
+ if (ejbMetaData.getConfigName() != null)
+ configName = ejbMetaData.getConfigName();
+ if (ejbMetaData.getConfigFile() != null)
+ configFile = ejbMetaData.getConfigFile();
+ }
+
if (configName != null || configFile != null)
sepMetaData.setConfigName(configName, configFile);
}
@@ -82,7 +101,7 @@
if (anWebContext == null)
return;
-
+
boolean isJSEEndpoint = (dep.getType() == DeploymentType.JAXWS_JSE);
// context-root
@@ -143,7 +162,7 @@
sepMetaData.setTransportGuarantee(transportGuarantee);
}
}
-
+
// secure wsdl access
sepMetaData.setSecureWSDLAccess(anWebContext.secureWSDLAccess());
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSWebServiceMetaDataBuilder.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -134,7 +134,7 @@
processBindingType(sepMetaData, seiClass);
// process config
- processEndpointConfig(sepClass, linkName, sepMetaData);
+ processEndpointConfig(dep, sepMetaData, sepClass, linkName);
// Process web methods
processWebMethods(sepMetaData, seiClass);
Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -23,31 +23,31 @@
// $Id$
+import java.io.IOException;
+
+import javax.management.ObjectName;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
+
import org.jboss.logging.Logger;
import org.jboss.ws.metadata.umdm.ServerEndpointMetaData;
-import org.jboss.ws.metadata.umdm.UnifiedMetaData;
import org.jboss.wsf.common.ObjectNameFactory;
-import org.jboss.wsf.spi.invocation.EndpointAssociation;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
-import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.deployment.Endpoint.EndpointState;
+import org.jboss.wsf.spi.invocation.EndpointAssociation;
+import org.jboss.wsf.spi.invocation.RequestHandler;
import org.jboss.wsf.spi.management.EndpointRegistry;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
-import javax.management.ObjectName;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.WebServiceException;
-import java.io.IOException;
-
/**
* A servlet that is installed for every web service endpoint.
*
@@ -67,16 +67,14 @@
super.init(servletConfig);
SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry();
+
+ servletConfig.getServletContext().getContextPath();
+ String contextPath = servletConfig.getServletContext().getContextPath();
+ initServiceEndpoint(contextPath);
}
public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
{
- if (endpoint == null)
- {
- String contextPath = req.getContextPath();
- initServiceEndpoint(contextPath);
- }
-
try
{
EndpointAssociation.setEndpoint(endpoint);
@@ -124,7 +122,7 @@
log.debug("Updating service endpoint config\n config-name: " + configName + "\n config-file: " + configFile);
epMetaData.setConfigName(configName, configFile);
}
- }
+ }
private void initEndpoint(String contextPath, String servletName)
{
@@ -133,10 +131,8 @@
if (this.endpoint == null)
{
- ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" +
- Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + "," +
- Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName()
- );
+ ObjectName oname = ObjectNameFactory.create(Endpoint.SEPID_DOMAIN + ":" + Endpoint.SEPID_PROPERTY_CONTEXT + "=" + contextPath + ","
+ + Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + getServletName());
throw new WebServiceException("Cannot obtain endpoint for: " + oname);
}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvc.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1797;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+@WebService
+@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED)
+public interface IWebsvc
+{
+ public String submit(@WebParam(name = "foo") String foo);
+
+ public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header=true) String bar);
+}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/IWebsvcImpl.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1797;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jbws1797.IWebsvc", serviceName = "JBWS1797Service")
+public class IWebsvcImpl implements IWebsvc
+{
+ public String submit(@WebParam(name = "foo") String foo)
+ {
+ return "submit-" + foo;
+ }
+
+ public String cancel(@WebParam(name = "foo") String foo, @WebParam(name = "bar", header = true) String bar)
+ {
+ return "cancel-" + foo + bar;
+ }
+}
Added: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java (rev 0)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1797/JBWS1797TestCase.java 2007-10-17 13:00:58 UTC (rev 4784)
@@ -0,0 +1,146 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt 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.jbws1797;
+
+// $Id: JBWS1797TestCase.java 3729 2007-06-26 19:38:00Z thomas.diesler(a)jboss.com $
+
+import java.net.URL;
+import java.util.List;
+
+import javax.wsdl.Binding;
+import javax.wsdl.BindingOperation;
+import javax.wsdl.Definition;
+import javax.wsdl.Message;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.soap.SOAPBody;
+import javax.wsdl.extensions.soap.SOAPHeader;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.xml.WSDLReader;
+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;
+
+/**
+ * [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+ *
+ * @author Thomas.Diesler(a)jboss.com
+ * @since 17-Oct-2007
+ */
+public class JBWS1797TestCase extends JBossWSTest
+{
+ private static final String TARGET_NAMESPACE = "http://jbws1797.jaxws.ws.test.jboss.org/";
+ private static URL wsdlURL;
+ private static IWebsvc port;
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(JBWS1797TestCase.class, "jaxws-jbws1797.war");
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ if (port == null)
+ {
+ QName serviceName = new QName(TARGET_NAMESPACE, "JBWS1797Service");
+ wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1797/IWebsvcImpl?wsdl");
+
+ Service service = Service.create(wsdlURL, serviceName);
+ port = service.getPort(IWebsvc.class);
+ }
+ }
+
+ public void testSubmit() throws Exception
+ {
+ String result = port.submit("foo");
+ assertEquals("submit-foo", result);
+ }
+
+ public void testCancel() throws Exception
+ {
+ String result = port.cancel("foo", "bar");
+ assertEquals("cancel-foobar", result);
+ }
+
+ public void testMessagePartNames() throws Exception
+ {
+ Definition wsdl = getWSDLDefinition(wsdlURL.toExternalForm());
+
+ Message wsdlReqMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancel"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlReqMessage, wsdlReqMessage.getPart("parameters"));
+ assertNotNull("Expected part with name 'bar' in: " + wsdlReqMessage, wsdlReqMessage.getPart("bar"));
+
+ Message wsdlResMessage = wsdl.getMessage(new QName(TARGET_NAMESPACE, "IWebsvc_cancelResponse"));
+ assertNotNull("Expected part with name 'parameters' in: " + wsdlResMessage, wsdlResMessage.getPart("parameters"));
+
+ /*
+ <binding name='IWebsvcBinding' type='tns:IWebsvc'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='cancel'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body parts='parameters' use='literal'/>
+ <soap:header message='tns:IWebsvc_cancel' part='bar' use='literal'></soap:header>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ */
+ Binding wsdlBinding = wsdl.getBinding(new QName(TARGET_NAMESPACE, "IWebsvcBinding"));
+ BindingOperation bindingOperation = wsdlBinding.getBindingOperation("cancel", null, null);
+
+ boolean foundBody = false;
+ boolean foundHeader = false;
+ List<ExtensibilityElement> extList = bindingOperation.getBindingInput().getExtensibilityElements();
+ for (ExtensibilityElement extElement : extList)
+ {
+ if (extElement instanceof SOAPBody)
+ {
+ SOAPBody body = (SOAPBody)extElement;
+ assertEquals("parameters", body.getParts().get(0));
+ foundBody = true;
+ }
+ if (extElement instanceof SOAPHeader)
+ {
+ SOAPHeader header = (SOAPHeader)extElement;
+ assertEquals("bar", header.getPart());
+ foundHeader = true;
+ }
+ }
+ assertTrue("Found soap:body", foundBody);
+ assertTrue("Found soap:header", foundHeader);
+ }
+
+ private Definition getWSDLDefinition(String wsdlLocation) throws Exception
+ {
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance();
+ WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
+
+ Definition definition = wsdlReader.readWSDL(null, wsdlLocation);
+ return definition;
+ }
+}
Added: stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF/web.xml
===================================================================
--- stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF/web.xml (rev 0)
+++ stack/native/trunk/src/test/resources/jaxws/jbws1797/WEB-INF/web.xml 2007-10-17 13:00:58 UTC (rev 4784)
@@ -0,0 +1,20 @@
+<?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">
+
+ <context-param>
+ <param-name>jbossws-config-name</param-name>
+ <param-value>.NET friendly Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>WebService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.jbws1797.IWebsvcImpl</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>WebService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss40.no.ejb3.txt 2007-10-17 13:00:58 UTC (rev 4784)
@@ -57,3 +57,6 @@
org/jboss/test/ws/jaxws/wsaddressing/action/AddressingActionTestCase*
org/jboss/test/ws/jaxws/wsaddressing/replyto/AddressingReplyToTestCase*
org/jboss/test/ws/jaxws/handlerscope/HandlerScopeTestCase*
+
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss40.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss40.txt 2007-10-17 13:00:58 UTC (rev 4784)
@@ -7,3 +7,6 @@
org/jboss/test/ws/jaxws/samples/retail/**
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-17 11:51:37 UTC (rev 4783)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss42.txt 2007-10-17 13:00:58 UTC (rev 4784)
@@ -1,3 +1,6 @@
# EJB3/Injection excludes
org/jboss/test/ws/jaxws/samples/webserviceref/**
org/jboss/test/ws/jaxws/webserviceref/**
+
+# [JBWS-1797] Setting .NET friendly Endpoint in web.xml
+org/jboss/test/ws/jaxws/jbws1797/**
17 years
JBossWS SVN: r4783 - framework/branches/ropalka/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-17 07:51:37 -0400 (Wed, 17 Oct 2007)
New Revision: 4783
Modified:
framework/branches/ropalka/trunk/version.properties
Log:
fixing spi version
Modified: framework/branches/ropalka/trunk/version.properties
===================================================================
--- framework/branches/ropalka/trunk/version.properties 2007-10-17 10:54:21 UTC (rev 4782)
+++ framework/branches/ropalka/trunk/version.properties 2007-10-17 11:51:37 UTC (rev 4783)
@@ -15,7 +15,7 @@
# Thirdparty library versions
jbossws-common=1.0.0.CR1
-jbossws-spi=1.0.0.CR1
+jbossws-spi=1.0.0.GA
dom4j=1.6.1
jboss-common-core=2.0.2.GA
17 years
JBossWS SVN: r4782 - stack/native/trunk/src/main/java/org/jboss/ws/core/server.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-17 06:54:21 -0400 (Wed, 17 Oct 2007)
New Revision: 4782
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
[JBWS-1798] JBossWS cannot find local schema with relative urls
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-10-17 10:51:32 UTC (rev 4781)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-10-17 10:54:21 UTC (rev 4782)
@@ -124,6 +124,10 @@
if (locationAttr != null)
{
String orgLocation = locationAttr.getNodeValue();
+
+ while (orgLocation.startsWith("./"))
+ orgLocation = orgLocation.substring(2);
+
boolean isAbsolute = orgLocation.startsWith("http://") || orgLocation.startsWith("https://");
if (isAbsolute == false && orgLocation.startsWith(reqURL.getPath()) == false)
{
@@ -149,11 +153,6 @@
}
}
- while (newResourcePath.startsWith("./"))
- {
- newResourcePath = newResourcePath.substring(2);
- }
-
String reqPath = reqURL.getPath();
String completeHost = wsdlHost;
17 years
JBossWS SVN: r4781 - in stack/native/trunk/src/main/java/org/jboss/ws: tools/wsdl and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-17 06:51:32 -0400 (Wed, 17 Oct 2007)
New Revision: 4781
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
Log:
[JBWS-1798] JBossWS cannot find local schema with relative urls
Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-10-17 08:56:48 UTC (rev 4780)
+++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-10-17 10:51:32 UTC (rev 4781)
@@ -102,7 +102,7 @@
/**
* Modify the location of wsdl and schema imports
*/
- private void modifyAddressReferences(URL reqURL, String wsdlHost, String resPath, Element element) throws MalformedURLException
+ private void modifyAddressReferences(URL reqURL, String wsdlHost, String resPath, Element element) throws IOException
{
// map wsdl definition imports
NodeList nlist = element.getChildNodes();
@@ -130,8 +130,30 @@
String newResourcePath = orgLocation;
if (resPath != null && resPath.indexOf("/") > 0)
- newResourcePath = resPath.substring(0, resPath.lastIndexOf("/") + 1) + orgLocation;
+ {
+ String resParent = resPath.substring(0, resPath.lastIndexOf("/"));
+ while (orgLocation.startsWith("../") && resParent != null)
+ {
+ if (resParent.indexOf("/") > 0)
+ {
+ resParent = resParent.substring(0, resParent.lastIndexOf("/"));
+ orgLocation = orgLocation.substring(3);
+ newResourcePath = resParent + "/" + orgLocation;
+ }
+ else
+ {
+ orgLocation = orgLocation.substring(3);
+ newResourcePath = orgLocation;
+ resParent = null;
+ }
+ }
+ }
+ while (newResourcePath.startsWith("./"))
+ {
+ newResourcePath = newResourcePath.substring(2);
+ }
+
String reqPath = reqURL.getPath();
String completeHost = wsdlHost;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-10-17 08:56:48 UTC (rev 4780)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/wsdl/WSDL11Reader.java 2007-10-17 10:51:32 UTC (rev 4781)
@@ -553,9 +553,9 @@
return tmpFile != null ? tmpFile.toURL() : null;
}
- private void handleSchemaImports(Element schemaEl, URL wsdlLoc) throws MalformedURLException, WSDLException
+ private void handleSchemaImports(Element schemaEl, URL parentURL) throws WSDLException, IOException
{
- if (wsdlLoc == null)
+ if (parentURL == null)
throw new IllegalArgumentException("Cannot process import, parent location not set");
Iterator it = DOMUtils.getChildElements(schemaEl, new QName(Constants.NS_SCHEMA_XSD, "import"));
@@ -570,8 +570,15 @@
// Skip, let the entity resolver resolve these
if (namespace != null && schemaLocation != null)
{
- URL currLoc = getLocationURL(wsdlLoc, schemaLocation);
- schemaLocationsMap.put(namespace, currLoc);
+ URL currLoc = getLocationURL(parentURL, schemaLocation);
+ if (schemaLocationsMap.get(namespace) == null)
+ {
+ schemaLocationsMap.put(namespace, currLoc);
+
+ // Recursively handle schema imports
+ Element importedSchema = DOMUtils.parse(currLoc.openStream());
+ handleSchemaImports(importedSchema, currLoc);
+ }
}
else
{
17 years
JBossWS SVN: r4780 - in stack/native/trunk: src/test/resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-10-17 04:56:48 -0400 (Wed, 17 Oct 2007)
New Revision: 4780
Modified:
stack/native/trunk/ant-import-tests/build-testsuite.xml
stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
Log:
JBWS-1852 Failed to create a new SAX parser
Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-10-17 07:53:51 UTC (rev 4779)
+++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-10-17 08:56:48 UTC (rev 4780)
@@ -179,10 +179,8 @@
<classpath location="${tests.output.dir}/resources/jaxws/samples/wssecurityAnnotatedpolicy"/>
</taskdef>
- <!-- JBWS-1852 Failed to create a new SAX parser
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean" verbose="true"/>
<wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurityAnnotatedpolicy" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurityAnnotatedpolicy.HelloJavaBean"/>
- -->
</target>
<target name="tests-compile-generated-resources" depends="servicegen,wstools,wsprovide">
Modified: stack/native/trunk/src/test/resources/test-excludes-jboss50.txt
===================================================================
--- stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-17 07:53:51 UTC (rev 4779)
+++ stack/native/trunk/src/test/resources/test-excludes-jboss50.txt 2007-10-17 08:56:48 UTC (rev 4780)
@@ -3,10 +3,4 @@
org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.*
org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.*
org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.*
-org/jboss/test/ws/jaxrpc/wsdlpublish/**
-
-# [JBWS-1852] Failed to create a new SAX parser
-org/jboss/test/ws/jaxws/samples/wssecurity/*
-org/jboss/test/ws/jaxws/samples/wssecurityAnnotatedpolicy/*
-
-
+org/jboss/test/ws/jaxrpc/wsdlpublish/**
\ No newline at end of file
17 years
JBossWS SVN: r4779 - framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2007-10-17 03:53:51 -0400 (Wed, 17 Oct 2007)
New Revision: 4779
Modified:
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
Log:
[JBWS-1799] rollbacking my fix because it's not JAX-WS compliant
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2007-10-17 07:51:25 UTC (rev 4778)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2007-10-17 07:53:51 UTC (rev 4779)
@@ -94,7 +94,7 @@
File outputDir = new File("wsprovide/java");
File javaSource = new File(
outputDir.getAbsolutePath()+
- "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/generated__432967231/AddResponse.java"
+ "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java"
);
assertTrue("Response wrapper not generated", javaSource.exists());
Modified: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java
===================================================================
--- framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-10-17 07:51:25 UTC (rev 4778)
+++ framework/trunk/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-10-17 07:53:51 UTC (rev 4779)
@@ -98,7 +98,7 @@
{
File javaSource = new File(
directory.getAbsolutePath()+
- "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/generated__432967231/AddResponse.java"
+ "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java"
);
assertTrue("Source not generated", javaSource.exists());
@@ -112,7 +112,7 @@
{
provide();
ClassLoader loader = getArtefactClassLoader();
- Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.generated__432967231.AddResponse");
+ Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse");
XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class);
assertNotNull("@XmlRootElement missing form response wrapper", rootElement);
assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator");
@@ -199,7 +199,7 @@
System.out.println("-- End captured output --");
assertTrue("Provider messages not correctly redirected",
- messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/generated__432967231/Add.class") != -1 );
+ messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 );
}
private void provide() throws Exception
17 years