[jboss-svn-commits] JBossWS SVN: r862 - in branches/tdiesler/trunk: . docs/user-guide/project/en docs/user-guide/project/en/modules/endpoints docs/user-guide/project/en/modules/mtom-xop docs/user-guide/project/en/modules/secureejb docs/user-guide/project/en/modules/wssecurity src/main/java/org/jboss/ws/integration/tomcat src/main/java/org/jboss/ws/server src/main/resources/jbossws.war/JBoss/WEB-INF src/test src/test/etc src/test/java/org/jboss/test/ws src/test/java/org/jboss/test/ws/jbws1068 src/test/java/org/jboss/test/ws/jbws718 src/test/java/org/jboss/test/ws/jbws732 src/test/java/org/jboss/test/ws/jbws801 src/test/java/org/jboss/test/ws/jbws944 src/test/java/org/jboss/test/ws/samples/jmstransport src/test/java/org/jboss/test/ws/samples/secureejb src/test/resources src/test/resources/jbws1068 src/test/resources/jbws944 src/test/resources/jbws944/META-INF src/test/resources/jbws944/META-INF/wsdl src/test/resources/samples/secureejb/META-INF src/test/resources/samples-override/secure! ejb/META-INF/wsdl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Aug 30 18:01:24 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-08-30 18:00:35 -0400 (Wed, 30 Aug 2006)
New Revision: 862
Added:
branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/template-config.xml
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/JBWS1068TestCase.java
branches/tdiesler/trunk/src/test/resources/jbws1068/
branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_services.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_bindings.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_interfaces.wsdl
branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_types.xsd
branches/tdiesler/trunk/src/test/resources/jbws944/
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jaxrpc-mapping.xml
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jboss-client.xml
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/
branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/TestService.wsdl
branches/tdiesler/trunk/src/test/resources/jbws944/wstools-config.xml
Modified:
branches/tdiesler/trunk/.classpath
branches/tdiesler/trunk/build.xml
branches/tdiesler/trunk/docs/user-guide/project/en/master.template
branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/endpoints.xml
branches/tdiesler/trunk/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
branches/tdiesler/trunk/docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
branches/tdiesler/trunk/docs/user-guide/project/en/modules/wssecurity/wssecurity.xml
branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HttpServer.java
branches/tdiesler/trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml
branches/tdiesler/trunk/src/test/build.xml
branches/tdiesler/trunk/src/test/etc/log4j.xml
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws718/JBWS718TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws732/JBWS732TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws801/JBWS801TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws944/JBWS944TestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/secureejb/SecureEJBTestCase.java
branches/tdiesler/trunk/src/test/resources/samples-override/secureejb/META-INF/wsdl/OrganizationService.wsdl
branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/application-client.xml
branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/ejb-jar.xml
branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/jboss.xml
branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/webservices.xml
branches/tdiesler/trunk/version.properties
Log:
Add JBWS-1068 test case.
Add CONFIDETIAL test case for ejb.
Add JBWS-944 test case.
Build jboss-jaxrpc, jboss-saaj
Modified: branches/tdiesler/trunk/.classpath
===================================================================
--- branches/tdiesler/trunk/.classpath 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/.classpath 2006-08-30 22:00:35 UTC (rev 862)
@@ -8,8 +8,6 @@
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/javassist.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-backport-concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-common.jar"/>
<classpathentry kind="lib" path="thirdparty/jboss-container.jar"/>
@@ -34,7 +32,5 @@
<classpathentry kind="lib" path="thirdparty/xmlsec.jar"/>
<classpathentry kind="lib" path="thirdparty/xmlunit1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
<classpathentry kind="output" path="output-eclipse"/>
</classpath>
Modified: branches/tdiesler/trunk/build.xml
===================================================================
--- branches/tdiesler/trunk/build.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/build.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -26,7 +26,7 @@
<property environment="env"/>
<property name="build.dir" value="${basedir}/output"/>
<property name="build.classes.dir" value="${build.dir}/classes"/>
- <property name="build.retro.dir" value="${build.dir}/classes14"/>
+ <property name="build.classes14.dir" value="${build.dir}/classes14"/>
<property name="build.etc.dir" value="${build.dir}/etc"/>
<property name="build.lib.dir" value="${build.dir}/lib"/>
<property name="build.resources.dir" value="${build.dir}/resources"/>
@@ -117,28 +117,44 @@
<target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
<!-- Compile java sources -->
- <target name="compile-classes" depends="compile-core,compile-integration"/>
+ <target name="compile-classes" depends="compile-interfaces,compile-core,compile-integration"/>
<!-- Compile core java sources -->
- <target name="compile-core" depends="init">
+ <target name="compile-interfaces" depends="init">
+ <mkdir dir="${build.classes14.dir}"/>
+ <javac srcdir="${src.java.dir}" destdir="${build.classes14.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.4" target="1.4">
+ <include name="javax/xml/rpc/**"/>
+ <include name="javax/xml/soap/**"/>
+ <classpath refid="core.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile core java sources -->
+ <target name="compile-core" depends="compile-interfaces">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="javax/xml/ws/**"/>
+ <include name="javax/jws/**"/>
+ <include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
<exclude name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
+ <classpath path="${build.classes14.dir}"/>
<classpath refid="core.classpath"/>
</javac>
</target>
<!-- Compile interation java sources -->
- <target name="compile-integration" depends="init">
+ <target name="compile-integration" depends="compile-core">
<mkdir dir="${build.classes.dir}"/>
- <javac srcdir="${src.java.dir}" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
+ <javac srcdir="${src.java.dir}" sourcepath="" destdir="${build.classes.dir}" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<include name="org/jboss/ws/integration/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
<include name="org/jboss/ws/server/ServiceEndpointInterceptor.java"/>
+ <classpath path="${build.classes14.dir}"/>
<classpath refid="integration.classpath"/>
</javac>
</target>
@@ -181,11 +197,35 @@
-->
<target name="module-jars">
+ <!-- Build jboss-jaxrpc.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxrpc.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/xml/rpc/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-saaj.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-saaj.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/xml/soap/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jboss-jaxws.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxws.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes.dir}">
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws-core.jar" manifest="${build.etc.dir}/default.mf">
<fileset dir="${build.classes.dir}">
- <include name="javax/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
@@ -279,6 +319,7 @@
<include name="jbossws-jboss-integration.jar"/>
<include name="jbossws-context.war"/>
<include name="jbossws-core.jar"/>
+ <include name="jboss-jaxws.jar"/>
<include name="jbossws.beans"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -304,11 +345,19 @@
<target name="module-jars14" depends="jbossretro">
+ <!-- Build jboss-jaxws14.jar -->
+ <mkdir dir="${build.lib.dir}"/>
+ <jar jarfile="${build.lib.dir}/jboss-jaxws14.jar" manifest="${build.etc.dir}/default.mf">
+ <fileset dir="${build.classes14.dir}">
+ <include name="javax/jws/**"/>
+ <include name="javax/xml/ws/**"/>
+ </fileset>
+ </jar>
+
<!-- Build jbossws14-core.jar -->
<mkdir dir="${build.lib.dir}"/>
<jar jarfile="${build.lib.dir}/jbossws14-core.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
- <include name="javax/**"/>
+ <fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/**"/>
<exclude name="org/jboss/ws/transport/jms/**"/>
@@ -322,7 +371,7 @@
<!-- Build jbossws-jboss-integration.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-jboss-integration.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="org/jboss/ws/integration/*.class"/>
<include name="org/jboss/ws/integration/jboss/**"/>
<include name="org/jboss/ws/transport/jms/**"/>
@@ -332,7 +381,7 @@
<!-- Build jbossws14-client.jar -->
<jar jarfile="${build.lib.dir}/jbossws14-client.jar" manifest="${build.etc.dir}/default.mf">
- <fileset dir="${build.retro.dir}">
+ <fileset dir="${build.classes14.dir}">
<include name="javax/**"/>
<include name="org/jboss/ws/**"/>
<exclude name="org/jboss/ws/integration/jboss/**"/>
@@ -359,6 +408,7 @@
<include name="jbossws14-jboss-integration.jar"/>
<include name="jbossws14-core.jar"/>
<include name="jbossws-context.war"/>
+ <include name="jboss-jaxws14.jar"/>
<include name="jbossws.beans"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -390,10 +440,12 @@
</classpath>
</taskdef>
- <mkdir dir="${build.retro.dir}"/>
+ <mkdir dir="${build.classes14.dir}"/>
- <retro destdir="${build.retro.dir}">
+ <retro destdir="${build.classes14.dir}">
<classpath>
+ <pathelement location="${build.lib.dir}/jboss-jaxrpc.jar"/>
+ <pathelement location="${build.lib.dir}/jboss-saaj.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
<pathelement location="${thirdparty.dir}/jbossretro.jar"/>
<pathelement location="${thirdparty.dir}/jboss-backport-concurrent.jar"/>
@@ -405,7 +457,7 @@
<src path="${build.classes.dir}"/>
</retro>
- <copy todir="${build.retro.dir}">
+ <copy todir="${build.classes14.dir}">
<fileset dir="${build.resources.dir}">
<include name="schema/**"/>
<include name="dtd/**"/>
@@ -464,8 +516,6 @@
<!-- Deploy to jboss -->
<target name="deploy-to-server">
- <copy todir="${jboss.deploy.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
- <copy todir="${jboss.deploy.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/>
<copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
<delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
<mkdir dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
@@ -497,8 +547,6 @@
<!-- Build jbossws-thirdparty.jar -->
<mkdir dir="${build.lib.dir}/build"/>
<unjar dest="${build.lib.dir}/build" src="${jboss.lib}/jboss-common.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-jaxrpc.jar"/>
- <unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-saaj.jar"/>
<unjar dest="${build.lib.dir}/build" src="${jboss.server.lib}/jboss-j2ee.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-container.jar"/>
<unjar dest="${build.lib.dir}/build" src="${thirdparty.dir}/jboss-dependency.jar"/>
@@ -523,12 +571,15 @@
<target name="release" depends="all" description="Release to jboss.local.repository">
<!-- jbossws -->
- <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${version.id}"/>
+ <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
<mkdir dir="${jbossws.dir}/lib"/>
<copy todir="${jbossws.dir}/lib" overwrite="true">
<fileset dir="${build.lib.dir}">
<include name="jbossws.sar"/>
<include name="jbossws-client.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
</copy>
<copy tofile="${jbossws.dir}/component-info.xml" file="${src.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
@@ -538,12 +589,15 @@
</copy>
<!-- jbossws14 -->
- <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${version.id}"/>
+ <property name="jbossws14.dir" value="${jboss.local.repository}/jboss/jbossws14/${repository.id}"/>
<mkdir dir="${jbossws14.dir}/lib"/>
<copy todir="${jbossws14.dir}/lib" overwrite="true">
<fileset dir="${build.lib.dir}">
<include name="jbossws14.sar"/>
<include name="jbossws14-client.jar"/>
+ <include name="jboss-jaxws14.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-saaj.jar"/>
</fileset>
</copy>
<copy tofile="${jbossws14.dir}/component-info.xml" file="${src.etc.dir}/jbossws14-component-info.xml" filtering="true" overwrite="true">
Modified: branches/tdiesler/trunk/docs/user-guide/project/en/master.template
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/master.template 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/master.template 2006-08-30 22:00:35 UTC (rev 862)
@@ -23,6 +23,7 @@
<!ENTITY s-jsr181-pojo-endpoint SYSTEM "modules/endpoints/jsr181-pojo-endpoint.xml">
<!ENTITY s-jsr181-ejb3-endpoint SYSTEM "modules/endpoints/jsr181-ejb3-endpoint.xml">
<!ENTITY s-service-lifecycle SYSTEM "modules/endpoints/service-lifecycle.xml">
+<!ENTITY s-templates SYSTEM "modules/endpoints/template-config.xml">
<!ENTITY ch-clients SYSTEM "modules/clients/clients.xml">
<!ENTITY s-jsr109-clients SYSTEM "modules/clients/jsr109-clients.xml">
<!ENTITY s-dii-clients SYSTEM "modules/clients/dii-clients.xml">
@@ -74,9 +75,9 @@
</para>
<para> If you have questions regarding JBossWS, please feel to ask the JBossWS team.</para>
- <para>Web Service Lead - thomas.diesler at jboss.org</para>
- <para>WS-Security, WSTools - jason.greene at jboss.org</para>
- <para>WS-Eventing, Standards - heiko.braun at jboss.org</para>
+ <para>Web Service Lead - Thomas Diesler</para>
+ <para>WS-Security, WSTools - Jason Greene</para>
+ <para>WS-Eventing, Standards - Heiko Braun</para>
</preface>
Modified: branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/endpoints.xml
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/endpoints.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/endpoints.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -14,5 +14,6 @@
&s-jsr109-endpoints;
&s-jsr181-endpoints;
&s-service-lifecycle;
+ &s-templates;
</chapter>
Added: branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/template-config.xml
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/template-config.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/template-config.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<sect1 id="template-config">
+
+ <title>Endpoint configuration templates</title>
+ <para>
+
+ Configuration templates provide a convenient way to setup a handler configuration for JBossWS endpoints.
+ A configuration basically includes a list of <link linkend="handlers">JAXRPC handlers</link> that are
+ registered with a web service endpoint upon deployment.
+
+ <programlisting><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbossws-config xmlns="urn:jboss:jbossws-config:5.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ xsi:schemaLocation="urn:jboss:jbossws-config:5.0 http://www.jboss.com/xml/jbossws-config_1_0.xsd">
+
+ <endpoint-config>
+ <config-name>Standard Endpoint</config-name>
+ </endpoint-config>
+
+ <endpoint-config>
+ <config-name>Standard Secure Endpoint</config-name>
+ <pre-handler-chain>
+ <handler-chain-name>PreHandlerChain</handler-chain-name>
+ <handler>
+ <j2ee:handler-name>WSSecurityHandlerInbound</j2ee:handler-name>
+ <j2ee:handler-class>org.jboss.ws.wsse.WSSecurityHandlerInbound</j2ee:handler-class>
+ </handler>
+ </pre-handler-chain>
+ </endpoint-config>
+
+</jbossws-config>
+ ]]></programlisting>
+
+ </para>
+
+ <para>
+ These template configurations can be referenced from any jboss specific deplyoment descriptor, i.e:
+
+ <programlisting><![CDATA[
+ <jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ (1) <config-name>Standard Secure Client</config-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-samples-wssecurity-encrypt?wsdl</wsdl-override>
+ </service-ref>
+
+ </jboss-client>
+ ]]></programlisting>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ An example configuration reference from a client deployment descriptor.
+ </para>
+ </listitem>
+ </orderedlist>
+
+
+ <note>
+ <para>This is a proprietary configuration mechanism.
+ In order to stay portable it's recommended to use the default JAXRPC handler configuration.</para>
+ </note>
+
+ </para>
+
+ <para>
+ <command>Configuration reference from web.xml</command>
+ <para>
+ Within web.xml the same approach can be taken, with the difference that it uses a predefined servlet context
+ parameter (1) to specfiy the chosen endpoint config (2):
+
+ <programlisting><![CDATA[
+<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>
+ (1) <param-name>jbossws-config-name</param-name>>
+ (2) <param-value>Standard Secure Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>org.jboss.test.ws.samples.wssecurity.HelloJavaBean</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app> ]]></programlisting>
+ </para>
+ </para>
+
+</sect1>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/docs/user-guide/project/en/modules/endpoints/template-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/modules/mtom-xop/mtom-xop.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -3,96 +3,142 @@
<!-- $Id$ -->
<chapter id="mtom-xop">
-
- <title>MTOM/XOP</title>
-
- <para>This chapter describes Message Transmission Optimization Mechanism (MTOM) and XML-binary Optimized Packaging (XOP),
- a means of more efficiently serializing XML Infosets that have certain types of content.
- The related specifications are <ulink url=" http://www.w3.org/TR/soap12-mtom/">SOAP Message Transmission Optimization Mechanism (MTOM)</ulink>
- and <ulink url="http://www.w3.org/TR/xop10/">XML-binary Optimized Packaging (XOP)</ulink>
- </para>
-
- <para>The MTOM/XOP example uses a service endpoint interface with the same operations as in <link linkend="attachments">SOAP with Attachments</link>
- </para>
-
- <para><command>Generating required deployment artifacts</command></para>
-
- <para>Run wstools with the following configuration</para>
-
- <para>
- <programlisting>
- <ulink url="http://jira.jboss.org/jira/browse/JBWS-703">FIXME: JBWS-703</ulink>
- </programlisting>
- </para>
-
- <para>WSTools does generate schema elements of type xsd:base64Binary with the associated xmime:expectedContentTypes.
- There is no special mime binding.</para>
-
- <para>
- <programlisting><![CDATA[
- <element name="imagegif" xmime:expectedContentTypes="image/gif"
- type="xmime:base64Binary"/>
- <element name="imagejpeg" xmime:expectedContentTypes="image/jpeg"
- type="xmime:base64Binary"/>
- <element name="textplain" xmime:expectedContentTypes="text/plain"
- type="xmime:base64Binary"/>
- <element name="multipart" xmime:expectedContentTypes="multipart/*"
- type="xmime:base64Binary"/>
- <element name="textxml" xmime:expectedContentTypes="text/xml"
- type="xmime:base64Binary"/>
- <element name="applxml" xmime:expectedContentTypes="application/xml"
- type="xmime:base64Binary"/>
-
- <binding name="XOPTestBinding" type="tns:XOPTest">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="sendMimeImageGIF">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/>
- </input>
- <output>
- <soap:body use="literal" namespace="http://org.jboss.ws/samples/mtom"/>
- </output>
- </operation>
- ...
- </binding>
+
+ <title>MTOM/XOP</title>
+
+ <para>This chapter describes Message Transmission Optimization Mechanism (MTOM) and XML-binary Optimized Packaging (XOP),
+ a means of more efficiently serializing XML Infosets that have certain types of content.
+ The related specifications are <ulink url=" http://www.w3.org/TR/soap12-mtom/">SOAP Message Transmission Optimization Mechanism (MTOM)</ulink>
+ and <ulink url="http://www.w3.org/TR/xop10/">XML-binary Optimized Packaging (XOP)</ulink>
+ </para>
+
+ <para>The MTOM/XOP example uses a service endpoint interface with the same operations as in <link linkend="attachments">SOAP with Attachments</link>
+ </para>
+
+ <sect1 id="mtom-schema-elements">
+ <title>MTOM schema elements</title>
+
+
+ <para>Currently neither wstools nor wscompile has support for MTOM.
+ Fortunatly a MTOM optimizable element decalaration isn't that difficult to understand
+ and can easily be created manually:</para>
+
+ <para>
+ <programlisting><![CDATA[
+ <schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://org.jboss.ws/samples/mtom"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime">
+
+ (1) <import schemaLocation="http://www.w3.org/2005/05/xmlmime" namespace="http://www.w3.org/2005/05/xmlmime"/>
+
+ (2) <element name="imagejpeg" xmime:contentType="image/jpeg" type="xmime:base64Binary"/>
+ </schema>
+ ]]></programlisting>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ Import the xmime schema declarations
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Derive your element declaration from xmime:base64Binary
+ </para>
+ </listitem>
+ </orderedlist>
+
+ The JBossWS MTOM implementation scans the associated schema
+ and will treat any xmime:base64Binary occurance as a MTOM optimizable parameter.
+ </para>
+
+ </sect1>
+
+ <sect1 id="mtom-schema-elements">
+ <title>Supported MTOM parameter types</title>
+ <para>
+ <table frame="all">
+ <title>Java to Mime mapping</title>
+ <tgroup cols="2">
+ <tbody>
+ <row>
+ <entry>image/jpeg</entry>
+ <entry>java.awt.Image</entry>
+ </row>
+ <row>
+ <entry>text/xml</entry>
+ <entry>javax.xml.transform.Source</entry>
+ </row>
+ <row>
+ <entry>application/xml</entry>
+ <entry>javax.xml.transform.Source</entry>
+ </row>
+ <row>
+ <entry>*/*</entry>
+ <entry>javax.activation.DataHandler</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </para>
+
+ The above table shows a list of supported endpoint parameter types. The recommended approach is to use
+ the <ulink url="http://java.sun.com/j2ee/1.4/docs/api/javax/activation/DataHandler.html">
+ javax.activation.DataHandler</ulink> classes to represent binary data as service endpoint parameters.
+
+ </sect1>
+
+ <sect1>
+ <title>An example MTOM request</title>
+
+ <para>The incomming message is multipart/related. The first part is the SOAP Envelope.</para>
+
+ <para>
+ <programlisting><![CDATA[
+POST /jbossws-samples-mtom HTTP/1.1
+SOAPAction: ""
+Content-Type: multipart/related; start-info="text/xml";
+ type="application/xop+xml";
+ start="<rootpart at ws.jboss.org>";
+ boundary="----=_Part_2_29441291.1153833579421"
+User-Agent: Java/1.5.0_07
+Host: localhost:8081
+Accept: text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2
+Connection: keep-alive
+Content-Length: 915
+
+
+------=_Part_2_29441291.1153833579421
+Content-Type: application/xop+xml; type="text/xml"
+Content-Transfer-Encoding: 8bit
+Content-ID: <rootpart at ws.jboss.org>
+
+<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
+ <env:Header/>
+ <env:Body>
+ <ns1:sendMimeTextXML xmlns:ns1='http://org.jboss.ws/samples/mtom'>
+ <message>Some text message</message>
+ <ns1:textxml>
+ <xop:Include
+ href='cid:textxml-590c9216-9871-48a8-9239-f73831644442 at ws.jboss.org'
+ xmlns:xop='http://www.w3.org/2004/08/xop/include'/>
+ </ns1:textxml>
+ </ns1:sendMimeTextXML>
+ </env:Body>
+</env:Envelope>
+------=_Part_2_29441291.1153833579421
+Content-Type: text/xml
+Content-Transfer-Encoding: binary
+Content-Id: <textxml-590c9216-9871-48a8-9239-f73831644442 at ws.jboss.org>
+
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<mime-message>This is an xml attachment.</mime-message>
+
+------=_Part_2_29441291.1153833579421--
+
]]></programlisting></para>
-
- <para><command>SOAP message exchange</command></para>
-
- <para>The incomming message is multipart/related. The first part is the SOAP Envelope.</para>
-
- <para>
- <programlisting><![CDATA[
- Incomming SOAPMessage
+
+ </sect1>
- <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
- <env:Header/>
- <env:Body>
- <ns1:sendMimeImageGIF xmlns:ns1='http://org.jboss.ws/samples/mtom'>
- <message>Some text message</message>
- <ns1:imagegif xmime:contentType='image/gif'
- xmlns:xmime='http://www.w3.org/2004/11/xmlmime'>
- <xop:Include href='cid:imagegif-... at ws.jboss.org'
- xmlns:xop='http://www.w3.org/2004/08/xop/include'/>
- </ns1:imagegif>
- </ns1:sendMimeImageGIF>
- </env:Body>
- </env:Envelope>
- ]]></programlisting></para>
-
- <para>
- <programlisting><![CDATA[
- Outgoing SOAPMessage
-
- <env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>
- <env:Header/>
- <env:Body>
- <ns1:sendMimeImageGIFResponse xmlns:ns1='http://org.jboss.ws/samples/mtom'>
- <result>[pass]</result>
- </ns1:sendMimeImageGIFResponse>
- </env:Body>
- </env:Envelope>
- ]]></programlisting></para>
-
</chapter>
\ No newline at end of file
Modified: branches/tdiesler/trunk/docs/user-guide/project/en/modules/secureejb/secure-ejb.xml
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/modules/secureejb/secure-ejb.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -198,8 +198,7 @@
</jboss>
]]></programlisting></para>
- <para>At last, make sure that your WSDL files point to the right url.
- Otherwise your webservice client may be redirected to the unsecure HTTP access method.
+ <para>At last, make sure that the endpoint address in your WSDL file uses a secure protocol.
The easiest way is to add "https://" to the SOAP Address entry:</para>
<para>
Modified: branches/tdiesler/trunk/docs/user-guide/project/en/modules/wssecurity/wssecurity.xml
===================================================================
--- branches/tdiesler/trunk/docs/user-guide/project/en/modules/wssecurity/wssecurity.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/docs/user-guide/project/en/modules/wssecurity/wssecurity.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -3,58 +3,60 @@
<!-- $Id$ -->
<chapter id="wssecurity">
-
- <title>WS-Security</title>
-
- <para>WS-Security standardizes authorization, encryption, and digital signature processing of web services.
- Unlike transport security models, such as SSL, WS-Security applies security directly to the elements of the web service message.
- This increases the flexibility of your web services, by allowing any message model to be used (point to point, multi-hop relay, etc).
- </para>
-
- <para>This chapter describes how to use WS-Security to sign and encrypt a simple SOAP message.</para>
-
- <para><command>Specifications</command></para>
-
- <para>WS-Security is defined by the combination of the following specifications:</para>
- <para>
- <itemizedlist>
- <listitem>
- <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf">SOAP Message Security 1.0</ulink></para>
- </listitem>
- <listitem>
- <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0.pdf">Username Token Profile 1.0</ulink></para>
- </listitem>
- <listitem>
- <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0.pdf">X.509 Token Profile 1.0</ulink></para>
- </listitem>
- <listitem>
- <para><ulink url="http://www.w3.org/TR/xmlenc-core">W3C XML Encryption</ulink></para>
- </listitem>
- <listitem>
- <para><ulink url="http://www.w3.org/TR/xmldsig-core">W3C XML Signature</ulink></para>
- </listitem>
- <listitem>
- <para><ulink url="http://www.ws-i.org/Profiles/BasicSecurityProfile-1.0.html">Basic Security Profile 1.0 (Still in Draft)</ulink></para>
- </listitem>
- </itemizedlist> </para>
+ <title>WS-Security</title>
- <para> Lets start with a trivial service endpoint interface (SEI) that echos a user defined type.</para>
-
- <para>
- <programlisting><![CDATA[
+ <para>WS-Security standardizes authorization, encryption, and digital signature processing of web services.
+ Unlike transport security models, such as SSL, WS-Security applies security directly to the elements of the web service message.
+ This increases the flexibility of your web services, by allowing any message model to be used (point to point, multi-hop relay, etc).
+ </para>
+
+ <para>This chapter describes how to use WS-Security to sign and encrypt a simple SOAP message.</para>
+
+ <para><command>Specifications</command></para>
+
+ <para>WS-Security is defined by the combination of the following specifications:</para>
+
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0.pdf">SOAP Message Security 1.0</ulink></para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0.pdf">Username Token Profile 1.0</ulink></para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0.pdf">X.509 Token Profile 1.0</ulink></para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://www.w3.org/TR/xmlenc-core">W3C XML Encryption</ulink></para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://www.w3.org/TR/xmldsig-core">W3C XML Signature</ulink></para>
+ </listitem>
+ <listitem>
+ <para><ulink url="http://www.ws-i.org/Profiles/BasicSecurityProfile-1.0.html">Basic Security Profile 1.0 (Still in Draft)</ulink></para>
+ </listitem>
+ </itemizedlist> </para>
+
+ <sect1>
+ <title>Generating required deployment artifacts</title>
+
+ <para> Lets start with a trivial service endpoint interface (SEI) that echos a user defined type.</para>
+
+ <para>
+ <programlisting><![CDATA[
public interface Hello extends Remote
{
public UserType echoUserType(UserType in0) throws RemoteException;
}
]]></programlisting></para>
-
- <para><command>Generating required deployment artifacts</command></para>
- <para>Run wstools with the following configuration</para>
-
- <para>
- <programlisting><![CDATA[
+
+ <para>Run wstools with the following configuration</para>
+
+ <para>
+ <programlisting><![CDATA[
<configuration ...>
<java-wsdl>
<service name="HelloService" style="rpc"
@@ -68,104 +70,234 @@
</java-wsdl>
</configuration>
]]></programlisting></para>
-
- <para><command>Server configuration (jboss-wsse-server.xml)</command></para>
-
- <para>In this example we configure both the client and the server to sign the message body.
- Both also require this from each other. So, if you remove either the client or the server security deployment descriptor,
- you will notice that the other party will throw a fault explaining that the message did not conform to the proper security requirements.</para>
-
- <para>
- <programlisting><![CDATA[
+ </sect1>
+
+ <sect1>
+ <title>Configuration and setup</title>
+
+ <sect2>
+ <title>Enable security processing</title>
+ <para>
+ JBossWS uses generic <link linkend="handlers">JAXRPC handlers</link> to identify ws-security encoded requests
+ and invoke the security components to sign and encrypt messages. In order to enable security processing,
+ the client and server side need to include a corressponding handler configuration. The preferred way is to reference
+ a <link linkend="template-config">predefined endpoint configuration</link> (excerpt from WEB-INF/web.xml):
+
+ <programlisting><![CDATA[
+<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>
+ (1) <param-name>jbossws-config-name</param-name>>
+ (2) <param-value>Standard Secure Endpoint</param-value>
+ </context-param>
+
+ <servlet>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>org.jboss.test.ws.samples.wssecurity.HelloJavaBean</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app> ]]></programlisting>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ JBossWS specific context param
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Point it to 'Standard Secure Endpoint'
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+
+ <para>
+ Or the equivalent on the client side (excerpt from META-INF/jboss-client.xml):
+ <programlisting><![CDATA[
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/HelloService</service-ref-name>
+ (1) <config-name>Standard Secure Client</config-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-samples-wssecurity-encrypt?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
+ ]]></programlisting>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ JBossWS configuration. Point it to 'Standard Secure Client'
+ </para>
+ </listitem>
+ </orderedlist>
+ </para>
+
+ <sect3>
+ <title>Security processing with JSR-181 endpoints</title>
+ <para>
+ With JSR-181 endpoints we can't directly reference a predefined endpoint configuration,
+ therefore we have to reference the necessary handlers directly to be able to process WSSE messages:
+
+ <programlisting><![CDATA[
+[...]
+(1) @HandlerChain(file = "resource://config/ServerHandlers.xml", name = "SecureHandlerChain")
+public class EJB3Bean01 implements EJB3RemoteInterface
+{
+ @WebMethod
+ public String echo(String input)
+ {
+ return input;
+ }
+}
+ ]]></programlisting>
+
+ <orderedlist>
+ <listitem>
+ <para>
+ Reference to handler configuration file that specifies the WSSE handlers needed
+ </para>
+ </listitem>
+ </orderedlist>
+
+ <note><para>These excerpts are taken from the JSR181 ejb endpoint examples shipped with the distribution</para></note>
+
+ Contents of the ServerHandler.xml file referenced above:
+ <programlisting><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+
+<handler-config>
+ <handler-chain>
+ <handler-chain-name>SecureHandlerChain</handler-chain-name>
+ <handler>
+ <handler-name>WSSecurityHandlerInbound</handler-name>
+ <handler-class>org.jboss.ws.wsse.WSSecurityHandlerInbound</handler-class>
+ </handler>
+ </handler-chain>
+</handler-config>
+ ]]></programlisting>
+
+ </para>
+ </sect3>
+ </sect2>
+
+ <sect2>
+ <title>Configure the WS-Security implementation</title>
+ Once you enabled security processing, it's time configure the ws-security implementation.
+ Both client and server require configuration files that specify key-store, trust-store
+ and various other ws-security specific options.
+
+ <para><command>Server side configuration (jboss-wsse-server.xml)</command></para>
+
+ <para>In this example we configure both the client and the server to sign the message body.
+ Both also require this from each other. So, if you remove either the client or the server security deployment descriptor,
+ you will notice that the other party will throw a fault explaining that the message did not conform to the proper security requirements.</para>
+
+ <para>
+ <programlisting><![CDATA[
<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">
- 1. <key-store-file>WEB-INF/wsse.keystore</key-store-file>
- 2. <key-store-password>jbossws</key-store-password>
- 3. <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
- 4. <trust-store-password>jbossws</trust-store-password>
- 5. <config>
- 6. <sign type="x509v3" alias="wsse"/>
- 7. <requires>
- 8. <signature/>
+ (1) <key-store-file>WEB-INF/wsse.keystore</key-store-file>
+ (2) <key-store-password>jbossws</key-store-password>
+ (3) <trust-store-file>WEB-INF/wsse.truststore</trust-store-file>
+ (4) <trust-store-password>jbossws</trust-store-password>
+ (5) <config>
+ (6) <sign type="x509v3" alias="wsse"/>
+ (7) <requires>
+ (8) <signature/>
</requires>
</config>
</jboss-ws-security>
]]></programlisting></para>
- <para>
- <orderedlist>
- <listitem>
- <para>This specifies that the key store we wish to use is WEB-INF/wsse.keystore, which is located in our war file.</para>
- </listitem>
- <listitem>
- <para>This specifies that the store password is "jbossws"</para>
- </listitem>
- <listitem>
- <para>This specifies that the trust store we wish to use is WEB-INF/wsse.truststore, which is located in our war file.</para>
- </listitem>
- <listitem>
- <para>This specifies that the trust store password is also "jbossws"</para>
- </listitem>
- <listitem>
- <para>Here we start our root config block. The root config block is the default configuration for all services in this war file.</para>
- </listitem>
- <listitem>
- <para>This means that the server must sign the message body of all responses. Type means that we are to use a X.509v3 certificate (a standard certificate). The alias option says that the certificate/key pair to use for signing is in the key store under the "wsse" alias</para>
- </listitem>
- <listitem>
- <para>Here we start our optional requires block. This block specifies all security requirements that must be met when the server receives a message.</para>
- </listitem>
- <listitem>
- <para> This means that all web services in this war file require the message body to be siged.</para>
- </listitem>
- </orderedlist>
- </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>This specifies that the key store we wish to use is WEB-INF/wsse.keystore, which is located in our war file.</para>
+ </listitem>
+ <listitem>
+ <para>This specifies that the store password is "jbossws". Password can be encypted using the {EXT} and {CLASS} commands. Please see samples for their usage.</para>
+ </listitem>
+ <listitem>
+ <para>This specifies that the trust store we wish to use is WEB-INF/wsse.truststore, which is located in our war file.</para>
+ </listitem>
+ <listitem>
+ <para>This specifies that the trust store password is also "jbossws". Password can be encypted using the {EXT} and {CLASS} commands. Please see samples for their usage.</para>
+ </listitem>
+ <listitem>
+ <para>Here we start our root config block. The root config block is the default configuration for all services in this war file.</para>
+ </listitem>
+ <listitem>
+ <para>This means that the server must sign the message body of all responses. Type means that we are to use a X.509v3 certificate (a standard certificate). The alias option says that the certificate/key pair to use for signing is in the key store under the "wsse" alias</para>
+ </listitem>
+ <listitem>
+ <para>Here we start our optional requires block. This block specifies all security requirements that must be met when the server receives a message.</para>
+ </listitem>
+ <listitem>
+ <para> This means that all web services in this war file require the message body to be siged.</para>
+ </listitem>
+ </orderedlist>
+ </para>
+ </sect2>
- <para><command> Client configuration (jboss-wsse-client.xml)</command></para>
-
- <para>
- <programlisting><![CDATA[
+
+ <para><command>Client configuration (jboss-wsse-client.xml)</command></para>
+
+ <para>
+ <programlisting><![CDATA[
<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">
- 1. <config>
- 2. <sign type="x509v3" alias="wsse"/>
- 3. <requires>
- 4. <signature/>
+ (1) <config>
+ (2) <sign type="x509v3" alias="wsse"/>
+ (3) <requires>
+ (4) <signature/>
</requires>
</config>
</jboss-ws-security>
]]></programlisting></para>
- <para>
- <orderedlist>
- <listitem>
- <para>Here we start our root config block. The root config block is the default configuration for all web service clients (Call, Proxy objects).</para>
- </listitem>
- <listitem>
- <para>This means that the client must sign the message body of all requests it sends. Type means that we are to use a X.509v3 certificate (a standard certificate). The alias option says that the certificate/key pair to use for signing is in the key store under the "wsse" alias</para>
- </listitem>
- <listitem>
- <para>Here we start our optional requires block. This block specifies all security requirements that must be met when the client receives a response.</para>
- </listitem>
- <listitem>
- <para> This means that all web service clients must receive signed response messages.</para>
- </listitem>
- </orderedlist>
- </para>
+ <para>
+ <orderedlist>
+ <listitem>
+ <para>Here we start our root config block. The root config block is the default configuration for all web service clients (Call, Proxy objects).</para>
+ </listitem>
+ <listitem>
+ <para>This means that the client must sign the message body of all requests it sends. Type means that we are to use a X.509v3 certificate (a standard certificate). The alias option says that the certificate/key pair to use for signing is in the key store under the "wsse" alias</para>
+ </listitem>
+ <listitem>
+ <para>Here we start our optional requires block. This block specifies all security requirements that must be met when the client receives a response.</para>
+ </listitem>
+ <listitem>
+ <para> This means that all web service clients must receive signed response messages.</para>
+ </listitem>
+ </orderedlist>
+ </para>
- <para>We did not specify a key store or trust store, because client apps instead use the wsse System properties instead. If this was a web or ejb client (meaning a webservice client in a war or ejb jar file), then we would have specified them in the client descriptor.</para>
+ <para>We did not specify a key store or trust store, because client apps instead use the wsse System properties instead. If this was a web or ejb client (meaning a webservice client in a war or ejb jar file), then we would have specified them in the client descriptor.</para>
- <para><command>SOAP message exchange</command></para>
-
- <para>Below you see the incomming SOAP message with the details of the security headers ommited. The idea is, that the SOAP body is still
- plain text, but it is signed in the security header and can therefore not manipulated in transit.</para>
-
- <para>
- <programlisting><![CDATA[
+ </sect1>
+
+ <sect1>
+ <title>SOAP message exchange</title>
+
+ <para>Below you see the incomming SOAP message with the details of the security headers ommited. The idea is, that the SOAP body is still
+ plain text, but it is signed in the security header and can therefore not manipulated in transit.</para>
+
+ <para>
+ <programlisting><![CDATA[
Incomming SOAPMessage
<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
@@ -189,38 +321,38 @@
</env:Body>
</env:Envelope>
]]></programlisting></para>
-
- <para><command>Installing the BouncyCastle JCE provider</command></para>
-
- <para>
- The information below has originaly been provided by <ulink url="http://www.bouncycastle.org/specifications.html#install">The Legion of the Bouncy Castle</ulink>.
- </para>
-
- <para>
- The provider can be configured as part of your environment via static registration by adding an
- entry to the java.security properties file (found in $JAVA_HOME/jre/lib/security/java.security,
- where $JAVA_HOME is the location of your JDK/JRE distribution).
- You'll find detailed instructions in the file but basically it comes down to adding a line:
- </para>
- <para>
- <programlisting><![CDATA[
+ </sect1>
+
+ <sect1>
+ <title>Installing the BouncyCastle JCE provider (JDK 1.4)</title>
+
+ <para>
+ The information below has originaly been provided by <ulink url="http://www.bouncycastle.org/specifications.html#install">The Legion of the Bouncy Castle</ulink>.
+ </para>
+
+ <para>
+ The provider can be configured as part of your environment via static registration by adding an
+ entry to the java.security properties file (found in $JAVA_HOME/jre/lib/security/java.security,
+ where $JAVA_HOME is the location of your JDK/JRE distribution).
+ You'll find detailed instructions in the file but basically it comes down to adding a line:
+ </para>
+
+ <para>
+ <programlisting><![CDATA[
security.provider.<n>=org.bouncycastle.jce.provider.BouncyCastleProvider
]]></programlisting></para>
- <para>
- Where <n> is the preference you want the provider at (1 being the most prefered).
- Note: issues arise if the Sun provided providers are not first.
- </para>
+ <para>
+ Where <n> is the preference you want the provider at.
+ <note><para>Issues may arise if the Sun provided providers are not first.</para></note>
+ </para>
- <para>
- Where you put the jar is up to mostly up to you, although with jdk1.4 the best
- (and in some cases only) place to have it is in $JAVA_HOME/jre/lib/ext.
- </para>
-
- <para>
- Note: under Windows there will normally be a JRE and a JDK install of Java if you think you have installed it
- correctly and it still doesn't work chances are you have added the provider to the installation not being used.
- </para>
-
+ <para>
+ Where you put the jar is up to mostly up to you, although with jdk1.4 the best
+ (and in some cases only) place to have it is in $JAVA_HOME/jre/lib/ext.
+ Under Windows there will normally be a JRE and a JDK install of Java if you think you have installed it
+ correctly and it still doesn't work chances are you have added the provider to the installation not being used.
+ </para>
+ </sect1>
</chapter>
\ No newline at end of file
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/TomcatServiceEndpointPublisher.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -34,7 +34,6 @@
import org.jboss.util.NotImplementedException;
import org.jboss.ws.deployment.ServiceEndpointPublisher;
import org.jboss.ws.deployment.UnifiedDeploymentInfo;
-import org.jboss.ws.tools.wspublish;
/**
* Publish the HTTP service endpoint to Tomcat
Added: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ws.integration.tomcat;
+
+// $Id$
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+import org.jboss.util.file.JarUtils;
+
+/**
+ * Publish a standard portable J2EE web service endpoint
+ * to standalone Tomcat
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 15-May-2006
+ */
+public class wspublish
+{
+ // provide logging
+ protected final Logger log = Logger.getLogger(wspublish.class);
+
+ public static final String DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET = "org.jboss.ws.integration.other.GenericServiceEndpointServlet";
+
+ public URL process(URL warURL, File destDir, String servletName) throws IOException
+ {
+ if (warURL == null)
+ throw new IllegalArgumentException("Invalid war URL: " + warURL);
+
+ if (destDir == null || destDir.isDirectory() == false)
+ throw new IllegalArgumentException("Invalid destintion dir: " + destDir);
+
+ if (servletName == null)
+ servletName = DEFAULT_TOMCAT_SERVICE_ENDPOINT_SERVLET;
+
+ InputStream in = warURL.openStream();
+ String warName = new File(warURL.getFile()).getName();
+ File tmpDir = new File("./wspublish/" + warName);
+ tmpDir.mkdirs();
+
+ log.debug("Extracting war to: " + tmpDir);
+ JarUtils.unjar(in, tmpDir);
+ in.close();
+
+ TomcatServiceEndpointPublisher publisher = new TomcatServiceEndpointPublisher();
+ publisher.setServiceEndpointServlet(servletName);
+ publisher.rewriteWebXML(tmpDir.toURL());
+
+ File outFile = new File(destDir.getCanonicalPath() + "/" + warName);
+ outFile.getParentFile().mkdirs();
+
+ log.info("Writing war to: " + outFile.toURL());
+ FileOutputStream fos = new FileOutputStream(outFile);
+ JarUtils.jar(fos, tmpDir.listFiles());
+ fos.close();
+
+ return outFile.toURL();
+ }
+
+ public static void main(String[] args) throws Exception
+ {
+ URL warURL = null;
+ File destDir = null;
+ String servletName = null;
+
+ for (int i = 0; i < args.length; i++)
+ {
+ String arg = args[i];
+ if ("-url".equals(arg))
+ {
+ warURL = getURL(args[i + 1]);
+ i++;
+ }
+ else if ("-dest".equals(arg))
+ {
+ destDir = new File(args[i + 1]);
+ i++;
+ }
+ else if ("-servlet".equals(arg))
+ {
+ servletName = args[i + 1];
+ i++;
+ }
+ }
+
+ if (warURL == null || destDir == null)
+ {
+ System.out.println("Usage: wspublish -url warURL -dest webappsDir [-servlet servletName]");
+ System.exit(1);
+ }
+
+ // process the args
+ new wspublish().process(warURL, destDir, servletName);
+ }
+
+ private static URL getURL(String urlStr)
+ {
+ URL warURL = null;
+ try
+ {
+ warURL = new URL(urlStr);
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ try
+ {
+ warURL = new File(urlStr).toURL();
+ }
+ catch (MalformedURLException ex)
+ {
+ // ignore
+ }
+ return warURL;
+ }
+}
Property changes on: branches/tdiesler/trunk/src/main/java/org/jboss/ws/integration/tomcat/wspublish.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HttpServer.java
===================================================================
--- branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HttpServer.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/main/java/org/jboss/ws/server/HttpServer.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -28,7 +28,6 @@
import javax.xml.ws.Endpoint;
-import org.jboss.ws.integration.jboss.JBossHttpServer;
import org.jboss.ws.jaxws.util.FactoryFinder;
/**
@@ -40,7 +39,7 @@
public abstract class HttpServer
{
public static String HTTP_SERVER_PROPERTY = HttpServer.class.getName();
- public static String DEFAULT_HTTP_SERVER_PROPERTY = JBossHttpServer.class.getName();
+ public static String DEFAULT_HTTP_SERVER_PROPERTY = "org.jboss.ws.integration.jboss.JBossHttpServer";
private Map<String, Object> properties = new HashMap<String, Object>();
Modified: branches/tdiesler/trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml
===================================================================
--- branches/tdiesler/trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/main/resources/jbossws.war/JBoss/WEB-INF/web.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -19,7 +19,7 @@
<servlet>
<servlet-name>PortComponentLinkServlet</servlet-name>
- <servlet-class>org.jboss.ws.server.PortComponentLinkServlet</servlet-class>
+ <servlet-class>org.jboss.ws.integration.jboss.PortComponentLinkServlet</servlet-class>
</servlet>
<!-- now the mappings -->
Modified: branches/tdiesler/trunk/src/test/build.xml
===================================================================
--- branches/tdiesler/trunk/src/test/build.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/build.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -32,7 +32,7 @@
<available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/>
<available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <!-- JBoss Home -->
+ <!-- JBoss Home -->
<condition property="jboss.home" value="${jboss.jdk14.home}">
<not>
<isset property="HAVE_JDK_1.5"/>
@@ -84,6 +84,8 @@
<echo message="-----------------------------------------------"/>
<available property="jbossws.available" file="${jboss.home}/client/jbossall-client.jar"/>
+ <available property="installer.setup" file="jboss-ejb3-client.jar"/>
+
<fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/>
<mkdir dir="${build.test.dir}/log"/>
@@ -126,10 +128,10 @@
<pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jboss-common.jar"/>
- <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
<pathelement location="${jboss.client}/jbossretro-rt.jar"/>
<pathelement location="${jboss.client}/jboss-backport-concurrent.jar"/>
+ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
<pathelement location="${jboss.client}/${jbossws.client.jar}"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/mail.jar"/>
@@ -205,8 +207,7 @@
<target name="compile-generated" depends="init" description="Compile generated sources">
<mkdir dir="${build.test.dir}/classes"/>
- <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <javac destdir="${build.test.dir}/classes" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
<src path="${build.test.dir}/wstools/java"/>
<classpath refid="javac.classpath"/>
</javac>
@@ -244,7 +245,7 @@
<mkdir dir="${build.test.dir}/libs"/>
<ant antfile="${test.dir}/ant/build-jars.xml" target="build-jars" inheritall="true"/>
</target>
-
+
<!--
Generate samples sources
-->
@@ -297,13 +298,12 @@
</filterset>
</copy>
</target>
-
+
<!-- Custom targets that are not needed very often -->
-
+
<target name="build-benchmark" depends="main">
- <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
+ <ant antfile="src/test/ant/build-benchmark-jars.xml" target="build-benchmark-jars" inheritall="true"/>
</target>
-
<!-- ================================================================== -->
<!-- Testing -->
@@ -328,15 +328,6 @@
<antcall target="tests-report"/>
</target>
- <!-- Run samples test cases -->
- <target name="tests-jaxws" depends="main" description="Run jaxws unit tests">
- <antcall target="tests-main">
- <param name="include.wildcard" value="org/jboss/test/ws/jaxws/**/*TestCase.class"/>
- <param name="excludesfile" value="${tests.excludesfile}"/>
- </antcall>
- <antcall target="tests-report"/>
- </target>
-
<!-- Run tools test cases -->
<target name="tests-tools" depends="main" description="Run tools unit tests">
<antcall target="tests-main">
@@ -396,7 +387,7 @@
-->
<target name="one-test" depends="init" if="test" description="Run a single unit test">
<junit printsummary="yes" showoutput="yes" dir="${build.test.dir}">
- <!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/-->
+ <!-- jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"/ -->
<jvmarg value="-Djava.security.manager"/>
<sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/>
<sysproperty key="jboss.home" value="${jboss.home}"/>
@@ -460,5 +451,5 @@
<target name="clean" description="Delete all generated test files.">
<delete dir="${build.test.dir}"/>
</target>
-
+
</project>
Modified: branches/tdiesler/trunk/src/test/etc/log4j.xml
===================================================================
--- branches/tdiesler/trunk/src/test/etc/log4j.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/etc/log4j.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -61,7 +61,7 @@
</category>
<category name="jbossws.SOAPMessage">
- <priority value="DEBUG"/>
+ <priority value="DEBUG"/>
</category>
<!--
Added: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/JBWS1068TestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/JBWS1068TestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/JBWS1068TestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,48 @@
+/*
+ * 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.jbws1068;
+
+import java.io.File;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
+import org.jboss.ws.metadata.wsdl.WSDLDefinitionsFactory;
+
+/**
+ * Cannot handle xsd:import of xml schema
+ *
+ * http://jira.jboss.org/jira/browse/JBWS-1068
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 14-Jul-2006
+ */
+public class JBWS1068TestCase extends JBossWSTest
+{
+ public void testWSDLParse() throws Exception
+ {
+ File wsdlFile = new File("resources/jbws1068/wsrp_services.wsdl");
+ assertTrue(wsdlFile.exists());
+
+ WSDLDefinitionsFactory factory = WSDLDefinitionsFactory.newInstance();
+ WSDLDefinitions wsdlDefinitions = factory.parse(wsdlFile.toURL());
+ }
+}
Property changes on: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws1068/JBWS1068TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws718/JBWS718TestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws718/JBWS718TestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws718/JBWS718TestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -31,7 +31,7 @@
import javax.xml.rpc.Service;
/**
- * Support sequences of anys
+ * DOM Serialization in ServiceReferencable leads to stack overflow
*
* http://jira.jboss.org/jira/browse/JBWS-718
*
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws732/JBWS732TestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws732/JBWS732TestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws732/JBWS732TestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -30,7 +30,7 @@
import org.jboss.test.ws.JBossWSTestSetup;
/**
- * Marshalling empty arrays arrays nil=true
+ * Empty unwrapped arrays incorrectly unmarshalled as a null value
* http://jira.jboss.org/jira/browse/JBWS-732
*
* @author Thomas.Diesler at jboss.org
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws801/JBWS801TestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws801/JBWS801TestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws801/JBWS801TestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jbws801;
+// $Id: $
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws944/JBWS944TestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws944/JBWS944TestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/jbws944/JBWS944TestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.jbws944;
+// $Id: $
+
import java.net.MalformedURLException;
import java.net.URL;
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/jmstransport/JMSTransportTestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -26,8 +26,6 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.util.xml.DOMUtils;
-import EDU.oswego.cs.dl.util.concurrent.CountDown;
-
/**
* A web service client that connects to a MDB endpoint.
*
@@ -36,8 +34,6 @@
*/
public class JMSTransportTestCase extends JBossWSTest
{
- static CountDown done = new CountDown(1);
-
public static Test suite() throws Exception
{
return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jbossws-samples-jmstransport.sar");
@@ -86,7 +82,7 @@
sender.send(message);
sender.close();
- Thread.sleep(1000);
+ Thread.sleep(500);
assertNotNull("Expected response message", responseListener.resMessage);
assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage));
@@ -102,7 +98,6 @@
public void onMessage(Message msg)
{
- done.release();
TextMessage textMessage = (TextMessage)msg;
try
{
Modified: branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/secureejb/SecureEJBTestCase.java 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/java/org/jboss/test/ws/samples/secureejb/SecureEJBTestCase.java 2006-08-30 22:00:35 UTC (rev 862)
@@ -21,6 +21,8 @@
*/
package org.jboss.test.ws.samples.secureejb;
+// $Id: $
+
import java.rmi.RemoteException;
import javax.naming.InitialContext;
@@ -102,11 +104,11 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured");
QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort");
- OrganizationService endpoint = (OrganizationService)service.getPort(portName, OrganizationService.class);
+ OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
try
{
- endpoint.getContactInfo("mafia");
+ port.getContactInfo("mafia");
fail("Security exception expected");
}
catch (RemoteException ignore)
@@ -114,11 +116,11 @@
// ignore expected exception
}
- Stub stub = (Stub)endpoint;
+ Stub stub = (Stub)port;
stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME);
stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD);
- String info = endpoint.getContactInfo("mafia");
+ String info = port.getContactInfo("mafia");
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
@@ -127,11 +129,11 @@
InitialContext iniCtx = getInitialContext();
Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured");
QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort");
- OrganizationService endpoint = (OrganizationService)service.getPort(portName, OrganizationService.class);
+ OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
try
{
- endpoint.getContactInfo("mafia");
+ port.getContactInfo("mafia");
fail("Security exception expected");
}
catch (RemoteException ignore)
@@ -139,11 +141,40 @@
// ignore expected exception
}
- Stub stub = (Stub)endpoint;
+ Stub stub = (Stub)port;
stub._setProperty(Stub.USERNAME_PROPERTY, USERNAME);
stub._setProperty(Stub.PASSWORD_PROPERTY, PASSWORD);
- String info = endpoint.getContactInfo("mafia");
+ String info = port.getContactInfo("mafia");
assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
}
+
+ public void testConfidentialServiceAccess() throws Exception
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured");
+ QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort");
+ OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class);
+
+ Stub stub = (Stub)port;
+ String address = (String)stub._getProperty(Stub.ENDPOINT_ADDRESS_PROPERTY);
+ assertEquals("https://" + getServerHost() + ":8443/ws4ee-samples-ejb/ConfidentialSecured", address);
+
+ // test non-confidential access
+ try
+ {
+ stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/ws4ee-samples-ejb/ConfidentialSecured");
+ port.getContactInfo("mafia");
+ fail("Security exception expected");
+ }
+ catch (RemoteException ignore)
+ {
+ // ignore expected exception
+ }
+
+ // test confidential access
+ //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/ws4ee-samples-ejb/ConfidentialSecured");
+ //String info = port.getContactInfo("mafia");
+ //assertEquals("The 'mafia' boss is currently out of office, please call again.", info);
+ }
}
Added: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_services.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_services.wsdl 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_services.wsdl 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"
+ xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:intf="urn:oasis:names:tc:wsrp:v1:intf"
+ xmlns:tns="urn:oasis:names:tc:wsrp:v1:wsdl">
+
+ <import namespace="urn:oasis:names:tc:wsrp:v1:bind" location="wsrp_v1_bindings.wsdl"/>
+
+ <wsdl:service name="WSRPService">
+ <wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPMarkupService">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </wsdl:port>
+
+ <wsdl:port binding="bind:WSRP_v1_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </wsdl:port>
+
+ <wsdl:port binding="bind:WSRP_v1_Registration_Binding_SOAP" name="WSRPRegistrationService">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </wsdl:port>
+
+ <wsdl:port binding="bind:WSRP_v1_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_services.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_bindings.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_bindings.wsdl 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_bindings.wsdl 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,417 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:bind"
+ xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind"
+ xmlns:intf="urn:oasis:names:tc:wsrp:v1:intf"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+<!-- This file reflects v1.0 of the specification -->
+
+
+ <import namespace="urn:oasis:names:tc:wsrp:v1:intf"
+ location="wsrp_v1_interfaces.wsdl"/>
+
+ <wsdl:binding name="WSRP_v1_Markup_Binding_SOAP" type="intf:WSRP_v1_Markup_PortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="getMarkup">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:getMarkup"/>
+ <wsdl:input name="getMarkup">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getMarkupResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidCookie">
+ <soap:fault name="InvalidCookie" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidSession">
+ <soap:fault name="InvalidSession" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedMode">
+ <soap:fault name="UnsupportedMode" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedWindowState">
+ <soap:fault name="UnsupportedWindowState" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedLocale">
+ <soap:fault name="UnsupportedLocale" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedMimeType">
+ <soap:fault name="UnsupportedMimeType" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="performBlockingInteraction">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:performBlockingInteraction"/>
+ <wsdl:input name="performBlockingInteraction">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="performBlockingInteractionResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="PortletStateChangeRequired">
+ <soap:fault name="PortletStateChangeRequired" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidCookie">
+ <soap:fault name="InvalidCookie" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidSession">
+ <soap:fault name="InvalidSession" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedMode">
+ <soap:fault name="UnsupportedMode" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedWindowState">
+ <soap:fault name="UnsupportedWindowState" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedLocale">
+ <soap:fault name="UnsupportedLocale" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="UnsupportedMimeType">
+ <soap:fault name="UnsupportedMimeType" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="releaseSessions">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:releaseSessions"/>
+ <wsdl:input name="releaseSessions">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="releaseSessionsResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="initCookie">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:initCookie"/>
+ <wsdl:input name="initCookie">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="initCookieResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+
+ <wsdl:binding name="WSRP_v1_ServiceDescription_Binding_SOAP" type="intf:WSRP_v1_ServiceDescription_PortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="getServiceDescription">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:getServiceDescription"/>
+ <wsdl:input name="getServiceDescription">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getServiceDescriptionResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="WSRP_v1_PortletManagement_Binding_SOAP" type="intf:WSRP_v1_PortletManagement_PortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="getPortletDescription">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:getPortletDescription"/>
+ <wsdl:input name="getPortletDescription">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getPortletDescriptionResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="clonePortlet">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:clonePortlet"/>
+ <wsdl:input name="clonePortlet">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="clonePortletResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="destroyPortlets">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:destroyPortlets"/>
+ <wsdl:input name="destroyPortlets">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="destroyPortletsResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="setPortletProperties">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:setPortletProperties"/>
+ <wsdl:input name="setPortletProperties">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="setPortletPropertiesResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="getPortletProperties">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:getPortletProperties"/>
+ <wsdl:input name="getPortletProperties">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getPortletPropertiesResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="getPortletPropertyDescription">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:getPortletPropertyDescription"/>
+ <wsdl:input name="getPortletPropertyDescription">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="getPortletPropertyDescriptionResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="AccessDenied">
+ <soap:fault name="AccessDenied" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidUserCategory">
+ <soap:fault name="InvalidUserCategory" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InconsistentParameters">
+ <soap:fault name="InconsistentParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="InvalidHandle">
+ <soap:fault name="InvalidHandle" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+
+ <wsdl:binding name="WSRP_v1_Registration_Binding_SOAP" type="intf:WSRP_v1_Registration_PortType">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+ <wsdl:operation name="register">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:register"/>
+ <wsdl:input name="register">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="registerResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="deregister">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:deregister"/>
+ <wsdl:input name="deregister">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="deregisterResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+
+ <wsdl:operation name="modifyRegistration">
+ <soap:operation soapAction="urn:oasis:names:tc:wsrp:v1:modifyRegistration"/>
+ <wsdl:input name="modifyRegistration">
+ <soap:body use="literal"/>
+ </wsdl:input>
+ <wsdl:output name="modifyRegistrationResponse">
+ <soap:body use="literal"/>
+ </wsdl:output>
+ <wsdl:fault name="InvalidRegistration">
+ <soap:fault name="InvalidRegistration" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="MissingParameters">
+ <soap:fault name="MissingParameters" use="literal"/>
+ </wsdl:fault>
+ <wsdl:fault name="OperationFailed">
+ <soap:fault name="OperationFailed" use="literal"/>
+ </wsdl:fault>
+ </wsdl:operation>
+ </wsdl:binding>
+</wsdl:definitions>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_bindings.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_interfaces.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_interfaces.wsdl 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_interfaces.wsdl 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,348 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v1:intf"
+ xmlns:types="urn:oasis:names:tc:wsrp:v1:types"
+ xmlns:intf="urn:oasis:names:tc:wsrp:v1:intf"
+
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ >
+
+<!-- This file reflects v1.0 of the specification -->
+
+ <wsdl:types>
+ <schema targetNamespace="urn:oasis:names:tc:wsrp:v1:intf"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+ <import namespace="urn:oasis:names:tc:wsrp:v1:types" schemaLocation="wsrp_v1_types.xsd"/>
+
+ </schema>
+ </wsdl:types>
+
+
+ <!-- - - - - - - - - -->
+ <!-- fault messages -->
+ <!-- - - - - - - - - -->
+
+ <wsdl:message name="AccessDenied">
+ <wsdl:part name="fault" element="types:AccessDenied"/>
+ </wsdl:message>
+
+ <wsdl:message name="InvalidUserCategory">
+ <wsdl:part name="fault" element="types:InvalidUserCategory"/>
+ </wsdl:message>
+
+ <wsdl:message name="InconsistentParameters">
+ <wsdl:part name="fault" element="types:InconsistentParameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="InvalidRegistration">
+ <wsdl:part name="fault" element="types:InvalidRegistration"/>
+ </wsdl:message>
+
+ <wsdl:message name="MissingParameters">
+ <wsdl:part name="fault" element="types:MissingParameters"/>
+ </wsdl:message>
+
+ <wsdl:message name="OperationFailed">
+ <wsdl:part name="fault" element="types:OperationFailed"/>
+ </wsdl:message>
+
+ <wsdl:message name="InvalidHandle">
+ <wsdl:part name="fault" element="types:InvalidHandle"/>
+ </wsdl:message>
+
+ <wsdl:message name="PortletStateChangeRequired">
+ <wsdl:part name="fault" element="types:PortletStateChangeRequired"/>
+ </wsdl:message>
+
+ <wsdl:message name="InvalidCookie">
+ <wsdl:part name="fault" element="types:InvalidCookie"/>
+ </wsdl:message>
+
+ <wsdl:message name="InvalidSession">
+ <wsdl:part name="fault" element="types:InvalidSession"/>
+ </wsdl:message>
+
+ <wsdl:message name="UnsupportedMode">
+ <wsdl:part name="fault" element="types:UnsupportedMode"/>
+ </wsdl:message>
+
+ <wsdl:message name="UnsupportedWindowState">
+ <wsdl:part name="fault" element="types:UnsupportedWindowState"/>
+ </wsdl:message>
+
+ <wsdl:message name="UnsupportedLocale">
+ <wsdl:part name="fault" element="types:UnsupportedLocale"/>
+ </wsdl:message>
+
+ <wsdl:message name="UnsupportedMimeType">
+ <wsdl:part name="fault" element="types:UnsupportedMimeType"/>
+ </wsdl:message>
+
+
+ <!-- - - - - - - - - - - -->
+ <!-- Operations messages -->
+ <!-- - - - - - - - - - - -->
+
+ <wsdl:message name="getMarkup">
+ <wsdl:part name="getMarkup" element="types:getMarkup"/>
+ </wsdl:message>
+ <wsdl:message name="getMarkupResponse">
+ <wsdl:part name="getMarkupResponse" element="types:getMarkupResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="performBlockingInteraction">
+ <wsdl:part name="performBlockingInteraction" element="types:performBlockingInteraction"/>
+ </wsdl:message>
+ <wsdl:message name="performBlockingInteractionResponse">
+ <wsdl:part name="performBlockingInteractionResponse" element="types:performBlockingInteractionResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="getServiceDescription">
+ <wsdl:part name="getServiceDescription" element="types:getServiceDescription"/>
+ </wsdl:message>
+ <wsdl:message name="getServiceDescriptionResponse">
+ <wsdl:part name="getServiceDescriptionResponse" element="types:getServiceDescriptionResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="register">
+ <wsdl:part name="register" element="types:register"/>
+ </wsdl:message>
+ <wsdl:message name="registerResponse">
+ <wsdl:part name="registerResponse" element="types:registerResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="deregister">
+ <wsdl:part name="deregister" element="types:deregister"/>
+ </wsdl:message>
+ <wsdl:message name="deregisterResponse">
+ <wsdl:part name="deregisterResponse" element="types:deregisterResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="modifyRegistration">
+ <wsdl:part name="modifyRegistration" element="types:modifyRegistration"/>
+ </wsdl:message>
+ <wsdl:message name="modifyRegistrationResponse">
+ <wsdl:part name="modifyRegistrationResponse" element="types:modifyRegistrationResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="getPortletDescription">
+ <wsdl:part name="getPortletDescription" element="types:getPortletDescription"/>
+ </wsdl:message>
+ <wsdl:message name="getPortletDescriptionResponse">
+ <wsdl:part name="getPortletDescriptionResponse" element="types:getPortletDescriptionResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="clonePortlet">
+ <wsdl:part name="clonePortlet" element="types:clonePortlet"/>
+ </wsdl:message>
+ <wsdl:message name="clonePortletResponse">
+ <wsdl:part name="clonePortletResponse" element="types:clonePortletResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="destroyPortlets">
+ <wsdl:part name="destroyPortlets" element="types:destroyPortlets"/>
+ </wsdl:message>
+ <wsdl:message name="destroyPortletsResponse">
+ <wsdl:part name="destroyPortletsResponse" element="types:destroyPortletsResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="setPortletProperties">
+ <wsdl:part name="setPortletProperties" element="types:setPortletProperties"/>
+ </wsdl:message>
+ <wsdl:message name="setPortletPropertiesResponse">
+ <wsdl:part name="setPortletPropertiesResponse" element="types:setPortletPropertiesResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="getPortletProperties">
+ <wsdl:part name="getPortletProperties" element="types:getPortletProperties"/>
+ </wsdl:message>
+ <wsdl:message name="getPortletPropertiesResponse">
+ <wsdl:part name="getPortletPropertiesResponse" element="types:getPortletPropertiesResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="getPortletPropertyDescription">
+ <wsdl:part name="getPortletPropertyDescription" element="types:getPortletPropertyDescription"/>
+ </wsdl:message>
+ <wsdl:message name="getPortletPropertyDescriptionResponse">
+ <wsdl:part name="getPortletPropertyDescriptionResponse" element="types:getPortletPropertyDescriptionResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="releaseSessions">
+ <wsdl:part name="releaseSessions" element="types:releaseSessions"/>
+ </wsdl:message>
+ <wsdl:message name="releaseSessionsResponse">
+ <wsdl:part name="releaseSessionsResponse" element="types:releaseSessionsResponse"/>
+ </wsdl:message>
+
+ <wsdl:message name="initCookie">
+ <wsdl:part name="initCookie" element="types:initCookie"/>
+ </wsdl:message>
+ <wsdl:message name="initCookieResponse">
+ <wsdl:part name="initCookieResponse" element="types:initCookieResponse"/>
+ </wsdl:message>
+
+ <wsdl:portType name="WSRP_v1_Markup_PortType">
+ <wsdl:operation name="getMarkup">
+ <wsdl:input message="intf:getMarkup" name="getMarkup"/>
+ <wsdl:output message="intf:getMarkupResponse" name="getMarkupResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/>
+ <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/>
+ <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/>
+ <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/>
+ <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/>
+ <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="performBlockingInteraction">
+ <wsdl:input message="intf:performBlockingInteraction" name="performBlockingInteraction"/>
+ <wsdl:output message="intf:performBlockingInteractionResponse" name="performBlockingInteractionResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ <wsdl:fault message="intf:PortletStateChangeRequired" name="PortletStateChangeRequired"/>
+ <wsdl:fault message="intf:InvalidCookie" name="InvalidCookie"/>
+ <wsdl:fault message="intf:InvalidSession" name="InvalidSession"/>
+ <wsdl:fault message="intf:UnsupportedMode" name="UnsupportedMode"/>
+ <wsdl:fault message="intf:UnsupportedWindowState" name="UnsupportedWindowState"/>
+ <wsdl:fault message="intf:UnsupportedLocale" name="UnsupportedLocale"/>
+ <wsdl:fault message="intf:UnsupportedMimeType" name="UnsupportedMimeType"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="releaseSessions">
+ <wsdl:input message="intf:releaseSessions" name="releaseSessions"/>
+ <wsdl:output message="intf:releaseSessionsResponse" name="releaseSessionsResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="initCookie">
+ <wsdl:input message="intf:initCookie" name="initCookie"/>
+ <wsdl:output message="intf:initCookieResponse" name="initCookieResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="WSRP_v1_ServiceDescription_PortType">
+ <wsdl:operation name="getServiceDescription">
+ <wsdl:input message="intf:getServiceDescription" name="getServiceDescription"/>
+ <wsdl:output message="intf:getServiceDescriptionResponse" name="getServiceDescriptionResponse"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="WSRP_v1_Registration_PortType">
+ <wsdl:operation name="register">
+ <wsdl:input message="intf:register" name="register"/>
+ <wsdl:output message="intf:registerResponse" name="registerResponse"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="deregister">
+ <wsdl:input message="intf:deregister" name="deregister"/>
+ <wsdl:output message="intf:deregisterResponse" name="deregisterResponse"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="modifyRegistration">
+ <wsdl:input message="intf:modifyRegistration" name="modifyRegistration"/>
+ <wsdl:output message="intf:modifyRegistrationResponse" name="modifyRegistrationResponse"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:portType name="WSRP_v1_PortletManagement_PortType">
+ <wsdl:operation name="getPortletDescription">
+ <wsdl:input message="intf:getPortletDescription" name="getPortletDescription"/>
+ <wsdl:output message="intf:getPortletDescriptionResponse" name="getPortletDescriptionResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="clonePortlet">
+ <wsdl:input message="intf:clonePortlet" name="clonePortlet"/>
+ <wsdl:output message="intf:clonePortletResponse" name="clonePortletResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="destroyPortlets">
+ <wsdl:input message="intf:destroyPortlets" name="destroyPortlets"/>
+ <wsdl:output message="intf:destroyPortletsResponse" name="destroyPortletsResponse"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="setPortletProperties">
+ <wsdl:input message="intf:setPortletProperties" name="setPortletProperties"/>
+ <wsdl:output message="intf:setPortletPropertiesResponse" name="setPortletPropertiesResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="getPortletProperties">
+ <wsdl:input message="intf:getPortletProperties" name="getPortletProperties"/>
+ <wsdl:output message="intf:getPortletPropertiesResponse" name="getPortletPropertiesResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ </wsdl:operation>
+
+ <wsdl:operation name="getPortletPropertyDescription">
+ <wsdl:input message="intf:getPortletPropertyDescription" name="getPortletPropertyDescription"/>
+ <wsdl:output message="intf:getPortletPropertyDescriptionResponse" name="getPortletPropertyDescriptionResponse"/>
+ <wsdl:fault message="intf:AccessDenied" name="AccessDenied"/>
+ <wsdl:fault message="intf:InvalidUserCategory" name="InvalidUserCategory"/>
+ <wsdl:fault message="intf:InconsistentParameters" name="InconsistentParameters"/>
+ <wsdl:fault message="intf:InvalidRegistration" name="InvalidRegistration"/>
+ <wsdl:fault message="intf:MissingParameters" name="MissingParameters"/>
+ <wsdl:fault message="intf:OperationFailed" name="OperationFailed"/>
+ <wsdl:fault message="intf:InvalidHandle" name="InvalidHandle"/>
+ </wsdl:operation>
+ </wsdl:portType>
+</wsdl:definitions>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_interfaces.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_types.xsd
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_types.xsd 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_types.xsd 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,854 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="urn:oasis:names:tc:wsrp:v1:types"
+ xmlns:types="urn:oasis:names:tc:wsrp:v1:types"
+
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+
+ elementFormDefault="qualified">
+
+<!-- This file reflects v1.0 of the specification -->
+
+ <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+ <!-- - - - - - - - - - - - - - - - - -->
+ <!-- General types used throughout -->
+ <!-- - - - - - - - - - - - - - - - - -->
+
+ <!-- This definition matches the WSRP v1 specification, but is not used throughout the
+ rest of these definitions as not all stacks are able to handle restrictions on strings
+ -->
+ <simpleType name="Handle">
+ <restriction base="xsd:string">
+ <xsd:minLength value="1"/>
+ <xsd:maxLength value="255"/>
+ </restriction>
+ </simpleType>
+ <element name="Handle" type="types:Handle"/>
+
+ <!-- This definition matches the WSRP v1 specification, but is not used throughout the
+ rest of these definitions as not all stacks are able to handle restrictions on strings
+ -->
+ <simpleType name="ID">
+ <restriction base="xsd:string">
+ <xsd:minLength value="1"/>
+ <xsd:maxLength value="4096"/>
+ </restriction>
+ </simpleType>
+ <element name="ID" type="types:ID"/>
+
+ <!-- This definition matches the WSRP v1 specification, but is not used throughout the
+ rest of these definitions as not all stacks are able to handle restrictions on strings
+ -->
+ <simpleType name="Key">
+ <restriction base="xsd:string">
+ <xsd:minLength value="1"/>
+ <xsd:maxLength value="255"/>
+ </restriction>
+ </simpleType>
+ <element name="Key" type="types:Key"/>
+
+ <complexType name="Extension">
+ <sequence>
+ <!-- JBoss modification: added processContents="lax" to better process extensions. -->
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="LocalizedString">
+ <sequence>
+ <element name="value" type="xsd:string"/>
+ </sequence>
+ <attribute ref="xml:lang" use="required"/>
+ <attribute name="resourceName" type="xsd:string"/>
+ </complexType>
+
+ <complexType name="ResourceList">
+ <sequence>
+ <element name="resources" type="types:Resource" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Resource">
+ <sequence>
+ <element name="values" type="types:ResourceValue" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="resourceName" type="xsd:string" use="required"/>
+ </complexType>
+
+ <complexType name="ResourceValue">
+ <sequence>
+ <element name="value" type="xsd:string"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute ref="xml:lang" use="required"/>
+ </complexType>
+
+ <complexType name="StringArray">
+ <sequence>
+ <element name="String" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="StringArray" type="types:StringArray"/>
+
+ <complexType name="NamedString">
+ <sequence>
+ <element name="value" type="xsd:string"/>
+ </sequence>
+ <attribute name="name" type="xsd:string" use="required"/>
+ </complexType>
+
+ <complexType name="NamedStringArray">
+ <sequence>
+ <element name="NamedString" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="NamedStringArray" type="types:NamedStringArray"/>
+
+ <!-- - - - - - - - - -->
+ <!-- Producer types -->
+ <!-- - - - - - - - - -->
+
+ <complexType name="RegistrationData">
+ <sequence>
+ <element name="consumerName" type="xsd:string"/>
+ <element name="consumerAgent" type="xsd:string"/>
+ <element name="methodGetSupported" type="xsd:boolean"/>
+ <element name="consumerModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="consumerWindowStates" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="consumerUserScopes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="customUserProfileData" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="registrationProperties" type="types:Property" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="RegistrationData" type="types:RegistrationData"/>
+
+ <complexType name="RegistrationState">
+ <sequence>
+ <element name="registrationState" type="xsd:base64Binary" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="RegistrationState" type="types:RegistrationState"/>
+
+ <complexType name="RegistrationContext">
+ <sequence>
+ <!-- <element name="registrationHandle" type="types:Handle"/>
+ JAX-RPC RI doesn't handle restrictions on xsd:string
+ -->
+ <element name="registrationHandle" type="xsd:string"/>
+ <element name="registrationState" type="xsd:base64Binary" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="RegistrationContext" type="types:RegistrationContext"/>
+
+ <complexType name="SessionContext">
+ <sequence>
+ <element name="sessionID" type="xsd:string"/>
+ <element name="expires" type="xsd:int"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="SessionContext" type="types:SessionContext"/>
+
+ <complexType name="RuntimeContext">
+ <sequence>
+ <element name="userAuthentication" type="xsd:string"/>
+ <element name="portletInstanceKey" type="xsd:string" minOccurs="0"/>
+ <element name="namespacePrefix" type="xsd:string" minOccurs="0"/>
+ <element name="templates" type="types:Templates" minOccurs="0"/>
+ <element name="sessionID" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="RuntimeContext" type="types:RuntimeContext"/>
+
+ <complexType name="ItemDescription">
+ <sequence>
+ <element name="description" type="types:LocalizedString"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="itemName" type="xsd:string" use="required"/>
+ </complexType>
+
+ <simpleType name="CookieProtocol">
+ <restriction base="xsd:string">
+ <enumeration value="none"/>
+ <enumeration value="perUser"/>
+ <enumeration value="perGroup"/>
+ </restriction>
+ </simpleType>
+
+ <complexType name="ServiceDescription">
+ <sequence>
+ <element name="requiresRegistration" type="xsd:boolean"/>
+ <element name="offeredPortlets" type="types:PortletDescription" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="userCategoryDescriptions" type="types:ItemDescription" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="customUserProfileItemDescriptions" type="types:ItemDescription" minOccurs="0"
+ maxOccurs="unbounded"/>
+ <element name="customWindowStateDescriptions" type="types:ItemDescription" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="customModeDescriptions" type="types:ItemDescription" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="requiresInitCookie" type="types:CookieProtocol" default="none" minOccurs="0"/>
+ <element name="registrationPropertyDescription" type="types:ModelDescription" minOccurs="0"/>
+ <element name="locales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="resourceList" type="types:ResourceList" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="ServiceDescription" type="types:ServiceDescription"/>
+
+
+ <!-- - - - - - - - - - - - - - - - - - - -->
+ <!-- Portlet types (metadata and runtime) -->
+ <!-- - - - - - - - - - - - - - - - - - - -->
+
+ <complexType name="MarkupType">
+ <sequence>
+ <element name="mimeType" type="xsd:string"/>
+ <element name="modes" type="xsd:string" maxOccurs="unbounded"/>
+ <element name="windowStates" type="xsd:string" maxOccurs="unbounded"/>
+ <element name="locales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PortletDescription">
+ <sequence>
+ <!-- <element name="portletHandle" type="types:Handle"/> -->
+ <element name="portletHandle" type="xsd:string"/>
+ <element name="markupTypes" type="types:MarkupType" maxOccurs="unbounded"/>
+ <element name="groupID" type="xsd:string" minOccurs="0"/>
+ <element name="description" type="types:LocalizedString" minOccurs="0"/>
+ <element name="shortTitle" type="types:LocalizedString" minOccurs="0"/>
+ <element name="title" type="types:LocalizedString" minOccurs="0"/>
+ <element name="displayName" type="types:LocalizedString" minOccurs="0"/>
+ <element name="keywords" type="types:LocalizedString" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="userCategories" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="userProfileItems" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="usesMethodGet" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="defaultMarkupSecure" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="onlySecure" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="userContextStoredInSession" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="templatesStoredInSession" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="hasUserSpecificState" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="doesUrlTemplateProcessing" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PortletDescriptionResponse">
+ <sequence>
+ <element name="portletDescription" type="types:PortletDescription"/>
+ <element name="resourceList" type="types:ResourceList" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PortletContext">
+ <sequence>
+ <!-- <element name="portletHandle" type="types:Handle"/> -->
+ <element name="portletHandle" type="xsd:string"/>
+ <element name="portletState" type="xsd:base64Binary" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="PortletContext" type="types:PortletContext"/>
+
+ <complexType name="DestroyFailed">
+ <sequence>
+ <element name="portletHandle" type="xsd:string"/>
+ <element name="reason" type="xsd:string"/>
+ </sequence>
+ </complexType>
+
+ <!-- - - - - - - - - - - - -->
+ <!-- Markup oriented types -->
+ <!-- - - - - - - - - - - - -->
+
+ <complexType name="ClientData">
+ <sequence>
+ <element name="userAgent" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="ClientData" type="types:ClientData"/>
+
+ <complexType name="CacheControl">
+ <sequence>
+ <element name="expires" type="xsd:int"/>
+ <element name="userScope" type="xsd:string"/>
+ <element name="validateTag" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Templates">
+ <sequence>
+ <element name="defaultTemplate" type="xsd:string" nillable="true"/>
+ <element name="blockingActionTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="renderTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="resourceTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="secureDefaultTemplate" type="xsd:string" nillable="true"/>
+ <element name="secureBlockingActionTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="secureRenderTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="secureResourceTemplate" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="Templates" type="types:Templates"/>
+
+ <complexType name="MarkupParams">
+ <sequence>
+ <element name="secureClientCommunication" type="xsd:boolean"/>
+ <element name="locales" type="xsd:string" maxOccurs="unbounded"/>
+ <element name="mimeTypes" type="xsd:string" maxOccurs="unbounded"/>
+ <element name="mode" type="xsd:string"/>
+ <element name="windowState" type="xsd:string"/>
+ <element name="clientData" type="types:ClientData" minOccurs="0"/>
+ <element name="navigationalState" type="xsd:string" minOccurs="0"/>
+ <element name="markupCharacterSets" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="validateTag" type="xsd:string" minOccurs="0"/>
+ <element name="validNewModes" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="validNewWindowStates" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="MarkupParams" type="types:MarkupParams"/>
+
+ <complexType name="MarkupResponse">
+ <sequence>
+ <element name="markupContext" type="types:MarkupContext"/>
+ <element name="sessionContext" type="types:SessionContext" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="MarkupContext">
+ <sequence>
+ <element name="useCachedMarkup" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="mimeType" type="xsd:string" minOccurs="0"/>
+ <element name="markupString" type="xsd:string" minOccurs="0"/>
+ <element name="markupBinary" type="xsd:base64Binary" minOccurs="0"/>
+ <element name="locale" type="xsd:string" minOccurs="0"/>
+ <element name="requiresUrlRewriting" type="xsd:boolean" default="false" minOccurs="0"/>
+ <element name="cacheControl" type="types:CacheControl" minOccurs="0"/>
+ <element name="preferredTitle" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <!-- - - - - - - - - - - - - - - -->
+ <!-- Interaction oriented types -->
+ <!-- - - - - - - - - - - - - - - -->
+
+ <simpleType name="StateChange">
+ <restriction base="xsd:string">
+ <enumeration value="readWrite"/>
+ <enumeration value="cloneBeforeWrite"/>
+ <enumeration value="readOnly"/>
+ </restriction>
+ </simpleType>
+
+ <complexType name="UploadContext">
+ <sequence>
+ <element name="mimeType" type="xsd:string"/>
+ <element name="uploadData" type="xsd:base64Binary"/>
+ <element name="mimeAttributes" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="InteractionParams">
+ <sequence>
+ <element name="portletStateChange" type="types:StateChange"/>
+ <element name="interactionState" type="xsd:string" minOccurs="0"/>
+ <element name="formParameters" type="types:NamedString" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="uploadContexts" type="types:UploadContext" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="InteractionParams" type="types:InteractionParams"/>
+
+ <complexType name="UpdateResponse">
+ <sequence>
+ <element name="sessionContext" type="types:SessionContext" minOccurs="0"/>
+ <element name="portletContext" type="types:PortletContext" minOccurs="0"/>
+ <element name="markupContext" type="types:MarkupContext" minOccurs="0"/>
+ <element name="navigationalState" type="xsd:string" nillable="true"/>
+ <element name="newWindowState" type="xsd:string" minOccurs="0"/>
+ <element name="newMode" type="xsd:string" minOccurs="0"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="BlockingInteractionResponse">
+ <sequence>
+ <!-- Would prefer this to be a choice ... Axis and JAX-RPC failed to handle that -->
+ <element name="updateResponse" type="types:UpdateResponse" minOccurs="0"/>
+ <element name="redirectURL" type="xsd:string" minOccurs="0"/>
+ <!-- end prefer this to be a choice -->
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="BlockingInteractionResponse" type="types:BlockingInteractionResponse"/>
+
+ <!-- - - - - - - - - - - -->
+ <!-- User Profile types -->
+ <!-- - - - - - - - - - - -->
+
+ <complexType name="Postal">
+ <sequence>
+ <element name="name" type="xsd:string" minOccurs="0"/>
+ <element name="street" type="xsd:string" minOccurs="0"/>
+ <element name="city" type="xsd:string" minOccurs="0"/>
+ <element name="stateprov" type="xsd:string" minOccurs="0"/>
+ <element name="postalcode" type="xsd:string" minOccurs="0"/>
+ <element name="country" type="xsd:string" minOccurs="0"/>
+ <element name="organization" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="TelephoneNum">
+ <sequence>
+ <element name="intcode" type="xsd:string" minOccurs="0"/>
+ <element name="loccode" type="xsd:string" minOccurs="0"/>
+ <element name="number" type="xsd:string" minOccurs="0"/>
+ <element name="ext" type="xsd:string" minOccurs="0"/>
+ <element name="comment" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Telecom">
+ <sequence>
+ <element name="telephone" type="types:TelephoneNum" minOccurs="0"/>
+ <element name="fax" type="types:TelephoneNum" minOccurs="0"/>
+ <element name="mobile" type="types:TelephoneNum" minOccurs="0"/>
+ <element name="pager" type="types:TelephoneNum" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Online">
+ <sequence>
+ <element name="email" type="xsd:string" minOccurs="0"/>
+ <element name="uri" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="Contact">
+ <sequence>
+ <element name="postal" type="types:Postal" minOccurs="0"/>
+ <element name="telecom" type="types:Telecom" minOccurs="0"/>
+ <element name="online" type="types:Online" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="Contact" type="types:Contact"/>
+
+ <complexType name="EmployerInfo">
+ <sequence>
+ <element name="employer" type="xsd:string" minOccurs="0"/>
+ <element name="department" type="xsd:string" minOccurs="0"/>
+ <element name="jobtitle" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="PersonName">
+ <sequence>
+ <element name="prefix" type="xsd:string" minOccurs="0"/>
+ <element name="given" type="xsd:string" minOccurs="0"/>
+ <element name="family" type="xsd:string" minOccurs="0"/>
+ <element name="middle" type="xsd:string" minOccurs="0"/>
+ <element name="suffix" type="xsd:string" minOccurs="0"/>
+ <element name="nickname" type="xsd:string" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="UserProfile">
+ <sequence>
+ <element name="name" type="types:PersonName" minOccurs="0"/>
+ <element name="bdate" type="xsd:dateTime" minOccurs="0"/>
+ <element name="gender" type="xsd:string" minOccurs="0"/>
+ <element name="employerInfo" type="types:EmployerInfo" minOccurs="0"/>
+ <element name="homeInfo" type="types:Contact" minOccurs="0"/>
+ <element name="businessInfo" type="types:Contact" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="UserContext">
+ <sequence>
+ <element name="userContextKey" type="xsd:string"/>
+ <element name="userCategories" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="profile" type="types:UserProfile" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="UserContext" type="types:UserContext"/>
+
+ <!-- - - - - - - - - -->
+ <!-- Property types -->
+ <!-- - - - - - - - - -->
+
+ <complexType name="Property">
+ <sequence>
+ <!-- Would prefer this to be a choice ... Axis and JAX-RPC failed to handle that -->
+ <element name="stringValue" type="xsd:string" minOccurs="0"/>
+ <!-- JBoss modification: added processContents="lax" to better process extensions. -->
+ <any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+ <!-- end prefer this to be a choice -->
+ </sequence>
+ <attribute name="name" type="xsd:string" use="required"/>
+ <attribute ref="xml:lang"/>
+ </complexType>
+
+ <complexType name="ResetProperty">
+ <sequence/>
+ <attribute name="name" type="xsd:string" use="required"/>
+ </complexType>
+
+ <complexType name="PropertyList">
+ <sequence>
+ <element name="properties" type="types:Property" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="resetProperties" type="types:ResetProperty" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="PropertyList" type="types:PropertyList"/>
+
+ <complexType name="PropertyDescription">
+ <sequence>
+ <element name="label" type="types:LocalizedString" minOccurs="0"/>
+ <element name="hint" type="types:LocalizedString" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="name" type="xsd:string" use="required"/>
+ <attribute name="type" type="xsd:QName" use="required"/>
+ </complexType>
+
+ <complexType name="ModelTypes">
+ <sequence>
+ <!-- JBoss modification: added processContents="lax" to better process extensions. -->
+ <any namespace="##other" processContents="lax"/>
+ </sequence>
+ </complexType>
+
+ <complexType name="ModelDescription">
+ <sequence>
+ <element name="propertyDescriptions" type="types:PropertyDescription" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="modelTypes" type="types:ModelTypes" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="ModelDescription" type="types:ModelDescription"/>
+
+ <complexType name="PortletPropertyDescriptionResponse">
+ <sequence>
+ <element name="modelDescription" type="types:ModelDescription" minOccurs="0"/>
+ <element name="resourceList" type="types:ResourceList" minOccurs="0"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <!-- - - - - - - - - - - - - -->
+ <!-- operation message types -->
+ <!-- - - - - - - - - - - - - -->
+
+ <complexType name="ReturnAny">
+ <sequence>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
+ <element name="getMarkup">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="runtimeContext" type="types:RuntimeContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="markupParams" type="types:MarkupParams"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getMarkupResponse" type="types:MarkupResponse"/>
+
+ <element name="performBlockingInteraction">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="runtimeContext" type="types:RuntimeContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="markupParams" type="types:MarkupParams"/>
+ <element name="interactionParams" type="types:InteractionParams"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="performBlockingInteractionResponse" type="types:BlockingInteractionResponse"/>
+
+ <element name="getServiceDescription">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getServiceDescriptionResponse" type="types:ServiceDescription"/>
+
+ <element name="register" type="types:RegistrationData"/>
+ <element name="registerResponse" type="types:RegistrationContext"/>
+
+ <element name="deregister" type="types:RegistrationContext"/>
+ <element name="deregisterResponse" type="types:ReturnAny"/>
+
+ <element name="modifyRegistration">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="registrationData" type="types:RegistrationData"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="modifyRegistrationResponse" type="types:RegistrationState"/>
+
+ <element name="getPortletDescription">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getPortletDescriptionResponse" type="types:PortletDescriptionResponse"/>
+
+ <element name="clonePortlet">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="clonePortletResponse" type="types:PortletContext"/>
+
+ <element name="destroyPortlets">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletHandles" type="xsd:string" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <complexType name="DestroyPortletsResponse">
+ <sequence>
+ <element name="destroyFailed" type="types:DestroyFailed" minOccurs="0" maxOccurs="unbounded"/>
+ <element name="extensions" type="types:Extension" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ <element name="destroyPortletsResponse" type="types:DestroyPortletsResponse"/>
+
+ <element name="setPortletProperties">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="propertyList" type="types:PropertyList"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="setPortletPropertiesResponse" type="types:PortletContext"/>
+
+ <element name="getPortletProperties">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="names" type="xsd:string" nillable="true" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getPortletPropertiesResponse" type="types:PropertyList"/>
+
+ <element name="getPortletPropertyDescription">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="portletContext" type="types:PortletContext"/>
+ <element name="userContext" type="types:UserContext" nillable="true"/>
+ <element name="desiredLocales" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="getPortletPropertyDescriptionResponse" type="types:PortletPropertyDescriptionResponse"/>
+
+ <element name="releaseSessions">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ <element name="sessionIDs" type="xsd:string" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="releaseSessionsResponse" type="types:ReturnAny"/>
+
+ <element name="initCookie">
+ <complexType>
+ <sequence>
+ <element name="registrationContext" type="types:RegistrationContext" nillable="true"/>
+ </sequence>
+ </complexType>
+ </element>
+ <element name="initCookieResponse" type="types:ReturnAny"/>
+
+ <!-- - - - - - - -->
+ <!-- fault types -->
+ <!-- - - - - - - -->
+
+ <complexType name="Fault">
+ <sequence/>
+ </complexType>
+
+ <complexType name="AccessDeniedFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="AccessDenied" type="types:AccessDeniedFault"/>
+
+ <complexType name="InconsistentParametersFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="InconsistentParameters" type="types:InconsistentParametersFault"/>
+
+ <complexType name="InvalidRegistrationFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="InvalidRegistration" type="types:InvalidRegistrationFault"/>
+
+ <complexType name="MissingParametersFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="MissingParameters" type="types:MissingParametersFault"/>
+
+ <complexType name="OperationFailedFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="OperationFailed" type="types:OperationFailedFault"/>
+
+ <complexType name="InvalidHandleFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="InvalidHandle" type="types:InvalidHandleFault"/>
+
+ <complexType name="InvalidUserCategoryFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="InvalidUserCategory" type="types:InvalidUserCategoryFault"/>
+
+ <complexType name="PortletStateChangeRequiredFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="PortletStateChangeRequired" type="types:PortletStateChangeRequiredFault"/>
+
+ <complexType name="InvalidCookieFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="InvalidCookie" type="types:InvalidCookieFault"/>
+
+ <complexType name="InvalidSessionFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+
+ <element name="InvalidSession" type="types:InvalidSessionFault"/>
+
+ <complexType name="UnsupportedModeFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="UnsupportedMode" type="types:UnsupportedModeFault"/>
+
+ <complexType name="UnsupportedWindowStateFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="UnsupportedWindowState" type="types:UnsupportedWindowStateFault"/>
+
+ <complexType name="UnsupportedLocaleFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="UnsupportedLocale" type="types:UnsupportedLocaleFault"/>
+
+ <complexType name="UnsupportedMimeTypeFault">
+ <complexContent>
+ <extension base="types:Fault">
+ <sequence/>
+ </extension>
+ </complexContent>
+ </complexType>
+ <element name="UnsupportedMimeType" type="types:UnsupportedMimeTypeFault"/>
+</schema>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws1068/wsrp_v1_types.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/application-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/application-client.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/application-client.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,21 @@
+<?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>JBWS944 Test</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.jbws944.EndpointInterface</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jaxrpc-mapping.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jaxrpc-mapping.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jaxrpc-mapping.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,37 @@
+<?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.ws.jbws944</package-type>
+ <namespaceURI>http://org.jboss.ws/jbws944</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.ws.jbws944.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.ws/jbws944'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>EndpointInterfacePort</port-name>
+ <java-port-name>EndpointInterfacePort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.ws.jbws944.EndpointInterface</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.ws/jbws944'>portTypeNS:EndpointInterface</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.ws/jbws944'>bindingNS:EndpointInterfaceBinding</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.ws/jbws944'>wsdlMsgNS:EndpointInterface_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.ws/jbws944'>wsdlMsgNS:EndpointInterface_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>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jboss-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jboss-client.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jboss-client.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,9 @@
+<?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>
+</jboss-client>
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/TestService.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/TestService.wsdl 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/TestService.wsdl 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,32 @@
+<definitions name='TestService' targetNamespace='http://org.jboss.ws/samples/jsr181ejb' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/jsr181ejb' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types></types>
+ <message name='EndpointInterface_echoResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <message name='EndpointInterface_echo'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <portType name='EndpointInterface'>
+ <operation name='echo' parameterOrder='String_1'>
+ <input message='tns:EndpointInterface_echo'/>
+ <output message='tns:EndpointInterface_echoResponse'/>
+ </operation>
+ </portType>
+ <binding name='EndpointInterfaceBinding' type='tns:EndpointInterface'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echo'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.ws/samples/jsr181ejb' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.ws/samples/jsr181ejb' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:EndpointInterfaceBinding' name='EndpointInterfacePort'>
+ <soap:address location='http://@jbosstest.host.name@:8080/jbossws-jbws944/FooBean01'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws944/META-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/tdiesler/trunk/src/test/resources/jbws944/wstools-config.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/jbws944/wstools-config.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/jbws944/wstools-config.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -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">
+
+ <wsdl-java file="resources/samples/jsr181ejb/META-INF/wsdl/TestService.wsdl">
+ <mapping file="jaxrpc-mapping.xml" />
+ </wsdl-java>
+
+</configuration>
\ No newline at end of file
Property changes on: branches/tdiesler/trunk/src/test/resources/jbws944/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/application-client.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/application-client.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/application-client.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -19,5 +19,11 @@
<wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file>
<jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
</service-ref>
+ <service-ref>
+ <service-ref-name>service/ConfidentialSecured</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ </service-ref>
</application-client>
Modified: branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/ejb-jar.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/ejb-jar.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/ejb-jar.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -27,6 +27,15 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
+ <session>
+ <ejb-name>ConfidentialSLSB</ejb-name>
+ <remote>org.jboss.test.ws.samples.secureejb.OrganizationRemote</remote>
+ <home>org.jboss.test.ws.samples.secureejb.OrganizationHome</home>
+ <service-endpoint>org.jboss.test.ws.samples.secureejb.OrganizationService</service-endpoint>
+ <ejb-class>org.jboss.test.ws.samples.secureejb.OrganizationImpl</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
</enterprise-beans>
<assembly-descriptor>
@@ -47,6 +56,13 @@
<method-name>*</method-name>
</method>
</method-permission>
+ <method-permission>
+ <unchecked/>
+ <method>
+ <ejb-name>ConfidentialSLSB</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ </method-permission>
</assembly-descriptor>
</ejb-jar>
Modified: branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/jboss.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/jboss.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/jboss.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -28,5 +28,14 @@
<transport-guarantee>NONE</transport-guarantee>
</port-component>
</session>
+ <session>
+ <ejb-name>ConfidentialSLSB</ejb-name>
+ <jndi-name>ejb/ConfidentialSLSB</jndi-name>
+ <port-component>
+ <port-component-name>ConfidentialSecured</port-component-name>
+ <port-component-uri>/ws4ee-samples-ejb/ConfidentialSecured</port-component-uri>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ </port-component>
+ </session>
</enterprise-beans>
</jboss>
Modified: branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/webservices.xml
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/webservices.xml 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/samples/secureejb/META-INF/webservices.xml 2006-08-30 22:00:35 UTC (rev 862)
@@ -26,5 +26,13 @@
<ejb-link>BasicSecuredSLSB</ejb-link>
</service-impl-bean>
</port-component>
+ <port-component>
+ <port-component-name>ConfidentialSecured</port-component-name>
+ <wsdl-port>impl:ConfidentialPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.samples.secureejb.OrganizationService</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link>ConfidentialSLSB</ejb-link>
+ </service-impl-bean>
+ </port-component>
</webservice-description>
</webservices>
Modified: branches/tdiesler/trunk/src/test/resources/samples-override/secureejb/META-INF/wsdl/OrganizationService.wsdl
===================================================================
--- branches/tdiesler/trunk/src/test/resources/samples-override/secureejb/META-INF/wsdl/OrganizationService.wsdl 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/src/test/resources/samples-override/secureejb/META-INF/wsdl/OrganizationService.wsdl 2006-08-30 22:00:35 UTC (rev 862)
@@ -32,5 +32,8 @@
<port name="RoleSecuredPort" binding="tns:OrganizationServiceBinding">
<soap:address location="http://@jbosstest.host.name@:8080/ws4ee-samples-ejb/RoleSecured"/>
</port>
+ <port name="ConfidentialPort" binding="tns:OrganizationServiceBinding">
+ <soap:address location="https://@jbosstest.host.name@:8443/ws4ee-samples-ejb/ConfidentialSecured"/>
+ </port>
</service>
</definitions>
\ No newline at end of file
Modified: branches/tdiesler/trunk/version.properties
===================================================================
--- branches/tdiesler/trunk/version.properties 2006-08-30 21:42:38 UTC (rev 861)
+++ branches/tdiesler/trunk/version.properties 2006-08-30 22:00:35 UTC (rev 862)
@@ -6,6 +6,7 @@
specification.version=jbossws-2.0
version.id=2.0.0.DEV
+repository.id=snapshot
implementation.title=JBoss Web Services (JBossWS)
implementation.url=http://www.jboss.org/products/jbossws
More information about the jboss-svn-commits
mailing list