[jboss-svn-commits] JBossWS SVN: r678 - in trunk: . src/main/java/org/jboss/ws/jaxrpc src/test src/test/ant src/test/java/org/jboss/test/ws src/test/java/org/jboss/test/ws/jbws1121 src/test/resources src/test/resources/jbws1121 src/test/resources/jbws1121/META-INF src/test/resources/jbws1121/WEB-INF src/test/resources/jbws1121/WEB-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 3 14:06:16 EDT 2006
Author: darran.lofthouse at jboss.com
Date: 2006-08-03 14:06:01 -0400 (Thu, 03 Aug 2006)
New Revision: 678
Added:
trunk/src/test/java/org/jboss/test/ws/jbws1121/
trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java
trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java
trunk/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java
trunk/src/test/resources/jbws1121/
trunk/src/test/resources/jbws1121/META-INF/
trunk/src/test/resources/jbws1121/META-INF/application-client.xml
trunk/src/test/resources/jbws1121/META-INF/application.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-app.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml
trunk/src/test/resources/jbws1121/WEB-INF/
trunk/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml
trunk/src/test/resources/jbws1121/WEB-INF/web.xml
trunk/src/test/resources/jbws1121/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1121/WEB-INF/wsdl/
trunk/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl
trunk/src/test/resources/jbws1121/wsse.keystore
trunk/src/test/resources/jbws1121/wsse.truststore
trunk/src/test/resources/jbws1121/wstools-config.xml
Removed:
trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java
trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java
trunk/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java
trunk/src/test/resources/jbws1121/META-INF/
trunk/src/test/resources/jbws1121/META-INF/application-client.xml
trunk/src/test/resources/jbws1121/META-INF/application.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-app.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml
trunk/src/test/resources/jbws1121/WEB-INF/
trunk/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml
trunk/src/test/resources/jbws1121/WEB-INF/web.xml
trunk/src/test/resources/jbws1121/WEB-INF/webservices.xml
trunk/src/test/resources/jbws1121/WEB-INF/wsdl/
trunk/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl
trunk/src/test/resources/jbws1121/wsse.keystore
trunk/src/test/resources/jbws1121/wsse.truststore
trunk/src/test/resources/jbws1121/wstools-config.xml
Modified:
trunk/.classpath
trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java
trunk/src/test/ant/build-jars.xml
trunk/src/test/build.xml
Log:
JBWS-1121 - Merged from branches/jbossws-1.0
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2006-08-03 14:33:57 UTC (rev 677)
+++ trunk/.classpath 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,28 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry path="src/main/java" kind="src"/>
- <classpathentry excluding="org/jboss/test/ws/interop/" path="src/test/java" kind="src"/>
- <classpathentry path="thirdparty/activation.jar" kind="lib"/>
- <classpathentry sourcepath="D:/cvs/JBossRemoting/src/main" path="thirdparty/jboss-remoting.jar" kind="lib"/>
- <classpathentry path="thirdparty/mailapi.jar" kind="lib"/>
- <classpathentry path="thirdparty/qdox.jar" kind="lib"/>
- <classpathentry path="thirdparty/servlet-api.jar" kind="lib"/>
- <classpathentry path="thirdparty/wsdl4j.jar" kind="lib"/>
- <classpathentry path="thirdparty/xercesImpl.jar" kind="lib"/>
- <classpathentry path="thirdparty/xml-apis.jar" kind="lib"/>
- <classpathentry path="thirdparty/xmlsec.jar" kind="lib"/>
- <classpathentry path="thirdparty/xmlunit1.0.jar" kind="lib"/>
- <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
- <classpathentry path="thirdparty/xalan.jar" kind="lib"/>
- <classpathentry path="thirdparty/junit.jar" kind="lib"/>
- <classpathentry path="thirdparty/concurrent.jar" kind="lib"/>
- <classpathentry path="thirdparty/javassist.jar" kind="lib"/>
- <classpathentry path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x" kind="con"/>
- <classpathentry path="thirdparty/jboss-xml-binding.jar" kind="lib"/>
- <classpathentry path="thirdparty/policy-1.0.jar" kind="lib"/>
- <classpathentry path="thirdparty/stax-api-1.0.jar" kind="lib"/>
- <classpathentry path="thirdparty/wstx-lgpl-2.0.6.jar" kind="lib"/>
- <classpathentry path="thirdparty/jaxb-api.jar" kind="lib"/>
- <classpathentry path="thirdparty/ant.jar" kind="lib"/>
- <classpathentry path="output-eclipse" kind="output"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/>
+ <classpathentry kind="lib" path="thirdparty/activation.jar"/>
+ <classpathentry sourcepath="D:/cvs/JBossRemoting/src/main" kind="lib" path="thirdparty/jboss-remoting.jar"/>
+ <classpathentry kind="lib" path="thirdparty/mailapi.jar"/>
+ <classpathentry kind="lib" path="thirdparty/qdox.jar"/>
+ <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="thirdparty/xercesImpl.jar"/>
+ <classpathentry kind="lib" path="thirdparty/xml-apis.jar"/>
+ <classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
+ <classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="thirdparty/xalan.jar"/>
+ <classpathentry kind="lib" path="thirdparty/junit.jar"/>
+ <classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
+ <classpathentry kind="lib" path="thirdparty/javassist.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/>
+ <classpathentry kind="lib" path="thirdparty/policy-1.0.jar"/>
+ <classpathentry kind="lib" path="thirdparty/stax-api-1.0.jar"/>
+ <classpathentry kind="lib" path="thirdparty/wstx-lgpl-2.0.6.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="thirdparty/ant.jar"/>
+ <classpathentry kind="lib" path="thirdparty/jboss-common.jar"/>
+ <classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java 2006-08-03 14:33:57 UTC (rev 677)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/ServiceReferenceable.java 2006-08-03 18:06:01 UTC (rev 678)
@@ -169,7 +169,7 @@
private URL getSecurityConfigURL()
{
- ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader();
+ ClassLoader ctxClassLoader = refMetaData.getResourceCL();
String descriptorLoc = udi.metaData instanceof UnifiedWebMetaData ? "WEB-INF" : "META-INF";
URL securityURL = ctxClassLoader.getResource(descriptorLoc + "/" + WSSecurityConfigurationFactory.CLIENT_RESOURCE_NAME);
return securityURL;
Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml 2006-08-03 14:33:57 UTC (rev 677)
+++ trunk/src/test/ant/build-jars.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -309,6 +309,52 @@
</metainf>
</jar>
+ <!-- jbossws-jbws1121 -->
+ <war destfile="${build.test.dir}/libs/jbossws-jbws1121.war" webxml="${build.test.dir}/resources/jbws1121/WEB-INF/web.xml">
+ <classes dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ <include name="org/jboss/test/ws/jbws1121/HelloWorldBean.class"/>
+ </classes>
+ <webinf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ <include name="jboss-wsse-server.xml"/>
+ </webinf>
+ <webinf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </webinf>
+ </war>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1121-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1121/HelloWorld.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jboss-wsse-client.xml"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121/WEB-INF">
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*"/>
+ </metainf>
+ <metainf dir="${build.test.dir}/resources/jbws1121">
+ <include name="wsse.keystore"/>
+ <include name="wsse.truststore"/>
+ </metainf>
+ </jar>
+ <ear destfile="${build.test.dir}/libs/jbossws-jbws1121.ear"
+ appxml="${build.test.dir}/resources/jbws1121/META-INF/application.xml">
+ <fileset dir="${build.test.dir}/libs">
+ <include name="jbossws-jbws1121-client.jar"/>
+ <include name="jbossws-jbws1121.war"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1121/META-INF">
+ <include name="jboss-app.xml"/>
+ </metainf>
+ </ear>
+
<!-- jbossws-jaxws-context -->
<war warfile="${build.test.dir}/libs/jbossws-jaxws-context.war" webxml="${build.test.dir}/resources/jaxws/context/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-08-03 14:33:57 UTC (rev 677)
+++ trunk/src/test/build.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -125,6 +125,7 @@
<pathelement location="${jboss.client}/activation.jar"/>
<pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/javassist.jar"/>
+ <pathelement location="${jboss.client}/jboss-common.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1121 (from rev 676, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java 2006-08-03 18:06:01 UTC (rev 678)
@@ -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.jbws1121;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 03-August-2006
- */
-public interface HelloWorld extends Remote
-{
-
- public String echo(final String message) throws RemoteException;
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java (from rev 676, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/HelloWorld.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,39 +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.jbws1121;
-
-import java.rmi.RemoteException;
-
-/**
- *
- * @author darran.lofthouse at jboss.com
- * @since 03-August-2006
- */
-public class HelloWorldBean implements HelloWorld
-{
-
- public String echo(String message) throws RemoteException
- {
- return message;
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java (from rev 676, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/HelloWorldBean.java)
Deleted: trunk/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java
===================================================================
--- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,69 +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.jbws1121;
-
-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 case to test that the call can be made when the client
- * was deployed with an issolated classloader.
- *
- * If the client has not picked up the config it will send the
- * message without security headers which will cause the call
- * to fail.
- *
- * @author darran.lofthouse at jboss.com
- * @since 03-August-2006
- */
-public class JBWS1121TestCase extends JBossWSTest
-{
-
- private static HelloWorld port;
-
- public static Test suite() throws Exception
- {
- return JBossWSTestSetup.newTestSetup(JBWS1121TestCase.class, "jbossws-jbws1121.ear");
- }
-
- public void setUp() throws Exception
- {
- super.setUp();
- if (port == null)
- {
- InitialContext iniCtx = getInitialContext();
- Service service = (Service)iniCtx.lookup("java:comp/env/service/HelloWorldService");
- port = (HelloWorld)service.getPort(HelloWorld.class);
- }
- }
-
- public void testCall() throws Exception
- {
- String response = port.echo("Hello");
- assertEquals("Hello", response);
- }
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java (from rev 676, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jbws1121/JBWS1121TestCase.java)
Copied: trunk/src/test/resources/jbws1121 (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121)
Copied: trunk/src/test/resources/jbws1121/META-INF (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF)
Deleted: trunk/src/test/resources/jbws1121/META-INF/application-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/application-client.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/META-INF/application-client.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -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>HelloService</display-name>
-
- <service-ref>
- <service-ref-name>service/HelloWorldService</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/HelloWorldService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>org.jboss.test.ws.jbws1121.HelloWorld</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</application-client>
-
Copied: trunk/src/test/resources/jbws1121/META-INF/application-client.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/application-client.xml)
Deleted: trunk/src/test/resources/jbws1121/META-INF/application.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/application.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/META-INF/application.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<application 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_1_4.xsd"
- version="1.4">
-
- <module>
- <web>
- <web-uri>jbossws-jbws1121.war</web-uri>
- <context-root>jbossws-jbws1121</context-root>
- </web>
- </module>
-
- <module>
- <java>jbossws-jbws1121-client.jar</java>
- </module>
-
-</application>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/META-INF/application.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/application.xml)
Deleted: trunk/src/test/resources/jbws1121/META-INF/jboss-app.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-app.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/META-INF/jboss-app.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!DOCTYPE jboss-app
- PUBLIC "-//JBoss//DTD J2EE Application 1.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-app_4_0.dtd">
-
-<jboss-app>
- <loader-repository>jboss.ws.test:loader=JBWS1121</loader-repository>
-</jboss-app>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/META-INF/jboss-app.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-app.xml)
Deleted: trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-client.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,16 +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/HelloWorldService</service-ref-name>
- <config-name>Standard Secure Client</config-name>
- <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-jbws1121?wsdl</wsdl-override>
- </service-ref>
-
-</jboss-client>
Copied: trunk/src/test/resources/jbws1121/META-INF/jboss-client.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-client.xml)
Deleted: trunk/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <config>
- <sign type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- </requires>
- </config>
-</jboss-ws-security>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/META-INF/jboss-wsse-client.xml)
Copied: trunk/src/test/resources/jbws1121/WEB-INF (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF)
Deleted: trunk/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -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.jbws1121</package-type>
- <namespaceURI>http://org.jboss.test.ws/jbws1121/types</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>org.jboss.test.ws.jbws1121.HelloWorldService</service-interface>
- <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1121'>serviceNS:HelloWorldService</wsdl-service-name>
- <port-mapping>
- <port-name>HelloWorldPort</port-name>
- <java-port-name>HelloWorldPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jbws1121.HelloWorld</service-endpoint-interface>
- <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1121'>portTypeNS:HelloWorld</wsdl-port-type>
- <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1121'>bindingNS:HelloWorldBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>echo</java-method-name>
- <wsdl-operation>echo</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/jbws1121'>wsdlMsgNS:HelloWorld_echo</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/jbws1121'>wsdlMsgNS:HelloWorld_echoResponse</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/jbws1121/WEB-INF/jaxrpc-mapping.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/jaxrpc-mapping.xml)
Deleted: trunk/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd">
- <key-store-file>WEB-INF/wsse.keystore</key-store-file>
- <key-store-password>jbossws</key-store-password>
- <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- <trust-store-password>jbossws</trust-store-password>
- <config>
- <sign type="x509v3" alias="wsse"/>
- <requires>
- <signature/>
- </requires>
- </config>
-</jboss-ws-security>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/jboss-wsse-server.xml)
Deleted: trunk/src/test/resources/jbws1121/WEB-INF/web.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/web.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/WEB-INF/web.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,22 +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">
-
- <context-param>
- <param-name>jbossws-config-name</param-name>>
- <param-value>Standard Secure Endpoint</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>HelloWorldService</servlet-name>
- <servlet-class>org.jboss.test.ws.jbws1121.HelloWorldBean</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloWorldService</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
-</web-app>
-
Copied: trunk/src/test/resources/jbws1121/WEB-INF/web.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/web.xml)
Deleted: trunk/src/test/resources/jbws1121/WEB-INF/webservices.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/webservices.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/WEB-INF/webservices.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,15 +0,0 @@
-<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1121' 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>HelloWorldService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/HelloWorldService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>HelloWorldPort</port-component-name>
- <wsdl-port>impl:HelloWorldPort</wsdl-port>
- <service-endpoint-interface>org.jboss.test.ws.jbws1121.HelloWorld</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloWorldService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/WEB-INF/webservices.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/webservices.xml)
Copied: trunk/src/test/resources/jbws1121/WEB-INF/wsdl (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/wsdl)
Deleted: trunk/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions name='HelloWorldService' targetNamespace='http://org.jboss.test.ws/jbws1121' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1121' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
- <types/>
- <message name='HelloWorld_echo'>
- <part name='String_1' type='xsd:string'/>
- </message>
- <message name='HelloWorld_echoResponse'>
- <part name='result' type='xsd:string'/>
- </message>
- <portType name='HelloWorld'>
- <operation name='echo' parameterOrder='String_1'>
- <input message='tns:HelloWorld_echo'/>
- <output message='tns:HelloWorld_echoResponse'/>
- </operation>
- </portType>
- <binding name='HelloWorldBinding' type='tns:HelloWorld'>
- <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
- <operation name='echo'>
- <soap:operation soapAction=''/>
- <input>
- <soap:body namespace='http://org.jboss.test.ws/jbws1121' use='literal'/>
- </input>
- <output>
- <soap:body namespace='http://org.jboss.test.ws/jbws1121' use='literal'/>
- </output>
- </operation>
- </binding>
- <service name='HelloWorldService'>
- <port binding='tns:HelloWorldBinding' name='HelloWorldPort'>
- <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
- </port>
- </service>
-</definitions>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/WEB-INF/wsdl/HelloWorldService.wsdl)
Deleted: trunk/src/test/resources/jbws1121/wsse.keystore
===================================================================
(Binary files differ)
Copied: trunk/src/test/resources/jbws1121/wsse.keystore (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/wsse.keystore)
Deleted: trunk/src/test/resources/jbws1121/wsse.truststore
===================================================================
(Binary files differ)
Copied: trunk/src/test/resources/jbws1121/wsse.truststore (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/wsse.truststore)
Deleted: trunk/src/test/resources/jbws1121/wstools-config.xml
===================================================================
--- branches/jbossws-1.0/src/test/resources/jbws1121/wstools-config.xml 2006-08-03 11:28:38 UTC (rev 676)
+++ trunk/src/test/resources/jbws1121/wstools-config.xml 2006-08-03 18:06:01 UTC (rev 678)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- wstools.bat -config wstools-config.xml -cp ../../../../output/tests/classes/
--->
-
-<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="HelloWorldService" style="rpc" endpoint="org.jboss.test.ws.jbws1121.HelloWorld"/>
- <namespaces target-namespace="http://org.jboss.test.ws/jbws1121" type-namespace="http://org.jboss.test.ws/jbws1121/types"/>
- <mapping file="jaxrpc-mapping.xml"/>
- <webservices servlet-link="HelloWorldService"/>
- </java-wsdl>
-</configuration>
\ No newline at end of file
Copied: trunk/src/test/resources/jbws1121/wstools-config.xml (from rev 676, branches/jbossws-1.0/src/test/resources/jbws1121/wstools-config.xml)
More information about the jboss-svn-commits
mailing list