[jbossws-commits] JBossWS SVN: r1494 - in trunk/src: main/java/org/jboss/ws/common main/java/org/jboss/ws/integration/tomcat main/java/org/jboss/ws/metadata/j2ee main/java/org/jboss/ws/server test/ant test/java/org/jboss/test/ws/jaxrpc test/java/org/jboss/test/ws/jaxrpc/jbws1148 test/java/org/jboss/test/ws/jaxrpc/jbws1179 test/java/org/jboss/test/ws/jaxrpc/jbws1190 test/java/org/jboss/test/ws/jaxws test/java/org/jboss/test/ws/jaxws/jbws1190 test/resources/jaxrpc test/resources/jaxrpc/jbws1148 test/resources/jaxrpc/jbws1148/META-INF test/resources/jaxrpc/jbws1148/WEB-INF test/resources/jaxrpc/jbws1148/WEB-INF/wsdl test/resources/jaxrpc/jbws1179 test/resources/jaxrpc/jbws1179/META-INF test/resources/jaxrpc/jbws1179/WEB-INF test/resources/jaxrpc/jbws1179/WEB-INF/wsdl test/resources/jaxrpc/jbws1190 test/resources/jaxrpc/jbws1190/META-INF test/resources/jaxrpc/jbws1190/WEB-INF test/resources/jaxrpc/jbws1190/WEB-INF/wsdl test/resources/jaxws test/resources/jaxws/jbws1190 test/resources/ja! xws/jbws1190/WEB-INF
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Nov 21 15:04:19 EST 2006
Author: thomas.diesler at jboss.com
Date: 2006-11-21 15:02:08 -0500 (Tue, 21 Nov 2006)
New Revision: 1494
Added:
trunk/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
trunk/src/test/resources/jaxrpc/jbws1148/
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1179/
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1190/
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml
trunk/src/test/resources/jaxws/jbws1190/
trunk/src/test/resources/jaxws/jbws1190/WEB-INF/
trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
Removed:
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml
trunk/src/test/resources/jaxws/jbws1190/WEB-INF/
trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
Modified:
trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java
trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
trunk/src/test/ant/build-jars-jaxrpc.xml
trunk/src/test/ant/build-jars-jaxws.xml
Log:
[JBWS-1190] Respect transport-guarantee as specified in web.xml for POJO deployments.
[JBWS-1179] Delay creation of HttpSession until it is actually used.
[JBWS-1148] Test Case for anonymous simple types with restrictions.
Modified: trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/main/java/org/jboss/ws/common/CommonMessageContext.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -119,7 +119,14 @@
*/
public Object getProperty(String name)
{
- return props.get(name);
+ Object value = props.get(name);
+
+ if (value instanceof MessageContextPropertyHelper)
+ {
+ return ((MessageContextPropertyHelper)value).get();
+ }
+
+ return value;
}
/**
Copied: trunk/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java (from rev 1281, branches/jbossws-1.0/src/main/java/org/jboss/ws/common/MessageContextPropertyHelper.java)
Modified: trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/main/java/org/jboss/ws/integration/tomcat/DeploymentInfoAdaptor.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -28,8 +28,10 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -39,6 +41,8 @@
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
import org.jboss.ws.deployment.AbstractServiceEndpointPublisher;
import org.jboss.ws.metadata.j2ee.UnifiedWebMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData;
+import org.jboss.ws.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection;
import org.w3c.dom.Element;
/**
@@ -82,6 +86,7 @@
wmd.setContextRoot(getContextRoot(udi.url));
wmd.setConfigName(ctx.getInitParameter("jbossws-config-name"));
wmd.setConfigFile(ctx.getInitParameter("jbossws-config-file"));
+ wmd.setSecurityMetaData(getSecurityMetaData(webXML));
return wmd;
}
@@ -143,6 +148,45 @@
return servletClassMap;
}
+ private static List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Element root)
+ {
+ ArrayList<UnifiedWebSecurityMetaData> securityMetaData = new ArrayList<UnifiedWebSecurityMetaData>();
+
+ Iterator itSecurityConstraint = DOMUtils.getChildElements(root, "security-constraint");
+ while (itSecurityConstraint.hasNext())
+ {
+ UnifiedWebSecurityMetaData uwsmd = new UnifiedWebSecurityMetaData();
+ securityMetaData.add(uwsmd);
+
+ Element securityConstraint = (Element)itSecurityConstraint.next();
+
+ Iterator itWebResCol = DOMUtils.getChildElements(securityConstraint, "web-resource-collection");
+ while (itWebResCol.hasNext())
+ {
+ Element webResCol = (Element)itWebResCol.next();
+ String webResName = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(webResCol, "web-resource-name"));
+ UnifiedWebResourceCollection uwrc = uwsmd.addWebResource(webResName);
+
+ Iterator itUrlPatters = DOMUtils.getChildElements(webResCol, "url-pattern");
+ while (itUrlPatters.hasNext())
+ {
+ Element urlPattern = (Element)itUrlPatters.next();
+ uwrc.addPattern(DOMUtils.getTextContent(urlPattern));
+ }
+ }
+
+ Element userData = DOMUtils.getFirstChildElement(securityConstraint, "user-data-constraint");
+ if (userData != null)
+ {
+ String transportGuarantee = DOMUtils.getTextContent(DOMUtils.getFirstChildElement(userData, "transport-guarantee"));
+ uwsmd.setTransportGuarantee(transportGuarantee);
+ }
+
+ }
+
+ return securityMetaData;
+ }
+
private static Element getWebXMLDocument(ServletContext ctx)
{
URL webXML = null;
Modified: trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/main/java/org/jboss/ws/metadata/j2ee/UnifiedWebMetaData.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -41,8 +41,6 @@
private Map<String, String> servletMappings = new HashMap<String, String>();
/** The servlet <servlet-name, servlet-class> */
private Map<String, String> servletClassNames = new HashMap<String, String>();
- /** web.xml security-constraints */
- private List<UnifiedWebSecurityMetaData> securityMetaData;
/** The optional JBossWS config-name */
private String configName;
/** The optional JBossWS config-file */
@@ -51,7 +49,9 @@
private String securityDomain;
/** A HashMap<String, String> for webservice description publish locations */
private Map<String, String> wsdlPublishLocationMap = new HashMap<String, String>();
-
+ /** web.xml security-constraints */
+ private List<UnifiedWebSecurityMetaData> securityMetaData;
+
public String getContextRoot()
{
return contextRoot;
@@ -121,7 +121,7 @@
{
this.securityMetaData = securityMetaData;
}
-
+
public void setWsdlPublishLocationMap(Map<String, String> wsdlPublishLocationMap)
{
this.wsdlPublishLocationMap = wsdlPublishLocationMap;
@@ -131,5 +131,6 @@
{
// if not found, the we will use default
return wsdlPublishLocationMap.get(name);
- }
+ }
+
}
Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -48,7 +48,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
@@ -60,6 +59,7 @@
import org.jboss.ws.WSException;
import org.jboss.ws.addressing.AddressingConstantsImpl;
import org.jboss.ws.common.CommonMessageContext;
+import org.jboss.ws.common.MessageContextPropertyHelper;
import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC;
import org.jboss.ws.jaxrpc.handler.SOAPMessageContextJAXRPC;
import org.jboss.ws.jaxws.handler.MessageContextJAXWS;
@@ -346,7 +346,7 @@
ServerEndpointMetaData sepMetaData = wsEndpoint.getServiceEndpointInfo().getServerEndpointMetaData();
Type type = sepMetaData.getType();
- HttpSession httpSession = null; // context.getHttpSession();
+ MessageContextPropertyHelper httpSession = new HttpSessionPropertyHelper(context);
ServletContext servletContext = context.getServletContext();
HttpServletRequest httpRequest = context.getHttpServletRequest();
HttpServletResponse httpResponse = context.getHttpServletResponse();
@@ -639,4 +639,21 @@
}
return server;
}
+
+ public static class HttpSessionPropertyHelper implements MessageContextPropertyHelper
+ {
+
+ private EndpointContext context;
+
+ public HttpSessionPropertyHelper(final EndpointContext context)
+ {
+ this.context = context;
+ }
+
+ public Object get()
+ {
+ return context.getHttpSession();
+ }
+
+ }
}
Modified: trunk/src/test/ant/build-jars-jaxrpc.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/test/ant/build-jars-jaxrpc.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -716,6 +716,59 @@
</metainf>
</jar>
+ <!-- jaxrpc-jbws1148 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1148-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1148/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ </metainf>
+ </jar>
+
+ <!-- jbossws-jbws1179 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jaxrpc-jbws1179-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1179/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jbws1186 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
@@ -730,6 +783,36 @@
<include name="wsdl/**"/>
</webinf>
</war>
+
+ <!-- jaxrpc-jbws1190 -->
+ <war warfile="${build.test.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="test-mapping.xml"/>
+ <include name="confidential-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </webinf>
+ </war>
+ <jar jarfile="${build.test.dir}/libs/jaxrpc-jbws1190-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jaxrpc/jbws1190/WEB-INF">
+ <include name="test-mapping.xml"/>
+ </metainf>
+ </jar>
<!-- jaxrpcws-jbws1205 -->
<war warfile="${build.test.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.test.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml">
Modified: trunk/src/test/ant/build-jars-jaxws.xml
===================================================================
--- trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 19:52:20 UTC (rev 1493)
+++ trunk/src/test/ant/build-jars-jaxws.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -113,6 +113,16 @@
</classes>
</war>
+ <!-- jaxws-jbws1190 -->
+ <war destfile="${build.test.dir}/libs/jaxws-jbws1190.war" webxml="${build.test.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/>
+ <include name="org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jsr181-complex -->
<war warfile="${build.test.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.test.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1148;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- * Test a call to an endpoint that uses an anonymous simple
- * type with restriction.
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public class JBWS1148TestCase extends JBossWSTest
-{
-
- private static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1148TestCase.class, "jaxrpc-jbws1148.war, jaxrpc-jbws1148-client.jar");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- public void testCall() throws Exception
- {
- TelephoneNumber number = port.lookup("SomeName");
- assertEquals("areaCode", "12345", number.getAreaCode());
- assertEquals("number", "678901", number.getNumber());
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/JBWS1148TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1148;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public class TelephoneNumber
-{
-
- private String areaCode;
-
- private String number;
-
- public String getAreaCode()
- {
- return areaCode;
- }
-
- public void setAreaCode(String areaCode)
- {
- this.areaCode = areaCode;
- }
-
- public String getNumber()
- {
- return number;
- }
-
- public void setNumber(String number)
- {
- this.number = number;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1148;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public interface TestEndpoint extends Remote
-{
-
- public TelephoneNumber lookup(final String surname) throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1148;
-
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- /**
- * @see org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint#lookup(java.lang.String)
- */
- public TelephoneNumber lookup(final String surname)
- {
- TelephoneNumber number = new TelephoneNumber();
- number.setAreaCode("12345");
- number.setNumber("678901");
-
- return number;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.java)
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 18-October-2006
- */
-public class JBWS1179TestCase extends JBossWSTest
-{
-
- public static TestEndpoint port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1179TestCase.class, "jaxrpc-jbws1179.war, jaxrpc-jbws1179-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- protected int getActiveSessions() throws Exception
- {
- MBeanServerConnection server = getServer();
- ObjectName objectName = new ObjectName("jboss.web:host=localhost,path=/jaxrpc-jbws1179,type=Manager");
-
- return ((Integer)server.getAttribute(objectName, "activeSessions")).intValue();
- }
-
- public void testCallCreateNoSession() throws Exception
- {
- int originalSessions = getActiveSessions();
-
- port.echoMessage("Hello");
-
- int finalSessions = getActiveSessions();
-
- assertEquals("activeSessions after call", originalSessions, finalSessions);
- }
-
- public void testAccessSession() throws Exception
- {
- int originalSessions = getActiveSessions();
-
- assertTrue("Can access session", port.canAccessSession());
-
- int finalSessions = getActiveSessions();
-
- assertEquals("activeSessions after call", originalSessions + 1, finalSessions);
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 18-October-2006
- */
-public interface TestEndpoint extends Remote
-{
-
- /**
- * Simple call to test if a session is created.
- *
- * @param message
- * @return
- * @throws RemoteException
- */
- public String echoMessage(final String message) throws RemoteException;
-
- /**
- * Call to test if the session can be accessed.
- *
- * @return
- * @throws RemoteException
- */
- public boolean canAccessSession() throws RemoteException;
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1179;
-
-import java.rmi.RemoteException;
-
-import javax.servlet.http.HttpSession;
-
-import org.jboss.ws.common.CommonMessageContext;
-import org.jboss.ws.jaxrpc.handler.MessageContextJAXRPC;
-import org.jboss.ws.soap.MessageContextAssociation;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 18-October-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public String echoMessage(String message)
- {
- return message;
- }
-
- public boolean canAccessSession() throws RemoteException
- {
- CommonMessageContext context = MessageContextAssociation.peekMessageContext();
- HttpSession session = (HttpSession)context.getProperty(MessageContextJAXRPC.SERVLET_SESSION);
-
- session.setAttribute("Test", "Test String");
- String testString = (String)session.getAttribute("Test");
- if ("Test String".equals(testString) == false)
- {
- throw new RuntimeException("Invalid attribute returned.");
- }
-
- return true;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.java)
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public interface ConfidentialEndpoint extends Remote
-{
-
- public String helloWorld(final String message) throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public class ConfidentialEndpointImpl implements ConfidentialEndpoint
-{
-
- /**
- * @see org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint#helloWorld(java.lang.String)
- */
- public String helloWorld(final String message) throws RemoteException
- {
- return message;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpointImpl.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public class JBWS1190Exception extends RuntimeException
-{
-
- /** */
- private static final long serialVersionUID = 5957186382787505270L;
-
- public JBWS1190Exception()
- {
- super();
- }
-
- public JBWS1190Exception(final String message, final Throwable cause)
- {
- super(message, cause);
- }
-
- public JBWS1190Exception(final String message)
- {
- super(message);
- }
-
- public JBWS1190Exception(final Throwable cause)
- {
- super(cause);
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since Oct 22, 2006
- */
-public class JBWS1190TestCase extends JBossWSTest
-{
- private static final String ARCHIVE_NAME = "jaxrpc-jbws1190.war";
-
- private static TestEndpoint port;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME+", jaxrpc-jbws1190-client.jar");
- }
-
- protected void setUp() throws Exception
- {
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
- }
- }
-
- public void testTestEndpoint() throws Exception
- {
- port.testAddress(ARCHIVE_NAME, "TestService", "http", "8080");
- }
-
- public void testConfidentialEndpoint() throws Exception
- {
- port.testAddress(ARCHIVE_NAME, "ConfidentialService", "https", "8443");
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public interface TestEndpoint extends Remote
-{
-
- public void testAddress(final String archive, final String service, final String scheme, final String port) throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,102 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxrpc.jbws1190;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.MalformedURLException;
-
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
-import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.ws.server.ServerConfig;
-import org.jboss.ws.server.ServerConfigFactory;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public void testAddress(final String archive, final String service, final String scheme, final String port)
- {
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
-
- File dataDir = serverConfig.getServerDataDir();
- File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
-
- if (wsdlDir.exists() == false)
- {
- throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist.");
- }
-
- File[] wsdls = wsdlDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.startsWith(service);
- }
- });
-
- assertEquals("WSDL files found", 1, wsdls.length);
-
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdl;
- try
- {
- wsdl = factory.parse(wsdls[0].toURL());
- }
- catch (MalformedURLException e)
- {
- throw new JBWS1190Exception("Error readin WSDL", e);
- }
-
- WSDLService[] services = wsdl.getServices();
- assertEquals("No of services", 1, services.length);
-
- WSDLEndpoint[] endpoints = services[0].getEndpoints();
- assertEquals("No of endpoints", 1, endpoints.length);
-
- String address = endpoints[0].getAddress();
- assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
- }
-
- private void assertEquals(final String message, final int expected, final int actual)
- {
- if (expected != actual)
- {
- throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual);
- }
- }
-
- private void assertTrue(final String message, final boolean value)
- {
- if (value == false)
- {
- throw new JBWS1190Exception(message);
- }
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.java)
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
- at WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public class ConfidentialEndpoint
-{
-
- public String helloWorld(final String message)
- {
- return message;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public class JBWS1190Exception extends RuntimeException
-{
-
- public JBWS1190Exception()
- {
- super();
- }
-
- public JBWS1190Exception(final String message, final Throwable cause)
- {
- super(message, cause);
- }
-
- public JBWS1190Exception(final String message)
- {
- super(message);
- }
-
- public JBWS1190Exception(final Throwable cause)
- {
- super(cause);
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190Exception.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-
-import junit.framework.Test;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestSetup;
-import org.jboss.ws.jaxrpc.ServiceFactoryImpl;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
-public class JBWS1190TestCase extends JBossWSTest
-{
-
- private static final String ARCHIVE_NAME = "jaxws-jbws1190.war";
-
- private static Service service;
-
- public static Test suite()
- {
- return JBossWSTestSetup.newTestSetup(JBWS1190TestCase.class, ARCHIVE_NAME);
- }
-
- protected void setUp() throws Exception
- {
- if (service == null)
- {
- ServiceFactoryImpl factory = new ServiceFactoryImpl();
- URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1190/TestEndpoint?wsdl");
-
- QName qname = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointService");
- service = factory.createService(wsdlURL, qname);
- }
- }
-
- public void testTestEndpoint() throws Exception
- {
- QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
- QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
-
- Call call = service.createCall(portName);
- call.setOperationName(methodName);
- call.invoke(new Object[] { ARCHIVE_NAME, "TestEndpointService", "http", "8080" });
- }
-
- public void testConfidentialEndpoint() throws Exception
- {
- QName portName = new QName("http://org.jboss/test/ws/jbws1190", "TestEndpointPort");
- QName methodName = new QName("http://org.jboss/test/ws/jbws1190", "testAddress");
-
- Call call = service.createCall(portName);
- call.setOperationName(methodName);
- call.invoke(new Object[] { ARCHIVE_NAME, "ConfidentialEndpointService", "https", "8443" });
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.rmi.Remote;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
- at WebService(targetNamespace = "http://org.jboss/test/ws/jbws1190")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public interface TestEndpoint extends Remote
-{
-
- @WebMethod
- public void testAddress(final String archive, final String service, final String scheme, final String port);
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxws.jbws1190;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.net.MalformedURLException;
-
-import javax.jws.WebService;
-
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
-import org.jboss.ws.metadata.wsdl.WSDLEndpoint;
-import org.jboss.ws.metadata.wsdl.WSDLService;
-import org.jboss.ws.server.ServerConfig;
-import org.jboss.ws.server.ServerConfigFactory;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 19-October-2006
- */
- at WebService(name = "TestEndpoint", endpointInterface = "org.jboss.test.ws.jaxws.jbws1190.TestEndpoint")
-public class TestEndpointImpl implements TestEndpoint
-{
-
- public void testAddress(final String archive, final String service, final String scheme, final String port)
- {
- ServerConfigFactory serverConfigFactory = ServerConfigFactory.getInstance();
- ServerConfig serverConfig = serverConfigFactory.getServerConfig();
-
- File dataDir = serverConfig.getServerDataDir();
- File wsdlDir = new File(dataDir.getAbsolutePath() + File.separator + "wsdl" + File.separator + archive);
-
- if (wsdlDir.exists() == false)
- {
- throw new JBWS1190Exception(wsdlDir.getAbsolutePath() + " does not exist.");
- }
-
- File[] wsdls = wsdlDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name)
- {
- return name.startsWith(service);
- }
- });
-
- assertEquals("WSDL files found", 1, wsdls.length);
-
- WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
- WSDLDefinitions wsdl;
- try
- {
- wsdl = factory.parse(wsdls[0].toURL());
- }
- catch (MalformedURLException e)
- {
- throw new JBWS1190Exception("Error readin WSDL", e);
- }
-
- WSDLService[] services = wsdl.getServices();
- assertEquals("No of services", 1, services.length);
-
- WSDLEndpoint[] endpoints = services[0].getEndpoints();
- assertEquals("No of endpoints", 1, endpoints.length);
-
- String address = endpoints[0].getAddress();
- assertTrue("Expected Scheme '" + scheme + "'", address.startsWith(scheme + "://"));
- assertTrue("Expected Port '" + port + "'", address.contains(":" + port + "/"));
- }
-
- private void assertEquals(final String message, final int expected, final int actual)
- {
- if (expected != actual)
- {
- throw new JBWS1190Exception(message + " expected=" + expected + " actual=" + actual);
- }
- }
-
- private void assertTrue(final String message, final boolean value)
- {
- if (value == false)
- {
- throw new JBWS1190Exception(message);
- }
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java (from rev 1281, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl.java)
Copied: trunk/src/test/resources/jaxrpc/jbws1148 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148)
Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>Test Service</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1148?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,50 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1148</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1148/types</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxrpc.jbws1148.TelephoneNumber</java-type>
- <root-type-qname xmlns:typeNS='http://org.jboss.test.ws/jbws1148/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>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1148'>serviceNS:TestService</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.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1148'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1148'>bindingNS:TestEndpointBinding</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>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_lookup</wsdl-message>
- <wsdl-message-part-name>String_1</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.jaxrpc.jbws1148.TelephoneNumber</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1148'>wsdlMsgNS:TestEndpoint_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>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1148' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1148' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:ns1='http://org.jboss.test.ws/jbws1148/types' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1148' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types>
- <schema targetNamespace='http://org.jboss.test.ws/jbws1148/types' xmlns='http://www.w3.org/2001/XMLSchema' xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' xmlns:tns='http://org.jboss.test.ws/jbws1148/types' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <complexType name='TelephoneNumber'>
- <sequence>
- <element name='areaCode' nillable='true'>
- <simpleType>
- <restriction base='string'>
- <pattern value='[0-9]{5}'/>
- </restriction>
- </simpleType>
- </element>
- <element name='number' nillable='true' type='string'/>
- </sequence>
- </complexType>
- </schema>
- </types>
- <message name='TestEndpoint_lookup'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_lookupResponse'>
- <part name='result' type='ns1:TelephoneNumber'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='lookup' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_lookup'/>
- <output message='tns:TestEndpoint_lookupResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='lookup'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1148' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1148.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1148" type-namespace="http://org.jboss.test.ws/jbws1148/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
-
-<!-- Replace areaCode element with
-
- <element name='areaCode' nillable='true'>
- <simpleType>
- <restriction base='string'>
- <pattern value='[0-9]{5}'/>
- </restriction>
- </simpleType>
- </element>
-
--->
Copied: trunk/src/test/resources/jaxrpc/jbws1148/wstools-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1148/wstools-config.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1179 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179)
Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1179/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,46 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1179</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1179/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1179'>serviceNS:TestService</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.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1179'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1179'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echoMessage</java-method-name>
- <wsdl-operation>echoMessage</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://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessage</wsdl-message>
- <wsdl-message-part-name>String_1</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://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_echoMessageResponse</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>canAccessSession</java-method-name>
- <wsdl-operation>canAccessSession</wsdl-operation>
- <wsdl-return-value-mapping>
- <method-return-value>boolean</method-return-value>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1179'>wsdlMsgNS:TestEndpoint_canAccessSessionResponse</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>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
-</web-app>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1179' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1179' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1179' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_canAccessSession'/>
- <message name='TestEndpoint_canAccessSessionResponse'>
- <part name='result' type='xsd:boolean'/>
- </message>
- <message name='TestEndpoint_echoMessage'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_echoMessageResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='TestEndpoint'>
- <operation name='canAccessSession'>
- <input message='tns:TestEndpoint_canAccessSession'/>
- <output message='tns:TestEndpoint_canAccessSessionResponse'/>
- </operation>
- <operation name='echoMessage' parameterOrder='String_1'>
- <input message='tns:TestEndpoint_echoMessage'/>
- <output message='tns:TestEndpoint_echoMessageResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='canAccessSession'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </output>
- </operation>
- <operation name='echoMessage'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1179' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config wstools-config.xml
--->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1179.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1179" type-namespace="http://org.jboss.test.ws/jbws1179/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jaxrpc/jbws1179/wstools-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1179/wstools-config.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190)
Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
- version="1.4">
-
- <display-name>TestService</display-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/test-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-client PUBLIC
- "-//JBoss//DTD Application Client 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
-
-<jboss-client>
- <jndi-name>jbossws-client</jndi-name>
-
- <service-ref>
- <service-ref-name>service/TestService</service-ref-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws1190/TestEndpoint?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/META-INF/jboss-client.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:ConfidentialService</wsdl-service-name>
- <port-mapping>
- <port-name>ConfidentialEndpointPort</port-name>
- <java-port-name>ConfidentialEndpointPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:ConfidentialEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:ConfidentialEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>helloWorld</java-method-name>
- <wsdl-operation>helloWorld</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://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorld</wsdl-message>
- <wsdl-message-part-name>String_1</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://org.jboss.test.ws/jbws1190'>wsdlMsgNS:ConfidentialEndpoint_helloWorldResponse</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>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/confidential-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,59 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
- <package-mapping>
- <package-type>org.jboss.test.ws.jaxrpc.jbws1190</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1190/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1190'>serviceNS:TestService</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.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1190'>portTypeNS:TestEndpoint</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1190'>bindingNS:TestEndpointBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>testAddress</java-method-name>
- <wsdl-operation>testAddress</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://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
- <wsdl-message-part-name>String_1</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
- <wsdl-message-part-name>String_2</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>2</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
- <wsdl-message-part-name>String_3</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>3</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1190'>wsdlMsgNS:TestEndpoint_testAddress</wsdl-message>
- <wsdl-message-part-name>String_4</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/test-mapping.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ConfidentialEndpoint</web-resource-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-</web-app>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,28 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1190' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
- <webservice-description>
- <webservice-description-name>TestService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/test-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>TestEndpointPort</port-component-name>
- <wsdl-port>impl:TestEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>TestEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
- <webservice-description>
- <webservice-description-name>ConfidentialService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/ConfidentialService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/confidential-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>ConfidentialEndpointPort</port-component-name>
- <wsdl-port>impl:ConfidentialEndpointPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ConfidentialEndpoint</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='ConfidentialService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='ConfidentialEndpoint_helloWorld'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='ConfidentialEndpoint_helloWorldResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='ConfidentialEndpoint'>
- <operation name='helloWorld' parameterOrder='String_1'>
- <input message='tns:ConfidentialEndpoint_helloWorld'/>
- <output message='tns:ConfidentialEndpoint_helloWorldResponse'/>
- </operation>
- </portType>
- <binding name='ConfidentialEndpointBinding' type='tns:ConfidentialEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='helloWorld'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='ConfidentialService'>
- <port binding='tns:ConfidentialEndpointBinding' name='ConfidentialEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/ConfidentialService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1190' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1190' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='TestEndpoint_testAddress'>
- <part name='String_1' type='xsd:string'/>
- <part name='String_2' type='xsd:string'/>
- <part name='String_3' type='xsd:string'/>
- <part name='String_4' type='xsd:string'/>
- </message>
- <message name='TestEndpoint_testAddressResponse'/>
- <portType name='TestEndpoint'>
- <operation name='testAddress' parameterOrder='String_1 String_2 String_3 String_4'>
- <input message='tns:TestEndpoint_testAddress'/>
- <output message='tns:TestEndpoint_testAddressResponse'/>
- </operation>
- </portType>
- <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='testAddress'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1190' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='TestService'>
- <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/WEB-INF/wsdl/TestService.wsdl)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config confidential-config.xml
--->
-
-<!-- Run wstools for test config first, then follow with confidential-config -->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="ConfidentialService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.ConfidentialEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/>
- <mapping file="confidential-mapping.xml"/>
- <webservices servlet-link="ConfidentialEndpoint" append="true"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jaxrpc/jbws1190/confidential-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/confidential-config.xml)
Deleted: trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools -cp ../../../../../output/tests/classes -dest ./WEB-INF -config test-config.xml
--->
-
-<!-- Run wstools for test config first, then follow with confidential-config -->
-
-<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
- <java-wsdl>
- <service name="TestService" endpoint="org.jboss.test.ws.jaxrpc.jbws1190.TestEndpoint" style="rpc">
- </service>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1190" type-namespace="http://org.jboss.test.ws/jbws1190/types"/>
- <mapping file="test-mapping.xml"/>
- <webservices servlet-link="TestEndpoint"/>
- </java-wsdl>
-</configuration>
Copied: trunk/src/test/resources/jaxrpc/jbws1190/test-config.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxrpc/jbws1190/test-config.xml)
Copied: trunk/src/test/resources/jaxws/jbws1190 (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190)
Copied: trunk/src/test/resources/jaxws/jbws1190/WEB-INF (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF)
Deleted: trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-10-22 18:57:24 UTC (rev 1281)
+++ trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml 2006-11-21 20:02:08 UTC (rev 1494)
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <servlet>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1190.ConfidentialEndpoint</servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>TestEndpoint</servlet-name>
- <servlet-class>org.jboss.test.ws.jaxws.jbws1190.TestEndpointImpl</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>ConfidentialEndpoint</servlet-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TestEndpoint</servlet-name>
- <url-pattern>/TestEndpoint</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>ConfidentialEndpoint</web-resource-name>
- <url-pattern>/ConfidentialEndpoint</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-</web-app>
\ No newline at end of file
Copied: trunk/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml (from rev 1281, branches/jbossws-1.0/src/test/resources/jaxws/jbws1190/WEB-INF/web.xml)
More information about the jbossws-commits
mailing list