JBossWS SVN: r1966 - in trunk: integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50 and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 08:32:12 -0500 (Mon, 15 Jan 2007)
New Revision: 1966
Modified:
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java
trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB.java
trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
Log:
[JBWS-723] - Protect access to wsdl
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB21.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -113,7 +113,7 @@
protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException
{
ServiceEndpointGeneratorEJB21 generator = new ServiceEndpointGeneratorEJB21();
- return generator.generatWebDeployment(di, wsMetaData);
+ return generator.generatWebDeployment(wsMetaData, di);
}
}
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -124,6 +124,6 @@
protected URL generateWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException
{
- return new ServiceEndpointGeneratorEJB3().generatWebDeployment(di, wsMetaData);
+ return new ServiceEndpointGeneratorEJB3().generatWebDeployment(wsMetaData, di);
}
}
Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -33,9 +33,9 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.logging.Logger;
-import org.jboss.system.server.ServerConfig;
-import org.jboss.system.server.ServerConfigLocator;
import org.jboss.ws.WSException;
+import org.jboss.ws.core.server.ServerConfig;
+import org.jboss.ws.core.server.ServerConfigFactory;
import org.jboss.ws.core.utils.DOMUtils;
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.metadata.umdm.EndpointMetaData;
@@ -55,25 +55,25 @@
// logging support
protected Logger log = Logger.getLogger(ServiceEndpointGeneratorEJB.class);
- public URL generatWebDeployment(DeploymentInfo di, UnifiedMetaData wsMetaData) throws IOException
+ public URL generatWebDeployment(UnifiedMetaData wsMetaData, DeploymentInfo di) throws IOException
{
// Collect the list of PortComponentMetaData
- List<EndpointMetaData> epMetaDataList = new ArrayList<EndpointMetaData>();
+ List<ServerEndpointMetaData> sepMetaDataList = new ArrayList<ServerEndpointMetaData>();
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
{
- epMetaDataList.add(epMetaData);
+ sepMetaDataList.add((ServerEndpointMetaData)epMetaData);
}
}
- Element webDoc = createWebAppDescriptor(di, epMetaDataList);
- Element jbossDoc = createJBossWebAppDescriptor(di, epMetaDataList);
+ Element webDoc = createWebAppDescriptor(sepMetaDataList, di);
+ Element jbossDoc = createJBossWebAppDescriptor(sepMetaDataList, di);
File tmpWar = null;
try
{
- ServerConfig config = ServerConfigLocator.locate();
+ ServerConfig config = ServerConfigFactory.getInstance().getServerConfig();
File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
String deploymentName = di.getCanonicalName().replace('/', '-') + "-ws";
@@ -91,16 +91,16 @@
fw = new FileWriter(jbossWebXml);
new DOMWriter(fw).setPrettyprint(true).print(jbossDoc);
fw.close();
+
+ return tmpWar.toURL();
}
catch (IOException e)
{
throw new WSException("Failed to create webservice.war", e);
}
-
- return tmpWar.toURL();
}
- private Element createWebAppDescriptor(DeploymentInfo di, List<EndpointMetaData> epMetaDataList)
+ private Element createWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList, DeploymentInfo di)
{
Element webApp = DOMUtils.createElement("web-app");
@@ -110,9 +110,8 @@
<servlet-class>
</servlet>
*/
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet"));
Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name"));
@@ -131,9 +130,8 @@
</servlet-mapping>
*/
ArrayList<String> urlPatters = new ArrayList<String>();
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping"));
Element servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name"));
@@ -156,9 +154,8 @@
String authMethod = null;
// Add web-app/security-constraint for each port component
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
if (sepMetaData.getAuthMethod() != null || sepMetaData.getTransportGuarantee() != null)
{
@@ -183,9 +180,12 @@
Element pattern = (Element)wrc.appendChild(DOMUtils.createElement("url-pattern"));
String uri = sepMetaData.getURLPattern();
pattern.appendChild(DOMUtils.createTextNode(uri));
+ if (sepMetaData.isSecureWSDLAccess())
+ {
+ Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
+ method.appendChild(DOMUtils.createTextNode("GET"));
+ }
Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
- method.appendChild(DOMUtils.createTextNode("GET"));
- method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
method.appendChild(DOMUtils.createTextNode("POST"));
// Optional auth-constraint
@@ -224,7 +224,7 @@
return webApp;
}
- private Element createJBossWebAppDescriptor(DeploymentInfo di, List<EndpointMetaData> epMetaDataList)
+ private Element createJBossWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList, DeploymentInfo di)
{
/* Create a jboss-web
<jboss-web>
@@ -234,7 +234,7 @@
*/
Element jbossWeb = DOMUtils.createElement("jboss-web");
- UnifiedMetaData wsMetaData = epMetaDataList.get(0).getServiceMetaData().getUnifiedMetaData();
+ UnifiedMetaData wsMetaData = sepMetaDataList.get(0).getServiceMetaData().getUnifiedMetaData();
String securityDomain = wsMetaData.getSecurityDomain();
if (securityDomain != null)
{
@@ -244,9 +244,8 @@
// Get the context root for this deployment
String contextRoot = null;
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String next = sepMetaData.getContextRoot();
if (next != null)
{
@@ -267,9 +266,8 @@
root.appendChild(DOMUtils.createTextNode(contextRoot));
String[] virtualHosts = null;
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String[] next = sepMetaData.getVirtualHosts();
if (next != null && next.length > 0)
{
Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java
===================================================================
--- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServiceEndpointGeneratorEJB.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -57,30 +57,29 @@
public URL generatWebDeployment(UnifiedMetaData wsMetaData, DeploymentUnit unit)
{
- // Collect the list of EndpointMetaData
- List<EndpointMetaData> epMetaDataList = new ArrayList<EndpointMetaData>();
+ // Collect the list of PortComponentMetaData
+ List<ServerEndpointMetaData> sepMetaDataList = new ArrayList<ServerEndpointMetaData>();
for (ServiceMetaData serviceMetaData : wsMetaData.getServices())
{
for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints())
{
- epMetaDataList.add(epMetaData);
+ sepMetaDataList.add((ServerEndpointMetaData)epMetaData);
}
}
- Element webDoc = createWebAppDescriptor(epMetaDataList, unit);
- Element jbossDoc = createJBossWebAppDescriptor(epMetaDataList, unit);
+ Element webDoc = createWebAppDescriptor(sepMetaDataList, unit);
+ Element jbossDoc = createJBossWebAppDescriptor(sepMetaDataList, unit);
File tmpWar = null;
try
{
- ServerConfigFactory factory = ServerConfigFactory.getInstance();
- ServerConfig config = factory.getServerConfig();
+ ServerConfig config = ServerConfigFactory.getInstance().getServerConfig();
File tmpdir = new File(config.getServerTempDir().getCanonicalPath() + "/deploy");
String deploymentName = wsMetaData.getDeploymentName().replace('/', '-');
tmpWar = File.createTempFile(deploymentName, ".war", tmpdir);
tmpWar.delete();
-
+
File webInf = new File(tmpWar, "WEB-INF");
webInf.mkdirs();
@@ -93,7 +92,7 @@
fw = new FileWriter(jbossWebXml);
new DOMWriter(fw).setPrettyprint(true).print(jbossDoc);
fw.close();
-
+
return tmpWar.toURL();
}
catch (IOException e)
@@ -102,7 +101,7 @@
}
}
- private Element createWebAppDescriptor(List<EndpointMetaData> epMetaDataList, DeploymentUnit unit)
+ private Element createWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList, DeploymentUnit unit)
{
Element webApp = DOMUtils.createElement("web-app");
@@ -112,9 +111,8 @@
<servlet-class>
</servlet>
*/
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
Element servlet = (Element)webApp.appendChild(DOMUtils.createElement("servlet"));
Element servletName = (Element)servlet.appendChild(DOMUtils.createElement("servlet-name"));
@@ -133,9 +131,8 @@
</servlet-mapping>
*/
ArrayList urlPatters = new ArrayList();
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
Element servletMapping = (Element)webApp.appendChild(DOMUtils.createElement("servlet-mapping"));
Element servletName = (Element)servletMapping.appendChild(DOMUtils.createElement("servlet-name"));
@@ -158,9 +155,8 @@
String authMethod = null;
// Add web-app/security-constraint for each port component
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String ejbName = sepMetaData.getLinkName();
if (sepMetaData.getAuthMethod() != null || sepMetaData.getTransportGuarantee() != null)
{
@@ -185,9 +181,12 @@
Element pattern = (Element)wrc.appendChild(DOMUtils.createElement("url-pattern"));
String uri = sepMetaData.getURLPattern();
pattern.appendChild(DOMUtils.createTextNode(uri));
+ if (sepMetaData.isSecureWSDLAccess())
+ {
+ Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
+ method.appendChild(DOMUtils.createTextNode("GET"));
+ }
Element method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
- method.appendChild(DOMUtils.createTextNode("GET"));
- method = (Element)wrc.appendChild(DOMUtils.createElement("http-method"));
method.appendChild(DOMUtils.createTextNode("POST"));
// Optional auth-constraint
@@ -226,7 +225,7 @@
return webApp;
}
- private Element createJBossWebAppDescriptor(List<EndpointMetaData> epMetaDataList, DeploymentUnit unit)
+ private Element createJBossWebAppDescriptor(List<ServerEndpointMetaData> sepMetaDataList, DeploymentUnit unit)
{
/* Create a jboss-web
<jboss-web>
@@ -237,7 +236,7 @@
*/
Element jbossWeb = DOMUtils.createElement("jboss-web");
- UnifiedMetaData wsMetaData = epMetaDataList.get(0).getServiceMetaData().getUnifiedMetaData();
+ UnifiedMetaData wsMetaData = sepMetaDataList.get(0).getServiceMetaData().getUnifiedMetaData();
String securityDomain = wsMetaData.getSecurityDomain();
if (securityDomain != null)
{
@@ -247,9 +246,8 @@
// Get the context root for this deployment
String contextRoot = null;
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String next = sepMetaData.getContextRoot();
if (next != null)
{
@@ -270,9 +268,8 @@
root.appendChild(DOMUtils.createTextNode(contextRoot));
String[] virtualHosts = null;
- for (EndpointMetaData epMetaData : epMetaDataList)
+ for (ServerEndpointMetaData sepMetaData : sepMetaDataList)
{
- ServerEndpointMetaData sepMetaData = (ServerEndpointMetaData)epMetaData;
String[] next = sepMetaData.getVirtualHosts();
if (next != null && next.length > 0)
{
@@ -298,9 +295,8 @@
Element virtualHost = (Element)jbossWeb.appendChild(DOMUtils.createElement("virtual-host"));
virtualHost.appendChild(DOMUtils.createTextNode(current));
}
- }
-
-
+ }
+
return jbossWeb;
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/PortComponent.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -61,23 +61,6 @@
*/
String urlPattern() default "";
- /**
- * The optional config-name element gives the client configuration name that must be present in
- * the configuration given by element config-file.
- *
- * Server side default: Standard Endpoint
- * Client side default: Standard Client
- */
- String configName() default "";
-
- /**
- * The optional config-file element gives the to a URL or resource name for the configuration.
- *
- * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml
- * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml
- */
- String configFile() default "";
-
/**
* The authMethod is used to configure the authentication mechanism for the web service.
* As a prerequisite to gaining access to any web service which are protected by an authorization
@@ -100,4 +83,30 @@
* CONFIDENTIAL flag will indicate that the use of SSL is required.
*/
String transportGuarantee() default "";
+
+ /**
+ * A secure endpoint does not by default publish it's wsdl on an unsecure transport.
+ * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false.
+ *
+ * Protect access to WSDL
+ * http://jira.jboss.org/jira/browse/JBWS-723
+ */
+ boolean secureWSDLAccess() default true;
+
+ /**
+ * The optional config-name element gives the client configuration name that must be present in
+ * the configuration given by element config-file.
+ *
+ * Server side default: Standard Endpoint
+ * Client side default: Standard Client
+ */
+ String configName() default "";
+
+ /**
+ * The optional config-file element gives the to a URL or resource name for the configuration.
+ *
+ * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml
+ * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml
+ */
+ String configFile() default "";
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSEndpointMetaDataBuilder.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -135,6 +135,9 @@
sepMetaData.setTransportGuarantee(transportGuarantee);
}
}
+
+ // secure wsdl access
+ sepMetaData.setSecureWSDLAccess(anPortComponent.secureWSDLAccess());
// virtual hosts
String[] virtualHosts = anPortComponent.virtualHosts();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -58,6 +58,8 @@
private String urlPattern;
// The optional transport guarantee
private String transportGuarantee;
+ // The optional secure wsdl access
+ private boolean secureWSDLAccess = true;
// The bean that registers with the ServiceEndpointManager
private String managedEndpointBean = "org.jboss.ws.core.server.ServiceEndpoint";
@@ -152,6 +154,16 @@
this.transportGuarantee = transportGuarantee;
}
+ public boolean isSecureWSDLAccess()
+ {
+ return secureWSDLAccess;
+ }
+
+ public void setSecureWSDLAccess(boolean secureWSDLAccess)
+ {
+ this.secureWSDLAccess = secureWSDLAccess;
+ }
+
public String getManagedEndpointBean()
{
return managedEndpointBean;
@@ -209,6 +221,7 @@
buffer.append("\n configName=").append(getConfigName());
buffer.append("\n authMethod=").append(getAuthMethod());
buffer.append("\n transportGuarantee=").append(getTransportGuarantee());
+ buffer.append("\n secureWSDLAccess=").append(isSecureWSDLAccess());
buffer.append("\n properties=").append(getProperties());
for (OperationMetaData opMetaData : getOperations())
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-15 13:25:57 UTC (rev 1965)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.java 2007-01-15 13:32:12 UTC (rev 1966)
@@ -52,7 +52,7 @@
// jboss propriatary annotations
@RemoteBinding(jndiBinding = "/ejb3/EJB3Bean01")
-@PortComponent(authMethod="BASIC", transportGuarantee="NONE", configName="Standard WSSecurity Endpoint")
+@PortComponent(authMethod="BASIC", transportGuarantee="NONE", secureWSDLAccess=false, configName="Standard WSSecurity Endpoint")
@SecurityDomain("JBossWS")
public class EJB3Bean01 implements EJB3RemoteInterface
{
18 years
- 1
- 0
JBossWS SVN: r1965 - in branches/jbossws-1.0.4.GA_JBWS-1454: src/main/java/org/jboss/ws/tools and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 08:25:57 -0500 (Mon, 15 Jan 2007)
New Revision: 1965
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/AbstractType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/Person.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/TelephoneNumber.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/wstools-config.xml
Removed:
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/AbstractType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/Person.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook.wsdl
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/TelephoneNumber.java
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/wstools-config.xml
Modified:
branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
Log:
JBWS-1454 Complex type defined with complexContent only last element is in the generated java class if base type is empty.
Added: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 12:52:39 UTC (rev 1964)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt 2007-01-15 13:25:57 UTC (rev 1965)
@@ -0,0 +1,51 @@
+PATCH NAME:
+ JBWS-1454
+PRODUCT NAME:
+ JBoss WS
+VERSION:
+ 1.0.4.GA
+SHORT DESCRIPTION:
+ This patch addresses a number of issues identified with wstools since the JBossWS 1.0.4.GA release.
+LONG DESCRIPTION:
+ The mapping of anonymous types is not consitent across the generated source and the generated mapping file when
+ using wsdl to java, this patch incorporates the fix for this.
+
+ http://jira.jboss.com/jira/browse/JBWS-1079
+
+ A lot of errors are reported when using wsdl to java with JBossWS 1.0.4.GA with wrapped parameter style, this patch
+ incorporates the fixes implemented as part of the following task: -
+
+ http://jira.jboss.com/jira/browse/JBWS-1260
+
+ Also when using java to wsdl if an array is defined with indexed accessors it is rejected even though non-indexed
+ access has been made available.
+
+ http://jira.jboss.com/jira/browse/JBWS-1428
+
+ WSDL to Java - Complex type defined with complexContent only last element is in the generated java class
+ if base type is empty
+
+ http://jira.jboss.com/jira/browse/JBWS-1441
+MANUAL INSTALL INSTRUCTIONS:
+ If you require the Java 1.4 version: -
+ 1.) Copy lib/jbossws14-client.jar to $JBOSS_HOME/client/
+ 2.) Unzip lib/jbossws14.sar to $JBOSS_HOME/server/{configuration}/deploy/
+
+ If you require the Java 5.0 version: -
+ 1.) Copy lib/jbossws-client.jar to $JBOSS_HOME/client/
+ 2.) Unzip lib/jbossws.sar to $JBOSS_HOME/server/{configuration}/deploy/
+
+ You need to manually replace the jboss-xml-binding.jar in the $JBOSS_HOME/client and $JBOSS_HOME/lib directories.
+ The compatible release can be found here: http://repository.jboss.com/jboss/jbossxb/1.0.0.CR7
+COMPATIBILITY:
+ None
+DEPENDENCIES:
+ JBossAS 4.0.5.GA
+SUPERSEDES:
+ JBWS-1440
+SUPERSEDED BY:
+ None
+CREATOR:
+ Darran Lofthouse
+DATE:
+ 15th January 2007
\ No newline at end of file
Property changes on: branches/jbossws-1.0.4.GA_JBWS-1454/docs/Patch Instructions.txt
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15 12:52:39 UTC (rev 1964)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -310,7 +310,18 @@
return;
}
- XSParticle xspar = (XSParticle)xparts.item(length - 1);
+ XSParticle xspar;
+
+ if (baseType instanceof XSComplexTypeDefinition && ((XSComplexTypeDefinition)baseType).getContentType() == XSComplexTypeDefinition.CONTENTTYPE_EMPTY)
+ {
+ // If the base type is empty there will not have been a particle to ignore.
+ xspar = xsparticle;
+ }
+ else
+ {
+ xspar = (XSParticle)xparts.item(length - 1);
+ }
+
XSTerm xsparTerm = xspar.getTerm();
if (xsparTerm instanceof XSModelGroup)
{
@@ -319,6 +330,7 @@
}
else if (xsparTerm instanceof XSElementDeclaration)
vars.addAll(createVARforXSElementDeclaration(xsparTerm, schemautils.isArrayType(xspar), schema, type));
+
}
}
}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441 (from rev 1892, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.tools.jbws1441;
-
-import java.io.File;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
-import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
-import org.jboss.ws.tools.WSTools;
-
-/**
- *
- * @author darran.lofthouse(a)jboss.com
- * @since 5 Jan 2007
- */
-public class JBWS1441TestCase extends JBossWSTest
-{
-
- private static final String resourceDir = "resources/tools/jbws1441";
- private static final String toolsDir = "tools/jbws1441";
-
- public void testGenerate() throws Exception
- {
- String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
- new WSTools().generate(args);
-
- compareSource("AbstractType.java");
- compareSource("Person.java");
- compareSource("PhoneBook_PortType.java");
- compareSource("TelephoneNumber.java");
-
- JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
- mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
- }
-
- private static void compareSource(final String fileName) throws Exception
- {
- File expected = new File(resourceDir + "/" + fileName);
- File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1441/" + fileName);
-
- JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
- sc.validate();
- sc.validateImports();
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java (from rev 1892, trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1441/JBWS1441TestCase.java)
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441 (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/AbstractType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/AbstractType.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,13 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1441;
-
-
-public class AbstractType {
-
- public AbstractType() {
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/AbstractType.java (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/AbstractType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/Person.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/Person.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,36 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1441;
-
-
-public class Person extends org.jboss.test.ws.jbws1441.AbstractType {
- protected java.lang.String firstName;
- protected java.lang.String surname;
-
- public Person() {
- }
-
- public Person(java.lang.String firstName, java.lang.String surname) {
- this.firstName = firstName;
- this.surname = surname;
- }
-
- public java.lang.String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(java.lang.String firstName) {
- this.firstName = firstName;
- }
-
- public java.lang.String getSurname() {
- return surname;
- }
-
- public void setSurname(java.lang.String surname) {
- this.surname = surname;
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/Person.java (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/Person.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook.wsdl 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='PhoneBook' targetNamespace='http://test.jboss.org/ws/jbws1441' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1441/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1441' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://test.jboss.org/ws/jbws1441/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1441/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
-
- <complexType name='AbstractType'>
- <sequence/>
- </complexType>
-
- <complexType name='Person'>
- <complexContent>
- <extension base='tns:AbstractType'>
- <sequence>
- <element name='firstName' nillable='true' type='string'/>
- <element name='surname' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name='TelephoneNumber'>
- <complexContent>
- <extension base='tns:AbstractType'>
- <sequence>
- <element name='areaCode' nillable='true' type='string'/>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </extension>
- </complexContent>
- </complexType>
-
- <element name='lookup' type='tns:Person'/>
- <element name='lookupResponse' type='tns:TelephoneNumber'/>
-
- </schema>
- </types>
- <message name='PhoneBook_lookup'>
- <part element='ns1:lookup' name='parameters'/>
- </message>
- <message name='PhoneBook_lookupResponse'>
- <part element='ns1:lookupResponse' name='result'/>
- </message>
- <portType name='PhoneBook'>
- <operation name='lookup'>
- <input message='tns:PhoneBook_lookup'/>
- <output message='tns:PhoneBook_lookupResponse'/>
- </operation>
- </portType>
- <binding name='PhoneBookBinding' type='tns:PhoneBook'>
- <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body use='literal'/>
- </input>
- <output>
- <soap:body use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='PhoneBook'>
- <port binding='tns:PhoneBookBinding' name='PhoneBookPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook.wsdl (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook.wsdl)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook_PortType.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,11 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1441;
-
-public interface PhoneBook_PortType extends java.rmi.Remote {
- public org.jboss.test.ws.jbws1441.TelephoneNumber lookup(org.jboss.test.ws.jbws1441.Person parameters) throws
- java.rmi.RemoteException;
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/PhoneBook_PortType.java (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/PhoneBook_PortType.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/TelephoneNumber.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/TelephoneNumber.java 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,36 +0,0 @@
-// This class was generated by the JAXRPC SI, do not edit.
-// Contents subject to change without notice.
-// JAX-RPC Standard Implementation (1.1.3, build R1)
-// Generated source version: 1.1.3
-
-package org.jboss.test.ws.jbws1441;
-
-
-public class TelephoneNumber extends org.jboss.test.ws.jbws1441.AbstractType {
- protected java.lang.String areaCode;
- protected java.lang.String number;
-
- public TelephoneNumber() {
- }
-
- public TelephoneNumber(java.lang.String areaCode, java.lang.String number) {
- this.areaCode = areaCode;
- this.number = number;
- }
-
- public java.lang.String getAreaCode() {
- return areaCode;
- }
-
- public void setAreaCode(java.lang.String areaCode) {
- this.areaCode = areaCode;
- }
-
- public java.lang.String getNumber() {
- return number;
- }
-
- public void setNumber(java.lang.String number) {
- this.number = number;
- }
-}
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/TelephoneNumber.java (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/TelephoneNumber.java)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1441</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1441</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>org.jboss.test.ws.jbws1441</package-type>
- <namespaceURI>http://test.jboss.org/ws/jbws1441/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1441.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:TelephoneNumber</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>areaCode</java-variable-name>
- <xml-element-name>areaCode</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>number</java-variable-name>
- <xml-element-name>number</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jbws1441.Person</java-type>
- <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1441/types">typeNS:Person</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>firstName</java-variable-name>
- <xml-element-name>firstName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>surname</java-variable-name>
- <xml-element-name>surname</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1441.PhoneBook_Service</service-interface>
- <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1441">serviceNS:PhoneBook</wsdl-service-name>
- <port-mapping>
- <port-name>PhoneBookPort</port-name>
- <java-port-name>PhoneBookPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1441.PhoneBook_PortType</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1441">portTypeNS:PhoneBook</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1441">bindingNS:PhoneBookBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>lookup</java-method-name>
- <wsdl-operation>lookup</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>org.jboss.test.ws.jbws1441.Person</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookup</wsdl-message>
- <wsdl-message-part-name>parameters</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jbws1441.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1441">wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message>
- <wsdl-message-part-name>result</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/jaxrpc-mapping.xml (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/jaxrpc-mapping.xml)
Deleted: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml 2007-01-10 12:51:04 UTC (rev 1892)
+++ branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/wstools-config.xml 2007-01-15 13:25:57 UTC (rev 1965)
@@ -1,5 +0,0 @@
-<configuration>
- <wsdl-java location="resources/tools/jbws1441/PhoneBook.wsdl" parameter-style="bare">
- <mapping file="jaxrpc-mapping.xml"/>
- </wsdl-java>
-</configuration>
Copied: branches/jbossws-1.0.4.GA_JBWS-1454/src/test/resources/tools/jbws1441/wstools-config.xml (from rev 1892, trunk/jbossws-tests/src/main/resources/tools/jbws1441/wstools-config.xml)
18 years
- 1
- 0
JBossWS SVN: r1964 - branches.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 07:52:39 -0500 (Mon, 15 Jan 2007)
New Revision: 1964
Added:
branches/jbossws-1.0.4.GA_JBWS-1454/
Log:
Branch for support patch JBWS-1454
Copied: branches/jbossws-1.0.4.GA_JBWS-1454 (from rev 1963, branches/jbossws-1.0.4.GA_JBWS-1440)
18 years
- 1
- 0
JBossWS SVN: r1963 - trunk/jbossws-core/src/main/java/org/jboss/ws/core.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 07:36:46 -0500 (Mon, 15 Jan 2007)
New Revision: 1963
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
Log:
[JBWS-1285] - NPE when the soap encoded array size is 0 on the return path
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-01-15 12:29:50 UTC (rev 1962)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2007-01-15 12:36:46 UTC (rev 1963)
@@ -700,7 +700,9 @@
{
QName compXMLName = paramMetaData.getXmlName();
Element compElement = DOMUtils.getFirstChildElement(aux);
- if (compElement.getNodeName().equals(compXMLName.getLocalPart()))
+ // NPE when the soap encoded array size is 0 on the return path
+ // http://jira.jboss.org/jira/browse/JBWS-1285
+ if (compElement == null || compElement.getNodeName().equals(compXMLName.getLocalPart()))
{
soapContentElement = aux;
soapContentElement.setParamMetaData(paramMetaData);
18 years
- 1
- 0
JBossWS SVN: r1962 - in trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing: mgmt and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-15 07:29:50 -0500 (Mon, 15 Jan 2007)
New Revision: 1962
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/element/NotificationFailure.java
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
Log:
Fix JBWS-1406. Thanks for the contribution from Alessio Soldano
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/element/NotificationFailure.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/element/NotificationFailure.java 2007-01-15 12:14:55 UTC (rev 1961)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/element/NotificationFailure.java 2007-01-15 12:29:50 UTC (rev 1962)
@@ -0,0 +1,86 @@
+/*
+ * 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.extensions.eventing.element;
+
+import java.net.URI;
+
+import org.jboss.ws.core.utils.DOMWriter;
+import org.w3c.dom.Element;
+
+/**
+ * Represent an error during notification.
+ *
+ * @author Stefano Maestri <stefano.maestri(a)javalinux.it>, Alessio Soldano <alessio.soldano(a)javalinux.it>
+ * @since 26/11/2006
+ */
+
+public class NotificationFailure
+{
+ private URI endTo;
+ private Element event;
+ private Exception exception;
+
+ public NotificationFailure(URI endTo, Element event, Exception exception)
+ {
+ super();
+ this.endTo = endTo;
+ this.event = event;
+ this.exception = exception;
+ }
+ public URI getEndTo()
+ {
+ return endTo;
+ }
+ public void setEndTo(URI endTo)
+ {
+ this.endTo = endTo;
+ }
+ public Element getEvent()
+ {
+ return event;
+ }
+ public void setEvent(Element event)
+ {
+ this.event = event;
+ }
+ public Exception getException()
+ {
+ return exception;
+ }
+ public void setException(Exception exception)
+ {
+ this.exception = exception;
+ }
+
+ public String toString() {
+ StringBuffer sb = new StringBuffer();
+ sb.append("endTo: ");
+ sb.append(endTo);
+ sb.append("\n\nevent: ");
+ sb.append(DOMWriter.printNode(event, false));
+ sb.append("\n\nexception: ");
+ sb.append(exception);
+ sb.append("\n*******************\n");
+ return sb.toString();
+ }
+
+}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-01-15 12:14:55 UTC (rev 1961)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/Subscription.java 2007-01-15 12:29:50 UTC (rev 1962)
@@ -39,6 +39,7 @@
import org.jboss.ws.core.utils.DOMWriter;
import org.jboss.ws.extensions.eventing.EventingConstants;
import org.jboss.ws.extensions.eventing.element.EndpointReference;
+import org.jboss.ws.extensions.eventing.element.NotificationFailure;
import org.w3c.dom.Element;
/**
@@ -58,6 +59,8 @@
final private EndpointReference endpointReference;
final private URI eventSourceNS;
+ private SubscriptionManagerFactory factory = SubscriptionManagerFactory.getInstance();
+
public Subscription(URI eventSourceNS, EndpointReference endpointReference, EndpointReference notifyTo, EndpointReference endTo, Date expires, Filter filter)
{
this.eventSourceNS = eventSourceNS;
@@ -98,7 +101,9 @@
}
catch (Exception e)
{
- // todo: this should get back to manager
+ SubscriptionManagerMBean manager = factory.getSubscriptionManager();
+ NotificationFailure failure = new NotificationFailure(this.endTo.getAddress(), event, e);
+ manager.addNotificationFailure(failure);
log.error("Failed to send notification message", e);
}
}
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-01-15 12:14:55 UTC (rev 1961)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManager.java 2007-01-15 12:29:50 UTC (rev 1962)
@@ -53,6 +53,7 @@
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
import org.jboss.ws.extensions.eventing.element.EndpointReference;
import org.jboss.ws.extensions.eventing.element.ReferenceParameters;
+import org.jboss.ws.extensions.eventing.element.NotificationFailure;
import org.w3c.dom.Element;
/**
@@ -116,6 +117,13 @@
private static EventingBuilder builder = EventingBuilder.createEventingBuilder();
+
+ /**
+ * List containing all errors occured during notification since service startup
+ * todo: save this list and made possible to resend failed notification using jms instead of list
+ */
+ private List<NotificationFailure> notificationFailures = new ArrayList<NotificationFailure>();
+
public void create() throws Exception
{
MBeanServer server = getJMXServer();
@@ -457,6 +465,16 @@
threadPool.execute(dispatchJob);
}
+ public void addNotificationFailure(NotificationFailure failure)
+ {
+ notificationFailures.add(failure);
+ }
+
+ public List<NotificationFailure> showNotificationFailures()
+ {
+ return notificationFailures;
+ }
+
// ----------------------------------------------------------------------
// MBean support
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-01-15 12:14:55 UTC (rev 1961)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerMBean.java 2007-01-15 12:29:50 UTC (rev 1962)
@@ -25,9 +25,11 @@
import java.net.URI;
import java.util.Date;
+import java.util.List;
import org.jboss.ws.extensions.eventing.deployment.EventingEndpointDI;
import org.jboss.ws.extensions.eventing.element.EndpointReference;
+import org.jboss.ws.extensions.eventing.element.NotificationFailure;
import org.w3c.dom.Element;
/**
@@ -98,4 +100,8 @@
String showSubscriptionTable();
String showEventsourceTable();
+
+ public void addNotificationFailure(NotificationFailure failure);
+
+ public List<NotificationFailure> showNotificationFailures();
}
18 years
- 1
- 0
JBossWS SVN: r1961 - in trunk: integration-jboss50/src/main/resources/jbossws.deployer/META-INF and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-15 07:14:55 -0500 (Mon, 15 Jan 2007)
New Revision: 1961
Modified:
trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
Log:
Fix JBWS-1399. Thanks for the contribution from Stefano Maestri
Modified: trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml
===================================================================
--- trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-01-15 12:14:55 UTC (rev 1961)
@@ -13,7 +13,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is an empty string, JBossWS uses requesters host when rewriting the <soap:address>.
+ If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="webServiceSecurePort">8443</property>
Modified: trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-01-15 12:14:55 UTC (rev 1961)
@@ -11,7 +11,7 @@
If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true.
If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below.
- If 'webServiceHost' is an empty string, JBossWS uses requesters host when rewriting the <soap:address>.
+ If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>.
-->
<property name="webServiceHost">${jboss.bind.address}</property>
<property name="webServiceSecurePort">8443</property>
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/CommonContextServlet.java 2007-01-15 12:14:55 UTC (rev 1961)
@@ -25,6 +25,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.net.URL;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -67,7 +68,8 @@
setupHTMLResponseHeader(writer);
writer.print("<body>");
- writer.print(epManager.showServiceEndpointTable());
+ //writer.print(epManager.showServiceEndpointTable());
+ writer.print(epManager.showServiceEndpointTable(new URL(req.getRequestURL().toString())));
writer.print("</body>");
writer.print("</html>");
writer.close();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2007-01-15 12:14:55 UTC (rev 1961)
@@ -24,6 +24,7 @@
// $Id$
import java.io.StringWriter;
+import java.util.List;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
@@ -36,6 +37,7 @@
import org.jboss.ws.core.jaxrpc.binding.BindingException;
import org.jboss.ws.core.jaxrpc.binding.ComplexTypeSerializer;
import org.jboss.ws.core.jaxrpc.binding.SerializationContext;
+import org.jboss.ws.core.utils.JavaUtils;
import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl;
import org.w3c.dom.NamedNodeMap;
@@ -63,7 +65,29 @@
try
{
TypeMappingImpl typeMapping = serContext.getTypeMapping();
- Class javaType = typeMapping.getJavaType(xmlType);
+
+ Class javaType = null;
+ List<Class> possibleJavaTypes = typeMapping.getJavaTypes(xmlType);
+ if(possibleJavaTypes.size()>1)
+ {
+ // resolve java type by assignability
+ for(Class type : possibleJavaTypes)
+ {
+ if(JavaUtils.isAssignableFrom(type, value.getClass()))
+ {
+ javaType = value.getClass();
+ break;
+ }
+ }
+ }
+ else
+ {
+ javaType = typeMapping.getJavaType(xmlType);
+ }
+
+ if(null == javaType)
+ throw new Exception("Unable to resolve target java type");
+
JAXBContext jaxbContext = JAXBContext.newInstance(javaType);
Marshaller marshaller = jaxbContext.createMarshaller();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpoint.java 2007-01-15 12:14:55 UTC (rev 1961)
@@ -134,7 +134,8 @@
ServiceEndpointInfo sepInfo = getServiceEndpointInfo();
EndpointMetaData epMetaData = sepInfo.getServerEndpointMetaData();
- String wsdlHost = reqURL.getHost();
+ //String wsdlHost = reqURL.getHost();
+ String wsdlHost = reqURL.getProtocol() + "://" + reqURL.getHost() + ":" + reqURL.getPort();
ServiceEndpointManagerFactory factory = ServiceEndpointManagerFactory.getInstance();
ServiceEndpointManager epManager = factory.getServiceEndpointManager();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-01-15 12:14:55 UTC (rev 1961)
@@ -269,7 +269,7 @@
/** Show the registered webservices
*/
- public String showServiceEndpointTable()
+ public String showServiceEndpointTable(URL requestURL) throws java.net.MalformedURLException
{
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
@@ -286,7 +286,15 @@
ServiceEndpoint wsEndpoint = (ServiceEndpoint)entry.getValue();
ServiceEndpointInfo seInfo = wsEndpoint.getServiceEndpointInfo();
String endpointAddress = seInfo.getServerEndpointMetaData().getEndpointAddress();
- pw.println("<tr><td>" + sepID.getCanonicalName() + "</td><td><a href='" + endpointAddress + "?wsdl'>" + endpointAddress + "?wsdl</a></td></tr>");
+ //pw.println("<tr><td>" + sepID.getCanonicalName() + "</td><td><a href='" + endpointAddress + "?wsdl'>" + endpointAddress + "?wsdl</a></td></tr>");
+ URL displayURL = new URL(endpointAddress);
+ String endPointPath = displayURL.getPath();
+ if (this.getWebServiceHost().equals(ServiceEndpointManager.UNDEFINED_HOSTNAME) == true)
+ {
+ displayURL = requestURL;
+ }
+ String displayAddress = displayURL.getProtocol() + "://" + displayURL.getHost() + ":" + displayURL.getPort() + endPointPath;
+ pw.println("<tr><td>" + sepID.getCanonicalName() + "</td><td><a href='" + displayAddress + "?wsdl'>" + displayAddress + "?wsdl</a></td></tr>");
}
pw.println("</table>");
pw.close();
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-01-15 11:50:03 UTC (rev 1960)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/WSDLRequestHandler.java 2007-01-15 12:14:55 UTC (rev 1961)
@@ -110,6 +110,8 @@
{
Element childElement = (Element)childNode;
String nodeName = childElement.getLocalName();
+
+ // Replace xsd:import location attributes
if ("import".equals(nodeName) || "include".equals(nodeName))
{
Attr locationAttr = childElement.getAttributeNode("schemaLocation");
@@ -127,18 +129,24 @@
if (resPath != null && resPath.indexOf("/") > 0)
newResourcePath = resPath.substring(0, resPath.lastIndexOf("/") + 1) + orgLocation;
- String reqProtocol = reqURL.getProtocol();
- int reqPort = reqURL.getPort();
- String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : "");
String reqPath = reqURL.getPath();
-
- String newLocation = reqProtocol + "://" + hostAndPort + reqPath + "?wsdl&resource=" + newResourcePath;
- locationAttr.setNodeValue(newLocation);
+ String completeHost = wsdlHost;
+ if (! wsdlHost.startsWith("http://") && wsdlHost.startsWith("https://"))
+ {
+ String reqProtocol = reqURL.getProtocol();
+ int reqPort = reqURL.getPort();
+ String hostAndPort = wsdlHost + (reqPort > 0 ? ":" + reqPort : "");
+ completeHost = reqProtocol + "://" + hostAndPort;
+ }
+
+ String newLocation = completeHost + reqPath + "?wsdl&resource=" + newResourcePath;
log.debug("Mapping import from '" + orgLocation + "' to '" + newLocation + "'");
}
}
}
+
+ // Replace the soap:address location attribute
else if ("address".equals(nodeName))
{
Attr locationAttr = childElement.getAttributeNode("location");
@@ -149,12 +157,19 @@
URL locURL = new URL(orgLocation);
String locProtocol = locURL.getProtocol();
String locPath = locURL.getPath();
+
if (reqURL.getProtocol().equals(locProtocol) && reqURL.getPath().equals(locPath))
{
- int locPort = locURL.getPort();
- String hostAndPort = wsdlHost + (locPort > 0 ? ":" + locPort : "");
-
- String newLocation = locProtocol + "://" + hostAndPort + locPath;
+ String completeHost = wsdlHost;
+ if (!completeHost.startsWith("http://") || !completeHost.startsWith("https://"))
+ {
+ int locPort = locURL.getPort();
+ String hostAndPort = wsdlHost + (locPort > 0 ? ":" + locPort : "");
+
+ completeHost = locProtocol + "://" + hostAndPort;
+ }
+
+ String newLocation = completeHost + locPath;
locationAttr.setNodeValue(newLocation);
log.debug("Mapping address from '" + orgLocation + "' to '" + newLocation + "'");
18 years
- 1
- 0
JBossWS SVN: r1960 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-15 06:50:03 -0500 (Mon, 15 Jan 2007)
New Revision: 1960
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws1455/
trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java
trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
Log:
JBWS-1455 - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-01-15 11:50:03 UTC (rev 1960)
@@ -96,6 +96,7 @@
private String serviceName = null;
private String packageName = null;
private Set<String> registeredTypes = new HashSet<String>();
+ private Set<String> registeredExceptions = new HashSet<String>();
private LiteralTypeMapping typeMapping = null;
private String wsdlStyle;
@@ -217,14 +218,14 @@
semm.setWrappedElement(isWrapped());
if (isDocStyle())
- constructDOCParameters(semm, wiop, j);
+ constructDOCParameters(semm, wiop);
else constructRPCParameters(semm, wiop);
seim.addServiceEndpointMethodMapping(semm);
}
}
- private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop, int paramPosition)
+ private void constructDOCParameters(ServiceEndpointMethodMapping semm, WSDLInterfaceOperation wiop)
{
WSDLInterfaceOperationInput win = WSDLUtils.getWsdl11Input(wiop);
JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes());
@@ -249,7 +250,7 @@
if (xt instanceof XSSimpleTypeDefinition)
xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt);
- mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, paramPosition, wsdlMessageName, "IN", partName, false, true);
+ mpin = getMethodParamPartsMapping(semm, xmlName, xmlType, 0, wsdlMessageName, "IN", partName, false, true);
semm.addMethodParamPartsMapping(mpin);
}
}
@@ -426,10 +427,16 @@
XSTypeDefinition xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI());
addJavaXMLTypeMap(xt, xmlName.getLocalPart(), "", "", jwm, true);
- ExceptionMapping exceptionMapping = new ExceptionMapping(jwm);
- exceptionMapping.setExceptionType(getJavaTypeAsString(null, xmlType, false, true));
- exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString()));
- jwm.addExceptionMappings(exceptionMapping);
+ String exceptionType = getJavaTypeAsString(null, xmlType, false, true);
+
+ if (registeredExceptions.contains(exceptionType) == false)
+ {
+ registeredExceptions.add(exceptionType);
+ ExceptionMapping exceptionMapping = new ExceptionMapping(jwm);
+ exceptionMapping.setExceptionType(exceptionType);
+ exceptionMapping.setWsdlMessage(new QName(wsdlDefinitions.getTargetNamespace(), fault.getName().toString()));
+ jwm.addExceptionMappings(exceptionMapping);
+ }
}
}//end for
}
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,64 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.tools.jbws1455;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 15 Jan 2007
+ */
+public class JBWS1455TestCase extends JBossWSTest
+{
+
+ private static final String resourceDir = "resources/tools/jbws1455";
+ private static final String toolsDir = "tools/jbws1455";
+
+ public void testGenerate() throws Exception
+ {
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource("MyException.java");
+ compareSource("TestEndpoint_PortType.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String fileName) throws Exception
+ {
+ File expected = new File(resourceDir + "/" + fileName);
+ File generated = new File(toolsDir + "/org/jboss/test/ws/jbws1455/" + fileName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1455/JBWS1455TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/validation/JaxrpcMappingValidator.java 2007-01-15 11:50:03 UTC (rev 1960)
@@ -27,6 +27,7 @@
import javax.xml.namespace.QName;
import org.jboss.logging.Logger;
+import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory;
import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping;
@@ -77,22 +78,31 @@
{
boolean bool = true;
bool = validatePackageMappings(jw1.getPackageMappings(), jw2.getPackageMappings());
- if (bool)
- bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings());
- else throw new IllegalStateException("Validation of PackageMappings failed");
- if (bool)
- bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings());
- else throw new IllegalStateException("Validation of JavaXmlTypeMappings failed");
+ checkBool(bool, "PackageMappings");
- if (bool)
- bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings());
- else throw new IllegalStateException("Validation of ServiceInterfaceMappings failed");
+ bool = validateJavaXmlTypeMappings(jw1.getJavaXmlTypeMappings(), jw2.getJavaXmlTypeMappings());
+ checkBool(bool, "JavaXmlTypeMappings");
- if (bool == false)
- throw new IllegalStateException("Validation of ServiceEndpointInterfaceMappings failed");
+ bool = validateExceptionMapping(jw1.getExceptionMappings(), jw2.getExceptionMappings());
+ checkBool(bool, "ExceptionMappings");
+
+ bool = validateServiceInterfaceMappings(jw1.getServiceInterfaceMappings(), jw2.getServiceInterfaceMappings());
+ checkBool(bool, "ServiceInterfaceMappings");
+
+ bool = validateServiceEndpointInterfaceMappings(jw1.getServiceEndpointInterfaceMappings(), jw2.getServiceEndpointInterfaceMappings());
+ checkBool(bool, "ServiceEndpointInterfaceMappings");
+
return bool;
}
+ private void checkBool(final boolean bool, final String check)
+ {
+ if (bool == false)
+ {
+ throw new IllegalStateException("Validation of " + check + " failed.");
+ }
+ }
+
//PRIVATE METHODS
private boolean validatePackageMappings(PackageMapping[] pm1, PackageMapping[] pm2)
{
@@ -132,6 +142,22 @@
return true;
}
+ private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2)
+ {
+ boolean bool = true;
+ bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType());
+ if (bool)
+ bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope());
+ if (bool)
+ bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName());
+ if (bool)
+ bool = checkQNameEquality(jm1.getAnonymousTypeQName(), jm2.getAnonymousTypeQName());
+ if (bool)
+ bool = validateVariableMappings(jm1.getVariableMappings(), jm2.getVariableMappings());
+
+ return bool;
+ }
+
private boolean validateJavaXmlTypeMappings(JavaXmlTypeMapping[] jm1, JavaXmlTypeMapping[] jm2)
{
int len1 = jm1 != null ? jm1.length : 0;
@@ -175,19 +201,59 @@
return true;
}
- private boolean validateJavaXmlTypeMapping(JavaXmlTypeMapping jm1, JavaXmlTypeMapping jm2)
+ private boolean validateExceptionMapping(ExceptionMapping[] em1, ExceptionMapping[] em2)
{
+ int len1 = em1 != null ? em1.length : 0;
+ int len2 = em2 != null ? em2.length : 0;
+ if (len1 != len2)
+ {
+ throw new IllegalStateException("Length of ExceptionMapping[] do not match expected=" + len1 + " actual=" + len2);
+ }
+
+ HashMap actualMappings = new HashMap(len1);
+
+ for (int i = 0; i < len1; i++)
+ {
+ ExceptionMapping current = em2[i];
+ String name = current.getExceptionType();
+ if (actualMappings.containsKey(name))
+ {
+ throw new IllegalStateException("Type '" + name + "' registered more than once.");
+ }
+
+ actualMappings.put(name, current);
+ }
+
+ for (int i = 0; i < len1; i++)
+ {
+ ExceptionMapping expected = em1[i];
+ ExceptionMapping actual = (ExceptionMapping)actualMappings.get(expected.getExceptionType());
+
+ if (actual == null)
+ {
+ throw new IllegalStateException("Mapping not found for '" + expected.getExceptionType() + "'");
+ }
+
+ if (validateExceptionMapping(expected, actual) == false)
+ {
+ throw new IllegalStateException(expected + " does not match with other side " + actual);
+ }
+ }
+
+ return true;
+ }
+
+ private boolean validateExceptionMapping(ExceptionMapping em1, ExceptionMapping em2)
+ {
boolean bool = true;
- bool = checkStringEquality(jm1.getJavaType(), jm2.getJavaType());
+ bool = checkStringEquality(em1.getExceptionType(), em2.getExceptionType());
if (bool)
- bool = checkStringEquality(jm1.getQnameScope(), jm2.getQnameScope());
- if (bool)
- bool = checkQNameEquality(jm1.getRootTypeQName(), jm2.getRootTypeQName());
- if (bool)
- bool = checkQNameEquality(jm1.getAnonymousTypeQName(), jm2.getAnonymousTypeQName());
- if (bool)
- bool = validateVariableMappings(jm1.getVariableMappings(), jm2.getVariableMappings());
+ bool = checkQNameEquality(em1.getWsdlMessage(), em2.getWsdlMessage());
+ // Parameter order optional so don't enforce.
+ //if (bool)
+ // bool = checkStringArrayEquality(em1.getConstructorParameterOrder(), em2.getConstructorParameterOrder());
+
return bool;
}
@@ -479,6 +545,23 @@
return str1.equals(str2);
}
+ private boolean checkStringArrayEquality(String[] ar1, String[] ar2)
+ {
+ int len1 = ar1 != null ? ar1.length : 0;
+ int len2 = ar2 != null ? ar2.length : 0;
+
+ if (len1 != len2)
+ return false;
+
+ for (int i = 0; i < len1; i++)
+ {
+ if (checkStringEquality(ar1[i], ar2[i]) == false)
+ return false;
+ }
+
+ return true;
+ }
+
private boolean checkQNameEquality(QName q1, QName q2)
{
if (q1 == null && q2 == null)
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,21 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1455;
+
+
+public class MyException extends java.lang.Exception {
+ private java.lang.String comment;
+
+
+ public MyException(java.lang.String comment) {
+ super(comment);
+ this.comment = comment;
+ }
+
+ public java.lang.String getComment() {
+ return comment;
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1455/MyException.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1455' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1455/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1455' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1455/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1455/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='MyException'>
+ <sequence>
+ <element name='comment' nillable='true' type='string'/>
+ </sequence>
+ </complexType>
+ <element name='methodOne' type='string'/>
+ <element name='methodOneResponse' type='string'/>
+ <element name='MyException' type='tns:MyException'/>
+ <element name='methodTwo' type='string'/>
+ <element name='methodTwoResponse' type='string'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_methodOne'>
+ <part element='ns1:methodOne' name='parameters'/>
+ </message>
+ <message name='TestEndpoint_methodOneResponse'>
+ <part element='ns1:methodOneResponse' name='result'/>
+ </message>
+ <message name='TestEndpoint_methodTwo'>
+ <part element='ns1:methodTwo' name='parameters'/>
+ </message>
+ <message name='TestEndpoint_methodTwoResponse'>
+ <part element='ns1:methodTwoResponse' name='result'/>
+ </message>
+ <message name='MyException'>
+ <part element='ns1:MyException' name='MyException'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='methodOne'>
+ <input message='tns:TestEndpoint_methodOne'/>
+ <output message='tns:TestEndpoint_methodOneResponse'/>
+ </operation>
+ <operation name='methodTwo'>
+ <input message='tns:TestEndpoint_methodTwo'/>
+ <output message='tns:TestEndpoint_methodTwoResponse'/>
+ <fault message='tns:MyException' name='MyException'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='methodOne'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ <operation name='methodTwo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ <fault name='MyException'>
+ <soap:fault name='MyException' use='literal'/>
+ </fault>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,13 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1455;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public java.lang.String methodOne(java.lang.String parameters) throws
+ java.rmi.RemoteException;
+ public java.lang.String methodTwo(java.lang.String parameters) throws
+ org.jboss.test.ws.jbws1455.MyException, java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1455/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1455</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1455</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1455</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1455/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1455.MyException</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1455/types">typeNS:MyException</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>comment</java-variable-name>
+ <xml-element-name>comment</xml-element-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <exception-mapping>
+ <exception-type>org.jboss.test.ws.jbws1455.MyException</exception-type>
+ <wsdl-message xmlns:exMsgNS="http://test.jboss.org/ws/jbws1455">exMsgNS:MyException</wsdl-message>
+ <constructor-parameter-order>
+ <element-name>comment</element-name>
+ </constructor-parameter-order>
+ </exception-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1455.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1455">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1455.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1455">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1455">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>methodOne</java-method-name>
+ <wsdl-operation>methodOne</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodOne</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodOneResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ <service-endpoint-method-mapping>
+ <java-method-name>methodTwo</java-method-name>
+ <wsdl-operation>methodTwo</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodTwo</wsdl-message>
+ <wsdl-message-part-name>parameters</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1455">wsdlMsgNS:TestEndpoint_methodTwoResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1455/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml 2007-01-15 10:48:40 UTC (rev 1959)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml 2007-01-15 11:50:03 UTC (rev 1960)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1455/TestEndpoint.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1455/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1959 - in trunk/jbossws-core/src/main/java/org/jboss/ws: jaxrpc and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-01-15 05:48:40 -0500 (Mon, 15 Jan 2007)
New Revision: 1959
Added:
trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/
trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/soap/
trunk/jbossws-core/src/main/java/org/jboss/ws/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPConnectionFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java
Log:
Add deprecated jaxrpc factories for backward compatibility
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java 2007-01-15 10:35:49 UTC (rev 1958)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java 2007-01-15 10:48:40 UTC (rev 1959)
@@ -0,0 +1,33 @@
+/*
+* 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.jaxrpc;
+
+// $Id$
+
+
+/**
+ * Included for backwards compatibility
+ * @deprecated
+ */
+public class ServiceFactoryImpl extends org.jboss.ws.core.jaxrpc.ServiceFactoryImpl
+{
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/jaxrpc/ServiceFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/soap/MessageFactoryImpl.java 2007-01-15 10:35:49 UTC (rev 1958)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/soap/MessageFactoryImpl.java 2007-01-15 10:48:40 UTC (rev 1959)
@@ -0,0 +1,33 @@
+/*
+ * 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.soap;
+
+// $Id$
+
+
+/**
+ * Included for backwards compatibility
+ * @deprecated
+ */
+public class MessageFactoryImpl extends org.jboss.ws.core.soap.MessageFactoryImpl
+{
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/MessageFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPConnectionFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPConnectionFactoryImpl.java 2007-01-15 10:35:49 UTC (rev 1958)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPConnectionFactoryImpl.java 2007-01-15 10:48:40 UTC (rev 1959)
@@ -0,0 +1,66 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Axis" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache(a)apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+package org.jboss.ws.soap;
+
+// $Id$
+
+
+/**
+ * Included for backwards compatibility
+ * @deprecated
+ */
+public class SOAPConnectionFactoryImpl extends org.jboss.ws.core.soap.SOAPConnectionFactoryImpl
+{
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPConnectionFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java 2007-01-15 10:35:49 UTC (rev 1958)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java 2007-01-15 10:48:40 UTC (rev 1959)
@@ -0,0 +1,33 @@
+/*
+* 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.soap;
+
+// $Id$
+
+
+/**
+ * Included for backwards compatibility
+ * @deprecated
+ */
+public class SOAPFactoryImpl extends org.jboss.ws.core.soap.SOAPFactoryImpl
+{
+}
Property changes on: trunk/jbossws-core/src/main/java/org/jboss/ws/soap/SOAPFactoryImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0
JBossWS SVN: r1958 - trunk/jbossws-tests.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-01-15 05:35:49 -0500 (Mon, 15 Jan 2007)
New Revision: 1958
Modified:
trunk/jbossws-tests/build.xml
Log:
exclude interop test, they seem to break the build
Modified: trunk/jbossws-tests/build.xml
===================================================================
--- trunk/jbossws-tests/build.xml 2007-01-13 18:07:01 UTC (rev 1957)
+++ trunk/jbossws-tests/build.xml 2007-01-15 10:35:49 UTC (rev 1958)
@@ -207,7 +207,7 @@
<mkdir dir="${tests.output.dir}/classes"/>
<javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${tests.java.dir}"/>
- <!--exclude name="org/jboss/test/ws/interop/**"/-->
+ <exclude name="org/jboss/test/ws/interop/**"/>
<exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/>
<classpath refid="javac.classpath"/>
</javac>
18 years
- 1
- 0
JBossWS SVN: r1957 - in trunk: jbossws-tests/src/main/java/org/jboss/test/ws/tools and 5 other directories.
by jbossws-commits＠lists.jboss.org
Author: darran.lofthouse(a)jboss.com
Date: 2007-01-13 13:07:01 -0500 (Sat, 13 Jan 2007)
New Revision: 1957
Added:
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/
trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
trunk/jbossws-tests/src/main/resources/tools/jbws1184/
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
Log:
JBWS-1184 - WSDL to Java, correct use of Java wrapper types for attributes with use set to required.
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/XSDTypeToJava.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -410,7 +410,8 @@
XSAttributeDeclaration att = obj.getAttrDeclaration();
XSSimpleTypeDefinition xstype = att.getTypeDefinition();
QName qn = SchemaUtils.handleSimpleType(xstype);
- VAR v = createVAR(qn, att.getName(), pkgname);
+ boolean primitive = obj.getRequired();
+ VAR v = createVAR(qn, att.getName(), pkgname, primitive);
if (vars == null)
vars = new ArrayList();
vars.add(v);
@@ -471,7 +472,7 @@
return vars;
}
- private VAR createVAR(QName qn, String varstr, String pkgname)
+ private VAR createVAR(QName qn, String varstr, String pkgname, boolean primitive)
{
String clname = "";
Class cls = typeMapping.getJavaType(qn);
@@ -479,6 +480,13 @@
if (cls != null)
{
clname = cls.getName();
+ if (primitive)
+ {
+ String primName = utils.getPrimitive(clname);
+ if (primName != null)
+ clname = primName;
+ }
+
}
else
{
Added: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,100 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.tools.jbws1184;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
+import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator;
+import org.jboss.ws.tools.WSTools;
+
+/**
+ * JBWS-1184 - Test the use of wrapper jave type for generated source
+ * with attributes with use of required or optional.
+ *
+ * @author darran.lofthouse(a)jboss.com
+ * @since 13 Jan 2007
+ */
+public class JBWS1184TestCase extends JBossWSTest
+{
+
+ /**
+ * Test attributes with use set to required.
+ *
+ * <complexType name='DataObject'>
+ * <attribute name='booleanValue' use='required' type='boolean'/>
+ * <attribute name='byteValue' use='required' type='byte'/>
+ * <attribute name='floatValue' use='required' type='float'/>
+ * <attribute name='integerValue' use='required' type='int'/>
+ * <attribute name='longValue' use='required' type='long'/>
+ * <attribute name='shortValue' use='required' type='short'/>
+ * </complexType>
+ *
+ */
+ public void testUseRequired() throws Exception
+ {
+ generateScenario("A");
+ }
+
+ /**
+ * Test attributes with use set to optional.
+ *
+ * <complexType name='DataObject'>
+ * <attribute name='booleanValue' use='optional' type='boolean'/>
+ * <attribute name='byteValue' use='optional' type='byte'/>
+ * <attribute name='floatValue' use='optional' type='float'/>
+ * <attribute name='integerValue' use='optional' type='int'/>
+ * <attribute name='longValue' use='optional' type='long'/>
+ * <attribute name='shortValue' use='optional' type='short'/>
+ * </complexType>
+ *
+ */
+ public void testUseOptional() throws Exception
+ {
+ generateScenario("B");
+ }
+
+ protected void generateScenario(final String scenario) throws Exception
+ {
+ String resourceDir = "resources/tools/jbws1184/scenario_" + scenario;
+ String toolsDir = "tools/jbws1184/scenario_" + scenario;
+ String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" };
+ new WSTools().generate(args);
+
+ compareSource(resourceDir + "/DataObject.java", toolsDir + "/org/jboss/test/ws/jbws1184/DataObject.java");
+ compareSource(resourceDir + "/TestEndpoint_PortType.java", toolsDir + "/org/jboss/test/ws/jbws1184/TestEndpoint_PortType.java");
+
+ JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator();
+ mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml");
+ }
+
+ private static void compareSource(final String expectedName, final String generatedName) throws Exception
+ {
+ File expected = new File(expectedName);
+ File generated = new File(generatedName);
+
+ JBossSourceComparator sc = new JBossSourceComparator(expected, generated);
+ sc.validate();
+ sc.validateImports();
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/tools/jbws1184/JBWS1184TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,76 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1184;
+
+
+public class DataObject {
+ protected boolean booleanValue;
+ protected byte byteValue;
+ protected float floatValue;
+ protected int integerValue;
+ protected long longValue;
+ protected short shortValue;
+
+ public DataObject() {
+ }
+
+ public DataObject(boolean booleanValue, byte byteValue, float floatValue, int integerValue, long longValue, short shortValue) {
+ this.booleanValue = booleanValue;
+ this.byteValue = byteValue;
+ this.floatValue = floatValue;
+ this.integerValue = integerValue;
+ this.longValue = longValue;
+ this.shortValue = shortValue;
+ }
+
+ public boolean isBooleanValue() {
+ return booleanValue;
+ }
+
+ public void setBooleanValue(boolean booleanValue) {
+ this.booleanValue = booleanValue;
+ }
+
+ public byte getByteValue() {
+ return byteValue;
+ }
+
+ public void setByteValue(byte byteValue) {
+ this.byteValue = byteValue;
+ }
+
+ public float getFloatValue() {
+ return floatValue;
+ }
+
+ public void setFloatValue(float floatValue) {
+ this.floatValue = floatValue;
+ }
+
+ public int getIntegerValue() {
+ return integerValue;
+ }
+
+ public void setIntegerValue(int integerValue) {
+ this.integerValue = integerValue;
+ }
+
+ public long getLongValue() {
+ return longValue;
+ }
+
+ public void setLongValue(long longValue) {
+ this.longValue = longValue;
+ }
+
+ public short getShortValue() {
+ return shortValue;
+ }
+
+ public void setShortValue(short shortValue) {
+ this.shortValue = shortValue;
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1184' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1184/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1184' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1184/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1184/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='DataObject'>
+ <attribute name='booleanValue' use='required' type='boolean'/>
+ <attribute name='byteValue' use='required' type='byte'/>
+ <attribute name='floatValue' use='required' type='float'/>
+ <attribute name='integerValue' use='required' type='int'/>
+ <attribute name='longValue' use='required' type='long'/>
+ <attribute name='shortValue' use='required' type='short'/>
+ </complexType>
+ <element name='echoDataObject' type='tns:DataObject'/>
+ <element name='echoDataObjectResponse' type='tns:DataObject'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echoDataObject'>
+ <part element='ns1:echoDataObject' name='echoDataObject'/>
+ </message>
+ <message name='TestEndpoint_echoDataObjectResponse'>
+ <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoDataObject' parameterOrder='echoDataObject'>
+ <input message='tns:TestEndpoint_echoDataObject'/>
+ <output message='tns:TestEndpoint_echoDataObjectResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoDataObject'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1184;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1184.DataObject echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1184</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1184</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeNS:DataObject</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>booleanValue</java-variable-name>
+ <xml-attribute-name>booleanValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>byteValue</java-variable-name>
+ <xml-attribute-name>byteValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>floatValue</java-variable-name>
+ <xml-attribute-name>floatValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>integerValue</java-variable-name>
+ <xml-attribute-name>integerValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>longValue</java-variable-name>
+ <xml-attribute-name>longValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>shortValue</java-variable-name>
+ <xml-attribute-name>shortValue</xml-attribute-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoDataObject</java-method-name>
+ <wsdl-operation>echoDataObject</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
+ <wsdl-message-part-name>echoDataObject</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1184.DataObject</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObjectResponse</wsdl-message>
+ <wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1184/scenario_A/TestEndpoint.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_A/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,76 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1184;
+
+
+public class DataObject {
+ protected java.lang.Boolean booleanValue;
+ protected java.lang.Byte byteValue;
+ protected java.lang.Float floatValue;
+ protected java.lang.Integer integerValue;
+ protected java.lang.Long longValue;
+ protected java.lang.Short shortValue;
+
+ public DataObject() {
+ }
+
+ public DataObject(java.lang.Boolean booleanValue, java.lang.Byte byteValue, java.lang.Float floatValue, java.lang.Integer integerValue, java.lang.Long longValue, java.lang.Short shortValue) {
+ this.booleanValue = booleanValue;
+ this.byteValue = byteValue;
+ this.floatValue = floatValue;
+ this.integerValue = integerValue;
+ this.longValue = longValue;
+ this.shortValue = shortValue;
+ }
+
+ public java.lang.Boolean getBooleanValue() {
+ return booleanValue;
+ }
+
+ public void setBooleanValue(java.lang.Boolean booleanValue) {
+ this.booleanValue = booleanValue;
+ }
+
+ public java.lang.Byte getByteValue() {
+ return byteValue;
+ }
+
+ public void setByteValue(java.lang.Byte byteValue) {
+ this.byteValue = byteValue;
+ }
+
+ public java.lang.Float getFloatValue() {
+ return floatValue;
+ }
+
+ public void setFloatValue(java.lang.Float floatValue) {
+ this.floatValue = floatValue;
+ }
+
+ public java.lang.Integer getIntegerValue() {
+ return integerValue;
+ }
+
+ public void setIntegerValue(java.lang.Integer integerValue) {
+ this.integerValue = integerValue;
+ }
+
+ public java.lang.Long getLongValue() {
+ return longValue;
+ }
+
+ public void setLongValue(java.lang.Long longValue) {
+ this.longValue = longValue;
+ }
+
+ public java.lang.Short getShortValue() {
+ return shortValue;
+ }
+
+ public void setShortValue(java.lang.Short shortValue) {
+ this.shortValue = shortValue;
+ }
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/DataObject.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestEndpoint' targetNamespace='http://test.jboss.org/ws/jbws1184' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://test.jboss.org/ws/jbws1184/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://test.jboss.org/ws/jbws1184' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types>
+ <schema targetNamespace='http://test.jboss.org/ws/jbws1184/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://test.jboss.org/ws/jbws1184/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+ <complexType name='DataObject'>
+ <attribute name='booleanValue' use='optional' type='boolean'/>
+ <attribute name='byteValue' use='optional' type='byte'/>
+ <attribute name='floatValue' use='optional' type='float'/>
+ <attribute name='integerValue' use='optional' type='int'/>
+ <attribute name='longValue' use='optional' type='long'/>
+ <attribute name='shortValue' use='optional' type='short'/>
+ </complexType>
+ <element name='echoDataObject' type='tns:DataObject'/>
+ <element name='echoDataObjectResponse' type='tns:DataObject'/>
+ </schema>
+ </types>
+ <message name='TestEndpoint_echoDataObject'>
+ <part element='ns1:echoDataObject' name='echoDataObject'/>
+ </message>
+ <message name='TestEndpoint_echoDataObjectResponse'>
+ <part element='ns1:echoDataObjectResponse' name='echoDataObjectResponse'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoDataObject' parameterOrder='echoDataObject'>
+ <input message='tns:TestEndpoint_echoDataObject'/>
+ <output message='tns:TestEndpoint_echoDataObjectResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoDataObject'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body use='literal'/>
+ </input>
+ <output>
+ <soap:body use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestEndpoint'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,11 @@
+// This class was generated by the JAXRPC SI, do not edit.
+// Contents subject to change without notice.
+// JAX-RPC Standard Implementation (1.1.3, build R1)
+// Generated source version: 1.1.3
+
+package org.jboss.test.ws.jbws1184;
+
+public interface TestEndpoint_PortType extends java.rmi.Remote {
+ public org.jboss.test.ws.jbws1184.DataObject echoDataObject(org.jboss.test.ws.jbws1184.DataObject echoDataObject) throws
+ java.rmi.RemoteException;
+}
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/TestEndpoint_PortType.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1184</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1184</namespaceURI>
+ </package-mapping>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1184</package-type>
+ <namespaceURI>http://test.jboss.org/ws/jbws1184/types</namespaceURI>
+ </package-mapping>
+ <java-xml-type-mapping>
+ <java-type>org.jboss.test.ws.jbws1184.DataObject</java-type>
+ <root-type-qname xmlns:typeNS="http://test.jboss.org/ws/jbws1184/types">typeNS:DataObject</root-type-qname>
+ <qname-scope>complexType</qname-scope>
+ <variable-mapping>
+ <java-variable-name>booleanValue</java-variable-name>
+ <xml-attribute-name>booleanValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>byteValue</java-variable-name>
+ <xml-attribute-name>byteValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>floatValue</java-variable-name>
+ <xml-attribute-name>floatValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>integerValue</java-variable-name>
+ <xml-attribute-name>integerValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>longValue</java-variable-name>
+ <xml-attribute-name>longValue</xml-attribute-name>
+ </variable-mapping>
+ <variable-mapping>
+ <java-variable-name>shortValue</java-variable-name>
+ <xml-attribute-name>shortValue</xml-attribute-name>
+ </variable-mapping>
+ </java-xml-type-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1184.TestEndpoint_Service</service-interface>
+ <wsdl-service-name xmlns:serviceNS="http://test.jboss.org/ws/jbws1184">serviceNS:TestEndpoint</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1184.TestEndpoint_PortType</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS="http://test.jboss.org/ws/jbws1184">portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS="http://test.jboss.org/ws/jbws1184">bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoDataObject</java-method-name>
+ <wsdl-operation>echoDataObject</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>org.jboss.test.ws.jbws1184.DataObject</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObject</wsdl-message>
+ <wsdl-message-part-name>echoDataObject</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>org.jboss.test.ws.jbws1184.DataObject</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS="http://test.jboss.org/ws/jbws1184">wsdlMsgNS:TestEndpoint_echoDataObjectResponse</wsdl-message>
+ <wsdl-message-part-name>echoDataObjectResponse</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml
===================================================================
--- trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-13 16:20:06 UTC (rev 1956)
+++ trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml 2007-01-13 18:07:01 UTC (rev 1957)
@@ -0,0 +1,5 @@
+<configuration>
+ <wsdl-java location="resources/tools/jbws1184/scenario_B/TestEndpoint.wsdl" parameter-style="bare">
+ <mapping file="jaxrpc-mapping.xml"/>
+ </wsdl-java>
+</configuration>
Property changes on: trunk/jbossws-tests/src/main/resources/tools/jbws1184/scenario_B/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years
- 1
- 0