March 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16032 - common/branches/jbossws-common-2.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 09:32:08 -0400 (Mon, 26 Mar 2012) New Revision: 16032 Modified: common/branches/jbossws-common-2.0.x/pom.xml Log: prepare for tagging Modified: common/branches/jbossws-common-2.0.x/pom.xml =================================================================== --- common/branches/jbossws-common-2.0.x/pom.xml 2012-03-26 13:29:32 UTC (rev 16031) +++ common/branches/jbossws-common-2.0.x/pom.xml 2012-03-26 13:32:08 UTC (rev 16032) @@ -9,7 +9,7 @@ <packaging>jar</packaging> <description>JBossWS Common</description> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.3.GA</version>  <parent> @@ -20,14 +20,14 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/common/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/common/tags/jbossws-common...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/common/tags/jbossws-common-2....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/common/tags/jbossws-common-2.0.3.GA</url> </scm>  <properties> - <jbossws.spi.version>2.0.4-SNAPSHOT</jbossws.spi.version> + <jbossws.spi.version>2.0.3.GA</jbossws.spi.version> <jboss.jaxbintros.version>1.0.2.GA</jboss.jaxbintros.version> <jboss.common.core.version>2.2.14.GA</jboss.common.core.version> <jboss-logging-spi.version>2.0.5.GA</jboss-logging-spi.version>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16031 - in stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources: jboss712 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 09:29:32 -0400 (Mon, 26 Mar 2012) New Revision: 16031 Added: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss711/ Log: fix previous commit - 711 -> 712 switch Added: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-03-26 13:29:32 UTC (rev 16031) @@ -0,0 +1,115 @@ + + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> +  + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16030 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/scripts and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 08:47:18 -0400 (Mon, 26 Mar 2012) New Revision: 16030 Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml Removed: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/JBossORG-EULA.txt stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/test-exclude.xsl stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/doc/ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss711/ Modified: stack/native/branches/jbossws-native-4.0.x/build.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: Target jboss712 instead of 711 Modified: stack/native/branches/jbossws-native-4.0.x/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/build.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/build.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -65,20 +65,20 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> - <isset property="profiles.profile.properties.jboss711.home"/> + <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> + <isset property="profiles.profile.properties.jboss712.home"/> </condition> - <fail message="jboss home not set, use jboss711.home=value to set"> + <fail message="jboss home not set, use jboss712.home=value to set"> <condition> <not> - <isset property="jboss711.home"/> + <isset property="jboss712.home"/> </not> </condition> </fail> <echo/> - <echo message="jboss711.home=${jboss711.home}"/> + <echo message="jboss712.home=${jboss712.home}"/> </target> <target name="init" depends="mvn-settings,prepare,os-init"> @@ -113,55 +113,4 @@ </exec> </target> - <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution"> -  - <property name="maven.opts" value=""/> - - <echo/> - <echo message="${mvn} ${maven.opts} -Pdist -Dbindist -Dno-testsuite install"/> - <echo/> - - <delete dir="${dist.output.dir}/jbossws-native-bin-dist"/> - <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pdist -Dbindist -Dno-testsuite install"/> - </exec> - - <zip destfile="${stack.output.dir}/jbossws-native-bin-dist.zip"> - <zipfileset - dir="${dist.output.dir}/assembly/jbossws-native-bin-dist" - includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example" - prefix="jbossws-native-bin-dist"/> - </zip> - </target> - - <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution"> -  - <property name="maven.opts" value=""/> - - <echo/> - <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist -Dno-testsuite install"/> - <echo/> - - <delete dir="${stack.output.dir}/jbossws-native-src-dist"/> - <exec dir="${basedir}" executable="${mvn}" failonerror="true"> - <arg line="${maven.opts} -Pdist -Dsrcdist -Dno-testsuite install"/> - </exec> - - <zip destfile="${stack.output.dir}/jbossws-native-src-dist.zip"> - <zipfileset - dir="${dist.output.dir}/assembly/jbossws-native-src-dist" - includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project " - prefix="jbossws-native-src-dist"/> - </zip> - </target> - - <target name="check.exist"> - <available file="${stack.output.dir}" property="file.exists" value="true" /> - </target> - - <target name="makedir" depends="check.exist" unless="file.exists"> - <mkdir dir="${stack.output.dir}" /> - </target> - - </project> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/scripts/antrun-beans-config.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -31,7 +31,7 @@ <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -46,7 +46,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> @@ -61,41 +61,13 @@ <scope>provided</scope> </dependency> -  <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-shared-testsuite</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-shared-testsuite</artifactId> - <type>zip</type> - <scope>test</scope> - </dependency> -  <dependency> - <groupId>org.jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>apache-scout</groupId> - <artifactId>scout</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>juddi</groupId> - <artifactId>juddi</artifactId> - <scope>provided</scope> - </dependency> - -  - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> @@ -126,177 +98,7 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.4</version> - <dependencies> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant-trax</artifactId> - <version>1.8.0</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>generate-exclude-file</id> - <phase>validate</phase> - <configuration> - <tasks> - <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" - in="../testsuite/pom.xml" - out="${basedir}/target/exclude-file/test-excludes-jboss711.txt"> - <param name="targetName" expression="jboss711" /> - </xslt> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> - <profiles> -  - <profile> - <id>bindist</id> - <activation> - <property> - <name>bindist</name> - </property> - </activation> - <dependencies> -  - <dependency> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-webservices-tests-integration</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-build-config</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.as</groupId> - <artifactId>jboss-as-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.marshalling</groupId> - <artifactId>jboss-marshalling-river</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - <configuration> - <sourceDocumentName>JBossWS-Native.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/doc</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/doc</directory> - <includes> - <include>images/*</include> - </includes> - </imageResource> - <formats> -  - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> -  - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - </options> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>srcdist</id> - <activation> - <property> - <name>srcdist</name> - </property> - </activation> - - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>distribution-package</id> - <configuration> - <finalName>assembly</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor> - <descriptor>src/main/scripts/assembly-src-dist.xml</descriptor> - </descriptors> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/Install.txt 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,28 +0,0 @@ - -${project.name} -http://www.jboss.org/jbossws/ - -Version: jbossws-native-${project.version} - -Installation instructions -========================= - -In order to install JBossWS the following steps are necessary: - -1.) Copy ant.properties.examples to ant.properties -2.) Modify the target container location in ant.properties -3.) Execute one of the following - - ant deploy-jboss711 - -4.) Execute the samples to verify your installation - - 'ant tests' - - You should see no errors. - -If you have any questions, please post to the userforum: -http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 - -Enjoy, -The JBossWS Team Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/JBossORG-EULA.txt =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/JBossORG-EULA.txt 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/JBossORG-EULA.txt 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ReleaseNotes.txt 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,1334 +0,0 @@ - -${project.name} -http://www.jboss.org/jbossws/ - -Version: jbossws-native-${project.version} - -Release Notes -============= - -The project home page (http://www.jboss.org/jbossws) and the official documentation -(https://docs.jboss.org/author/display/JBWS) are usually good starting points. -They contain the User Guide and Quick Start instructions. - -A list of examples that accompany the UserGuide can be found in the tests directory -that ship with the distribution. - -If you have any questions, please post to the JBossWS User Forum -http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 - -For details see the change log. -https://issues.jboss.org/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Achangelog-panel - -For issues that are scheduled for future versions see the road map. -https://issues.jboss.org/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap-panel - -What's new in jbossws-native-${project.version} ----------------------------------- - -Feature Request - - TODO: enumerate - -Bug - - TODO: enumerate - -Task - - TODO: enumerate - -Errata - - See: TODO: reference to associated JIRA issue - -Enjoy, -The JBossWS Team - - -Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - ------------------------ -jbossws-native-4.0.2.GA ------------------------ - -Feature Request - - * [JBWS-3439] - Upgrade to Apache WSS4J 1.6.5 and Santuario 1.5.1 - -Bug - - * [JBWS-3432] - WebservicesFactory can't parse webservices.xml with javaee:descriptionGroup references - -Task - - * [JBWS-3442] - Verify dependencies are up to date - * [JBWS-3437] - WS Refs have to keep classloader reference - * [JBWS-3438] - JAX-RPC generated proxies have to be de/serializable - * [JBWS-3444] - Review and rewrite appclient tests - -Errata - - See: https://issues.jboss.org/browse/JBWS-3450 - - ------------------------ -jbossws-native-4.0.1.GA ------------------------ - -Feature Request / Enhancement - - * [JBWS-2251] - Enhance X509 certificate issuer comparison - * [JBWS-3408] - maven-jaxws-tools-plugin <target> option is undocumented - * [JBWS-3420] - Enhance deployment performance by simplifying connector conf retrieval - * [JBWS-3162] - Add javaee_web_services_metadata_handler_2_0.xsd to jbossws-entities.properties - -Bug - - * [JBWS-3386] - Usernametoken support requires optional elements - * [JBWS-3414] - DeploymentAspectManagerImpl does not properly deal with deployment failures - * [JBWS-3415] - Provider endpoints are not processed for DD contribution - * [JBWS-3416] - MetadataBuilder does not re-use WebserviceMetadata parsed into AS integration layer - * [JBWS-3417] - JAXWSServerMetaDataBuilder::processWSDDContribution does not process WSDL location override - * [JBWS-3421] - EndpointRegistryDeploymentAspect can't properly deal with AS7 domain reloads - * [JBWS-3423] - JBWS3277TestCase.testMtomSawpFile fails on Windows - -Task - - * [JBWS-3388] - Switch to remoting-jmx for tests using JMX to connect to the server - * [JBWS-3419] - Restore managed endpoint registry - * [JBWS-3422] - Review and enable passing serviceref/webserviceref tests - * [JBWS-3425] - Upgrade to JAXB 2.2.4 - -Errata - - See: https://jira.jboss.org/browse/JBWS-3428 - ------------------------ -jbossws-native-4.0.0.GA ------------------------ - -Bug - - * [JBWS-3387] - JAXRPC SchemaBindingBuilder can't rely on jaxws integration classloader (AS7) - -Task - - * [JBWS-3281] - Create a migration guide to JBossWS 4.0 / AS 7 integration - * [JBWS-3373] - port component link servlet on AS7 - * [JBWS-3393] - Remove support for AS6 as target container - * [JBWS-3401] - Support deployment of EJB3 endpoints bundled in war archives referencing WSDL that is importing XML schema(s) - -Errata - - See: https://jira.jboss.org/browse/JBWS-3404 - ------------------------- -jbossws-native-4.0.0.CR1 ------------------------- - -Feature Request - - * [JBWS-1119] - Add support for fault signing and encryption - * [JBWS-2235] - Support for multiple schemas validation - * [JBWS-3115] - Clean dependencies on jbossws-spi - * [JBWS-3182] - Allow for centralized ws-security configuration from jaas security domain - * [JBWS-3265] - Isolate deployment classloader from ws server integration - * [JBWS-3282] - Extend jbossws jaxws endpoint configuration (@EndpointConfig) to jbossws-cxf stack - * [JBWS-3286] - Add jaxws-endpoint-configuration to AS7 domain - * [JBWS-3296] - Provide abstraction for picketbox/jboss-security AuthenticationManager and AuthorizationManager - * [JBWS-3343] - Support for both EJB3 and POJO WS endpoints in war archive - * [JBWS-3276] - Implement support for POJO endpoints with no web.xml in archive - -Enhancement - - * [JBWS-3318] - InvocationHandlerEJB3 cannot rely on EJB3 security impl. details - -Bug - - * [JBWS-3170] - SAAJ Where an Element is added to the SOAPBody this should be converted to a SOAPElement - * [JBWS-3175] - After calling StubExt.setConfigName a call to StubExt.getConfigName still returns original name - * [JBWS-3190] - CommonSOAPFaultException: org.xml.sax.SAXParseException: Invalid encoding name "UTF8" - Messages rejected - * [JBWS-3192] - content-type header is not properly set for FastInfoset response messages - * [JBWS-3194] - jbossws-entities.properties contains incorrect URI for policy xsd - * [JBWS-3198] - EPR's address is NOT used for invocations on the endpoint when the dispatchImpl is created with EPR - * [JBWS-3212] - Incomplete CONFIDENTIAL transport-guarantee detection for POJO endpoint. - * [JBWS-3250] - Swap file is deleted before response is completely handled - * [JBWS-3251] - org.w3c.dom.DOMException when create dispatch with EPR - * [JBWS-3270] - AS7 org.jboss.as.webservices:main module should not have any stack specific dependencies - * [JBWS-3277] - Unexpected bytes are serialized in MTOM attachment when the mime type is text/xml - * [JBWS-3199] - AbstractServerConfig.toIPv6URLFormat throws java.net.UnknownHostException - * [JBWS-3306] - No XPathFactory implementation found by a JAXWS client on AS7 - * [JBWS-3321] - Enhance ModelDeploymentAspect to generate compatible PathElements - * [JBWS-3322] - Ensure proper creation of WebMD for EJBs present in web archive. - * [JBWS-3332] - wsdl-port modification in subsystem webservices throws error and prevent AS 7 from stat. wsdl-secure-port does not break the startup - * [JBWS-3336] - Errata files not properly created by hudson jobs - * [JBWS-3337] - Fix ThreadLocalAwareWebServiceContext singleton de/serialization - * [JBWS-3338] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation also for port component refs - * [JBWS-3355] - Launch of *.sh scripts from path with space does not work - * [JBWS-3360] - Fix WS ref deserialization process - consider TCCL when instantiating classes. - * [JBWS-3205] - java.lang.StackOverflowError on binary distro due to org.jboss.wsf.common.logging.JDKLogManager - * [JBWS-3356] - Fix PostConstruct & PreDestroy implementation for JAXWS endpoints & handlers - * [JBWS-3357] - Implement support for lookup mechanism for JAXWS endpoints & handlers - * [JBWS-3367] - EJB3 endpoints in war archive should follow context root override rules - * [JBWS-3368] - jbossws-cxf-4.0.0.Beta6 : jaxws-benchmark-datatypes-pojo.war deployment on AS7 fails - * [JBWS-3371] - Implement better SEI -> EJB View translation algorithm - * [JBWS-3380] - NPE when dealing with default namespace on SOAP Envelope - * [JBWS-3384] - Missing dependency in module "org.jboss.ws.jaxws-client" - -Task - - * [JBWS-3080] - Update build for supporting Maven 3 - * [JBWS-3183] - Reduce Logging Level for MessageContextJAXWS when WSDL URL fails conversion to URI - * [JBWS-3206] - Modify deployment scripts for supporting AS 7 - * [JBWS-3207] - Remote deployment support for testsuite against AS 7 - * [JBWS-3208] - Add AS7 jobs to Hudson - * [JBWS-3210] - Configure testsuite against JBoss AS7 - * [JBWS-3223] - Runtime ws client classloader setup on AS7 - * [JBWS-3224] - Review the jbossws-spi ServiceLoader to allow for passing a classloader in - * [JBWS-3238] - Rewrite jaxws tools tests to run in fork mode - * [JBWS-3266] - Update stax-api dependency - * [JBWS-3273] - Move ANT & command line tools abstraction from jbossws-common.jar to jbossws-common-tools.jar - * [JBWS-3285] - Remove ws-reliable messaging implementation from native - * [JBWS-3169] - Remove spi dependency on JBossXB - * [JBWS-3217] - JBossWS SPI - NoClassDefFoundError: org/jboss/logging/Logger - * [JBWS-3220] - Test failures after update to maven3 - * [JBWS-3221] - Enable JMX tests - * [JBWS-3222] - Resuscitate JBossWS command line tools on AS7 - * [JBWS-3226] - AS7 jboss-service.xml parsing problem - * [JBWS-3239] - Fix SPI TCCL issue for servlet deployments trying to do Endpoint.publish() - * [JBWS-3241] - NPE in ServerHandler.handleInbound() - * [JBWS-3242] - Servlet base test throws IllegalArgumentException: Resource META-INF/jbossws-entities.properties not found - * [JBWS-3243] - Apache WSSecurity relies on TCCL when lookuping its providers - * [JBWS-3245] - AS7 RemoteDeployer have to always undeploy deployed archives - * [JBWS-3274] - Restore jaxbintros functionalities on AS7 - * [JBWS-3283] - Provide a stax based parser of jaxws endpoint config descriptors - * [JBWS-3289] - Refactor packages to be in sync. with new abstractions - * [JBWS-2709] - Review JBossWS public api and provide javadoc - * [JBWS-3105] - Review and fix JBossWS maven dependencies - * [JBWS-3215] - Review the way testsuite is run using Maven - * [JBWS-3271] - Allow both Native & CXF stacks to use their own SAAJ implementation on AS7 - * [JBWS-3294] - Remove ws-eventing implementation from native - * [JBWS-3310] - Avoid deployment of useless client archives when running JBossWS testsuite - * [JBWS-3312] - Cleanup previously deprecated spi methods - * [JBWS-3316] - i18n logging message - * [JBWS-3323] - Get rid of WebServiceDeclaration & WebServiceDeployment SPI abstractions - * [JBWS-3326] - Restore project generator against AS7 - * [JBWS-3328] - Restore @WebServiceRef functionalities on AS7 - * [JBWS-3330] - Restore RecordProcessor functionalities on AS7 - * [JBWS-3334] - Rewrite DD driven injection tests. - * [JBWS-3348] - Get rid of org.jboss.ws.backward_compatible_context_creator property - * [JBWS-3366] - Initial restore of JAX-RPC functionalities on AS 7 - * [JBWS-3219] - Unexpected element 'port-qname' encountered - * [JBWS-3240] - Rewrite tests relying on $JBOSS_HOME/server/default/tmp/jbossws folder existence - * [JBWS-3246] - Resuscitate JSON - * [JBWS-3255] - Unable to lookup AuthenticationManager - * [JBWS-3256] - Failed to load users/passwords/role files - * [JBWS-3257] - No class available with name 'org.jboss.security.plugins.JaasSecurityDomain' - * [JBWS-3346] - Add EndpointType - * [JBWS-3359] - Enable deploy ejb webservice in a war file in native stack - * [JBWS-3363] - Provide SPI hooks to obtain instances of handlers & endpoints from underlying stacks - * [JBWS-2338] - Review JBossWS SPI abstractions and interfaces - * [JBWS-2436] - Look for eventual optimizations when scanning classes - * [JBWS-3120] - Resuscitate Virtual host feature on AS 7 series - * [JBWS-3216] - Investigate & fix test failures against AS7 - * [JBWS-3358] - Restore @EJB & @Resource injection on JAXWS components on AS7 - * [JBWS-3369] - Fix AS7 jaxrpc classloading issues - * [JBWS-3375] - Restore JAXRPC EJB integration on AS7 - * [JBWS-3381] - Support latest AS 7.0.x target container - * [JBWS-3382] - Add AS7 RemoteDeployer to jbossws container integration - * [JBWS-3225] - Resuscitate JBossWS console - * [JBWS-3232] - javax.naming.NameNotFoundException: Name 'service' not found in context 'env' - * [JBWS-3364] - Refactor injections on JAXWS components from common to ASIL - * [JBWS-3376] - Introduce jboss-webservices.xml DD - * [JBWS-3385] - Enable Remote EJB JNDI support in our test suite - ------------------------ -jbossws-native-3.4.1.GA ------------------------ - -Feature Request - - * [JBWS-3139] - Ensure IPv6 Compatibility - * [JBWS-3161] - Distinguish between @Addressing(enabled=false) and no @Addressing annotation - * [JBWS-3181] - Add support for symlinked bin/*.sh files - -Bug - - * [JBWS-3184] - Fix Native concurrency issue with endpoint instantiation - -Task - - * [JBWS-2896] - Fix unguarded calls to Logger.debug() - * [JBWS-3171] - Fix WebServiceContext injection into EJB3 beans - * [JBWS-3177] - Provide CDI Integration Points - -Errata - - See: https://issues.jboss.org/browse/JBWS-3188 - ------------------------ -jbossws-native-3.4.0.GA ------------------------ - -Feature Request - - * [JBWS-2458] - Support UseAddressing in wsdl - * [JBWS-2957] - EJB webservices packaged in web archives (JSR 109 v.1.3 support) - * [JBWS-3063] - Support Log4J in command line wsconsume and wsprovide - * [JBWS-3114] - Stack agnostic configuration of connection timeout - * [JBWS-3122] - Implement @WebServiceRef to respect @Addressing, @MTOM & @RespectBinding annotations - * [JBWS-3123] - Implement @WebServiceRef support for annotation driven servlets - * [JBWS-3133] - Update UMDM for ServiceRef and PortComponentRef to support @Addressing, @MTOM & @RespectBinding settings - * [JBWS-3084] - Enable control of chunked encoding when using SOAPConnection - * [JBWS-3155] - Implement support for anonymous attachments - -Bug - - * [JBWS-2637] - incorrect namespace for fault messages - * [JBWS-2640] - UsernameToken does not correctly handle "Created" element from wsse:Security soap header - * [JBWS-2951] - StringIndexOutOfBoundsException in JavaUtils#getPackageName() - * [JBWS-3014] - JBossWS does not decode Nonce - * [JBWS-3034] - Annotation HandlerChain generating an StringIndexOutOfBoundsException when the file starts with "../" - * [JBWS-3070] - Secondary import of XSD contains incorrect path - * [JBWS-3071] - JAX-WS Asynchronous Client Exception issues - * [JBWS-3082] - org.jboss.test.ws.jaxws.samples.xop.doclit.XOPBareTestCase in framework tests Native stack implementation details - * [JBWS-3090] - Deploy script does not remove jbossws-native-jaxws-ext.jar - * [JBWS-3091] - org.jboss.test.ws.jaxws.samples.oneway.OnewayTestCase wrongly assumes the result will be set before the feedback() is invoked. - * [JBWS-3101] - NullPointerException if SOAPMessage Provider endpoint returns null to indicate a one way MEP - * [JBWS-3116] - NettyClient sends uri on absolute format which is not correct according to RFC2616 - * [JBWS-3119] - EndpointName attribute value in EPR Metadata should be unqualified - * [JBWS-2640] - UsernameToken does not correctly handle "Created" element from wsse:Security soap header - * [JBWS-3141] - Mtom and RespectBinding configuration in webservices.xml DD doesn't work - * [JBWS-3152] - AS Meta Data should be complete before passing to JBossWS - * [JBWS-3154] - wsa:MessageID is missing in response message - * [JBWS-3158] - Native ServiceDelegateImpl. getPort(Class<T> seiClass) does not respect the WebServiceFeatures to create Service - * [JBWS-3159] - SAAJ implementation does not set the correct NS prefix in SOAP header and body elements - -Task - - * [JBWS-2928] - Use JBoss provided EE APIs - * [JBWS-3006] - Review jbossws maven dependencies - * [JBWS-3049] - Hudson jobs need to test binary and src distros against vanilla JBoss AS - * [JBWS-3067] - Investigate remaining AS trunk failures - * [JBWS-3083] - Avoid double Maven lifecycle run for building src and bin distributions - * [JBWS-3093] - Configure maven compiler for JBossWS to be UTF-8 encoding based - * [JBWS-3106] - Get rid of broken Http SPI - * [JBWS-3107] - Review org.jboss.test.ws.jaxws.endoint tests - * [JBWS-3124] - Remove JBWS2942TestCase framework test and create Native and CXF specific tests validating empty EPR Metadata are dropped - * [JBWS-3126] - Move to new EjbReferenceResolver - * [JBWS-3121] - Prevent duplicated endpoints for EJB 3.1 beans in web archives - * [JBWS-2215] - Produce distributable docs from wiki - * [JBWS-2768] - Make sure SOAP stack test suite passes also when no internet connection is available - * [JBWS-3140] - Process the <addressing> element in webservices.xml (JSR-109 v.1.3) - * [JBWS-3156] - Refactor ThreadLocalAwareWebserviceContext - * [JBWS-3164] - Enhancement : NPE exception when the StreamSource with null inputstream in XMLFragment is wrote to OutputStream - -Errata - - See: https://jira.jboss.org/browse/JBWS-3180 - ------------------------ -jbossws-native-3.3.1.GA ------------------------ - -Bug - - * [JBWS-3048] - bin-dist does not correctly undeploy previously installed stack - -Errata - - See: https://jira.jboss.org/browse/JBWS-3044 (same as for 3.3.0.GA) - - ------------------------ -jbossws-native-3.3.0.GA ------------------------ - -Feature Request - - * [JBWS-3022] - Respect @Addressing.responses attribute - * [JBWS-3024] - Implement endorsing support for JBossWS ANT tools - * [JBWS-3031] - Use addressing meta data from WSDL if addressing related annotations are missing on SEI - * [JBWS-3040] - Default WSSecurity configurations should support both SOAP protocol versions - * [JBWS-3041] - Impement support for Endpoint References specified in WSDL - * [JBWS-3042] - Generated JAX-WS proxies and dispatches have to be feature aware - * [JBWS-2650] - Provide a Maven plugin for wsconsume/wsprovide - * [JBWS-2793] - Support of SOAP header code generation for implicit headers - * [JBWS-2942] - Do not add empty Metadata tag to NativeEndpointReference - * [JBWS-2895] - Provide JAX-RPC features on top of stacks not having them - - -Bug - - * [JBWS-2633] - wscompile fails to create valid package name where namespace contains capitalised reserved keyword - * [JBWS-3004] - JAX-WS Port injected using @WebServiceRef retains last message - * [JBWS-3008] - Dispatch doesn't respect @Addressing features - * [JBWS-3015] - wsdlLocation attribute from @WebServiceClient not considered when building up webservicerefs - * [JBWS-3027] - Throw RuntimeExceptions not Protocol exceptions in Addressing Handler - * [JBWS-3029] - Quote mismatch in JBossWS console index.html - * [JBWS-3037] - Fix NPE thrown from logging framework - * [JBWS-2969] - There is no WebServiceException thrown when the null value is passed as arguments to a rpc/literal operation - * [JBWS-2970] - InjectionMetaDataDeploymentAspect misuse of EJBContainer.getEnc() - * [JBWS-2972] - WSProvide tool throws WSExcepton for WebServiceProvider annotated endpoints - * [JBWS-2973] - Client side respects the @HandlerChain in service endpoint interface class - * [JBWS-2975] - JAXBSerializer does not use defaultNamespace to create JAXBContext - * [JBWS-2976] - The incompatiable handler can be added in HTTPBinding - * [JBWS-2977] - Native does not repsect the fault value in @Action - * [JBWS-2978] - WSA implementation does not check mismatch between soap action and wsa action - * [JBWS-2980] - The wsa action in response message is not correct when the @Action output value is not specified - * [JBWS-2982] - Native ignores user specified MessageContext.HTTP_REQUEST_HEADERS - * [JBWS-2983] - Fix regressions due to HornetQ update - * [JBWS-2984] - Benchmark tests are setting incorrect date - * [JBWS-2985] - Fix addressing action header to follow JAX-WS 2.2 specification - * [JBWS-2991] - Addressing handlers have to respect @AddressingFeature attributes - * [JBWS-2021] - app-client impl assumes client and server share the same filesystem - * [JBWS-2903] - MTOM/XOP root MIME part does not contain charset parameter - * [JBWS-2917] - We're using buggy xalan version causing namespaces issues - * [JBWS-2927] - WSAaddressingClientHandler and WSAaddressingServerHandler don't honor the required value in @Addressing annotation - * [JBWS-2940] - Wrong SOAPContentElement namespace prefix after multiple model transitions - * [JBWS-2943] - Inconsistent / Incomplete handling of CONFIDENTIAL transport-guarantee defined in jboss.xml compared to @WebContext annotation - * [JBWS-2944] - The soap fault message for missing wsa action header is not expected - * [JBWS-2947] - WSException on client side when server sends a 100-continue HTTP response code - * [JBWS-2949] - JBossWS native does not ignore handler chains containing illegal namespace prefix in handler chains configuration file - * [JBWS-2953] - Fix WebService method detection algorithm - * [JBWS-2954] - Use JBossWSEntityResolver in Native WSConsume tool - * [JBWS-2955] - Client handler chain configured by annotation does not work - * [JBWS-2956] - Swallow the outbound SoapFault threw by client side handler - * [JBWS-2960] - @Action not taken into account when generating WSDL from endpoint - * [JBWS-2962] - Sign/encrypt verification can fail when the soap model performs transition during it - * [JBWS-2963] - JavaDoc inconsistency in WSConsume.java - * [JBWS-2964] - SOAPMessageImpl.saveChanges() changed the referenced mimeHeaders - * [JBWS-2810] - UnifiedMetaData uses thread context loader to find classes, this can lead to javassist.NotFoundException - * [JBWS-2845] - NullPointerException deploying JAX-WS endpoint with types in target namespace ending with '#' - * [JBWS-2846] - Service.create(java.net.URL, javax.xml.namespace.QName) should throw javax.xml.ws.WebServiceException not org.jboss.ws.metadata.wsdl.WSDLException - * [JBWS-2856] - wsprovide.sh fails while processing webservice annotated with @WebServiceProvider - * [JBWS-2875] - Remove jbossws-jbossXYZ.jar files from JBOSS_HOME/client directory - * [JBWS-2883] - WSException: Malformed URL when deploying to AS bound to IPv6 address - * [JBWS-2888] - ClassCastException when using Dispatch with WebServiceFeature - * [JBWS-2889] - BindingProvider.getEndpointReference throws InvocationTargetException instead of WebServiceException - * [JBWS-2902] - Fix JAX-WS 2.2 webserviceref clarification - * [JBWS-2918] - Remove dependency on Sun specific JVM classes - * [JBWS-2919] - Remove WSEventing implementation dependency on xalan implementation classes - * [JBWS-2934] - WebServiceContext injection have to be ThreadLocal aware - * [JBWS-2937] - Cannot create dispatch object using EPR based javax.xml.ws.Service.createDispatch methods - * [JBWS-2938] - Wrong return value when using JAXB based Dispatch - -Task - - * [JBWS-3030] - Refactor *-deploy.conf for supporting un-install of CXF stack - * [JBWS-3032] - Activate authentication for all HTTP verbs in management console - * [JBWS-2923] - Move out of deployers/jbossws.deployer jars that are not required to be in deployers - * [JBWS-2979] - Switch to Netty 3.2.0.BETA1 - * [JBWS-2981] - Add <wsa:MessageID> element in request soap message - * [JBWS-2986] - Factor out stack agnostic wsdl file publish procedure to jbossws-common - * [JBWS-2988] - Fix dependency on jboss-logging - * [JBWS-3003] - Fix maven [WARNING] Using platform encoding ... build is platform dependent! - * [JBWS-3005] - Use new Maven repository at repository.jboss.org/nexus - * [JBWS-2948] - Fix regressions due to VFS3 update - * [JBWS-2950] - Implement support for JAX-WS 2.2 target in wsconsume tool - * [JBWS-2958] - Upgrade to wsdl4j 1.6.2 - * [JBWS-2959] - Update obsolete jboss dependencies - * [JBWS-2965] - Allow nullable root element when building SchemaBinding - * [JBWS-2966] - Fix regressions due to HornetQ update - * [JBWS-2968] - Remove compilation warnings where possible - * [JBWS-2758] - Remove support for Java 5 - * [JBWS-2830] - EnvelopeBuilderDOM: buildSOAPHeader, reduce log level to debug for text node types. - * [JBWS-2850] - Remove SAAJ API interfaces from jbossws-native-saaj - * [JBWS-2851] - Remove JAXRPC API interfaces from jbossws-native-jaxrpc - * [JBWS-2876] - Add xmldsig xsd to the schemas resolvable offline - * [JBWS-2881] - Increase DOMUtils performances optimizing DocumentBuilder creation - * [JBWS-2898] - Optimize DocumentBuilderFactory creation using DocumentBuilderFactory.newInstance(String s, ClassLoader c) - * [JBWS-2900] - Optimize EntityResolver setup in DOMUtils - * [JBWS-2913] - Upgrade jaxws tools from 2.1.7 to 2.2 - * [JBWS-2916] - Properly setup deployment classloader - * [JBWS-2920] - Review install scripts / container integration to produce jbossws-jaxrpc.deployer - * [JBWS-2921] - Isolate factories/services configuration in descriptor only jars - * [JBWS-2922] - Add some basic JAX-RPC coverage to jbossws-framework testsuite - -Errata - - See: https://jira.jboss.org/browse/JBWS-3044 - - ------------------------ -jbossws-native-3.2.2.GA ------------------------ - -Bug - - * [JBWS-2651] - ClassCast Exception in case of malformed webservice response - * [JBWS-2746] - ClassCastException because SOAPEnvelopeImpl blindly casts to o.j.ws.core.soap.SOAPElementImpl - * [JBWS-2769] - Make sure our test suites for all stacks pass on Windows XP - * [JBWS-2771] - Importes XSD´s schemaLocation URL Port not changed when "webServicePort" property set in stack-agnostic-jboss-beans.xml - * [JBWS-2841] - ClassCastException TextImpl cannot be cast to SOAPElementImpl in CommonSOAPBinding.getParameterFromMessage - * [JBWS-2842] - Soap address rewrite does not use request url port when jbossws.undefined.host is setup - * [JBWS-2847] - JBossWSEntityResolver should cache properties - * [JBWS-2849] - Failed to parse response code in netty based http client - * [JBWS-2853] - Ineffective implementation of string normalize method - * [JBWS-2859] - Optimize DefaultEndpoint.getTargetBeanClass() method - * [JBWS-2860] - Remove useless DOMUtils.parse() method calls during deserialization process - -Feature Request - - * [JBWS-2751] - JAXBIntroductions: support @XmlTransient, @XmlID, @XmlIDREF, @XmlElementWrapper and @XmlJavaTypeAdapter - -Task - - * [JBWS-2647] - Reference to jboss-xml-binding.jar in ws scripts should be changed to match name in repository. - * [JBWS-2692] - Define client/server security policy for JBWS testsuite and run it under a security manager - * [JBWS-2770] - Rewrite org.jboss.test.ws.jaxws.binding testcase to get SOAPMessageContext from handlers - * [JBWS-2821] - Remove jbossws.sar from deploy directory - * [JBWS-2826] - Give more time to copy the process inputstream and error stream in JBossWSTest - * [JBWS-2835] - Remove deployers ordering workaround forAS 6.x series - * [JBWS-2840] - Implement support for SOAP12 protocol in wsprovide - * [JBWS-2848] - Fix build/testsuite for supporting AS 6.0.0.M1 integration target - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2865 - ------------------------ -jbossws-native-3.2.1.GA ------------------------ - -Bug - - * [JBWS-2262] - WSDL is not correctly modified to use the configured https port - * [JBWS-2674] - Restore implementation of javax.xml.ws.Endpoint - * [JBWS-2701] - @XmlSeeAlso and generated wsdl - * [JBWS-2743] - Make sure all maven dependencies are downloaded only from JBoss repositories - * [JBWS-2745] - Issue with stack switch and binary distro install - * [JBWS-2747] - Implement unimplemented DOM related methods in JBossWS SAAJ Implementation - * [JBWS-2753] - Leverage keep-alive connections to improve client side perfomances - * [JBWS-2759] - JBossWS installation doesn't work for non default configurations - * [JBWS-2760] - wsconsume.bat and wsprovider.bat require JAVA_HOME environment variable in Winodws OS - * [JBWS-2761] - Wrong HTTP code sent by WS-RM backport server - * [JBWS-2762] - Relax restriction on @WebContext(authMethod) - * [JBWS-2767] - WSDL_DESCRIPTION population in MessageContext badly affects performances - * [JBWS-2773] - Remove JBossAS webservices integration layer from tests classpath - * [JBWS-2777] - WSDL11Reader issue with schemas with no namespace and improve optimisation for circular references. - * [JBWS-2783] - Malformed URL exception when deploying wsdl with jms address - * [JBWS-2784] - MetadataBuilder chokes on multiple imports: "Cannot find port with name ..." - * [JBWS-2789] - Investigate why Endpoint.publish() doesn't work on server side on AS Branch_5_x - -Feature Request - - * [JBWS-2717] - Send XML declarations with WSDL - * [JBWS-2752] - Add 'nocompile' option to wsconsume (command line) - * [JBWS-2781] - Allow use of custom ClientSocketChannelFactory - * [JBWS-2785] - Upgrade to Netty 3.1.5.GA - -Task - - * [JBWS-2613] - Ensure correct line ends in windows shell scripts (CRNL) - * [JBWS-2726] - Rewrite dar/JMSClientTestCase - * [JBWS-2727] - Fix AS-Tests-AS-6.0.0 hudson job - * [JBWS-2741] - Remove JAXWS API interfaces from jbossws-native-jaxws - * [JBWS-2748] - Update to xmlsec 1.4.3 - * [JBWS-2749] - Update Hudson jobs because of JDK1.5 finishing EOL transition period - * [JBWS-2750] - Reduce impact of logging on performances - * [JBWS-2757] - Update Class-Path attribute in manifest - * [JBWS-2763] - Miscellaneous performance optimizations - * [JBWS-2772] - Remove JBoss kernel dependencies from SPI, COMMON and all STACKS - * [JBWS-2792] - Update to latest available JAX-WS and JAXB RI - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2797 - ------------------------ -jbossws-native-3.2.0.GA ------------------------ - -Bug - - * [JBWS-2526] - org.jboss.ws.core.soap.TextImpl does not implement org.w3c.dom.Comment - * [JBWS-2594] - X509IssuerSerial reference token creates invalid xml request - * [JBWS-2597] - XsiNilLoader throws NPE when using FastInfoset and nullable elements - * [JBWS-2630] - Invalid "Endpoint Address" in http://localhost:8080/jbossws/services, when a .war is embedded in a jar. - * [JBWS-2632] - SOAPHeader == null not caught // no good cast - * [JBWS-2662] - WebServiceContext injection into WS Provider leads to memory leaks - * [JBWS-2668] - Add missing privileged blocks - * [JBWS-2681] - Concurrency issues where multiple threads create Port using Service Simultaneously - * [JBWS-2689] - webservice.xml files are not validated against corresponding schema files - * [JBWS-2690] - Wrong JAXRPC deployment type detection - * [JBWS-2698] - Calling setPrefix(newPrefix) on any SOAPElement the prefix is not used for marshalling. - * [JBWS-2699] - BackwardCompatibleURLPatternDeploymentAspect is mangling URLs - * [JBWS-2703] - Node.getElementsByTagName only works with name local part - * [JBWS-2704] - Element.getElementsByTagNameNS should support wildcards for namespace, local name or both - * [JBWS-2706] - Unable to unmarshall attachment parts where the type is 'application/octet-stream' - * [JBWS-2708] - XmlAttachmentRef annotation on List<DataHandler> is not identified as an Attachment part - -Feature Request - - * [JBWS-2106] - Unify Native and CXF api for JAX-WSA (JSR-261) - * [JBWS-2652] - jboss-bootstrap upgrade - * [JBWS-2657] - Provide testcase for common JSR-261 API - * [JBWS-2693] - Implement Node.setTextContent() - * [JBWS-2694] - Enable simpler approach to disable chunked encoding - * [JBWS-2723] - JBossWS-Native WSRM Server does not use Offer Identifier - * [JBWS-2724] - JBossWS-Native WSRM Server does not set Accept.AckstTo.Address on CreateSequenceResponse - * [JBWS-2739] - Make OneWay operation non-blocking (client side) - -Task - - * [JBWS-2402] - Upgrade JBoss-JAXR to 2.0.1 including its dependencies - * [JBWS-2435] - Move jbossws documentation to http://www.jboss.org/community/docs/ - * [JBWS-2457] - Update WS-Addressing tutorials to use JAXWS 2.1 AddressingFeature - * [JBWS-2554] - Remove dependency on Remoting 2 - * [JBWS-2587] - Investigate why SimpleDispatchTestCase is failing - * [JBWS-2685] - Remove dependency on Sun's JVM proprietary APIs - * [JBWS-2702] - Update Netty dependency - * [JBWS-2705] - Remove jbossws-native-jaxrpc.jar from endorsed dir - * [JBWS-2711] - Make SubscriptionManager.WatchDog a Daemon Thread and remove it at SubscriptionManager shutdown - * [JBWS-2719] - Allow jconsole to be attached to testsuite - * [JBWS-2333] - Refactor ArchiveDeployerHook.getWebservicesMetaData() to Separate Deployer - * [JBWS-2370] - Ensure correct JBossWS startup if there are Webservice archived in deploy directory during JBossAS bootstrap - * [JBWS-2382] - Fix JBossWS deployers processing - * [JBWS-2623] - Create new pages on jboss.org - * [JBWS-2625] - Redirect on jbossws.jboss.org - * [JBWS-2658] - Update jboss.org/jbossws home page - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2738 - ------------------------ -jbossws-native-3.1.2.GA ------------------------ - -Feature Request - - * [JBWS-2619] - Consider DeploymentUnit's metadataLocation in - * ArchiveDeployment.getMetadataFileURL(..) - -Bug - - * [JBWS-2074] - Resource injection in jaxws endpoints and handlers - * [JBWS-2558] - Component's resources defined in the \<env-entry\> are not available to the EJB3 JAX-WS handlers - * [JBWS-2616] - handlerscope testcase is (native) stack specific - * [JBWS-2631] - Fix resource injection in JAX-WS handlers associated with EJB3 endpoints - * [JBWS-2634] - Implement support for @EJB annotations in WS components - * [JBWS-2638] - Insufficient optimisation in JBossXSModel traversing XML schema - -Task - - * [JBWS-2612] - Remove AS 4.2.x support from all stacks - * [JBWS-2618] - Update to xmlsec 1.4.2 - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2643 - ------------------------ -jbossws-native-3.1.1.GA ------------------------ - -Feature Request - - * [JBWS-2405] - MTOM/XOP Interoperability - cid href URLEncode/URLDecode - * [JBWS-2579] - Implement property file driven JBossWS entities resolving - -Bug - - * [JBWS-1665] - incorrect wsdl generation - * [JBWS-2074] - Resource injection in jaxws endpoints and handlers - * [JBWS-2166] - WSA client handler throws exception when installing reference parameters - * [JBWS-2208] - Impossible to deploy WS containing binding objects that are defined by XmlAttribute from "http://www.w3.org/XML/1998/namespace" - * [JBWS-2248] - RemoteConnectionFactory rejects uppercased protocol identifiers - * [JBWS-2409] - Fix jbws771 testcase binding customization file - * [JBWS-2411] - OutOfMemoryExecption in WSDL11Reader when loading xml schemas with circular references - * [JBWS-2433] - Fix JMS tests on AS 5.x and above - * [JBWS-2486] - POJO service should be shared - * [JBWS-2555] - Miscellaneous issues reported by FindBugs - * [JBWS-2564] - Use Server MBean instead of ServerConfig to get JBoss version - * [JBWS-2565] - Wrong WebContext authMethod or transportGuarantee annotatoin field values are not detected at deploy time - * [JBWS-2573] - Fix JBossWS builds with Maven 2.0.10 - * [JBWS-2580] - NPE in JBossWS when passing only -Dcom.sun.management.jmxremote on commandline - * [JBWS-2585] - JBossWS commandline tools reference not existing log4j config - * [JBWS-2589] - Some deployment failures prevent re-deployment - * [JBWS-2598] - JBossWSEntityResolver don't recognize all JBossWS specific XML schemas - -Task - - * [JBWS-2259] - Enable MTOM for incomming requests where the type of the content type is 'application/xop+xml' - * [JBWS-2327] - Provide tests for wsrunclient shell script - * [JBWS-2524] - Sort out / remove GenericSOAPHandler duplicity - * [JBWS-2537] - Simplify Hudson Jobs - * [JBWS-2559] - Correct WeakReference handling in ConfigObservable to remove cleared WeakReferences - * [JBWS-2566] - Add Maven Release plugin - * [JBWS-2568] - Remove AS 4.2 branch support (424 target) - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2608 - ------------------------ -jbossws-native-3.1.0.GA ------------------------ - -Feature Request - - * [JBWS-2441] - Complete JAX-WS 2.1 implementation - * [JBWS-2446] - Complete support for WebServiceFeature - * [JBWS-2451] - Support JAXB annotations on SEI when producing wsdls - * [JBWS-2452] - Implement EndpointReference related methods - * [JBWS-2454] - Add javax.xml.ws.reference.parameters values in message context - * [JBWS-2477] - Support generics in wrapper classes - * [JBWS-2491] - Enable JAXWS 2.1 WebServiceContext methods - -Bug - - * [JBWS-2195] - MTOM services seem to return two extra bytes at the end - * [JBWS-2288] - Exception handling issue in org.jboss.ws.core.CommonClient. - * [JBWS-2368] - JAX-WS Deployments Fail For AOP Instrumented Endpoints - * [JBWS-2377] - jbossws-deploy.conf in 'all' configuration links libraries in 'default' conf - * [JBWS-2412] - WSDL schema imports do not published successfully - * [JBWS-2416] - Search is not working on the mediawiki - * [JBWS-2419] - MTOM/XOP message use always "text/xml" for start-info regardless of content type associated with the content (SOAP message) - * [JBWS-2432] - NullPointerException processing headers without actor - * [JBWS-2437] - WSDL access url with resource suffix allows any arbitrary xml file to be viewed - * [JBWS-2443] - services page does not correctly update host address of endpoints - * [JBWS-2482] - Fix WSConsumerPlugin.testTarget() classloading issues - * [JBWS-2509] - dar.JMSClientTestCase contains AS4 specific code - -Patch - - * [JBWS-2404] - Efficient string handling - -Task - - * [JBWS-1312] - Fix JMS transport in trunk - * [JBWS-1999] - WS-Security Usename Token Profile JAAS Implementation for JSE based WebServices - * [JBWS-2150] - Migrate AddressRewritingTestCase to jaxws - * [JBWS-2196] - FastInfoset interoperability - * [JBWS-2431] - Update native deployment macros to don't publish jaxb-api.jar and stax-api.jar to JBOSS_HOME/lib directory - * [JBWS-2444] - Update hudson, deploy scripts, etc. for new AS repository layout - * [JBWS-2445] - Move jaxws 2.1 partial impl from jaxws-ext to jaxws module - * [JBWS-2450] - Enable target 2.1 option when using WSImport - * [JBWS-2455] - Conformance Requirements JAX-WS 2.1 - * [JBWS-2483] - Add smoke tools tests to the binary distro - * [JBWS-2504] - Use ControllerContext instead of KernelRegistryEntry which will be deprecated - * [JBWS-2505] - Remove container integration layer for AS 5.1.0 and AS 6.0.0 - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2545 - ------------------------ -jbossws-native-3.0.5.GA ------------------------ - -Feature Request - - * [JBWS-2323] - Allow the Xerces defer-node-expansion optimisation to be disabled - * [JBWS-2373] - Dynamic address re-writing if the request URL does not have a port do not add a port to the generated address - * [JBWS-2375] - Add getChildren fuctionality to UnifiedVirtualFile - * [JBWS-2401] - Drop port from URL for endpoint where default port for the protocol is being used - -Bug - - * [JBWS-1862] - RPC DII Calls Assume response parameter is called 'result' in the response message - * [JBWS-2266] - Schema Validation Feature Fails for Special Characters - * [JBWS-2268] - Implement @PostConstruct and @Predestroy annotations support for POJO based endpoints (JSR 109 conformance) - * [JBWS-2304] - DOMUtils ThreadLocals not cleared for client calls - * [JBWS-2346] - Issue with SAAJ API: SOAPBody.getElementsByTagNameNS() appears non-recursive - * [JBWS-2372] - Protocol not considered when re-writing address in WSDL based on request address - * [JBWS-2378] - Fix remoting client usage for one-way invocations - * [JBWS-2389] - WSDL To Java - Anonymous types nested within anonymous types generated JAX-RPC mapping does not match generated source - * [JBWS-2399] - Specify groupId explicitly in assembly creating deploy-artifacts directory - -Task - - * [JBWS-2339] - Improve endpoint lifecycle management - * [JBWS-2340] - Refactor JAXBIntroDA - * [JBWS-2355] - Remove Aspect Manager support from AbstractEndpointServlet - * [JBWS-2366] - Restore missing images on wiki - * [JBWS-2371] - Fix maven build to include right woodstox artifact - * [JBWS-2383] - Fix JBossWS deployment macros for new JBossAS trunk directory structure - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2422 - ------------------------ -jbossws-native-3.0.4.GA ------------------------ - -Bug - - * [JBWS-1188] - Relax requirement for wsu:id for UsernameToken - * [JBWS-2011] - Signature is invalid error when the message contains \r - * [JBWS-2245] - test cannot find temp directory - * [JBWS-2246] - NPE deploying web services in service archive in CR1 release - * [JBWS-2264] - NPE when web services are shut down - * [JBWS-2267] - Some Tests are Failing on Machines Without Internet Access - * [JBWS-2278] - JBossWS is picking the wrong binding when both Soap1.1 and Soap1.2 bindings are provided for a port - * [JBWS-2285] - ClassCastException: org.jboss.ws.core.soap.TextImpl in LogicalMessageImpl.getPayload - * [JBWS-2290] - Missing property jbossws.integration.target during ant eclipse - * [JBWS-2309] - PasswordType element uses wss-wssecurity-secext NS instead of wss-username-token-profile - * [JBWS-2322] - Commandline JBossWS Native Tests Are Not Cross Platform - * [JBWS-2326] - wsrunclient shell script is unfunctional due to incorrect classpath - * [JBWS-2319] - ClassCastException in SOAPBody.extractContentAsDocument(); - * [JBWS-2325] - Each request results to an open file descriptor - * [JBWS-2336] - Fix JSE deployers ordering - * [JBWS-2363] - Binary distribution has ant.properties instead of ant.properties.example - -Task - - * [JBWS-1397] - Fix <wsdl-publish-location> for jboss-5.0.x - * [JBWS-2286] - Provide source distributions - * [JBWS-2289] - Update source code headers - * [JBWS-2310] - Restore hudson job cleaning maven repository - * [JBWS-2320] - JBossWS ant and maven targets don't work on Windows OS - -Errata - - See: https://jira.jboss.org/jira/browse/JBWS-2352 - ------------------------ -jbossws-native-3.0.3.GA ------------------------ - -Feature Request - - * [JBWS-981] - Virtual host configuration for EJB endpoints - * [JBWS-2191] - Provide junit tests for the record management tools - * [JBWS-2207] - Allow to fully initialize the WS stack - * [JBWS-2270] - Re-use JAXBContext whenever possible - -Bug - - * [JBWS-1987] - NoClassDefFoundError with testsuite against SOA-P - * [JBWS-2152] - @WebFault does not behave like @XmlType - * [JBWS-2155] - Not supporting JMS endpoints for WS-Addressing - * [JBWS-2186] - Transforming from SAAJ SOAPBody to StreamResult throws IndexOutOfBoundsException - * [JBWS-2187] - Handler Chain Management Prevents Service Re-Use - * [JBWS-2189] - Attribute EncodingType is required for Nonce element - * [JBWS-2190] - Default encoding is used to decode responses - * [JBWS-2194] - Cannot get security domain declared through jboss.xml DD - * [JBWS-2216] - Soap address incorrect for https - * [JBWS-2233] - EJB3 webserviceref failure - * [JBWS-2234] - SOAP 1.2 Endpoint sends SOAP 1.1 messages - * [JBWS-2240] - PortComponent from jboss.xml descriptor is not parsed - * [JBWS-2242] - WSDL To Java doesn't handle hyphens in PortType properly - * [JBWS-2250] - Reference to JAXBElement Causes NullPointerException on deployment - * [JBWS-2260] - WSDL to Java, hyphen in PortType not being mapped correctly in generated descriptors - * [JBWS-2265] - Wrong UsernameTokenProfile namespace in Password Type attribute - -Task - - * [JBWS-2182] - Provide a partial encryption test case - * [JBWS-2255] - Upgrade JAXR from 1.2.0.GA to 1.2.0.SP2 - -Errata - - See: http://jira.jboss.org/jira/browse/JBWS-2281 - ------------------------ -jbossws-native-3.0.2.GA ------------------------ - -Feature Request - - * [JBWS-652] - Add JAAS certificate authentication support to ws-security implementation - * [JBWS-1278] - WSDL To Java, add a configuration option so all generated types can implement java.io.Serializable - * [JBWS-1316] - Add support for a configurable time tolerance value that handles clock skew - * [JBWS-1907] - authorization based on certificate used for wsse signature - * [JBWS-2156] - Allow JBossWS users to include xml declaration processing instruction in SOAP messages - -Bug - - * [JBWS-2012] - Attachment support for JAX-WS collections - * [JBWS-2014] - MTOM + WS-Security not working - * [JBWS-2035] - Cannot determine variable name for void wrapper - * [JBWS-2089] - isXOPPackage() is returning an incorrect value - * [JBWS-2103] - JBoss tools classpath problem - * [JBWS-2153] - Cannot Extract Schema Definition - * [JBWS-2159] - Faults not handled correctly for WS-RM services - * [JBWS-2172] - Additional \n when restoring XOP elements - -Task - - * [JBWS-2013] - Implement standard message context properties - * [JBWS-2116] - Sample for certificate authentication - * [JBWS-2123] - Update to jaxb-2.1.6 - * [JBWS-2124] - Expose http chunking through SOAPConnection - -Errata - - See: http://jira.jboss.org/jira/browse/JBWS-2220 - --------------------------- -jbossws-3.0.1-native-2.0.4 --------------------------- - -Feature Request - - * [JBWS-925] - Provide initial support for FastInfoset - * [JBWS-1124] - Scoped class loading domains for WS endpoints - * [JBWS-1165] - Provide initial support JSON data binding - * [JBWS-1172] - Support schema validation for incoming/outgoing messages - * [JBWS-1211] - Add support for @WebFault - * [JBWS-1296] - Add support for digest + nonces - * [JBWS-1814] - Dynamic Encryption based on clients input - * [JBWS-1820] - Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated - * [JBWS-1844] - Implement Provider.createW3CEndpointReference() - * [JBWS-1850] - Documentation support for Java->WSDL - * [JBWS-1861] - Improve exception message on invalid @WebService usage on SEI - * [JBWS-1865] - Unify SOAP message trace - * [JBWS-1886] - Provide basic configuration for WS-enabled user projects - * [JBWS-1890] - Provide basic project configuration for JBossWS tests - * [JBWS-1893] - Provide meaningful advanced samples - * [JBWS-1968] - Documentation support for WSDL->Java - * [JBWS-1988] - Complete Username Token Profile 1.0 - * [JBWS-1990] - Support for SOAP 1.2 in wsconsume - * [JBWS-2022] - Provide interface for WSSecurityDispatcher - -Bug - - * [JBWS-1217] - WSDLtoJava Namespace to package mapping does not support multiple namespaces - * [JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8 - * [JBWS-1857] - JAXBContext created for every wrapper type - * [JBWS-1878] - ConcurrentModificationException in initHandlerChain() - * [JBWS-1905] - jaxws-samples-logicalhandler-jaxb.war produces: java.lang.ClassCastException: org.jboss.ws.core.soap.TextImpl - * [JBWS-1909] - RequestHandler.handlerWSDLResquest has dependency on Servlet API - * [JBWS-1912] - DispatcherDelegate - Bypass RMIAdaptor when used locally - * [JBWS-1938] - Assign message name instead of IN and OUT for Inbound/Outbound Addressing Property - * [JBWS-1941] - Fault handler chain is not called when user application exceptions are thrown - * [JBWS-1948] - Optional SOAP Header element is required by WSSecurityHandlerServer handler - * [JBWS-1957] - WS-Eventing extension sends incorrect HTTP content-type - * [JBWS-1964] - showSubscriptionTable MBean Method - NullPointerException - * [JBWS-1965] - subscribe method on subscription manager - NullPointerException - * [JBWS-1966] - No Handler execution for inbound response when using Dispatch - * [JBWS-1969] - Cannot publish wsdl with imported schema files, using bottom up approach - * [JBWS-1970] - wsrunclient doesn't work with args - * [JBWS-1971] - Missing clone on MemoryBufferRecorder - * [JBWS-1973] - MTOM/XOP attachments not inlined when using JAX-WS handlers - * [JBWS-1974] - Using signature as security in a webservice throws an error when loglevel not Debug - * [JBWS-1979] - Endpoint address prop doesn't work with Dispatch - * [JBWS-1985] - EntityResolver not used when reading web.xml during web serivce deployment - * [JBWS-2000] - MTOM: Chunked encoding transfer problem - * [JBWS-2009] - WSDLFilePublisher throws FileNotFoundException when schema files are not in wsdl directory - * [JBWS-2011] - Signature is invalid error when the message contains \r - * [JBWS-2018] - JavatoWSDL Package to Namespace mapping does not support multiple packages - * [JBWS-2019] - WSDL To Java - Case of service-interface and service-endpoint-interface in JAX-RPC mapping does not match generated interface when WSDL type begins with lower case - * [JBWS-2058] - 'wsa:From' header field is assigned to variable 'replyTo' instead of 'from' - -Task - - * [JBWS-515] - Provide an initial implementation for WS-ReliableMessaging - * [JBWS-1724] - wsconsume cannot use part names that are friendly to .NET - * [JBWS-1776] - Verify isolated classloading with WSProvide - * [JBWS-1978] - Evaluate (and remove) JBPM dependency from component info - * [JBWS-1982] - Simplify deploy/undeploy cycles for different stacks - -Errata - - FIXME: [JBWS-751] Multiple schema imports with the same namespace - FIXME: [JBWS-1312] Fix JMS transport in trunk - FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x - FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface - FIXME: [JBWS-981] Virtual host configuration for EJB endpoints - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-2044] Rewrite Server side file system based RM store - ----------------- -jbossws-2.0.3.GA ----------------- - -Feature Request - - * [JBWS-1257] - Add configuration for token references - * [JBWS-1850] - Documentation support for Java->WSDL - * [JBWS-1874] - Allow configuration of secret key wrap algorithm - * [JBWS-1880] - WS-Addressing with endpoints using soap 1.2 - * [JBWS-1897] - Enable/disable logging on every endpoint - * [JBWS-1898] - Statistics/logs about clients calling endpoints - * [JBWS-1899] - Fine grained management of statistics recording - * [JBWS-1904] - Explicitly set the namespace of a WebFault - * [JBWS-1911] - Support the JMS transport with JAX-WS - * [JBWS-1950] - Show collected records as html table in jmx-console - -Bug - - * [JBWS-1217] - WSDLtoJava Namespace to package mapping does not support multiple namespaces - * [JBWS-1324] - JMS Endpoint - Message delivery starts before endpoint is ready. - * [JBWS-1762] - web.xml modified to web.xml.org - Subsequent runs fail - * [JBWS-1813] - context-root in jboss.xml is ignored - * [JBWS-1819] - wsrunclient script(s) differ and do not always function. - * [JBWS-1841] - WebServiceRef injection from DD doesn't work - * [JBWS-1873] - WSDL to Java - Incorrect case of generated type for anonymous type. - * [JBWS-1876] - Wrong Content-Type in SOAP 1.2 messages - * [JBWS-1879] - @BindingType is read from SEI instead of endpoint implementation - * [JBWS-1881] - WSDL To Java - All generated types have first character upper case, extends clause in base types do not take this into account. - * [JBWS-1906] - Stack overflow exception when reading bad wsdl files - * [JBWS-1924] - Verify installation script for jboss-4.2.1.GA - * [JBWS-1937] - Document/Literal addressing endpoint fails when retreiving Outbound Action - * [JBWS-1939] - URL port information of soap:address is different from import schemaLocation URL - -Errata - - * FIXME [JBCTS-540] EJB3 proxy does not implement the Home interface - * FIXME [JBWS-1460] @XmlMimeType on SEI parameter declarations - * FIXME [JBWS-1665] incorrect wsdl generation - * FIXME [JBWS-1724] wsconsume cannot use part names that are friendly to .NET - * FIXME [JBWS-1772] WSConsume output is not correctly redirected - * FIXME [JBWS-1773] Verify isolated classloading with WSConsume - * FIXME [JBWS-1776] Verify isolated classloading with WSProvide - * FIXME [JBWS-751] Multiple schema imports with the same namespace - * FIXME [JBWS-798] Complete EventingTestCase - * FIXME [JBWS-981] Virtual host configuration for EJB endpoints - ----------------- -jbossws-2.0.2.GA ----------------- - -Feature Request - - * [JBWS-492] - Add support for Policy Identification - * [JBWS-493] - Add support for Compact Policy Expression - * [JBWS-494] - Add support for Policy Intersection - * [JBWS-895] - Provide support for policy attachments - * [JBWS-1644] - Process wsdl extensibility elements - * [JBWS-1645] - Modify WSDLGenerator to deal with policies - * [JBWS-1806] - Add EndpointRegistry to jmx-console - * [JBWS-1807] - HTTP bindings for Provider - -Bug - - * [JBWS-700] - Update documentation for dealing with attachments - * [JBWS-1669] - Fix WebServiceContext.getMessageContext() for EJB endpoints - * [JBWS-1704] - The Use Of Remoting Causes An Additional 'datatype' Parameter To Be Sent On All Requests - * [JBWS-1735] - wstx.jar is missing from release, causes wsconsume to fail - * [JBWS-1761] - WSProvide ignores SOAPBinding declaration - * [JBWS-1791] - target deploy-jboss42-endorsed incomplete - * [JBWS-1792] - init-param for handler defined in jaxrpc-config not processed - * [JBWS-1795] - Type Substitution doesn't work with Schema2Java Client approach - * [JBWS-1796] - deploy-jboss40-no-ejb3 build fails - * [JBWS-1797] - Setting .NET friendly Endpoint in web.xml - * [JBWS-1798] - Cannot find local schema with relative urls - * [JBWS-1800] - Trying to monitor the JVM using -Dcom.sun.management.jmxremote prevents the jbossws 2.0.1 from coming up - * [JBWS-1801] - WSDL To Java - When an array if returned from a method on the SEI it is incorrectly ommitted from the generated JAX-RPC mapping. - * [JBWS-1808] - BackwardCompatibleURLPatternDeploymentAspect is mangling valid URLpatterns - * [JBWS-1809] - JAXBIntros are not taken into consideration when generating the WSDL - * [JBWS-1811] - Cannot access CLIENT_ADDRESSING_PROPERTIES inside client - * [JBWS-1815] - Missing fault detail in messages from SLSB Provider - * [JBWS-1843] - WSDL with custom schema imports causes java.lang.OutOfMemoryError: Java heap space when there are circular schema imports dependencies - * [JBWS-1852] - Failed to create a new SAX parser - * [JBWS-1856] - Attachment part not cleanup correctly - * [JBWS-1903] - DOMUtils doesn't clear thread locals - -Task - - * [JBWS-856] - Complete WS-Policy implementation - * [JBWS-1330] - Fix jaxrpc wsse tests for jbossws-5.0 - * [JBWS-1571] - Provide/Verify WS-Policy implementation - * [JBWS-1572] - Provide/Verify WS-PolicyAttachment implementation - * [JBWS-1612] - Provide an integration layer for ESB - * [JBWS-1614] - Provide an integration layer for JBossAS - * [JBWS-1748] - Improve the documentation that explains proprietary DD options - * [JBWS-1793] - Provide a test case for the tools scripts that reside under JBOSS_HOME/bin - * [JBWS-1816] - JAXWS SOAPFault inheritance - * [JBWS-1817] - WS-Security with JAX-WS Dispatch - * [JBWS-1835] - Schedule metro issues at java.net - * [JBWS-1842] - JAXB based ServiceRef meta data - * [JBWS-1846] - Release jbossws-2.0.2.GA binary - -Errata - - FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface - FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations - FIXME: [JBWS-1665] incorrect wsdl generation - FIXME: [JBWS-1772] WSConsume output is not correctly redirected - FIXME: [JBWS-1773] Verify isolated classloading with WSConsume - FIXME: [JBWS-1776] Verify isolated classloading with WSProvide - FIXME: [JBWS-1813] context-root in jboss.xml is ignored - FIXME: [JBWS-751] Multiple schema imports with the same namespace - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-981] Virtual host configuration for EJB endpoints - ----------------- -jbossws-2.0.1.GA ----------------- - -Feature Request - - * [JBWS-1736] - MTOM property at service-ref level - -Bug - - * [JBWS-1453] - WSDL To Java - Invalid name for generated class if complex type name contains a period. - * [JBWS-1536] - NPE in WSDL to Java when webservices.xml requested but no global package mapping - * [JBWS-1617] - JAXRPC doc/literal trims empty string - * [JBWS-1702] - JAXWS type inheritance - * [JBWS-1723] - WSDL To Java - Anonymous Types Referenced As Bound Headers Not Handled Correctly - * [JBWS-1725] - WSDL-JAVA Derivation of a complex type from a Simple type: bas64Binary is not mapped to byte[] - * [JBWS-1732] - WSProvideTask throws IllegalArgumentException - * [JBWS-1733] - JAXWS client ignores BindingProvider.SESSION_MAINTAIN_PROPERTY - * [JBWS-1747] - org.jboss.wsf.container.jboss42.WebMetaDataAdapter doesn't check if there's a J2eeApplicationMetaData instance set on the DeploymentInfo parent - * [JBWS-1749] - JBossWS2.0.0.GA download does not contain updated jboss-xml-binding library - * [JBWS-1762] - web.xml modified to web.xml.org - Subsequent runs fail - * [JBWS-1763] - Incorrect handling of charsets when the default charset is not UTF-8 - * [JBWS-1766] - UsernameToken ignores BindingProvider.USERNAME_PROPERTY - * [JBWS-1771] - Post-handler-chain not invoked for "Standard Client" configuration with DII client - * [JBWS-1780] - Context servlet throws NPE - -Task - - * [JBWS-1729] - Create a comprehensive SPI tools test suite - * [JBWS-1770] - Fix Endpoint API for jboss-5.0.0.Beta3 - -Errata - - FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface - FIXME: [JBCTS-624] R2753 cannot parse web.xml for jsp vehicle - FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations - FIXME: [JBWS-1665] incorrect wsdl generation - FIXME: [JBWS-1772] WSConsume output is not correctly redirected - FIXME: [JBWS-1773] Verify isolated classloading with WSConsume - FIXME: [JBWS-1776] Verify isolated classloading with WSProvide - FIXME: [JBWS-751] Multiple schema imports with the same namespace - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-981] Virtual host configuration for EJB endpoints - -------------- -jbossws-2.0.0 -------------- - -Feature Request - - * [JBWS-434] - Support sequences of anys in JAXRPC - * [JBWS-1460] - @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations - * [JBWS-1518] - Add support for jdk-1.6 - * [JBWS-1597] - WSDL To Java - Add support for bound headers. - * [JBWS-1666] - Simplify jbosws jar dependencies - * [JBWS-1564] - Support swaRef with JAX-WS - * [JBWS-1618] - Make default context root for jaxws ejb endpoint configurable - * [JBWS-429] - WSDL To Java - Create Custom Holders for Custom types that define INOUT parameters and OUT parameters - * [JBWS-771] - Use part names that are friendly to .NET - -Bug - - * [JBWS-801] - Chunked transfer of large attachments - * [JBWS-805] - Fault code is always 'Client' - * [JBWS-859] - SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content - * [JBWS-862] - Return SOAP Fault for invalid soap messages - * [JBWS-1093] - Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints - * [JBWS-1263] - Addressing does not disable the mustUnderstand attribute, which causes HandlerchainBaseImple.checkMustUnderstand to fail - * [JBWS-1283] - Soap attachments were dropped on server responses. Attachment is added on a handler's handleResponse method; however it mysteriously disappeared on the outgoing soap message. - * [JBWS-1339] - @Security domain vs. <security-domain> - * [JBWS-1346] - wsa:ReplyTo alwayt null - * [JBWS-1403] - NumberFormatException When Using StubExt.PROPERTY_CLIENT_TIMEOUT - * [JBWS-1422] - NPE if @WebParam.name like "mX.." - * [JBWS-1439] - Jdk 1.6.0 Requests get the error "setProperty must be overridden by all subclasses of SOAPMessage" - * [JBWS-1446] - Invalid WSDL when a parameter of type Object is part of a webmethod - * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x - * [JBWS-1472] - Address in WSDL is now always replaced regardless of 'alwaysModifySOAPAddress' value. - * [JBWS-1511] - MessageFactory does not preserve comments - * [JBWS-1520] - No server response on invalid soap request - * [JBWS-1553] - fails to read operations for portType from different namespace - * [JBWS-1556] - @WebWservice does not work with class isolation - * [JBWS-1563] - WSDLDefinitionsFactory doesn't resolve schema references locally - * [JBWS-1566] - JBossWS-1.2.0.GA invalid wsdl generated when using @XmlSchema annotations on Types inheriting from >1 java package - * [JBWS-1579] - @EndpointConfig ignored on SEI - * [JBWS-1588] - Review jar in classpath for wsrunclient.sh - * [JBWS-1594] - Support certificate password different from keystore - * [JBWS-1595] - No typemapping for xsd:anyType with soap encoding - * [JBWS-1607] - WSDL To Java - document/literal, IN OUT parameter incorectly used as return type. - * [JBWS-1609] - Address in WSDL - Port value is -1 when server is requested with default port 80 - * [JBWS-1611] - SOAPAction is not sent in dispath requests - * [JBWS-1616] - Verify correct bahaviour of @WebService.wsdlLocation - * [JBWS-1619] - ServletEndpointContext.getHttpSession always creates HTTPSession - * [JBWS-1620] - Incorrect handling of MIME boundaries in MultipartRelatedDecoder - * [JBWS-1621] - wstools.sh contain the wrong client libs and will fail - * [JBWS-1622] - Multiple context root not supported - * [JBWS-1624] - JBossWS samples don't work with JMX authentication - * [JBWS-1625] - Calling SOAPPart.setContent() with a DOMSource containing an Element which is a SOAPElement the contents of the body are added twice. - * [JBWS-1627] - WSDL To Java - Array Unwrapping uses incorect case to reference array type. - * [JBWS-1647] - Text Node Preservation For Messages Sent Across The Wire - * [JBWS-1653] - Post-handler-chain not invoked for "Standard Client" configuration - * [JBWS-1657] - Error resolving swaref schema - * [JBWS-1658] - SwaRef fails with doclit/wrapped endpoints - * [JBWS-1659] - @XmlAttachmentRef ignored on method level - * [JBWS-1660] - Resolve swaref schema through entity resolver - * [JBWS-1680] - Dispatch.invoke does not throw a ProtocolException on Fault - * [JBWS-1690] - Review wstools scripts and jars copied to client. - * [JBWS-1691] - WSDL To Java - Initial Character of Service and SEI names should be upper case. - * [JBWS-1692] - SOAPElement.importNode() not supported - * [JBWS-1696] - MIssing wsdl4j.jar in scripts - * [JBWS-1697] - WSDL To Java - Incorrect handling of Simple types derived by restriction for holders. - * [JBWS-1698] - WSDL To Java - If fault name contains 'Fault' the generated Exception does not match the throws clause on the SEI - * [JBWS-1706] - SOAPConnection.get fails with ProtocolException - * [JBWS-1710] - StackOverflowError when calling SOAPDocument.createCDATASection - * [JBWS-1711] - NoClassDefFoundError: com/sun/xml/stream/buffer/XMLStreamBuffer - -Task - - * [JBWS-1661] - Update to jaxb-ri-2.1 - -Errata - - FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL - FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called - FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface - FIXME: [JBWS-1312] Fix JMS transport in trunk - FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0 - FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x - FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations - FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string - FIXME: [JBWS-751] Multiple schema imports with the same namespace - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-981] Virtual host configuration for EJB endpoints - -------------- -jbossws-1.2.1 -------------- - -Feature Request - - * [JBWS-1156] - Implement injection of WebServiceRef - * [JBWS-1021] - Implement javax.xml.ws.Endpoint - * [JBWS-1022] - Implement javax.xml.ws.WebServiceContext - * [JBWS-1023] - Implement javax.xml.ws.Service - * [JBWS-1024] - Implement javax.xml.ws.BindingProvider - * [JBWS-1025] - Implement javax.xml.ws.Dispatch - * [JBWS-1070] - Add context-root in generated jboss-web.xml for Endpoint API - * [JBWS-1207] - Async jaxws dispatch - * [JBWS-1208] - Async jaxws proxy - * [JBWS-1020] - Implement javax.xml.ws.Provider - * [JBWS-1192] - Examples for JSR181 EJB Endpoints: show how to use a JavaBean as an operations's argument or return value - * [JBWS-1388] - Notification validation before dispatch - * [JBWS-1406] - WS-Eventing: event notification failure - * [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2 - * [JBWS-1443] - getMessageContext Not Implemented - * [JBWS-1456] - Allow client configuration on StubExt - * [JBWS-1457] - Support soap attachments on StubExt - -Bug - - * [JBWS-1079] - Incorrect WSDL to Java mapping for anonymous struct. - * [JBWS-1336] - JAXWSDeployerJSE throws NPE - * [JBWS-1389] - WebServiceProvider should be allowed on EJB3 beans - * [JBWS-1409] - WsdlGenerator crashes on void-methods - * [JBWS-1168] - JAXWS handler ordering - * [JBWS-1357] - JAXWSDeployerJSE is not handling jsp servlet defs correctly - * [JBWS-1374] - Package to namespace mapping is wrong - * [JBWS-1375] - JSR181MetaDataBuilder inspects java.* classes - * [JBWS-800] - ClassCastException when trying to marshal a subclass of Date - * [JBWS-810] - Simple type with restriction - * [JBWS-1184] - WSDL to Java - maps required xsd:double attribute to java.lang.Double - * [JBWS-1231] - wstools/java-wsdl does not handle recursive types - * [JBWS-1259] - WSDL To Java - StackOverflowError with self referencing element. - * [JBWS-1260] - WSDL To Java - Parameter unwrapping fails for a lot of scenarios. - * [JBWS-1285] - NPE when the soap encoded array size is 0 on the return path - * [JBWS-1317] - webservices.xml override does not account for namespaces - * [JBWS-1328] - Security configuration not correctly loaded when deployed as ear to JBoss 5.0.x - * [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL - * [JBWS-1384] - Attachment parts with doclit message - * [JBWS-1386] - ComplexType with base64Binary property - * [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header - * [JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded - * [JBWS-1408] - NPE when jbossws.sar is not expanded - * [JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT - * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts - * [JBWS-1428] - Java to WSDL - Arrays defined with indexed properties within value type are skipped when generating the WSDL - * [JBWS-1441] - WSDL to Java - Complex type defined with complexContent only last element is in the generated java class if base type is empty - * [JBWS-1450] - WSDL To Java - Parameter unwrapping not handling nillable types correctly. - * [JBWS-1451] - comparison of the mime type should not be case sensitive - * [JBWS-1455] - WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations. - * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x - * [JBWS-1497] - Fix failed resource lookup when offline - * [JBWS-1501] - wsimport RI fails when processing parameterOrder on one-way operations - -Task - - * [JBWS-1284] - Gracefully handle invalid ImageIO mime types - * [JBWS-1297] - Implement JAXB Fault Marshalling - * [JBWS-1404] - Add support for differing namespaces on SEI and implementation bean - * [JBWS-644] - JAXWS initial implementation - * [JBWS-1031] - Use JAXB-2.0 for JSR-181 endpoints - * [JBWS-1099] - Implement JAXWS Handler Framework - * [JBWS-1150] - Implement JAXWS Logical Handlers - * [JBWS-1315] - Implement WS deployers for jbossas/trunk - * [JBWS-1425] - Update to remoting-2.0 - * [JBWS-723] - Protect access to WSDL - * [JBWS-1077] - Improve/Complete security documentation - * [JBWS-1098] - Publicly available interop endpoints - * [JBWS-1100] - Move WS-Eventing to updated wsa schema - * [JBWS-1155] - Document SwA/XOP usage with JSR181 endpoints. - * [JBWS-1307] - JAXWS user guide and samples - * [JBWS-1418] - Provide JBossWS API docs - * [JBWS-1429] - Cleanup PortComponent annotation - * [JBWS-1433] - Remerge connector discovery code - * [JBWS-1434] - Client programming: Add property API at Service level similiar to StubExt. - * [JBWS-1473] - Setup soak and performance tests - * [JBWS-1503] - Support XOP samples in tomcat - * [JBWS-1504] - Resolve dependency on snapshots - -Errata - - FIXME: [JBWS-1294] Add support for mapping async methods - FIXME: [JBWS-1511] MessageFactory does not preserve comments - FIXME: [JBWS-434] Support sequences of anys in JAXRPC - FIXME: [JBWS-751] Multiple schema imports with the same namespace - -------------- -jbossws-1.0.4 -------------- - - * [JBWS-660] XOP inline base64Binary and sign message - * [JBWS-779] Add webservices.xml support to wsdlTojava - * [JBWS-868] BPEL in jbossws-samples - * [JBWS-1113] Improve performance of Service.getPort() - * [JBWS-1178] Multiple virtual host and soap:address problem - * [JBWS-1182] Change wsdl-java@file to wsdl-java@location - * [JBWS-1200] Provide source download for GA release - * [JBWS-1261] Provide support for additional MTOM java types besides byte[] - * [JBWS-1299] Add support for wsdl-java@parameter-style - * [JBWS-1302] Use EAR name in context root for EJB endpoints - * [JBWS-1323] Add JBoss EULA - * Bug fixes - -Errata - - FIXME: [JBWS-1291] Fix JaxrpcMappingValidator - FIXME: [JBWS-1292] Fix XOPElementRPCTestCase - FIXME: [JBWS-269] Support attachments in Web Services Tools - FIXME: [JBWS-269] Support attachments in Web Services Tools - FIXME: [JBWS-434] Support sequences of anys - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-798] Complete EventingTestCase - FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums - -------------- -jbossws-1.0.3 -------------- - - * [JBWS-983] Configure SOAPAction on the Call object - * [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools - * [JBWS-1160] XOP Inline base64 for doc/lit requests - * Bug fixes - -------------- -jbossws-1.0.2 -------------- - - * [JBWS-855] Provide MTOM for document/literal - * [JBWS-920] integrate wstools wsdl2java functionality - * [JBWS-921] integrate wstools java2wsdl functionality - * [JBWS-932] Performance bottleneck when marshalling array types - * Bug fixes - -------------- -jbossws-1.0.1 -------------- - - * [JBWS-776] WSDLToJava Support wildcards - * [JBWS-852] Integration with Mikrocontainer - * [JBWS-865] Support security annotations for EJB3 endpoints - * [JBWS-871] Arrays with JSR181 endpoints - * [JBWS-923] Complete MTOM for rpc/literal - * Bug fixes Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/ant.properties.example 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,22 +0,0 @@ -# -# A sample ant properties file -# - -# Optional JBoss Home -jboss711.home=(a)jboss711.home@ - -# The JBoss server under test. -jbossws.integration.target=jboss711 - -# The JBoss settings -jboss.bind.address=localhost - -# JBoss Management console authentication (AS 7.1.x) -jbossws.deployer.authentication.username=admin -jbossws.deployer.authentication.password=admin - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -47,32 +47,32 @@ </target>  -  +   - <target name="target-jboss711"> - <property name="jbossws.integration.target" value="jboss711"/> + <target name="target-jboss712"> + <property name="jbossws.integration.target" value="jboss712"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <target name="deploy-jboss711" depends="undeploy-jboss711,deploy-structure-jboss71x" description="Deploy jbossws to jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <copy todir="${jboss711.home}" overwrite="true" verbose="true"> + <target name="deploy-jboss712" depends="undeploy-jboss712,deploy-structure-jboss71x" description="Deploy jbossws to jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <copy todir="${jboss712.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> <exclude name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy>  - <installModules targetDir="${jboss711.home}/modules"> + <installModules targetDir="${jboss712.home}/modules"> <fileset dir="${deploy.structure}/modules"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <target name="undeploy-jboss711" depends="target-jboss711,init" description="Remove jbossws from jboss711"> - <fail message="Not available: ${jboss711.available.file}" unless="jboss711.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss711.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <target name="undeploy-jboss712" depends="target-jboss712,init" description="Remove jbossws from jboss712"> + <fail message="Not available: ${jboss712.available.file}" unless="jboss712.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> </project> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-setup.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -36,9 +36,9 @@ <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> + <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> - <available property="jboss711.available" file="${jboss711.available.file}"/> + <available property="jboss712.available" file="${jboss712.available.file}"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -59,7 +59,7 @@ <condition property="jbossws.integration.jboss710" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </or> </condition> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/test-exclude.xsl =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/test-exclude.xsl 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/test-exclude.xsl 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,16 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet version="1.0" - xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:m="http://maven.apache.org/POM/4.0.0"> - <xsl:param name="targetName"/> - <xsl:output method="text"/> - <xsl:template match="/"> - <xsl:for-each select="//m:profile[m:id=$targetName]/m:build/m:plugins/m:plugin[m:artifactId='maven-surefire-plugin']//m:excludes"> - <xsl:for-each select="m:exclude|comment()"> - <xsl:if test="self::comment()"> - <xsl:text>#</xsl:text> - </xsl:if> - <xsl:value-of select="."/><xsl:text>
</xsl:text> - </xsl:for-each> - </xsl:for-each> - </xsl:template> -</xsl:stylesheet> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,118 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>binary-distribution</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-native-bin-dist/</outputDirectory> - <includes> - <include>build.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-native-bin-dist/</outputDirectory> - <filtered>true</filtered> - <includes> - <include>ant.properties.example</include> - </includes> - </fileSet> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-native-bin-dist/build</outputDirectory> - <includes> - <include>build-deploy.xml</include> - <include>build-setup.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>../resources/src/main/resources/resources</directory> - <outputDirectory>jbossws-native-bin-dist/build</outputDirectory> - <includes> - <include>deploy.conf</include> - <include>server-deploy.conf</include> - <include>jbossws-deploy-macros.xml</include> - </includes> - </fileSet> -  - <fileSet> - <directory>src/main/distro</directory> - <outputDirectory>jbossws-native-bin-dist/docs</outputDirectory> - <filtered>true</filtered> - <includes> - <include>Install.txt</include> - <include>ReleaseNotes.txt</include> - <include>JBossORG-EULA.txt</include> - </includes> - </fileSet> - <fileSet> - <directory>target/docbook/publish</directory> - <outputDirectory>jbossws-native-bin-dist/docs</outputDirectory> - </fileSet> -  - <fileSet> - <directory>target/assembly/deploy-artifacts</directory> - <outputDirectory>jbossws-native-bin-dist/deploy</outputDirectory> - </fileSet> -  - <fileSet> - <directory>../testsuite/native-tests/src/test</directory> - <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory> - <includes> - <include>etc/**</include> - </includes> - </fileSet> -  - <fileSet> - <directory>../testsuite/src/test/resources/</directory> - <outputDirectory>jbossws-native-bin-dist/tests/etc/appclient</outputDirectory> - </fileSet> -  - <fileSet> - <directory>target/exclude-file</directory> - <outputDirectory>jbossws-native-bin-dist/tests/resources</outputDirectory> - <includes> - <include>test-excludes-*.txt</include> - </includes> - </fileSet> - </fileSets> - -  - <dependencySets> - <dependencySet> - <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <unpack>true</unpack> - <scope>test</scope> - <includes> - <include>*:jbossws-shared-testsuite:zip</include> - </includes> - <unpackOptions> - <includes> - <include>ant-import/**</include> - <include>java/org/jboss/test/helper/**</include> - <include>java/org/jboss/test/ws/jaxrpc/samples/**</include> - <include>java/org/jboss/test/ws/jaxws/samples/**</include> - <include>java/org/jboss/test/ws/jaxws/smoke/**</include> - <include>java/org/jboss/test/ws/appclient/**</include> - <include>java/org/jboss/test/ws/management/**</include> - <include>java/org/jboss/test/ws/saaj/**</include> - <include>resources/jaxrpc/samples/**</include> - <include>resources/jaxws/samples/**</include> - <include>resources/jaxws/smoke/**</include> - <include>resources/management/**</include> - <include>resources/saaj/**</include> - </includes> - </unpackOptions> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - </dependencySets> -</assembly> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -24,7 +24,6 @@ <include>**/module.xml</include> </includes> </fileSet> - </fileSets> <dependencySets> @@ -61,9 +60,6 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.jaxr:juddi-service:sar</include> - <include>apache-scout:scout:jar</include> - <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss*:jar</include> <include>org.jboss:jbossxb:jar</include> @@ -171,6 +167,4 @@ </dependencySets> - - </assembly> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-src-dist.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -1,69 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>source-distribution</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <fileSets> - <fileSet> - <directory>../../eclipse/</directory> - <outputDirectory>jbossws-native-src-dist/eclipse/ - </outputDirectory> - </fileSet> - <fileSet> - <directory>../../src/</directory> - <outputDirectory>jbossws-native-src-dist/src/</outputDirectory> - </fileSet> - <fileSet> - <directory>../</directory> - <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory> - <excludes> - <exclude>**/target/**</exclude> - <exclude>**/shared-tests/**</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../testsuite/shared-tests</directory> - <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests - </outputDirectory> - <includes> - <include>src/test/etc/</include> - <include>scripts/</include> - <include>pom.xml</include> - </includes> - </fileSet> - <fileSet> - <directory>../../</directory> - <outputDirectory>jbossws-native-src-dist/</outputDirectory> - <includes> - <include>.classpath</include> - <include>.project</include> - <include>build.xml</include> - <include>pom.xml</include> - </includes> - </fileSet> - </fileSets> - -  - <dependencySets> - <dependencySet> - <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests/src/test - </outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>true</unpack> - <includes> - <include>*:jbossws-shared-testsuite:zip</include> - </includes> - <unpackOptions> - <includes> - <include>**/*</include> - </includes> - </unpackOptions> - <useProjectArtifact>false</useProjectArtifact> - </dependencySet> - </dependencySets> -</assembly> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -43,12 +43,12 @@ <phase>package</phase> </execution> <execution> - <id>jboss711</id> + <id>jboss712</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss711</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss711/jbossws.beans</classesDirectory> + <classifier>jboss712</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> </configuration> </execution> </executions> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -399,14 +399,14 @@ </profile>  <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jboss.version>${jboss711.version}</jboss.version> - <jbossws.integration.target>jboss711</jbossws.integration.target> + <jboss.version>${jboss712.version}</jboss.version> + <jbossws.integration.target>jboss712</jbossws.integration.target> <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> </properties> <dependencies> Added: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml (rev 0) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/src/test/resources/jboss712/appclient-ws.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -0,0 +1,115 @@ + + +<server xmlns="urn:jboss:domain:1.2"> + + <extensions> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.webservices"/> + </extensions> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:1.1"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + </console-handler> + + <periodic-rotating-file-handler name="FILE"> + <level name="INFO"/> + <formatter> + <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%E%n"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="appclient.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <logger category="jacorb"> + <level name="WARN"/> + </logger> +  + <logger category="jacorb.config"> + <level name="ERROR"/> + </logger> + + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:1.0"/> + <subsystem xmlns="urn:jboss:domain:ejb3:1.2" /> + <subsystem xmlns="urn:jboss:domain:naming:1.0"/> + <subsystem xmlns="urn:jboss:domain:security:1.0"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="UsersRoles" flag="required"/> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:remoting:1.1"> + <connector name="remoting-connector" socket-binding="remoting"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:1.1"/> + </profile> + + <interfaces> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public"> + <socket-binding name="remoting" port="4448"/> + </socket-binding-group> + +</server> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-26 11:46:37 UTC (rev 16029) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-03-26 12:47:18 UTC (rev 16030) @@ -63,7 +63,7 @@ <jbossws.common.version>2.0.3-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.1-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.3-SNAPSHOT</jbossws.shared.testsuite.version> - <jboss711.version>7.1.1.Final</jboss711.version> + <jboss712.version>7.1.2.Final-SNAPSHOT</jboss712.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <ant.version>1.7.1</ant.version> <commons.logging.version>1.1.1</commons.logging.version> @@ -117,7 +117,7 @@ <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss711.version}</version> + <version>${jboss712.version}</version> </dependency>  <dependency> @@ -504,14 +504,14 @@ </profile>  <profile> - <id>jboss711</id> + <id>jboss712</id> <properties> - <jbossws.integration.target>jboss711</jbossws.integration.target> - <jboss.home>${jboss711.home}</jboss.home> + <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.home>${jboss712.home}</jboss.home> </properties> </profile>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16029 - stack/native/branches/jbossws-native-4.0.x.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 07:46:37 -0400 (Mon, 26 Mar 2012) New Revision: 16029 Modified: stack/native/branches/jbossws-native-4.0.x/ Log: Blocked revisions 16017 via svnmerge ....... r16017 | ropalka | 2012-03-23 16:15:08 +0100 (Fri, 23 Mar 2012) | 1 line [JBWS-3462] removing AS70x support, binary distro, source distro & docs ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-blocked - https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:15652,15877,15934,...

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16028 - in stack/native/branches/jbossws-native-4.0.x: modules/testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 06:32:39 -0400 (Mon, 26 Mar 2012) New Revision: 16028 Removed: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/ Modified: stack/native/branches/jbossws-native-4.0.x/ Log: [JBPAPP-7572] Merged revisions 16021 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16021 | ropalka | 2012-03-24 07:04:28 +0100 (Sat, 24 Mar 2012) | 1 line [JBWS-3462] removing shared-testsuite ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16027 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/javax/xml/ws and 28 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 06:22:38 -0400 (Mon, 26 Mar 2012) New Revision: 16027 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/javax/xml/ws/addressing/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/wsaddressing/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/addressing/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/wsaddr/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/epr/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/handlerlifecycle/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2166/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2926/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2927/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2978/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3124/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsaddressing/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/wsaddr/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/handlerlifecycle/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2166/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2927/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2978/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/dar/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/samples/wsa/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/wsaddressing/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: [JBPAPP-7572] Merged revisions 16015 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16015 | ropalka | 2012-03-23 13:14:28 +0100 (Fri, 23 Mar 2012) | 1 line [JBWS-3472] removing ws-addressing support ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -22,22 +22,17 @@ package org.jboss.ws.core; import java.util.Observable; -import java.util.ResourceBundle; import javax.xml.ws.EndpointReference; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; -import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.jaxrpc.SOAP11BindingJAXRPC; import org.jboss.ws.core.jaxrpc.SOAP12BindingJAXRPC; import org.jboss.ws.core.jaxws.binding.HTTPBindingJAXWS; import org.jboss.ws.core.jaxws.binding.SOAP11BindingJAXWS; import org.jboss.ws.core.jaxws.binding.SOAP12BindingJAXWS; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.ws.metadata.config.Configurable; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -51,7 +46,6 @@ */ public class CommonBindingProvider implements Configurable { - private static final ResourceBundle bundle = BundleUtils.getBundle(CommonBindingProvider.class); private static Logger log = Logger.getLogger(CommonBindingProvider.class); protected EndpointMetaData epMetaData; @@ -103,42 +97,9 @@ public EndpointReference getEndpointReference() { - if (binding instanceof HTTPBinding ) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - return getEndpointReference(W3CEndpointReference.class); + throw new UnsupportedOperationException(); } - public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) - { - // Conformance 4.5 (javax.xml.ws.BindingProvider.getEndpointReference): An implementation - // MUST be able to return an javax.xml.ws.EndpointReference for the target endpoint if a SOAP binding - // is being used. If the BindingProvider instance has a binding that is either SOAP 1.1/HTTP or - // SOAP 1.2/HTTP, then a W3CEndpointReference MUST be returned. If the binding is XML/HTTP an - // java.lang.UnsupportedOperationExceptionMUST be thrown. - - if (binding instanceof HTTPBinding ) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - if (epMetaData == null) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_FROM_EMD")); - - if (epMetaData.getEndpointReference() != null) - { - return EndpointReferenceUtil.transform(clazz, epMetaData.getEndpointReference()); - } - - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - builder.address(epMetaData.getEndpointAddress()); - builder.serviceName(epMetaData.getServiceMetaData().getServiceName()); - builder.endpointName(epMetaData.getPortName()); - builder.wsdlDocumentLocation(epMetaData.getEndpointAddress() + "?wsdl"); - - return EndpointReferenceUtil.transform(clazz, builder.build()); - } - public void update(Observable observable, Object object) { if(log.isDebugEnabled()) log.debug("Update config: " + object); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -21,8 +21,6 @@ */ package org.jboss.ws.core; -import java.net.MalformedURLException; -import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -39,8 +37,6 @@ import javax.xml.soap.SOAPException; import javax.xml.ws.ProtocolException; import javax.xml.ws.WebServiceException; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.handler.MessageContext; import org.jboss.logging.Logger; @@ -58,7 +54,6 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; -import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -323,29 +318,6 @@ { String targetAddress = getTargetEndpointAddress(); - // Fall back to wsa:To - AddressingProperties addrProps = (AddressingProperties)msgContext.get(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND); - if (targetAddress == null && addrProps != null && addrProps.getTo() != null) - { - AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); - String wsaTo = addrProps.getTo().getURI().toString(); - if (wsaTo.equals(ADDR.getAnonymousURI()) == false) - { - try - { - URL wsaToURL = new URL(wsaTo); - if (log.isDebugEnabled()) - log.debug("Sending request to addressing destination: " + wsaToURL); - targetAddress = wsaToURL.toExternalForm(); - } - catch (MalformedURLException ex) - { - if (log.isDebugEnabled()) - log.debug("Not a valid URL: " + wsaTo); - } - } - } - // The endpoint address must be known beyond this point if (targetAddress == null) throw new WSException(BundleUtils.getMessage(bundle, "TARGET_ENDPOINT_ADDRESS_NOT_SET")); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -29,9 +29,7 @@ import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; -import javax.xml.ws.addressing.EndpointReference; -import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.MessageTrace; @@ -55,8 +53,6 @@ public abstract class HTTPRemotingConnection implements RemoteConnection { private static final ResourceBundle bundle = BundleUtils.getBundle(HTTPRemotingConnection.class); - // provide logging - private static Logger log = Logger.getLogger(HTTPRemotingConnection.class); private boolean closed; private Integer chunkSize; @@ -108,11 +104,6 @@ targetAddress = epInfo.getTargetAddress(); callProps = epInfo.getProperties(); } - else if (endpoint instanceof EndpointReference) - { - EndpointReference epr = (EndpointReference)endpoint; - targetAddress = epr.getAddress().toString(); - } else { targetAddress = endpoint.toString(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -38,8 +38,6 @@ import javax.xml.transform.Source; import javax.xml.transform.dom.DOMSource; import javax.xml.ws.WebServiceException; -import javax.xml.ws.addressing.AddressingException; -import javax.xml.ws.addressing.MapRequiredException; import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.soap.SOAPFaultException; @@ -59,14 +57,12 @@ import org.jboss.ws.core.soap.MessageFactoryImpl; import org.jboss.ws.core.soap.NameImpl; import org.jboss.ws.core.soap.SOAPFactoryImpl; -import org.jboss.ws.core.soap.SOAPFaultImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.soap.XMLFragment; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Element; -import org.w3c.dom.Node; /** * Helper methods to translate between SOAPFault and SOAPFaultException @@ -267,38 +263,7 @@ SOAPBody soapBody = soapMessage.getSOAPBody(); - SOAPFault soapFault = null; - if(ex instanceof MapRequiredException) - { - MapRequiredException addrException = (MapRequiredException)ex; - soapFault = soapBody.addFault(addrException.getSubcode(), addrException.getMessage()); - } - else if (ex instanceof AddressingException) - { - try - { - AddressingException addrException = (AddressingException) ex; - SOAPFault fault = new SOAPFaultImpl(); - fault.setFaultCode(addrException.getCode()); - fault.setFaultString(addrException.getReason()); - Detail detail = fault.addDetail(); - Object detailElement = addrException.getDetail(); - if (detailElement instanceof Node) - { - detail.appendChild((Node)detailElement); - } - - return toSOAPMessage(new SOAPFaultException(fault)); - } - catch (SOAPException e) - { - log.warn(BundleUtils.getMessage(bundle, "")); - } - } - else - { - soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); - } + SOAPFault soapFault = soapBody.addFault(getFallbackFaultCode(), getFallbackFaultString(ex)); CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); SerializationContext serContext = msgContext.getSerializationContext(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/BindingProviderImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -27,6 +27,7 @@ import javax.xml.ws.Binding; import javax.xml.ws.BindingProvider; +import javax.xml.ws.EndpointReference; import javax.xml.ws.Service.Mode; import javax.xml.ws.WebServiceException; import javax.xml.ws.http.HTTPBinding; @@ -95,4 +96,10 @@ { return (Binding)binding; } + + @Override + public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) + { + throw new UnsupportedOperationException(); + } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -29,15 +29,11 @@ import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.handler.Handler; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.binding.BindingExt; -import org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler; import org.jboss.ws.feature.ChunkedEncodingFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; @@ -49,7 +45,6 @@ import org.jboss.ws.metadata.wsdl.WSDLEndpoint; import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Process WebServiceFeature provided on client side @@ -66,7 +61,6 @@ private static FeatureSet supportedFeatures = new FeatureSet(); static { - supportedFeatures.addFeature(new AddressingFeature()); supportedFeatures.addFeature(new RespectBindingFeature()); supportedFeatures.addFeature(new ChunkedEncodingFeature()); } @@ -77,7 +71,6 @@ { throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", feature)); } - processAddressingFeature(feature, epMetaData, stub); processRespectBindingFeature(feature, epMetaData, stub); processChunkedEncodingFeature(feature, epMetaData, stub); @@ -87,54 +80,6 @@ } /** - * Setup addressing - * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - @SuppressWarnings("unchecked") - private static <T> void processAddressingFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof AddressingFeature) - { - BindingExt bindingExt = (BindingExt) ((BindingProvider) stub).getBinding(); - List<Handler> handlers = bindingExt.getHandlerChain(HandlerType.POST); - int addressingHandlerIndex = getAddressingHandlerIndex(handlers); - - if (feature.isEnabled()) - { - if (addressingHandlerIndex == -1) - { - handlers.add(new WSAddressingClientHandler()); - bindingExt.setHandlerChain(handlers, HandlerType.POST); - } - } - else if (addressingHandlerIndex != -1) - { - handlers.remove(addressingHandlerIndex); - bindingExt.setHandlerChain(handlers, HandlerType.POST); - } - } - } - - private static int getAddressingHandlerIndex(final List<Handler> handlers) - { - if (handlers != null) - { - for (int i = 0; i < handlers.size(); i++) - { - if (handlers.get(i) instanceof WSAddressingClientHandler) - return i; - } - } - - return -1; - } - - /** * Setup http chunked encoding * * @param <T> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -382,7 +382,7 @@ public <T extends EndpointReference> T getEndpointReference(Class<T> clazz) { - return bindingProvider.getEndpointReference(clazz); + throw new UnsupportedOperationException(); } public EndpointConfigMetaData getEndpointConfigMetaData() Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/EndpointImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -37,9 +37,7 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.WebServicePermission; -import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -47,7 +45,6 @@ import org.jboss.ws.core.jaxws.spi.http.HttpContext; import org.jboss.ws.core.jaxws.spi.http.HttpServer; import org.jboss.ws.core.jaxws.spi.http.NettyHttpServerFactory; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.Deployment; @@ -70,7 +67,6 @@ private Object implementor; private Executor executor; - private WebServiceFeature[] features; // TODO: use features private List<Source> metadata; private BindingProviderImpl bindingProvider; private Map<String, Object> properties = new HashMap<String, Object>(); @@ -89,7 +85,6 @@ this.implementor = implementor; this.bindingProvider = new BindingProviderImpl(bindingId); - this.features = features; } @Override @@ -285,24 +280,7 @@ @Override public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) { - if (isDestroyed || !isPublished) - throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_FOR_ENDPOINT")); - - if (getBinding() instanceof HTTPBinding) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR_WITH_XML_BINDING")); - } - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - builder.address(address.toString()); - builder.wsdlDocumentLocation(address.toString() + "?wsdl"); - //TODO set other parameters in the builder - if (referenceParameters != null && W3CEndpointReference.class.getName().equals(clazz.getName())) - { - for (Element el : referenceParameters) - builder.referenceParameter(el); - } - - return EndpointReferenceUtil.transform(clazz, builder.build()); + throw new UnsupportedOperationException(); } public String getPath() Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ProviderImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -32,7 +32,6 @@ import javax.xml.ws.BindingType; import javax.xml.ws.Endpoint; import javax.xml.ws.EndpointReference; -import javax.xml.ws.Service; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; import javax.xml.ws.soap.SOAPBinding; @@ -44,8 +43,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.w3c.dom.Element; /** @@ -135,21 +132,7 @@ final QName serviceName, final QName portName, final List<Element> metadata, final String wsdlDocumentLocation, final List<Element> referenceParameters, final List<Element> elements, final Map<QName, String> attributes) { - if ((serviceName == null) && (address == null) && (portName == null)) - throw new IllegalStateException(); - if ((portName != null) && (serviceName == null)) - throw new IllegalStateException(); - - final NativeEndpointReference epr = new NativeEndpointReference(); - epr.setAddress(address); - epr.setServiceName(serviceName); - epr.setEndpointName(portName); - epr.setInterfaceName(interfaceName); - epr.setMetadata(metadata); - epr.setWsdlLocation(wsdlDocumentLocation); - epr.setReferenceParameters(referenceParameters); - - return EndpointReferenceUtil.transform(W3CEndpointReference.class, epr); + throw new UnsupportedOperationException(); } public W3CEndpointReference createW3CEndpointReference(final String address, final QName serviceName, @@ -161,29 +144,12 @@ public <T> T getPort(final EndpointReference epr, final Class<T> sei, final WebServiceFeature... features) { - final NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - final URL wsdlLocation = nepr.getWsdlLocation(); - final QName serviceName = nepr.getServiceName(); - final ServiceDelegate delegate = createServiceDelegate(wsdlLocation, serviceName, Service.class); - - return delegate.getPort(epr, sei, features); + throw new UnsupportedOperationException(); } public EndpointReference readEndpointReference(final Source eprInfoset) { - if (eprInfoset == null) - throw new NullPointerException(BundleUtils.getMessage(bundle, "PROVIDED_EPRINFOSET_CANNOT_BE_NULL")); - - try - { - final NativeEndpointReference nativeEPR = new NativeEndpointReference(eprInfoset); - final Source source = EndpointReferenceUtil.getSourceFromEndpointReference(nativeEPR); - return new W3CEndpointReference(source); - } - catch (Exception e) - { - throw new WebServiceException(e); - } + throw new UnsupportedOperationException(); } private String getBindingFromAddress(final String address) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -25,7 +25,6 @@ import java.io.InputStream; import java.lang.reflect.Proxy; import java.net.MalformedURLException; -import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; import java.util.Iterator; @@ -47,10 +46,6 @@ import javax.xml.ws.Service.Mode; import javax.xml.ws.WebServiceException; import javax.xml.ws.WebServiceFeature; -import javax.xml.ws.addressing.AddressingBuilder; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; -import javax.xml.ws.addressing.ReferenceParameters; import javax.xml.ws.handler.HandlerResolver; import javax.xml.ws.spi.ServiceDelegate; @@ -66,8 +61,6 @@ import org.jboss.ws.core.jaxws.client.DispatchImpl; import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; import org.jboss.ws.core.jaxws.handler.HandlerResolverImpl; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.metadata.builder.jaxws.JAXWSClientMetaDataBuilder; import org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; @@ -87,7 +80,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.w3c.dom.Element; /** * Service delegates are used internally by Service objects to allow pluggability of JAX-WS implementations. @@ -244,11 +236,6 @@ } T port = (T)createProxy(seiClass, epMetaData); - EndpointReference epr = epMetaData.getEndpointReference(); - if (epr != null) - { - initAddressingProperties((BindingProvider)port, epr); - } initWebserviceFeatures(port, epMetaData.getFeatures().getFeatures()); //initialize webserviceFeature in service for getPort(Class<T> seiClass) and getPort(QName portName, Class<T> seiClass) @@ -492,19 +479,7 @@ @Override public <T> Dispatch<T> createDispatch(EndpointReference epr, Class<T> type, Mode mode, WebServiceFeature... features) { - QName portName = null; - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - portName = nepr.getEndpointName(); - //From the JAXWS dispacth api, EPR's address MUST be used for invocations on the endpoint - if (getEndpointMetaData(portName) != null && nepr.getAddress() != null && nepr.getAddress().length() > 0) - { - getEndpointMetaData(portName).setEndpointAddress(nepr.getAddress()); - } - Dispatch<T> dispatch = createDispatch(portName, type, mode); - initAddressingProperties(dispatch, epr); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + throw new UnsupportedOperationException(); } @Override @@ -519,15 +494,7 @@ @Override public Dispatch<Object> createDispatch(EndpointReference epr, JAXBContext context, Mode mode, WebServiceFeature... features) { - QName portName = null; - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - portName = nepr.getEndpointName(); - - Dispatch<Object> dispatch = createDispatch(portName, context, mode); - initAddressingProperties(dispatch, epr); - initWebserviceFeatures(dispatch, this.features); - initWebserviceFeatures(dispatch, features); - return dispatch; + throw new UnsupportedOperationException(); } @Override @@ -543,7 +510,6 @@ public <T> T getPort(EndpointReference epr, Class<T> sei, WebServiceFeature... features) { T port = getPort(sei); - initAddressingProperties((BindingProvider)port, epr); initWebserviceFeatures(port, features); return port; } @@ -639,34 +605,4 @@ } } } - - // Workaround for [JBWS-2015] Modify addressing handlers to work with the JAXWS-2.1 API - private void initAddressingProperties(BindingProvider bindingProvider, EndpointReference epr) - { - Map<String, Object> reqContext = bindingProvider.getRequestContext(); - AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); - AddressingProperties addrProps = builder.newAddressingProperties(); - reqContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps); - - NativeEndpointReference nepr = EndpointReferenceUtil.transform(NativeEndpointReference.class, epr); - try - { - if (nepr.getAddress() != null) - addrProps.setTo(builder.newURI(nepr.getAddress())); - - List<Element> w3cRefParams = nepr.getReferenceParameters(); - if (w3cRefParams != null) - { - ReferenceParameters refParams = addrProps.getReferenceParameters(); - for (Element w3cRefParam : w3cRefParams) - { - refParams.addElement(w3cRefParam); - } - } - } - catch (URISyntaxException ex) - { - throw new IllegalArgumentException(ex); - } - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPConnectionImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -26,11 +26,9 @@ import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.EndpointReference; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.MessageAbstraction; -import org.jboss.ws.core.client.EndpointInfo; import org.jboss.ws.core.client.HTTPRemotingConnection; import org.jboss.ws.core.client.RemoteConnection; import org.jboss.ws.core.client.SOAPProtocolConnectionHTTP; @@ -96,21 +94,6 @@ if (endpoint == null) throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "ENDPOINT_CANNOT_BE_NULL")); - String targetAddress = null; - if (endpoint instanceof EndpointInfo) - { - targetAddress = ((EndpointInfo) endpoint).getTargetAddress(); - } - else if (endpoint instanceof EndpointReference) - { - EndpointReference epr = (EndpointReference) endpoint; - targetAddress = epr.getAddress().toString(); - } - else - { - targetAddress = endpoint.toString(); - } - return remotingConnection; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageDispatcher.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -30,12 +30,9 @@ import javax.xml.soap.SOAPBodyElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -58,24 +55,6 @@ OperationMetaData opMetaData = null; boolean debugEnabled = log.isDebugEnabled(); - // Dispatch based on wsa:Action - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - AddressingProperties inProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_INBOUND); - if (inProps != null && inProps.getAction() != null) - { - String wsaAction = inProps.getAction().getURI().toASCIIString(); - for (OperationMetaData opAux : epMetaData.getOperations()) - { - if (wsaAction.equals(opAux.getSOAPAction())) - { - opMetaData = opAux; - if (debugEnabled) - log.debug("Use wsa:Action dispatch: " + wsaAction); - break; - } - } - } - // Dispatch to JAXWS Provider if (opMetaData == null && epMetaData.getServiceMode() != null) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -41,7 +41,6 @@ import javax.wsdl.extensions.soap.SOAPAddress; import javax.wsdl.extensions.soap12.SOAP12Address; import javax.xml.namespace.QName; -import javax.xml.ws.addressing.AddressingProperties; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -50,8 +49,6 @@ import org.jboss.ws.common.ObjectNameFactory; import org.jboss.ws.core.jaxrpc.UnqualifiedFaultException; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -66,7 +63,6 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceFault; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperation; import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutfault; -import org.jboss.ws.metadata.wsdl.WSDLProperty; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; @@ -475,158 +471,6 @@ } } - /** Process operation meta data extensions. */ - protected void processOpMetaExtensions(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) - { - final AddressingProperties ADDR = new AddressingPropertiesImpl(); - final AddressingOpMetaExt addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); - final boolean isOneWay = Constants.WSDL20_PATTERN_IN_ONLY.equals(wsdlOperation.getPattern()); - - final String inputAction = this.getInputAction(wsdlOperation, isOneWay); - addrExt.setInboundAction(inputAction); - - if (!isOneWay) - { - final String outputAction = this.getOutputAction(wsdlOperation, isOneWay); - addrExt.setOutboundAction(outputAction); - - setFaultActions(opMetaData, wsdlOperation, addrExt); - } - - opMetaData.addExtension(addrExt); - } - - private void setFaultActions(final OperationMetaData opMetaData, final WSDLInterfaceOperation wsdlOperation, final AddressingOpMetaExt addrExt) - { - for (WSDLInterfaceOperationOutfault fault : wsdlOperation.getOutfaults()) - { - final QName faultQName = wsdlOperation.getWsdlInterface().getFault(fault.getRef()).getElement(); - final String action = this.getFaultAction(wsdlOperation, fault); - - addrExt.setFaultAction(faultQName, action); - } - } - - /* - Copy/paste from http://www.w3.org/TR/wsdl#_names - - 2.4.5 Names of Elements within an Operation - - The name attribute of the input and output elements provides a unique name among all - input and output elements within the enclosing port type. - - In order to avoid having to name each input and output element within an operation, - WSDL provides some default values based on the operation name. If the name attribute - is not specified on a one-way or notification message, it defaults to the name of the operation. - If the name attribute is not specified on the input or output messages of a - request-response or solicit-response operation, the name defaults to the name of - the operation with "Request"/"Solicit" or "Response" appended, respectively. - - Each fault element must be named to allow a binding to specify the concrete format of the fault message. - The name of the fault element is unique within the set of faults defined for the operation. - */ - - private String getInputAction(final WSDLInterfaceOperation wsdlOperation, final boolean oneWay) - { - WSDLProperty wsaInAction = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_ACTION_IN); - if (wsaInAction != null && wsaInAction.getValue() != null && !"".equals(wsaInAction.getValue())) - { - return wsaInAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - WSDLProperty inputName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_IN); - if (inputName != null && inputName.getValue() != null && !"".equals(inputName.getValue())) - { - return prefix + inputName.getValue(); - } - else - { - return prefix + operationName + (oneWay ? "" : "Request"); - } - } - - private String getOutputAction(final WSDLInterfaceOperation wsdlOperation, final boolean oneWay) - { - WSDLProperty wsaOutAction = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_ACTION_OUT); - if (wsaOutAction != null && wsaOutAction.getValue() != null && !"".equals(wsaOutAction.getValue())) - { - return wsaOutAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - WSDLProperty outputName = wsdlOperation.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_OUT); - if (outputName != null && outputName.getValue() != null && !"".equals(outputName.getValue())) - { - return prefix + outputName.getValue(); - } - else - { - return prefix + operationName + (oneWay ? "" : "Response"); - } - } - - /* - Copy/paste from http://www.w3.org/TR/2007/REC-ws-addr-metadata-20070904/#defactionwsdl11 - - 4.4.4 Default Action Pattern for WSDL 1.1 - - A default pattern is also defined for backwards compatibility with WSDL 1.1. In the absence of an explicitly specified value - for the [action] property (see section 4.4.1 Explicit Association), the following pattern is used to construct a default action - for inputs and outputs. The general form of an action IRI is as follows: - - Example 4-6. Structure of defaulted wsa:Action IRI. - - [target namespace][delimiter][port type name][delimiter][input|output name] - - For fault messages, the general form of an action IRI is as follows: - - Example 4-7. Structure of default wsa:Action IRI for faults - - [target namespace][delimiter][port type name][delimiter][operation name][delimiter]Fault[delimiter][fault name] - */ - private String getFaultAction(final WSDLInterfaceOperation wsdlOperation, final WSDLInterfaceOperationOutfault fault) - { - final WSDLProperty wsaFaultAction = fault.getProperty(Constants.WSDL_PROPERTY_ACTION_FAULT); - if (wsaFaultAction != null && wsaFaultAction.getValue() != null && !"".equals(wsaFaultAction.getValue())) - { - return wsaFaultAction.getValue(); - } - - final String prefix = this.getActionPrefix(wsdlOperation); - String operationName = wsdlOperation.getName().getLocalPart(); - - final WSDLProperty faultName = fault.getProperty(Constants.WSDL_PROPERTY_MESSAGE_NAME_FAULT); - final String delimeter = this.getDelimeter(prefix); - if (faultName != null && faultName.getValue() != null && !"".equals(faultName.getValue())) - { - return prefix + operationName + delimeter + "Fault" + delimeter + faultName.getValue(); - } - - throw new IllegalStateException(); - } - - private String getActionPrefix(final WSDLInterfaceOperation wsdlOperation) - { - final String portTypeName = wsdlOperation.getWsdlInterface().getName().getLocalPart(); - String namespace = wsdlOperation.getName().getNamespaceURI(); - final String delimeter = this.getDelimeter(namespace); - - if (!namespace.endsWith(delimeter)) - namespace += delimeter; - - return namespace + portTypeName + delimeter; - } - - private String getDelimeter(final String namespace) - { - return namespace.toLowerCase().startsWith("urn:") ? ":" : "/"; - } - protected void buildFaultMetaData(OperationMetaData opMetaData, WSDLInterfaceOperation wsdlOperation) { TypesMetaData typesMetaData = opMetaData.getEndpointMetaData().getServiceMetaData().getTypesMetaData(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -144,8 +144,6 @@ protected void setupOperationsFromWSDL(EndpointMetaData epMetaData, WSDLEndpoint wsdlEndpoint, ServiceEndpointInterfaceMapping seiMapping) { - WSDLDefinitions wsdlDefinitions = wsdlEndpoint.getInterface().getWsdlDefinitions(); - // For every WSDL interface operation build the OperationMetaData WSDLInterface wsdlInterface = wsdlEndpoint.getInterface(); for (WSDLInterfaceOperation wsdlOperation : wsdlInterface.getOperations()) @@ -213,9 +211,6 @@ // Build operation faults buildFaultMetaData(opMetaData, wsdlOperation); - - // process further operation extensions - processOpMetaExtensions(opMetaData, wsdlOperation); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -28,15 +28,11 @@ import javax.xml.ws.RespectBinding; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceException; -import javax.xml.ws.soap.Addressing; -import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.spi.WebServiceFeatureAnnotation; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.DOMWriter; -import org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler; -import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXWS; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; import org.jboss.ws.metadata.wsdl.Extendable; @@ -46,7 +42,6 @@ import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; /** * Process EndpointFeature annotations @@ -66,14 +61,8 @@ WebServiceFeatureAnnotation wsfa = an.annotationType().getAnnotation(WebServiceFeatureAnnotation.class); if (wsfa != null) { - if (an.annotationType() == Addressing.class) + if (an.annotationType() == RespectBinding.class) { - Addressing anFeature = sepClass.getAnnotation(Addressing.class); - AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required(), anFeature.responses()); - sepMetaData.addFeature(feature); - } - else if (an.annotationType() == RespectBinding.class) - { RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); RespectBindingFeature feature = new RespectBindingFeature(anFeature.enabled()); sepMetaData.addFeature(feature); @@ -88,25 +77,9 @@ protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData) { - setupAddressingFeature(sepMetaData); setupRespectBindingFeature(sepMetaData); } - private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData) - { - AddressingFeature addressingFeature = sepMetaData.getFeature(AddressingFeature.class); - if (addressingFeature != null && addressingFeature.isEnabled()) - { - log.debug("AddressingFeature found, installing WS-Addressing post-handler"); - HandlerMetaDataJAXWS hmd = new HandlerMetaDataJAXWS(HandlerType.POST); - hmd.setEndpointMetaData(sepMetaData); - hmd.setHandlerClassName(WSAddressingServerHandler.class.getName()); - hmd.setHandlerName("WSAddressing Handler"); - hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP"); - sepMetaData.addHandler(hmd); - } - } - private static void setupRespectBindingFeature(ServerEndpointMetaData sepMetaData) { RespectBindingFeature respectBindingFeature = sepMetaData.getFeature(RespectBindingFeature.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -30,10 +30,8 @@ import javax.jws.soap.SOAPBinding; import javax.xml.namespace.QName; -import javax.xml.transform.dom.DOMSource; import javax.xml.ws.BindingType; import javax.xml.ws.RespectBindingFeature; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.ws.WSException; import org.jboss.ws.api.annotation.EndpointConfig; @@ -41,7 +39,6 @@ import org.jboss.ws.common.Constants; import org.jboss.ws.common.ResourceLoaderAdapter; import org.jboss.ws.core.jaxws.client.serviceref.NativeServiceObjectFactoryJAXWS; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -50,7 +47,6 @@ import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLDefinitions; import org.jboss.ws.metadata.wsdl.WSDLEndpoint; -import org.jboss.ws.metadata.wsdl.WSDLExtensibilityElement; import org.jboss.ws.metadata.wsdl.WSDLService; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; @@ -59,7 +55,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; -import org.w3c.dom.Element; /** * A client side meta data builder. @@ -98,12 +93,6 @@ buildMetaDataInternal(serviceMetaData, wsdlDefinitions); - //Setup policies and EPRs for each endpoint - for (EndpointMetaData epMetaData : serviceMetaData.getEndpoints()) - { - processEPRs(epMetaData, wsdlDefinitions); - } - // Read the WSDL and initialize the schema model // This should only be needed for debuging purposes of the UMDM JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); @@ -123,33 +112,6 @@ } } - private void processEPRs(EndpointMetaData endpointMD, WSDLDefinitions wsdlDefinitions) - { - WSDLService wsdlService = wsdlDefinitions.getService(endpointMD.getServiceMetaData().getServiceName()); - if (wsdlService != null) - { - WSDLEndpoint wsdlEndpoint = wsdlService.getEndpoint(endpointMD.getPortName()); - if (wsdlEndpoint != null) - { - List<WSDLExtensibilityElement> portEPRs = wsdlEndpoint.getExtensibilityElements(Constants.WSDL_ELEMENT_EPR); - if (portEPRs != null && portEPRs.size() != 0) - { - if (portEPRs.size() > 1) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "ONLY_ONE_EPR_ALLOWED")); - - Element eprElement = portEPRs.get(0).getElement(); - - // construct Native EPR - DOMSource eprInfoset = new DOMSource(eprElement); - NativeEndpointReference nativeEPR = (NativeEndpointReference) NativeEndpointReference - .readFrom(eprInfoset); - nativeEPR.setAddress(endpointMD.getEndpointAddress()); - endpointMD.setEndpointReference(nativeEPR); - } - } - } - } - /** Build from WSDL and service name */ public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL) @@ -252,13 +214,6 @@ if (log.isDebugEnabled()) log.debug("Processing service-ref contribution on portType: " + epMetaData.getPortTypeName()); - // process Addressing - if (portComp.isAddressingEnabled()) - { - AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); - epMetaData.addFeature(new AddressingFeature(true, portComp.isAddressingRequired(), response)); - } - // process RespectBinding if (portComp.isRespectBindingEnabled()) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -50,14 +50,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Action; import javax.xml.ws.BindingType; -import javax.xml.ws.FaultAction; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; import javax.xml.ws.WebFault; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.WSException; @@ -72,8 +68,6 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.core.utils.HolderUtils; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -201,17 +195,6 @@ } } - protected AddressingFeature.Responses getAddressFeatureResponses(String responses) - { - - AddressingFeature.Responses result = AddressingFeature.Responses.ALL; - if ("ANONYMOUS".equals(responses)) - result = AddressingFeature.Responses.ANONYMOUS; - if ("NON_ANONYMOUS".equals(responses)) - result = AddressingFeature.Responses.NON_ANONYMOUS; - return result; - } - public static UnifiedHandlerChainsMetaData getHandlerChainsMetaData(Class<?> wsClass, String filename) { URL fileURL = null; @@ -567,151 +550,6 @@ return (namespace != null) ? new QName(namespace, name) : new QName(name); } - /* - * 1. A non-default @Action(input=...) or @WebMethod(action=...) value on a SEI method - * MUST result into wsdl:input[@wsam:Action] attribute in the corresponding wsdl:operation. - * Also, @Action(input=...) and @WebMethod(action=...) annotation element values MUST - * be same, if present. - * 2. If wsdl:input[@wsam:Action] cannot be mapped from the above steps, then wsam:Action - * is generated using the metadata defaulting algorithm as if wsdl:input[@name] is - * not present in WSDL. - */ - private String getInputActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final AddressingOpMetaExt addrExt) - { - String actionInput = null; - Action actionAnn = method.getAnnotation(Action.class); - if ((actionAnn != null) && (!"".equals(actionAnn.input()))) - actionInput = actionAnn.input(); - - String webMethodAction = null; - WebMethod webMethodAnn = method.getAnnotation(WebMethod.class); - if ((webMethodAnn != null) && (!"".equals(webMethodAnn.action()))) - webMethodAction = webMethodAnn.action(); - - if ((actionInput != null) && (webMethodAction != null) && !actionInput.equals(webMethodAction)) - throw new RuntimeException(BundleUtils.getMessage(bundle, "MUST_HAVE_SAME_VALUE", method)); - - if (actionInput != null) - return actionInput; - - if (webMethodAction != null) - return webMethodAction; - - if (addrExt.getInboundAction() != null) - return addrExt.getInboundAction(); - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - - return tns + portTypeName + "/" + opName + "Request"; - } - - /* - * 2. A non-default @Action(output=...) value on a SEI method MUST result into wsdl:output- - * [@wsam:Action] attribute in the corresponding wsdl:operation. - * 5. If wsdl:output[@wsam:Action] cannot be mapped from the above steps, then wsam:Action - * is generated using the metadata defaulting algorithm as if wsdl:output[@name] is not present in - * WSDL. - */ - private String getOutputActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final AddressingOpMetaExt addrExt) - { - if (operationMD.isOneWay()) - return null; - - Action actionAnn = method.getAnnotation(Action.class); - if ((actionAnn != null) && (!"".equals(actionAnn.output()))) - return actionAnn.output(); - - if (addrExt.getOutboundAction() != null) - return addrExt.getOutboundAction(); - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - - return tns + portTypeName + "/" + opName + "Response"; - } - - /* - * 3. A non-default @Action(@FaultAction=...) value on a SEI method MUST result into wsdl:fault- - * [@wsam:Action] attribute in the corresponding wsdl:operation. The wsdl:fault element - * MUST correspond to the exception specified by className annotated element value. - * 6. If wsdl:fault[@wsam:Action] cannot be mapped from the above steps, then wsam:Action is - * generated using the metadata defaulting algorithm as if wsdl:fault[@name] is the corresponding - * exception class name. - */ - private String getFaultActionName(final Method method, final EndpointMetaData endpointMD, final OperationMetaData operationMD, final FaultMetaData faultMD, final AddressingOpMetaExt addrExt) - { - if (operationMD.isOneWay()) - return null; - - String faultBeanName = faultMD.getJavaTypeName(); - Action actionAnn = method.getAnnotation(Action.class); - FaultAction faultActionAnn = null; - if (actionAnn != null) - { - for (FaultAction faultAction : actionAnn.fault()) - { - if (faultAction.className().getName().equals(faultBeanName)) - { - faultActionAnn = faultAction; - break; - } - } - } - - if ((faultActionAnn != null) && (!"".equals(faultActionAnn.value()))) - return faultActionAnn.value(); - - final String faultAction = addrExt.getFaultAction(faultMD.getXmlName()); - if (faultAction != null) - return faultAction; - - String tns = this.getEndpointNamespace(endpointMD); - String portTypeName = endpointMD.getPortTypeName().getLocalPart(); - String opName = operationMD.getQName().getLocalPart(); - int dotIndex = faultBeanName.lastIndexOf('.'); - String excetionClassName = dotIndex == -1 ? faultBeanName : faultBeanName.substring(dotIndex + 1); - - return tns + portTypeName + "/" + opName + "/Fault/" + excetionClassName; - } - - private String getEndpointNamespace(final EndpointMetaData endpointMD) - { - String namespace = endpointMD.getPortTypeName().getNamespaceURI(); - if (!namespace.endsWith("/")) - namespace += "/"; - - return namespace; - } - - /** - * Process operation meta data extensions. - */ - private void processMetaExtensions(Method method, EndpointMetaData endpointMD, OperationMetaData operationMD) - { - AddressingProperties ADDR = new AddressingPropertiesImpl(); - - AddressingOpMetaExt addrExt = (AddressingOpMetaExt)operationMD.getExtension(ADDR.getNamespaceURI()); - if (addrExt == null) - { - addrExt = new AddressingOpMetaExt(ADDR.getNamespaceURI()); - operationMD.addExtension(addrExt); - } - - final String inboundAction = this.getInputActionName(method, endpointMD, operationMD, addrExt); - addrExt.setInboundAction(inboundAction); - - final String outboundAction = this.getOutputActionName(method, endpointMD, operationMD, addrExt); - addrExt.setOutboundAction(outboundAction); - - for (FaultMetaData faultMD : operationMD.getFaults()) - { - addrExt.setFaultAction(faultMD.getXmlName(), this.getFaultActionName(method, endpointMD, operationMD, faultMD, addrExt)); - } - } - private void processWebMethod(EndpointMetaData epMetaData, Method method) { String javaName = method.getName(); @@ -967,9 +805,6 @@ addFault(opMetaData, exClass); } } - - // process operation meta data extension - processMetaExtensions(method, epMetaData, opMetaData); } private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData) @@ -1015,9 +850,6 @@ protected void processWebMethods(EndpointMetaData epMetaData, Class<?> wsClass) { - if (epMetaData.getFeature(AddressingFeature.class) == null) - epMetaData.clearOperations(); - // Process @WebMethod annotations boolean webMethodFound = false; for (Method method : wsClass.getMethods()) @@ -1181,9 +1013,6 @@ // Build operation faults buildFaultMetaData(opMetaData, wsdlOperation); - - // process further operation extensions - processOpMetaExtensions(opMetaData, wsdlOperation); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -28,7 +28,6 @@ import javax.jws.WebService; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; @@ -46,7 +45,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebservicesFactory; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** @@ -235,13 +233,6 @@ } } - if (portComp.isAddressingEnabled()) - { log.debug("Enabling Addressing"); - AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); - AddressingFeature feature = new AddressingFeature(true, portComp.isAddressingRequired(), responses); - sepMetaData.getFeatures().addFeature(feature); - } - if (portComp.isRespectBindingEnabled()) { log.debug("Enabling RespectBinding Feature"); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -54,8 +54,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.core.CommonBindingProvider; -import org.jboss.ws.core.CommonSOAPBinding; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; @@ -66,7 +64,6 @@ import org.jboss.ws.core.jaxws.JAXBDeserializerFactory; import org.jboss.ws.core.jaxws.JAXBSerializerFactory; import org.jboss.ws.core.jaxws.client.DispatchBinding; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.accessor.AccessorFactory; @@ -147,8 +144,6 @@ private FeatureSet features = new FeatureSet(); // The documentation edfined through the @Documentation annotation private String documentation; - - private NativeEndpointReference epr; private ConfigObservable configObservable = new ConfigObservable(); @@ -188,16 +183,6 @@ this.portName = portName; } - public NativeEndpointReference getEndpointReference() - { - return epr; - } - - public void setEndpointReference(final NativeEndpointReference epr) - { - this.epr = epr; - } - public QName getPortTypeName() { return portTypeName; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/FeatureAwareClientEndpointMetaDataAdapter.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -36,7 +36,6 @@ import javax.xml.ws.handler.PortInfo; import org.jboss.ws.core.jaxws.JAXBContextCache; -import org.jboss.ws.core.jaxws.wsaddressing.NativeEndpointReference; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.metadata.config.Configurable; @@ -247,12 +246,6 @@ } @Override - public NativeEndpointReference getEndpointReference() - { - return this.delegee.getEndpointReference(); - } - - @Override public List<HandlerMetaData> getHandlerMetaData(HandlerType type) { return this.delegee.getHandlerMetaData(type); @@ -421,12 +414,6 @@ } @Override - public void setEndpointReference(NativeEndpointReference epr) - { - this.delegee.setEndpointReference(epr); - } - - @Override public void setHandlersInitialized(boolean flag) { this.delegee.setHandlersInitialized(flag); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLGenerator.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -29,24 +29,17 @@ import javax.xml.namespace.QName; import javax.xml.rpc.ParameterMode; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.soap.AddressingFeature; import javax.xml.ws.soap.SOAPBinding; -import org.jboss.ws.api.addressing.AddressingConstants; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.common.utils.UUIDGenerator; import org.jboss.ws.core.soap.Style; -import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; -import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FaultMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.ws.metadata.wsdl.Extendable; import org.jboss.ws.metadata.wsdl.WSDLBinding; import org.jboss.ws.metadata.wsdl.WSDLBindingFault; import org.jboss.ws.metadata.wsdl.WSDLBindingOperation; @@ -78,9 +71,7 @@ public abstract class WSDLGenerator { private static final ResourceBundle bundle = BundleUtils.getBundle(WSDLGenerator.class); - private static final AddressingProperties WSA_PROPERTIES = new AddressingPropertiesImpl(); public static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utilit..."; - public static final String WSAM_NS = AddressingConstants.Metadata.NS; public static final String WSP_NS = "http://www.w3.org/ns/ws-policy"; protected WSDLDefinitions wsdl; @@ -119,14 +110,6 @@ wsdlBinding.setType(endpoint.getBindingId()); wsdl.addBinding(wsdlBinding); wsdlEndpoint.setBinding(bindingQName); - if (endpoint.isFeatureEnabled(AddressingFeature.class)) - { - // register WSAM namespace - if (wsdl.getPrefix(WSAM_NS) == null) - { - wsdl.registerNamespaceURI(WSAM_NS, "wsa"); - } - } if (endpoint.getDocumentation() != null) { @@ -153,79 +136,8 @@ { processOperation(wsdlInterface, wsdlBinding, operation); } - - // Addressing policies - http://ws.apache.org/commons/neethi/ is not usable thus hacking the code ATM :( - // TODO: implement WS-P facade? - if (endpoint.isFeatureEnabled(AddressingFeature.class)) - { - AddressingFeature addressingFeature = endpoint.getFeature(AddressingFeature.class); - - String policyId = this.addAddressingPolicyDefinition(addressingFeature); - this.addAddressingPolicyReference(policyId, wsdlBinding); - } } - /** - * JAX-WS 3.11 Service and Ports - * <p> - * Conformance (Use of Addressing): Endpoint’s use of addressing, if any, MUST be indicated in the - * wsdl:binding or wsdl:port sections of the WSDL 1.1 as per WS-Addressing 1.0 - Metadata. - * </p> - * <pre> - * <wsp:Policy wsu:Id="SOME_ID"> - * <wsam:Addressing wsp:Optional="true"> - * <wsp:Policy> - * <wsam:NonAnonymousResponses/> - * </wsp:Policy> - * </wsam:Addressing> - * </wsp:Policy> - * <pre> - */ - private String addAddressingPolicyDefinition(final AddressingFeature addressing) - { - // construct addressing policy - String policyId = UUIDGenerator.generateRandomUUIDString(); - Element policyElement = DOMUtils.createElement(new QName(WSP_NS, "Policy", "wsp")); - policyElement.setAttribute("xmlns:wsu", WSU_NS); - policyElement.setAttribute("xmlns:wsp", WSP_NS); - policyElement.setAttribute("wsu:Id", policyId); - Element addressingElement = DOMUtils.createElement(new QName(WSAM_NS, "Addressing", "wsam")); - addressingElement.setAttribute("xmlns:wsam", WSAM_NS); - policyElement.appendChild(addressingElement); - if (!addressing.isRequired()) - { - addressingElement.setAttributeNS(WSP_NS, "wsp:Optional", "true"); - } - Element nestedPolicyElement = DOMUtils.createElement(new QName(WSP_NS, "Policy", "wsp")); - addressingElement.appendChild(nestedPolicyElement); - if (addressing.getResponses() == AddressingFeature.Responses.ANONYMOUS) - { - Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "AnonymousResponses", "wsam")); - nestedPolicyElement.appendChild(anonymousResponsesElement); - } - else if (addressing.getResponses() == AddressingFeature.Responses.NON_ANONYMOUS) - { - Element anonymousResponsesElement = DOMUtils.createElement(new QName(WSAM_NS, "NonAnonymousResponses", "wsam")); - nestedPolicyElement.appendChild(anonymousResponsesElement); - } - - // bind policy to WSDL - wsdl.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyElement)); - - return policyId; - } - - /* - * <wsp:PolicyReference URI="#SOME_ID"/> - */ - protected void addAddressingPolicyReference(String policyId, Extendable extendable) - { - Element policyReferenceElement = DOMUtils.createElement(new QName(WSP_NS, "PolicyReference", "wsp")); - policyReferenceElement.setAttribute("xmlns:wsp", WSP_NS); - policyReferenceElement.setAttribute("URI", "#" + policyId); - extendable.addExtensibilityElement(new WSDLExtensibilityElement(WSP_NS, policyReferenceElement)); - } - protected void processOperation(WSDLInterface wsdlInterface, WSDLBinding wsdlBinding, OperationMetaData operation) { WSDLInterfaceOperation interfaceOperation = new WSDLInterfaceOperation(wsdlInterface, operation.getQName()); @@ -253,7 +165,6 @@ String ns = getNamespace(fault.getJavaType(), fault.getXmlName().getNamespaceURI()); QName outFaultName = new QName(ns, fault.getXmlName().getLocalPart()); outfault.setRef(outFaultName); - this.setAddressingAction(outfault, fault, operation); interfaceOperation.addOutfault(outfault); WSDLBindingFault bindingFault = new WSDLBindingFault(wsdlBinding); @@ -348,7 +259,6 @@ // If there is no return parameter, it will most likely be set later with an INOUT or OUT parameter. // Otherwise, a null element means there is a 0 body element part, which is allowed by BP 1.0 interfaceOperation.addOutput(output); - this.setAddressingAction(output, operation); bindingOperation.addOutput(bindingOutput); } @@ -380,7 +290,6 @@ } interfaceOperation.addInput(input); - this.setAddressingAction(input, operation); bindingOperation.addInput(bindingInput); } @@ -427,7 +336,6 @@ } interfaceOperation.addOutput(output); - this.setAddressingAction(output, operation); bindingOperation.addOutput(bindingOutput); } @@ -458,45 +366,9 @@ } interfaceOperation.addInput(input); - this.setAddressingAction(input, operation); bindingOperation.addInput(bindingInput); } - private void setAddressingAction(WSDLInterfaceOperationInput input, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - input.setAction(addrExt.getInboundAction()); - } - } - - private void setAddressingAction(WSDLInterfaceOperationOutput output, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - output.setAction(addrExt.getOutboundAction()); - } - } - - private void setAddressingAction(WSDLInterfaceOperationOutfault fault, FaultMetaData faultMD, OperationMetaData operationMD) - { - AddressingOpMetaExt addrExt = this.getAddressingMD(operationMD); - if (addrExt != null) - { - fault.setAction(addrExt.getFaultAction(faultMD.getXmlName())); - } - } - - private AddressingOpMetaExt getAddressingMD(OperationMetaData operationMD) - { - if (operationMD.getEndpointMetaData().isFeatureEnabled(AddressingFeature.class)) - return (AddressingOpMetaExt)operationMD.getExtension(WSA_PROPERTIES.getNamespaceURI()); - - return null; - } - protected void processService(ServiceMetaData service) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/NativeWebServiceContext.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -22,19 +22,11 @@ package org.jboss.wsf.stack.jbws; import java.security.Principal; -import java.util.ResourceBundle; import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceException; import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.wsaddressing.W3CEndpointReference; -import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder; -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.wsaddressing.EndpointReferenceUtil; -import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import org.w3c.dom.Element; @@ -46,7 +38,6 @@ */ public final class NativeWebServiceContext extends ExtensibleWebServiceContext { - private static final ResourceBundle bundle = BundleUtils.getBundle(NativeWebServiceContext.class); public NativeWebServiceContext(final MessageContext messageContext) { super(messageContext); @@ -59,28 +50,7 @@ public <T extends EndpointReference> T getEndpointReference(final Class<T> clazz, final Element... referenceParameters) { - EndpointMetaData endpointMD = ((CommonMessageContext)getMessageContext()).getEndpointMetaData(); - if (endpointMD == null) - { - throw new WebServiceException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_ENDPOINTMD")); - } - if (HTTPBinding.HTTP_BINDING.equals(endpointMD.getBindingId())) - { - throw new UnsupportedOperationException(BundleUtils.getMessage(bundle, "CANNOT_GET_EPR")); - } - W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder(); - String address = endpointMD.getEndpointAddress(); - builder.address(address); - builder.wsdlDocumentLocation(address + "?wsdl"); - builder.serviceName(endpointMD.getServiceMetaData().getServiceName()); - builder.endpointName(endpointMD.getPortName()); - - if (referenceParameters != null && W3CEndpointReference.class.getName().equals(clazz.getName())) - { - for (Element el : referenceParameters) - builder.referenceParameter(el); - } - return EndpointReferenceUtil.transform(clazz, builder.build()); + throw new UnsupportedOperationException(); } @Override Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -48,10 +48,7 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; -import javax.xml.ws.addressing.AddressingProperties; -import javax.xml.ws.addressing.JAXWSAConstants; import javax.xml.ws.http.HTTPBinding; -import javax.xml.ws.soap.AddressingFeature; import org.jboss.logging.Logger; import org.jboss.ws.common.Constants; @@ -76,10 +73,8 @@ import org.jboss.ws.core.server.WSDLRequestHandler; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.MessageFactoryImpl; -import org.jboss.ws.core.soap.SOAPConnectionImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; -import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -390,7 +385,6 @@ private void sendResponse(Endpoint endpoint, OutputStream output, boolean isFault) throws SOAPException, IOException { CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - EndpointMetaData epMetaData = msgContext.getEndpointMetaData(); MessageAbstraction resMessage = msgContext.getMessageAbstraction(); if (resMessage == null) @@ -399,30 +393,7 @@ return; } - String wsaTo = null; - - // Get the destination from the AddressingProperties - AddressingProperties outProps = (AddressingProperties)msgContext.get(JAXWSAConstants.SERVER_ADDRESSING_PROPERTIES_OUTBOUND); - if (outProps != null && outProps.getTo() != null) - { - AddressingConstantsImpl ADDR = new AddressingConstantsImpl(); - wsaTo = outProps.getTo().getURI().toString(); - final AddressingFeature addressing = epMetaData.getFeature(AddressingFeature.class); - final boolean onlyAnonymousAllowed = addressing != null && addressing.getResponses() == AddressingFeature.Responses.ANONYMOUS; - if (wsaTo.equals(ADDR.getAnonymousURI()) || onlyAnonymousAllowed) - wsaTo = null; - } - if (wsaTo != null) - { - if (log.isDebugEnabled()) - log.debug("Sending response to addressing destination: " + wsaTo); - SOAPMessage soapMessage = (SOAPMessage)resMessage; - new SOAPConnectionImpl().callOneWay(soapMessage, wsaTo); - } - else - { - resMessage.writeTo(output); - } + resMessage.writeTo(output); } /** Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2012-03-26 10:22:38 UTC (rev 16027) @@ -2,8 +2,6 @@ urn\:jboss\:jaxws-config\:2.0=schema/jaxws-config_2_0.xsd http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd -http\://www.w3.org/2005/08/addressing=schema/ws-addr-2006-03.xsd -http\://www.w3.org/2007/02/addressing/metadata=schema/ws-addr-metadata-2007-02.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd http\://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd=schema/j2ee_web_services_client_1_1.xsd Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -7,15 +7,4 @@ <config-name>Standard Client</config-name> </client-config> - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressingClientHandler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingClientHandler</j2ee:handler-class> - </handler> - </post-handler-chain> - </client-config> - </jaxrpc-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -7,15 +7,4 @@ <config-name>Standard Endpoint</config-name> </endpoint-config> - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <pre-handler-chain> - <handler-chain-name>WSAddressing Handlers</handler-chain-name> - <handler> - <j2ee:handler-name>WSAddressing Handler</j2ee:handler-name> - <j2ee:handler-class>org.jboss.ws.extensions.addressing.jaxrpc.WSAddressingServerHandler</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - </jaxrpc-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-client-config.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -17,30 +17,4 @@ <feature><feature-name>http://org.jboss.ws/dispatch/validate</feature-name></feature> </client-config> - <client-config> - <config-name>Standard WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - - <client-config> - <config-name>Standard SOAP 1.2 WSAddressing Client</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingClientHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </client-config> - </jaxws-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -25,38 +25,4 @@ <feature><feature-name>http://org.jboss.ws/binding/wsdl/dotnet</feature-name></feature> </endpoint-config> - <endpoint-config> - <config-name>Standard WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - - <endpoint-config> - <config-name>Standard SOAP 1.2 WSAddressing Endpoint</config-name> - <post-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP12_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSAddressing Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.addressing.jaxws.WSAddressingServerHandler</javaee:handler-class> - </javaee:handler> - <javaee:handler> - <javaee:handler-name>Recording Handler</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.common.invocation.RecordingServerHandler</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </post-handler-chains> - </endpoint-config> - </jaxws-config> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified"> - -  - - <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> - <xs:complexType name="EndpointReferenceType" mixed="false"> - <xs:sequence> - <xs:element name="Address" type="tns:AttributedURIType"/> - <xs:element ref="tns:ReferenceParameters" minOccurs="0"/> - <xs:element ref="tns:Metadata" minOccurs="0"/> - <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/> - <xs:complexType name="ReferenceParametersType" mixed="false"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="Metadata" type="tns:MetadataType"/> - <xs:complexType name="MetadataType" mixed="false"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="MessageID" type="tns:AttributedURIType"/> - <xs:element name="RelatesTo" type="tns:RelatesToType"/> - <xs:complexType name="RelatesToType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:simpleType name="RelationshipTypeOpenEnum"> - <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> - </xs:simpleType> - - <xs:simpleType name="RelationshipType"> - <xs:restriction base="xs:anyURI"> - <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/> - <xs:element name="From" type="tns:EndpointReferenceType"/> - <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> - <xs:element name="To" type="tns:AttributedURIType"/> - <xs:element name="Action" type="tns:AttributedURIType"/> - - <xs:complexType name="AttributedURIType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - -  - - <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> - - <xs:simpleType name="FaultCodesOpenEnumType"> - <xs:union memberTypes="tns:FaultCodesType xs:QName"/> - </xs:simpleType> - - <xs:simpleType name="FaultCodesType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:InvalidAddressingHeader"/> - <xs:enumeration value="tns:InvalidAddress"/> - <xs:enumeration value="tns:InvalidEPR"/> - <xs:enumeration value="tns:InvalidCardinality"/> - <xs:enumeration value="tns:MissingAddressInEPR"/> - <xs:enumeration value="tns:DuplicateMessageID"/> - <xs:enumeration value="tns:ActionMismatch"/> - <xs:enumeration value="tns:MessageAddressingHeaderRequired"/> - <xs:enumeration value="tns:DestinationUnreachable"/> - <xs:enumeration value="tns:ActionNotSupported"/> - <xs:enumeration value="tns:EndpointUnavailable"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/> - <xs:complexType name="AttributedUnsignedLongType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:unsignedLong"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemIRI" type="tns:AttributedURIType"/> - - <xs:element name="ProblemAction" type="tns:ProblemActionType"/> - <xs:complexType name="ProblemActionType" mixed="false"> - <xs:sequence> - <xs:element ref="tns:Action" minOccurs="0"/> - <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - -</xs:schema> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/schema/ws-addr-metadata-2007-02.xsd 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2007/02/addressing/metadata" xmlns:wsp="http://www.w3.org/2006/07/ws-policy" targetNamespace="http://www.w3.org/2007/02/addressing/metadata" blockDefault="#all" elementFormDefault="qualified"> - - <xs:element name="ServiceName" type="tns:ServiceNameType"/> - <xs:complexType name="ServiceNameType"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:attribute name="EndpointName" type="xs:NCName" use="optional"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="InterfaceName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType"> - <xs:simpleContent> - <xs:extension base="xs:QName"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:attribute name="Action" type="xs:anyURI"/> - -  - - <xs:element name="Addressing"> - <xs:complexType> - <xs:sequence> - <xs:element ref="wsp:Policy"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="AnonymousResponses"> - <xs:complexType> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - - <xs:element name="NonAnonymousResponses"> - <xs:complexType> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - </xs:element> - -</xs:schema> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -57,8 +57,6 @@ <macro-wstools dest="jaxrpc/samples/oneway/WEB-INF" config="jaxrpc/samples/oneway/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/rpcstyle/WEB-INF" config="jaxrpc/samples/rpcstyle/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> </target> @@ -68,12 +66,6 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/hello/WEB-INF" includes="org/**"/> - </move> - <move todir="${tests.output.dir}/wstools/java"> - <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsaddr/replyto/WEB-INF" includes="org/**"/> - </move>  - <jar destfile="${tests.output.dir}/test-libs/jaxws-epr.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/epr/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/epr/*TestCase.class" /> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging,org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle.war" webxml="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/SOAPEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/TrackerEndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/LifecycleHandler.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/ServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PreServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/PostServerHandler*.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/HandlerTracker.class" /> - <include name="org/jboss/test/ws/jaxws/handlerlifecycle/jaxws-server-handlers.xml" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/WEB-INF"> - <include name="jaxws-endpoint-config.xml" /> - </webinf> - </war> - - <jar jarfile="${tests.output.dir}/test-libs/jaxws-handlerlifecycle-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/handlerlifecycle/META-INF"> - <include name="*.xml" /> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jaxbintros.war" webxml="${tests.output.dir}/test-resources/jaxws/jaxbintros/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -187,21 +153,6 @@ </fileset> </jar> -  - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointA.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointB.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointImplA.class" /> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-B.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointB.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2166/EndpointImplB.class" /> - </fileset> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2187.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2187/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -386,17 +337,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2927.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2927/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws2927/JBWS2927TestCase.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2927/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2949.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2949/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -423,19 +363,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2978.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbers.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersRequest.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2978/AddNumbersResponse.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2978/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2982.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2982/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -593,64 +520,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-action-rpc.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class" /> - </classes> - </war> - -  - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-initial.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class" /> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-replyto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class" /> - </classes> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-faultto.war" webxml="${tests.output.dir}/test-resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - </classes> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ClientHandler.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/AddressingHandler.class" /> - <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ApplicationClient.class" /> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.wsaddressing.replyto.ApplicationClient" /> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core,org.jboss.ws.common" /> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxws/wsaddressing/appclient/META-INF"> - <include name="application-client.xml" /> - <include name="jboss-client.xml" /> - <include name="jaxrpc-mapping.xml" /> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxws-wsaddressing-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxws-wsaddressing-appclient.jar"/> - </fileset> - </jar> - </target> </project> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -545,63 +545,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/HelloEndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-replyto.war" - webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyToEndpointJSE.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> - <include name="replyto-jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/Hello_*.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ClientHandler.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo.class"/> - <include name="org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/ReplyTo_*.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/hello/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/wsaddr/replyto/WEB-INF"> - <include name="replyto-jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsaddr-hello-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-samples-wsaddr-hello-appclient.jar"/> - </fileset> - </jar> -  </target> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -23,45 +23,13 @@ --> <project> - +    - + <target name="build-samples-jaxws" description="Build the jaxws samples deployments"> - - <mkdir dir="${tests.output.dir}/test-libs"/> - -  - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/dar/Bus.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarProcessor.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/DarResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/Route.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/ServiceRequest.class"/> - <include name="org/jboss/test/ws/jaxws/samples/dar/Stop.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF"> - <include name="jboss.xml"/> - </metainf> - </jar> -  - <war - warfile="${tests.output.dir}/test-libs/jaxws-samples-wsa.war" - webxml="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsa/Service*.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsa/jaxws/*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/samples/wsa/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> -  </target> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/soap/SOAPMessageWriterTestCase.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,67 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.common.soap; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; - -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPMessage; - -import org.jboss.ws.common.DOMUtils; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test the DOMWriter - * - * @author Thomas.Diesler(a)jboss.org - * @since 10-Aug-2006 - */ -public class SOAPMessageWriterTestCase extends JBossWSTest -{ - public void testEnvelopeWriter() throws Exception - { - String expEnv = "<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'>" - + " <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'>" - + " <wsa:To>http://fabrikam123.example/Purchasing</wsa:To>" - + " <wsa:ReplyTo>" - + " <wsa:Address>http://business456.example/client1</wsa:Address>" - + " <wsa:ReferenceParameters>" - + " <ns1:sessionid xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid>" - + " </wsa:ReferenceParameters>" - + " </wsa:ReplyTo>" - + " <wsa:Action>http://fabrikam123.example/SubmitPO</wsa:Action>" - + " <wsa:MessageID>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:MessageID>" - + " </env:Header>" - + " <env:Body/>" - + "</env:Envelope>"; - - MessageFactory factory = MessageFactory.newInstance(); - SOAPMessage soapMessage = factory.createMessage(null, new ByteArrayInputStream(expEnv.getBytes())); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - soapMessage.writeTo(baos); - String wasEnv = new String(baos.toByteArray()); - - assertEquals(DOMUtils.parse(expEnv), DOMUtils.parse(wasEnv)); - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2651/EnvelopBuilderTestCase.java 2012-03-26 10:22:38 UTC (rev 16027) @@ -26,7 +26,6 @@ import java.io.InputStream; import java.io.StringReader; -import javax.xml.soap.SOAPEnvelope; import javax.xml.transform.stream.StreamSource; import junit.framework.TestCase; Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req1.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,9 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'> - <wsa:To>http://business456.example/client1</wsa:To> - <wsa:Action>http://fabrikam123.example/ReplyPO</wsa:Action> - <wsa:RelatesTo>uuid:6B29FC40-CA47-1067-B31D-00DD010662DA</wsa:RelatesTo> - <ns1:sessionid wsa:IsReferenceParameter='true' xmlns:ns1='http://somens'>someuniqueid</ns1:sessionid> - </env:Header> - <env:Body/> -</env:Envelope> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/soap/req3.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,18 +0,0 @@ -<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'> - <env:Header xmlns:wsa='http://www.w3.org/2005/08/addressing'> - <wsa:To>uri:jbossws-addressing-initial/InitialService</wsa:To> - <wsa:ReplyTo> - <wsa:Address>http://localhost:8080/jbossws-addressing-replyto/ReplyToService</wsa:Address> - </wsa:ReplyTo> - <wsa:FaultTo> - <wsa:Address>http://localhost:8080/jbossws-addressing-faultto/FaultToService</wsa:Address> - </wsa:FaultTo> - <wsa:Action>http://org.jboss.ws/addressing/replyto/action</wsa:Action> - <wsa:MessageID>urn:uuid:fd82cb27-e79-4d44-8e88-e57398058132</wsa:MessageID> - </env:Header> - <env:Body> - <ns1:addItem xmlns:ns1='http://org.jboss.ws/addressing/replyto' xmlns:xsi='http://www..org/2001/XMLSchema-instance'> - <ns1:String_1>Ice Cream</ns1:String_1> - </ns1:addItem> - </env:Body> -</env:Envelope> \ No newline at end of file Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/wsdl11/inherit/wsaddr.xsd 2012-03-26 10:22:38 UTC (rev 16027) @@ -1,156 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" - "http://www.w3.org/2001/XMLSchema.dtd"> - -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" - xmlns:tns="http://www.w3.org/2005/08/addressing" - targetNamespace="http://www.w3.org/2005/08/addressing" - blockDefault="#all" elementFormDefault="qualified" - finalDefault="" attributeFormDefault="unqualified"> - -  - - <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> - <xs:complexType name="EndpointReferenceType" mixed="false"> - <xs:sequence> - <xs:element name="Address" type="xs:anyURI"/> - -  - <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/> - <xs:element ref="tns:Metadata" minOccurs="0"/> -  - </xs:sequence> -  - </xs:complexType> - - <xs:complexType name="ReferenceParametersType" mixed="false"> - <xs:sequence> -  -  - <xs:element name="Identifier" type="xs:anyURI" minOccurs="0"/> - </xs:sequence> -  - </xs:complexType> - - <xs:element name="Metadata" type="tns:MetadataType"/> - <xs:complexType name="MetadataType" mixed="false"> - <xs:sequence> -  - </xs:sequence> -  - </xs:complexType> - - <xs:element name="MessageID" type="tns:AttributedURIType"/> - <xs:element name="RelatesTo" type="tns:RelatesToType"/> - <xs:complexType name="RelatesToType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" - default="http://www.w3.org/2005/08/addressing/reply"/> -  - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:simpleType name="RelationshipTypeOpenEnum"> - <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> - </xs:simpleType> - - <xs:simpleType name="RelationshipType"> - <xs:restriction base="xs:anyURI"> - <xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="ReplyTo" type="tns:EndpointReferenceType"/> - <xs:element name="From" type="tns:EndpointReferenceType"/> - <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> - <xs:element name="To" type="tns:AttributedURIType"/> - <xs:element name="Action" type="tns:AttributedURIType"/> - - <xs:complexType name="AttributedURIType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> -  - </xs:extension> - </xs:simpleContent> - </xs:complexType> - -  - - <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> - - <xs:simpleType name="FaultCodesOpenEnumType"> - <xs:union memberTypes="tns:FaultCodesType xs:QName"/> - </xs:simpleType> - - <xs:simpleType name="FaultCodesType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:InvalidAddressingHeader"/> - <xs:enumeration value="tns:InvalidAddress"/> - <xs:enumeration value="tns:InvalidEPR"/> - <xs:enumeration value="tns:InvalidCardinality"/> - <xs:enumeration value="tns:MissingAddressInEPR"/> - <xs:enumeration value="tns:DuplicateMessageID"/> - <xs:enumeration value="tns:ActionMismatch"/> - <xs:enumeration value="tns:MessageAddressingHeaderRequired"/> - <xs:enumeration value="tns:DestinationUnreachable"/> - <xs:enumeration value="tns:ActionNotSupported"/> - <xs:enumeration value="tns:EndpointUnavailable"/> - </xs:restriction> - </xs:simpleType> - - <xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/> - <xs:complexType name="AttributedUnsignedLongType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:unsignedLong"> -  - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/> - <xs:complexType name="AttributedQNameType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:QName"> -  - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/> - <xs:complexType name="AttributedAnyType" mixed="false"> - <xs:sequence> -  - </xs:sequence> -  - </xs:complexType> - - <xs:element name="ProblemIRI" type="tns:AttributedURIType"/> - - <xs:element name="ProblemAction" type="tns:ProblemActionType"/> - <xs:complexType name="ProblemActionType" mixed="false"> - <xs:sequence> - <xs:element ref="tns:Action" minOccurs="0"/> - <xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/> - </xs:sequence> -  - </xs:complexType> - -</xs:schema> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 10:06:06 UTC (rev 16026) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 10:22:38 UTC (rev 16027) @@ -512,28 +512,13 @@  <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/dar/**</exclude> - -  -  -  - -  - <exclude>org/jboss/test/ws/jaxws/jbws2116/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws3182/**</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> -  <exclude>org/jboss/test/ws/jaxrpc/jbws1179/JBWS1179TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase*</exclude> <exclude>org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase*</exclude> - </excludes> </configuration> </plugin>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16026 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/core and 31 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 06:06:06 -0400 (Mon, 26 Mar 2012) New Revision: 16026 Removed: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/extensions/xop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2259/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3250/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/xop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples-override/mtom/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/samples/mtom/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxrpc/xop/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2259/ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/jaxws/jbws3250/ Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml Log: [JBPAPP-7572]Merged revisions 16013 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r16013 | ropalka | 2012-03-23 11:27:23 +0100 (Fri, 23 Mar 2012) | 1 line [JBWS-3471] remove MTOM & SWAREF support + don't run shared-testsuite anymore ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013 Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonBindingProvider.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -74,7 +74,6 @@ private void configure() { - // process MTOM config elements if (epMetaData != null) { epMetaData.configure(this); @@ -87,18 +86,10 @@ { binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS() : new SOAP11BindingJAXRPC()); } - else if (SOAPBinding.SOAP11HTTP_MTOM_BINDING.equals(bindingId)) - { - binding = (type == Type.JAXWS ? new SOAP11BindingJAXWS(true) : new SOAP11BindingJAXRPC(true)); - } else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS() : new SOAP12BindingJAXRPC()); } - else if (SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) - { - binding = (type == Type.JAXWS ? new SOAP12BindingJAXWS(true) : new SOAP12BindingJAXRPC(true)); - } else if (HTTPBinding.HTTP_BINDING.equals(bindingId)) { binding = new HTTPBindingJAXWS(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonClient.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -59,7 +59,6 @@ import org.jboss.ws.core.soap.UnboundHeader; import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ClientEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -317,8 +316,6 @@ handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]); handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]); - XOPContext.visitAndRestoreXOPData(); - // Handlers might have replaced the message reqMessage = msgContext.getMessageAbstraction(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonMessageContext.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -38,7 +38,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.xb.binding.NamespaceRegistry; @@ -268,12 +267,6 @@ public boolean isModified() { - // skip changes from XOP handler interactions - if (XOPContext.isXOPEncodedRequest() && !XOPContext.isXOPMessage()) - { - log.debug("Disregard changes from XOP/Handler interactions"); - return false; - } return isModified; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/CommonSOAPBinding.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -74,7 +74,6 @@ import org.jboss.ws.core.soap.attachment.AttachmentPartImpl; import org.jboss.ws.core.soap.attachment.CIDGenerator; import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.jboss.ws.metadata.umdm.TypesMetaData; @@ -93,18 +92,12 @@ // provide logging protected Logger log = Logger.getLogger(getClass()); - private boolean mtomEnabled; - protected HeaderSource headerSource; /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */ public static final String SOAP11HTTP_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http"; /** A constant representing the identity of the SOAP 1.2 over HTTP binding. */ public static final String SOAP12HTTP_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/"; - /** A constant representing the identity of the SOAP 1.1 over HTTP binding with MTOM enabled by default. */ - public static final String SOAP11HTTP_MTOM_BINDING = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"; - /** A constant representing the identity of the SOAP 1.2 over HTTP binding with MTOM enabled by default. */ - public static final String SOAP12HTTP_MTOM_BINDING = "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"; /** The SOAP encoded Array name */ private static final Name SOAP_ARRAY_NAME = new NameImpl("Array", Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC); @@ -122,16 +115,6 @@ return new SOAPFactoryImpl(); } - public boolean isMTOMEnabled() - { - return this.mtomEnabled; - } - - public void setMTOMEnabled(boolean flag) - { - this.mtomEnabled = flag; - } - /** Create the message */ protected abstract MessageAbstraction createMessage(OperationMetaData opMetaData) throws SOAPException; @@ -149,12 +132,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled(isMTOMEnabled()); - // Associate current message with message context SOAPMessageImpl reqMessage = (SOAPMessageImpl)createMessage(opMetaData); msgContext.setSOAPMessage(reqMessage); @@ -283,10 +260,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - // Get the namespace registry NamespaceRegistry namespaceRegistry = msgContext.getNamespaceRegistry(); @@ -390,12 +363,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - XOPContext.setMTOMEnabled(false); - else - XOPContext.setMTOMEnabled(isMTOMEnabled()); - // Associate current message with message context SOAPMessageImpl resMessage = (SOAPMessageImpl)createMessage(opMetaData); msgContext.setSOAPMessage(resMessage); @@ -567,10 +534,6 @@ if (msgContext == null) throw new WSException(BundleUtils.getMessage(bundle, "MESSAGECONTEXT_NOT_AVAILABLE")); - // Disable MTOM for rpc/encoded - if (opMetaData.isRPCEncoded()) - msgContext.put(StubExt.PROPERTY_MTOM_ENABLED, Boolean.FALSE); - SOAPHeader soapHeader = soapEnvelope.getHeader(); SOAPBodyImpl soapBody = (SOAPBodyImpl)soapEnvelope.getBody(); SOAPBodyElement soapBodyElement = soapBody.getBodyElement(); @@ -748,11 +711,6 @@ String swaCID = '<' + partName + "=" + cidGenerator.generateFromCount() + '>'; part.setContentId(swaCID); } - if (paramMetaData.isXOP()) - { - String xopCID = '<' + cidGenerator.generateFromName(partName) + '>'; - part.setContentId(xopCID); - } return part; } @@ -783,7 +741,7 @@ QName xmlName = paramMetaData.getXmlName(); Class javaType = paramMetaData.getJavaType(); - if (value != null && paramMetaData.isXOP() == false) + if (value != null) { Class valueType = value.getClass(); if (JavaUtils.isAssignableFrom(javaType, valueType) == false) @@ -829,22 +787,6 @@ contentElement.addNamespaceDeclaration(Constants.PREFIX_SOAP11_ENC, Constants.URI_SOAP11_ENC); } - // When a potential xop parameter is detected and MTOM is enabled - // we flag the SOAP message as a XOP package - if (paramMetaData.isXOP() && XOPContext.isMTOMEnabled()) - { - log.trace("Add parameter as XOP"); - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); - soapMessage.setXOPMessage(true); - } - else if (paramMetaData.isSwaRef()) - { - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); - SOAPMessageImpl soapMessage = (SOAPMessageImpl)msgContext.getSOAPMessage(); - soapMessage.setSWARefMessage(true); - } - contentElement.setObjectValue(value); return contentElement; @@ -937,20 +879,6 @@ if (soapContentElement == null && optional == false) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_FIND_CHILD_ELEMENT", xmlName)); - // When a potential XOP parameter is detected and - // the incomming request is actuall XOP encoded we flag - // the SOAP message a XOP packaged. - if (paramMetaData.isXOP() && XOPContext.isXOPEncodedRequest()) - { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setXOPMessage(true); - } - else if (paramMetaData.isSwaRef()) - { - SOAPMessageImpl soapMessage = (SOAPMessageImpl)MessageContextAssociation.peekMessageContext().getSOAPMessage(); - soapMessage.setSWARefMessage(true); - } - return soapContentElement; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/EndpointInvocation.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -320,7 +320,7 @@ // Verify that the java type matches a registered xmlType // Attachments are skipped because they don't use type mapping - if (value != null && !paramMetaData.isSwA() && !paramMetaData.isXOP()) + if (value != null && !paramMetaData.isSwA()) { if (JavaUtils.isAssignableFrom(javaType, inputType) == false) throw new WSException(BundleUtils.getMessage(bundle, "PARAMETER_NOT_ASSIGNABLE", new Object[]{ javaType , inputType})); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/StubExt.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -65,8 +65,6 @@ static final String PROPERTY_AUTH_TYPE = "org.jboss.ws.authType"; /** Authentication type, BASIC */ static final String PROPERTY_AUTH_TYPE_BASIC = "org.jboss.ws.authType.basic"; - /** Enable MTOM on the stub */ - static final String PROPERTY_MTOM_ENABLED= "org.jboss.ws.mtom.enabled"; /** HTTP chunk size */ static final String PROPERTY_CHUNKED_ENCODING_SIZE = "http://org.jboss.ws/http#chunksize"; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/client/SOAPProtocolConnectionHTTP.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -31,7 +31,6 @@ import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.soap.SOAPMessageMarshaller; import org.jboss.ws.core.soap.SOAPMessageUnMarshallerHTTP; -import org.jboss.ws.extensions.xop.XOPContext; /** * SOAPConnection implementation @@ -57,10 +56,6 @@ { try { - // enforce xop transitions - // TODO: there should be a clear transition to an immutable object model - XOPContext.eagerlyCreateAttachments(); - // save object model changes SOAPMessage soapMessage = (SOAPMessage)reqMessage; if (reqMessage != null && soapMessage.saveRequired()) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/LiteralTypeMapping.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -21,20 +21,16 @@ */ package org.jboss.ws.core.jaxrpc; -import java.awt.Image; import javax.activation.DataHandler; import javax.mail.internet.MimeMultipart; import javax.xml.soap.SOAPElement; -import javax.xml.transform.Source; import org.jboss.util.NotImplementedException; import org.jboss.ws.common.Constants; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxrpc.binding.ElementDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.ElementSerializerFactory; -import org.jboss.ws.core.jaxrpc.binding.JBossXBDeserializerFactory; -import org.jboss.ws.core.jaxrpc.binding.JBossXBSerializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPElementDeserializerFactory; import org.jboss.ws.core.jaxrpc.binding.SOAPElementSerializerFactory; import org.w3c.dom.Element; @@ -62,21 +58,6 @@ */ public LiteralTypeMapping() { - // XOP default mapping - JBossXBSerializerFactory jbxbSF = new JBossXBSerializerFactory(); - JBossXBDeserializerFactory jbxbDF = new JBossXBDeserializerFactory(); - - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(DataHandler.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - - register(String.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(Image.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(Source.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - register(MimeMultipart.class, Constants.TYPE_XMIME_DEFAULT, jbxbSF, jbxbDF); - registerStandardLiteralTypes(); // register default mime mappings Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP11BindingJAXRPC.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -44,16 +44,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC(); - public SOAP11BindingJAXRPC() - { - setMTOMEnabled(false); - } - - public SOAP11BindingJAXRPC(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAP12BindingJAXRPC.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -44,16 +44,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXRPC delegate = new SOAPBindingJAXRPC(); - public SOAP12BindingJAXRPC() - { - setMTOMEnabled(false); - } - - public SOAP12BindingJAXRPC(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/SOAPFaultHelperJAXRPC.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -327,7 +327,7 @@ { EndpointMetaData emd = msgContext.getEndpointMetaData(); String bindingId = emd.getBindingId(); - if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { return true; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Deserializer.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -28,11 +28,7 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.DeserializerSupport; import org.jboss.ws.core.binding.SerializationContext; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; -import org.jboss.ws.common.DOMUtils; import org.jboss.xb.binding.SimpleTypeBindings; -import org.jboss.xb.binding.sunday.xop.XOPUnmarshaller; import org.w3c.dom.Element; /** @@ -56,19 +52,9 @@ byte[] value = null; - if(XOPContext.isXOPMessage()) - { - Element xopInclude = DOMUtils.getFirstChildElement(xmlFragment); - String cid = xopInclude.getAttribute("href"); - XOPUnmarshaller xopUnmarshaller = new XOPUnmarshallerImpl(); - value = xopUnmarshaller.getAttachmentAsByteArray(cid); - } - else - { - String valueStr = unwrapValueStr(xmlFragment); - if (valueStr != null) - value = SimpleTypeBindings.unmarshalBase64(valueStr); - } + String valueStr = unwrapValueStr(xmlFragment); + if (valueStr != null) + value = SimpleTypeBindings.unmarshalBase64(valueStr); return value; } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/Base64Serializer.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -28,14 +28,10 @@ import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.SerializerSupport; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; import org.jboss.ws.util.xml.BufferedStreamResult; import org.jboss.ws.common.JavaUtils; import org.jboss.xb.binding.NamespaceRegistry; import org.jboss.xb.binding.SimpleTypeBindings; -import org.jboss.xb.binding.sunday.xop.XOPMarshaller; -import org.jboss.xb.binding.sunday.xop.XOPObject; import org.w3c.dom.NamedNodeMap; /** @@ -57,21 +53,9 @@ String xmlFragment = null; NamespaceRegistry nsRegistry = serContext.getNamespaceRegistry(); - if (XOPContext.isXOPMessage()) - { - XOPMarshaller xopMarshaller = new XOPMarshallerImpl(); - XOPObject xopObject = new XOPObject(value); - xopObject.setContentType("application/octet-stream"); - String cid = xopMarshaller.addMtomAttachment(xopObject, xmlName.getNamespaceURI(), xmlType.getLocalPart()); - String xopInclude = "<xop:Include xmlns:xop='http://www.w3.org/2004/08/xop/include' href='" + cid + "'/>"; - xmlFragment = wrapValueStr(xmlName, xopInclude, nsRegistry, null, attributes, false); - } - else - { - value = JavaUtils.getPrimitiveValueArray(value); - String valueStr = SimpleTypeBindings.marshalBase64((byte[])value); - xmlFragment = wrapValueStr(xmlName, valueStr, nsRegistry, null, attributes, true); - } + value = JavaUtils.getPrimitiveValueArray(value); + String valueStr = SimpleTypeBindings.marshalBase64((byte[])value); + xmlFragment = wrapValueStr(xmlName, valueStr, nsRegistry, null, attributes, true); return new BufferedStreamResult(xmlFragment); } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBMarshallerImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -34,7 +34,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.JavaUtils; -import org.jboss.ws.extensions.xop.jaxrpc.XOPMarshallerImpl; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; import org.jboss.ws.metadata.jaxrpcmapping.VariableMapping; @@ -143,7 +142,6 @@ // the actual marshalling SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - schemaBinding.setXopMarshaller(new XOPMarshallerImpl()); delegate.marshal(schemaBinding, null, obj, writer); } catch (RuntimeException e) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/JBossXBUnmarshallerImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -27,7 +27,6 @@ import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.extensions.xop.jaxrpc.XOPUnmarshallerImpl; import org.jboss.xb.binding.JBossXBException; import org.jboss.xb.binding.UnmarshallerFactory; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; @@ -54,8 +53,6 @@ org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller(); SchemaBinding schemaBinding = JBossXBSupport.getOrCreateSchemaBinding(properties); - XOPUnmarshallerImpl xopUnmarshaller = new XOPUnmarshallerImpl(); - schemaBinding.setXopUnmarshaller(xopUnmarshaller); try { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -38,7 +38,6 @@ import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.utils.JBossWSEntityResolver; -import org.jboss.ws.extensions.xop.jaxrpc.JBossXBContentAdapter; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaXmlTypeMapping; @@ -101,9 +100,6 @@ bindSchemaToJava(schemaBinding, wsdlMapping); } - // setup MTOM handler - JBossXBContentAdapter.register(schemaBinding); - return schemaBinding; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerChainBaseImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -44,7 +44,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; -import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.soap.SOAPElementImpl; import org.jboss.ws.core.soap.SOAPElementWriter; import org.jboss.ws.core.soap.SOAPEnvelopeImpl; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxrpc/handler/HandlerDelegateJAXRPC.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -37,12 +37,11 @@ import org.jboss.ws.core.RoleSource; import org.jboss.ws.core.server.ServerHandlerDelegate; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.HandlerMetaData; import org.jboss.ws.metadata.umdm.HandlerMetaDataJAXRPC; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; /** Delegates to JAXRPC handlers * @@ -126,12 +125,7 @@ else if (type == HandlerType.POST) handlerChain = postHandlerChain; - boolean status = (handlerChain != null ? handlerChain.handleResponse(msgContext) : true); - - if (type == HandlerType.ENDPOINT) - XOPContext.visitAndRestoreXOPData(); - - return status; + return handlerChain != null ? handlerChain.handleResponse(msgContext) : true; } public boolean callFaultHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type, Exception ex) @@ -146,12 +140,7 @@ else if (type == HandlerType.POST) handlerChain = postHandlerChain; - boolean status = (handlerChain != null ? handlerChain.handleFault(msgContext) : true); - - if (type == HandlerType.ENDPOINT) - XOPContext.visitAndRestoreXOPData(); - - return status; + return handlerChain != null ? handlerChain.handleFault(msgContext) : true; } public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/DynamicWrapperGenerator.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -40,10 +40,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttachmentRef; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlMimeType; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlType; @@ -126,7 +124,6 @@ clazz, parameter.getType(), parameter.getName(), parameter.getVariable(), parameter.getTypeArguments(), - new boolean[] {parameter.isSwaRef(), parameter.isXop()}, false, parameter.isXmlList(), parameter.getAdapter() ); } @@ -164,7 +161,7 @@ addProperty( clazz, prop.getReturnType().getName(), new QName(prop.getName()), prop.getName(), null, - new boolean[] {false, false}, prop.isTransientAnnotated(), false, null + prop.isTransientAnnotated(), false, null ); clazz.stopPruning(!prune); @@ -221,7 +218,7 @@ private void addProperty(CtClass clazz, String typeName, QName name, String variable, String[] typeArguments, - boolean[] attachments, boolean xmlTransient, boolean xmlList, String adapter) + boolean xmlTransient, boolean xmlList, String adapter) throws CannotCompileException, NotFoundException { ConstPool constPool = clazz.getClassFile().getConstPool(); @@ -253,19 +250,6 @@ annotation.addParameter("name", name.getLocalPart()); annotation.markField(field); } - // @XmlAttachmentRef - if(attachments[0]) - { - annotation = JavassistUtils.createAnnotation(XmlAttachmentRef.class, constPool); - annotation.markField(field); - } - // @XmlMimeType - if(attachments[1]) - { - annotation = JavassistUtils.createAnnotation(XmlMimeType.class, constPool); - annotation.addParameter("value", "application/octet-stream"); // TODO: default mime - annotation.markField(field); - } // @XmlTransient if(xmlTransient) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBDeserializer.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -34,14 +34,12 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.ComplexTypeDeserializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.jaxws.AttachmentUnmarshallerImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.api.binding.BindingCustomization; import org.jboss.ws.api.binding.JAXBBindingCustomization; @@ -76,8 +74,7 @@ JAXBContext jaxbContext = getJAXBContext(javaTypes); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); - unmarshaller.setAttachmentUnmarshaller( new AttachmentUnmarshallerImpl()); - + //workaround for https://jira.jboss.org/jira/browse/JBWS-2686 while waiting for Sun's bug to be fixed unmarshaller.setEventHandler(new ValidationEventHandler() { public boolean handleEvent(final ValidationEvent event) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/JAXBSerializer.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -35,13 +35,11 @@ import javax.xml.ws.WebServiceException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.binding.BindingException; import org.jboss.ws.core.binding.ComplexTypeSerializer; import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.jaxws.AttachmentMarshallerImpl; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.util.xml.BufferedStreamResult; import org.jboss.ws.api.binding.BindingCustomization; @@ -79,7 +77,6 @@ Marshaller marshaller = jaxbContext.createMarshaller(); marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true); - marshaller.setAttachmentMarshaller(new AttachmentMarshallerImpl()); // It's safe to pass a stream result, because the SCE will always be in XML_VALID state afterwards. // This state can safely be written to an outstream. See XMLFragment and XMLContent as well. Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/SOAPFaultHelperJAXWS.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -345,7 +345,7 @@ { EndpointMetaData emd = msgContext.getEndpointMetaData(); String bindingId = emd.getBindingId(); - if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId) || SOAPBinding.SOAP12HTTP_MTOM_BINDING.equals(bindingId)) + if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) { return true; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP11BindingJAXWS.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -47,16 +47,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXWS delegate = new SOAPBindingJAXWS(); - public SOAP11BindingJAXWS() - { - setMTOMEnabled(false); - } - - public SOAP11BindingJAXWS(boolean mtomEnabled) - { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); @@ -109,6 +99,17 @@ public String getBindingID() { - return isMTOMEnabled() ? SOAPBinding.SOAP11HTTP_MTOM_BINDING : SOAPBinding.SOAP11HTTP_BINDING; + return SOAPBinding.SOAP11HTTP_BINDING; } + + @Override + public boolean isMTOMEnabled() // does nothing + { + return false; + } + + @Override + public void setMTOMEnabled(boolean flag) // does nothing + { + } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/binding/SOAP12BindingJAXWS.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -51,16 +51,6 @@ // Delegate to JAXWS SOAP binding private SOAPBindingJAXWS delegate = new SOAPBindingJAXWS(); - public SOAP12BindingJAXWS() - { - super(); - setMTOMEnabled(false); - } - - public SOAP12BindingJAXWS(boolean mtomEnabled) { - setMTOMEnabled(mtomEnabled); - } - public void setSOAPActionHeader(OperationMetaData opMetaData, SOAPMessage reqMessage) { delegate.setSOAPActionHeader(opMetaData, reqMessage); @@ -120,6 +110,17 @@ public String getBindingID() { - return isMTOMEnabled() ? SOAPBinding.SOAP12HTTP_MTOM_BINDING : SOAPBinding.SOAP12HTTP_BINDING; + return SOAPBinding.SOAP12HTTP_BINDING; } + + @Override + public boolean isMTOMEnabled() // does nothing + { + return false; + } + + @Override + public void setMTOMEnabled(boolean flag) // does nothing + { + } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/ClientFeatureProcessor.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -31,8 +31,6 @@ import javax.xml.ws.WebServiceFeature; import javax.xml.ws.handler.Handler; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; -import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; @@ -69,7 +67,6 @@ static { supportedFeatures.addFeature(new AddressingFeature()); - supportedFeatures.addFeature(new MTOMFeature()); supportedFeatures.addFeature(new RespectBindingFeature()); supportedFeatures.addFeature(new ChunkedEncodingFeature()); } @@ -81,7 +78,6 @@ throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "UNSUPPORTED_FEATURE", feature)); } processAddressingFeature(feature, epMetaData, stub); - processMTOMFeature(feature, epMetaData, stub); processRespectBindingFeature(feature, epMetaData, stub); processChunkedEncodingFeature(feature, epMetaData, stub); @@ -157,25 +153,7 @@ } /** - * Setup MTOM * - * @param <T> - * @param feature - * @param epMetaData - * @param stub - * @return - */ - private static <T> void processMTOMFeature(WebServiceFeature feature, EndpointMetaData epMetaData, T stub) - { - if (feature instanceof MTOMFeature) - { - SOAPBinding binding = (SOAPBinding)((BindingProvider)stub).getBinding(); - binding.setMTOMEnabled(feature.isEnabled()); - } - } - - /** - * * Perform respect binding checks * * @param <T> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/client/DispatchImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -55,7 +55,6 @@ import javax.xml.ws.soap.SOAPFaultException; import org.jboss.logging.Logger; -import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.ConfigProvider; @@ -73,15 +72,12 @@ import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS; import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.config.ConfigurationProvider; import org.jboss.ws.metadata.umdm.EndpointConfigMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.FeatureAwareClientEndpointMetaDataAdapter; import org.jboss.ws.metadata.umdm.FeatureAwareEndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; -import org.jboss.ws.metadata.umdm.ServiceMetaData; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.w3c.dom.Node; @@ -249,8 +245,6 @@ handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[1]); handlerPass = handlerPass && callRequestHandlerChain(portName, handlerType[2]); - XOPContext.visitAndRestoreXOPData(); - // Handlers might have replaced the message reqMsg = (SOAPMessageImpl)msgContext.getSOAPMessage(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerDelegateJAXWS.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -27,7 +27,6 @@ import java.util.Set; import javax.xml.namespace.QName; -import javax.xml.soap.SOAPMessage; import javax.xml.ws.handler.Handler; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.PortInfo; @@ -35,10 +34,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.MessageAbstraction; import org.jboss.ws.core.server.ServerHandlerDelegate; import org.jboss.ws.core.soap.MessageContextAssociation; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointConfigMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; @@ -107,13 +104,7 @@ log.debug("callResponseHandlerChain: " + type); HandlerChainExecutor executor = getExecutor(type); MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext(); - boolean status = (executor != null ? executor.handleMessage(msgContext) : true); - - MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction(); - if (msg instanceof SOAPMessage) - XOPContext.visitAndRestoreXOPData(); - - return status; + return executor != null ? executor.handleMessage(msgContext) : true; } public void closeHandlerChain(ServerEndpointMetaData sepMetaData, HandlerType type) @@ -136,13 +127,7 @@ HandlerChainExecutor executor = getExecutor(type); MessageContext msgContext = (MessageContext)MessageContextAssociation.peekMessageContext(); ((CommonMessageContext)msgContext).setCurrentException(ex); - boolean status = (executor != null ? executor.handleFault(msgContext, ex) : true); - - MessageAbstraction msg = ((CommonMessageContext)msgContext).getMessageAbstraction(); - if (msg instanceof SOAPMessage) - XOPContext.visitAndRestoreXOPData(); - - return status; + return executor != null ? executor.handleFault(msgContext, ex) : true; } private List<Handler> getHandlerChain(EndpointMetaData epMetaData, HandlerType type) Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/jaxws/handler/HandlerResolverImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -73,9 +73,7 @@ static { protocolMap.put("##SOAP11_HTTP", SOAPBinding.SOAP11HTTP_BINDING); - protocolMap.put("##SOAP11_HTTP_MTOM", SOAPBinding.SOAP11HTTP_MTOM_BINDING); protocolMap.put("##SOAP12_HTTP", SOAPBinding.SOAP12HTTP_BINDING); - protocolMap.put("##SOAP12_HTTP_MTOM", SOAPBinding.SOAP12HTTP_MTOM_BINDING); protocolMap.put("##XML_HTTP", HTTPBinding.HTTP_BINDING); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -68,7 +68,6 @@ import org.jboss.ws.core.soap.MessageContextAssociation; import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; @@ -171,9 +170,6 @@ CommonBinding binding = bindingProvider.getCommonBinding(); binding.setHeaderSource(delegate); - if (binding instanceof CommonSOAPBinding) - XOPContext.setMTOMEnabled(((CommonSOAPBinding)binding).isMTOMEnabled()); - // call the request handler chain boolean handlersPass = callRequestHandlerChain(sepMetaData, handlerType[0]); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties 2012-03-26 10:06:06 UTC (rev 16026) @@ -57,7 +57,6 @@ ILLEGAL_STATE_REQUESTED=Illegal state requested: {0} OBJECT_VALUE_NOT_AVAILABLE=Object value not available MESSAGECONTEXT_NOT_AVAILABLE=MessageContext not available -FAILED_TO_ADOPT_XOP_CONTENT_TYPE=Failed to adopt XOP content type JAVA_TYPE_NOT_ASSIGNABLE=Java type '{0}' is not assignable from: {1} CANNOT_OBTAIN_DESERIALIZER_FACTORY=Cannot obtain deserializer factory for: [xmlType={0},javaType={1}] DOES_NOT_MATCH_ELEMENT_NAME=Content root name does not match element name: {0} != {1} @@ -109,7 +108,6 @@ CANNOT_DECODE_NAME=Cannot decode name for cid: {0} IGNORE_SOAPEXCEPTION=Ignore SOAPException: {0} MIMEHEADERS_CANNOT_BE_NULL=MimeHeaders cannot be null -XOP_PARAMETER_NOT_PROPERLY_INLINED=XOP parameter not properly inlined INVALID_OFFSET=Invalid offset [{0}] for '{1}' ILLEGAL_STATE_REQUESTED=Illegal state requested: {0} PAYLOAD_NOT_AVAILABLE=Payload not available Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -259,10 +259,6 @@ inputStream = decoder.getRootPart().getDataHandler().getInputStream(); attachments = decoder.getRelatedParts(); - if (isXOPContent(contentType)) - { - soapMessage.setXOPMessage(true); - } } else if (isSoapContent(contentType) == false) { @@ -328,10 +324,4 @@ String baseType = type.getBaseType(); return MimeConstants.TYPE_MULTIPART_RELATED.equalsIgnoreCase(baseType); } - - private boolean isXOPContent(ContentType type) - { - String paramType = type.getParameter("type"); - return MimeConstants.TYPE_APPLICATION_XOP_XML.endsWith(paramType); - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPContentElement.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -31,16 +31,13 @@ import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.transform.Source; -import javax.xml.ws.handler.MessageContext.Scope; import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMWriter; import org.jboss.ws.core.CommonMessageContext; -import org.jboss.ws.core.jaxws.handler.MessageContextJAXWS; import org.jboss.ws.core.soap.SOAPContent.State; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; @@ -590,55 +587,6 @@ } } - /** - * When a SOAPContentElement transitions between dom-valid and xml-valid - * the XOP elements need to transition from XOP optimized to base64 and reverse.<p> - * - * If MTOM is disabled through a message context property we always enforce the - * base64 representation by expanding to DOM, the same happens when a JAXRPC handler - * accesses the SOAPContentElement.<p> - * - * If the element is in dom-valid state (because a handlers accessed it), upon marshalling - * it's needs to be decided wether or not the <code>xop:Include</code> should be restored. - * This as well depends upon the message context property. - */ - public void handleMTOMTransitions() - { - // JMS transport hot fix. Can be removed once we got a immutabe object model - if (MessageContextAssociation.peekMessageContext() == null) - return; - - // MTOM processing is only required on XOP parameters - if (!isXOPParameter()) - return; - - boolean domContentState = (soapContent instanceof DOMContent); - - if (!XOPContext.isMTOMEnabled()) - { - // If MTOM is disabled, we force dom expansion on XOP parameters. - // This will inline any XOP include element and remove the attachment part. - // See SOAPFactoryImpl for details. - - log.debug("MTOM disabled: Force inline XOP data"); - expandToDOM(); - } - else if (domContentState && XOPContext.isMTOMEnabled()) - { - // When the DOM representation is valid, - // but MTOM is enabled we need to convert the inlined - // element back to an xop:Include element and create the attachment part - - log.debug("MTOM enabled: Restore XOP data"); - XOPContext.restoreXOPDataDOM(this); - } - } - - boolean isXOPParameter() - { - return paramMetaData != null && paramMetaData.isXOP(); - } - public void accept(SAAJVisitor visitor) { visitor.visitSOAPContentElement(this); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPFactoryImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -37,9 +37,7 @@ import org.jboss.logging.Logger; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -142,8 +140,6 @@ { SOAPElement soapChild = createElement((Element)child); soapElement.addChildElement(soapChild); - if (Constants.NAME_XOP_INCLUDE.equals(soapChild.getElementQName())) - XOPContext.inlineXOPData(soapChild); } else if (nodeType == Node.TEXT_NODE) { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -59,8 +59,6 @@ import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.core.soap.attachment.MultipartRelatedEncoder; import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder; -import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Node; @@ -83,8 +81,6 @@ private List<AttachmentPart> attachments = new LinkedList<AttachmentPart>(); private CIDGenerator cidGenerator = new CIDGenerator(); private boolean faultMessage; - private boolean isXOPMessage; - private boolean isSWARefMessage; private SOAPPartImpl soapPart; private MultipartRelatedEncoder multipartRelatedEncoder; private static final boolean writeXMLDeclaration = Boolean.getBoolean(WRITE_XML_DECLARATION); @@ -156,26 +152,6 @@ this.faultMessage = faultMessage; } - public boolean isXOPMessage() - { - return isXOPMessage; - } - - public void setXOPMessage(boolean isXOPMessage) - { - this.isXOPMessage = isXOPMessage; - } - - public boolean isSWARefMessage() - { - return isSWARefMessage; - } - - public void setSWARefMessage(boolean isSWAMessage) - { - this.isSWARefMessage = isSWAMessage; - } - public void setAttachments(Collection<AttachmentPart> parts) throws SOAPException { for (AttachmentPart part : parts) @@ -340,27 +316,15 @@ { boolean hasAttachments = attachments.size() > 0; - if (isXOPMessage() && !XOPContext.isMTOMEnabled() && hasAttachments) - throw new IllegalStateException(BundleUtils.getMessage(bundle, "XOP_PARAMETER_NOT_PROPERLY_INLINED")); - // default content-type CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); String contentType = getSOAPContentType(msgContext) + "; charset=" + getCharSetEncoding(); if (hasAttachments) { - if (isXOPMessage() && XOPContext.isMTOMEnabled()) - { - multipartRelatedEncoder = new MultipartRelatedXOPEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); - } - else - { - multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); - multipartRelatedEncoder.encodeMultipartRelatedMessage(); - contentType = multipartRelatedEncoder.getContentType(); - } + multipartRelatedEncoder = new MultipartRelatedSwAEncoder(this); + multipartRelatedEncoder.encodeMultipartRelatedMessage(); + contentType = multipartRelatedEncoder.getContentType(); } //JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders MimeHeaders newMimeHeaders = new MimeHeaders(); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -21,16 +21,11 @@ */ package org.jboss.ws.core.soap; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Array; import java.lang.reflect.Method; import java.util.List; import java.util.ResourceBundle; -import javax.activation.DataHandler; -import javax.activation.DataSource; import javax.xml.namespace.QName; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; @@ -39,7 +34,6 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.Constants; import org.jboss.ws.common.DOMUtils; import org.jboss.ws.common.JavaUtils; import org.jboss.ws.core.CommonMessageContext; @@ -49,9 +43,6 @@ import org.jboss.ws.core.binding.SerializationContext; import org.jboss.ws.core.binding.TypeMappingImpl; import org.jboss.ws.core.jaxws.SerializationContextJAXWS; -import org.jboss.ws.core.soap.attachment.SwapableMemoryDataSource; -import org.jboss.ws.core.utils.MimeUtils; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.jboss.ws.metadata.umdm.ParameterMetaData; import org.w3c.dom.Comment; @@ -219,30 +210,6 @@ if (!isAssignable) { - // handle XOP simple types, i.e. in RPC/LIT - try - { - String contentType = MimeUtils.resolveMimeType(javaType); - if (debugEnabled) - log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType); - - DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType); - DataHandler dh = new DataHandler(ds); - obj = dh.getContent(); - - // 'application/octet-stream' will return a byte[] instead fo the stream - if (obj instanceof InputStream) - { - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - dh.writeTo(bout); - obj = bout.toByteArray(); - } - } - catch (IOException e) - { - throw new WSException(BundleUtils.getMessage(bundle, "FAILED_TO_ADOPT_XOP_CONTENT_TYPE"), e); - } - if (!JavaUtils.isAssignableFrom(javaType, obj.getClass())) { throw new WSException(BundleUtils.getMessage(bundle, "JAVA_TYPE_NOT_ASSIGNABLE", new Object[]{ javaType , objType.getName()})); @@ -356,9 +323,6 @@ } SOAPElement soapElement = soapFactory.createElement((Element)child); container.addChildElement(soapElement); - if (Constants.NAME_XOP_INCLUDE.equals(qname) || container.isXOPParameter()) - XOPContext.inlineXOPData(soapElement); - } finally { Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MimeConstants.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -38,7 +38,6 @@ // Types public static final String TYPE_APPLICATION_OCTET_STREAM = "application/octet-stream"; - public static final String TYPE_APPLICATION_XOP_XML = "application/xop+xml"; public static final String TYPE_MULTIPART_RELATED = "multipart/related"; public static final String TYPE_TEXT_XML = "text/xml"; public static final String TYPE_XML_UTF8 = TYPE_TEXT_XML + "; charset=UTF-8"; @@ -55,5 +54,4 @@ // Misc public static final String CID_DOMAIN = "ws.jboss.org"; public static final String ROOTPART_CID = "<rootpart@" + CID_DOMAIN + ">"; - public static final String START_INFO_XOP = "text/xml"; } Deleted: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/attachment/MultipartRelatedXOPEncoder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.core.soap.attachment; - -import java.io.OutputStream; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; -import javax.mail.internet.ParameterList; -import javax.xml.soap.SOAPConstants; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; - -import org.jboss.ws.core.soap.SOAPElementImpl; -import org.jboss.ws.core.soap.SOAPElementWriter; -import org.jboss.ws.core.soap.SOAPMessageImpl; - -/** - * <code>MultipartRelatedEncoder</code> encodes a <code>SOAPMessage</code> - * into a multipart/related stream. - * - * @author Thomas.Diesler(a)jboss.org - * @since 17-Jan-2006 - */ -public class MultipartRelatedXOPEncoder extends MultipartRelatedEncoder -{ - /** - * Construct a MultipartRelatedEncoder from the specified <code>SOAPMessage</code>. - * There is minimal overhead on construction because all source streams are read - * only on a call to {@link #writeTo(OutputStream)}. - * - * @param soapMessage the SOAP message to be sent as a root part - */ - public MultipartRelatedXOPEncoder(SOAPMessageImpl soapMessage) throws SOAPException - { - super(soapMessage); - } - - public void encodeMultipartRelatedMessage() throws SOAPException, MessagingException - { - SOAPEnvelope soapEnv = soapMessage.getSOAPPart().getEnvelope(); - boolean isSoap12 = SOAPConstants.URI_NS_SOAP_1_2_ENVELOPE.equals(soapEnv.getElementQName().getNamespaceURI()); - String soapType = isSoap12 ? MimeConstants.TYPE_SOAP12 : MimeConstants.TYPE_SOAP11; - - ParameterList p = new ParameterList(); - p.set("type", MimeConstants.TYPE_APPLICATION_XOP_XML); - p.set("start", MimeConstants.ROOTPART_CID); - p.set("start-info", soapType); - - MimeMultipart multipart = new MimeMultipart("related" + p); - MimeBodyPart rootPart = new MimeBodyPart(); - - /* - * TODO - For now we build the root part content from a serialized string of the - * DOM tree, in the future, this should utilize a DataHandler, and a DataContentHandler - * to marshall the message. In this way the root part can be lazily written to the output - * stream. - */ - String envStr = SOAPElementWriter.writeElement((SOAPElementImpl)soapEnv, false); - rootPart.setText(envStr, "UTF-8"); - - rootPart.setContentID(MimeConstants.ROOTPART_CID); - rootPart.setHeader(MimeConstants.CONTENT_TYPE, MimeConstants.TYPE_APPLICATION_XOP_XML + "; charset=UTF-8; type=\"" + soapType + "\""); - rootPart.setHeader(MimeConstants.CONTENT_TRANSFER_ENCODING, MimeConstants.TEXT_8BIT_ENCODING); - - multipart.addBodyPart(rootPart); - - addAttachmentParts(multipart); - - this.multipart = multipart; - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -32,7 +32,6 @@ import javax.xml.rpc.ParameterMode; import javax.xml.rpc.encoding.TypeMappingRegistry; -import org.apache.xerces.xs.XSTypeDefinition; import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.api.util.BundleUtils; @@ -44,7 +43,6 @@ import org.jboss.ws.core.jaxrpc.TypeMappingRegistryImpl; import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; -import org.jboss.ws.extensions.xop.jaxrpc.XOPScanner; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.jaxrpcmapping.ExceptionMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; @@ -78,7 +76,6 @@ import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; -import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; /** * A meta data builder that is based on webservices.xml. @@ -504,34 +501,6 @@ } } - private void setupXOPAttachmentParameter(WSDLInterfaceOperation operation, ParameterMetaData paramMetaData) - { - QName xmlType = paramMetaData.getXmlType(); - - // An XOP parameter is detected if it is a complex type that derives from xsd:base64Binary - WSDLTypes wsdlTypes = operation.getWsdlInterface().getWsdlDefinitions().getWsdlTypes(); - JBossXSModel schemaModel = WSDLUtils.getSchemaModel(wsdlTypes); - String localPart = xmlType.getLocalPart() != null ? xmlType.getLocalPart() : ""; - String ns = xmlType.getNamespaceURI() != null ? xmlType.getNamespaceURI() : ""; - XSTypeDefinition xsType = schemaModel.getTypeDefinition(localPart, ns); - XOPScanner scanner = new XOPScanner(); - if (scanner.findXOPTypeDef(xsType) != null || (localPart.equals("base64Binary") && ns.equals(Constants.NS_SCHEMA_XSD))) - { - // FIXME: read the xmime:contentType from the element declaration - // See SchemaUtils#findXOPTypeDef(XSTypeDefinition typeDef) for details - - /* - FIXME: the classloader is not set yet - paramMetaData.setXopContentType( - MimeUtils.resolveMimeType(paramMetaData.getJavaType()) - ); - */ - - paramMetaData.setXOP(true); - - } - } - /* * Perhaps the JAX-RPC mapping model should be hash based. For now we optimize just this case. */ @@ -565,7 +534,6 @@ ParameterMetaData pmd = buildInputParameter(opMetaData, wsdlOperation, seiMethodMapping, typeMapping, partName, xmlName, xmlType, wsdlPosition++, false); - setupXOPAttachmentParameter(wsdlOperation, pmd); setupSOAPArrayParameter(pmd); } @@ -593,7 +561,6 @@ if (opMetaData.getReturnParameter() != pmd) wsdlPosition++; - setupXOPAttachmentParameter(wsdlOperation, pmd); setupSOAPArrayParameter(pmd); } } @@ -696,7 +663,6 @@ } } - setupXOPAttachmentParameter(wsdlOperation, inMetaData); wsdlPosition = 1; } @@ -852,7 +818,6 @@ } } - setupXOPAttachmentParameter(wsdlOperation, outMetaData); setupSOAPArrayParameter(outMetaData); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/EndpointFeatureProcessor.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -30,9 +30,6 @@ import javax.xml.ws.WebServiceException; import javax.xml.ws.soap.Addressing; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOM; -import javax.xml.ws.soap.MTOMFeature; -import javax.xml.ws.soap.SOAPBinding; import javax.xml.ws.spi.WebServiceFeatureAnnotation; import org.jboss.logging.Logger; @@ -75,12 +72,6 @@ AddressingFeature feature = new AddressingFeature(anFeature.enabled(), anFeature.required(), anFeature.responses()); sepMetaData.addFeature(feature); } - else if (an.annotationType() == MTOM.class) - { - MTOM anFeature = sepClass.getAnnotation(MTOM.class); - MTOMFeature feature = new MTOMFeature(anFeature.enabled(), anFeature.threshold()); - sepMetaData.addFeature(feature); - } else if (an.annotationType() == RespectBinding.class) { RespectBinding anFeature = sepClass.getAnnotation(RespectBinding.class); @@ -98,8 +89,7 @@ protected void setupEndpointFeatures(ServerEndpointMetaData sepMetaData) { setupAddressingFeature(sepMetaData); - setupMTOMFeature(sepMetaData); - setupRespectBindingFeature(sepMetaData); //this need to be processed last + setupRespectBindingFeature(sepMetaData); } private static void setupAddressingFeature(ServerEndpointMetaData sepMetaData) @@ -112,32 +102,11 @@ hmd.setEndpointMetaData(sepMetaData); hmd.setHandlerClassName(WSAddressingServerHandler.class.getName()); hmd.setHandlerName("WSAddressing Handler"); - hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP_MTOM"); + hmd.setProtocolBindings("##SOAP11_HTTP ##SOAP12_HTTP"); sepMetaData.addHandler(hmd); } } - private static void setupMTOMFeature(ServerEndpointMetaData sepMetaData) - { - MTOMFeature mtomFeature = sepMetaData.getFeature(MTOMFeature.class); - if (mtomFeature != null && mtomFeature.isEnabled()) - { - String bindingId = sepMetaData.getBindingId(); - if (SOAPBinding.SOAP11HTTP_BINDING.equals(bindingId)) - { - if (log.isDebugEnabled()) - log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP11HTTP_MTOM_BINDING); - sepMetaData.setBindingId(SOAPBinding.SOAP11HTTP_MTOM_BINDING); - } - else if (SOAPBinding.SOAP12HTTP_BINDING.equals(bindingId)) - { - if (log.isDebugEnabled()) - log.debug("MTOMFeature found, setting binding to " + SOAPBinding.SOAP12HTTP_MTOM_BINDING); - sepMetaData.setBindingId(SOAPBinding.SOAP12HTTP_MTOM_BINDING); - } - } - } - private static void setupRespectBindingFeature(ServerEndpointMetaData sepMetaData) { RespectBindingFeature respectBindingFeature = sepMetaData.getFeature(RespectBindingFeature.class); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSClientMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -34,7 +34,6 @@ import javax.xml.ws.BindingType; import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.WSException; import org.jboss.ws.api.annotation.EndpointConfig; @@ -71,6 +70,7 @@ public class JAXWSClientMetaDataBuilder extends JAXWSMetaDataBuilder { private static final ResourceBundle bundle = BundleUtils.getBundle(JAXWSClientMetaDataBuilder.class); + public ServiceMetaData buildMetaData(QName serviceName, URL wsdlURL, UnifiedVirtualFile vfsRoot) { return this.buildMetaData(serviceName, wsdlURL, vfsRoot, null); @@ -80,7 +80,7 @@ ClassLoader classLoader) { if (wsdlURL == null) - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_WSDLURL", wsdlURL)); + throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "INVALID_WSDLURL", wsdlURL)); if (log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceName + "]"); @@ -119,7 +119,7 @@ } catch (Exception ex) { - throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_BUILD_META_DATA", ex.getMessage()), ex); + throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_BUILD_META_DATA", ex.getMessage()), ex); } } @@ -138,10 +138,11 @@ throw new IllegalStateException(BundleUtils.getMessage(bundle, "ONLY_ONE_EPR_ALLOWED")); Element eprElement = portEPRs.get(0).getElement(); - + // construct Native EPR DOMSource eprInfoset = new DOMSource(eprElement); - NativeEndpointReference nativeEPR = (NativeEndpointReference)NativeEndpointReference.readFrom(eprInfoset); + NativeEndpointReference nativeEPR = (NativeEndpointReference) NativeEndpointReference + .readFrom(eprInfoset); nativeEPR.setAddress(endpointMD.getEndpointAddress()); endpointMD.setEndpointReference(nativeEPR); } @@ -181,7 +182,8 @@ for (WSDLService wsdls : wsdlDefinitions.getServices()) serviceNames.add(wsdls.getName()); - throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_WSDL_SERVICE", new Object[]{ serviceName , serviceNames})); + throw new IllegalArgumentException(BundleUtils.getMessage(bundle, "CANNOT_OBTAIN_WSDL_SERVICE", new Object[] + {serviceName, serviceNames})); } // Build endpoint meta data @@ -250,20 +252,15 @@ if (log.isDebugEnabled()) log.debug("Processing service-ref contribution on portType: " + epMetaData.getPortTypeName()); - // process MTOM overrides - if (portComp.isMtomEnabled()) - { - epMetaData.addFeature(new MTOMFeature(true, portComp.getMtomThreshold())); - } // process Addressing - if (portComp.isAddressingEnabled()) + if (portComp.isAddressingEnabled()) { - AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); + AddressingFeature.Responses response = getAddressFeatureResponses(portComp.getAddressingResponses()); epMetaData.addFeature(new AddressingFeature(true, portComp.isAddressingRequired(), response)); } - + // process RespectBinding - if (portComp.isRespectBindingEnabled()) + if (portComp.isRespectBindingEnabled()) { epMetaData.addFeature(new RespectBindingFeature(true)); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -74,8 +74,6 @@ import org.jboss.ws.core.utils.HolderUtils; import org.jboss.ws.extensions.addressing.AddressingPropertiesImpl; import org.jboss.ws.extensions.addressing.metadata.AddressingOpMetaExt; -import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; import org.jboss.ws.metadata.accessor.JAXBAccessorFactoryCreator; import org.jboss.ws.metadata.builder.MetaDataBuilder; import org.jboss.ws.metadata.umdm.EndpointMetaData; @@ -763,10 +761,6 @@ opMetaData.setDocumentation(method.getAnnotation(Documentation.class).content()); } - // Build parameter meta data - // Attachment annotations on SEI parameters - List<AttachmentScanResult> scanResult = ReflectiveAttachmentRefScanner.scanMethod(method); - Class<?>[] parameterTypes = method.getParameterTypes(); Type[] genericTypes = method.getGenericParameterTypes(); Annotation[][] parameterAnnotations = method.getParameterAnnotations(); @@ -841,8 +835,6 @@ wrappedParameter = new WrappedParameter(wrappedParameter); wrappedOutputParameters.add(wrappedParameter); } - - processAttachmentAnnotationsWrapped(scanResult, i, wrappedParameter); } else { @@ -872,7 +864,6 @@ javaTypes.add(javaType); typeRefs.add(new TypeReference(xmlName, genericType, parameterAnnotations[i])); - processAttachmentAnnotations(scanResult, i, paramMetaData); processMIMEBinding(epMetaData, opMetaData, paramMetaData); } } @@ -905,8 +896,6 @@ // insert at the beginning just for prettiness wrappedOutputParameters.add(0, wrapped); - - processAttachmentAnnotationsWrapped(scanResult, -1, wrapped); } else { @@ -939,7 +928,6 @@ javaTypes.add(returnType); typeRefs.add(new TypeReference(xmlName, genericReturnType, method.getAnnotations())); - processAttachmentAnnotations(scanResult, -1, retMetaData); processMIMEBinding(epMetaData, opMetaData, retMetaData); } } @@ -984,42 +972,6 @@ processMetaExtensions(method, epMetaData, opMetaData); } - /** - * @see org.jboss.ws.metadata.builder.jaxws.JAXWSMetaDataBuilder#processAttachmentAnnotations(java.util.List, int, org.jboss.ws.metadata.umdm.ParameterMetaData) - * @param scanResult - * @param i - * @param wrappedParameter - */ - private void processAttachmentAnnotationsWrapped(List<AttachmentScanResult> scanResult, int i, WrappedParameter wrappedParameter) - { - AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i); - if (asr != null) - { - if (AttachmentScanResult.Type.SWA_REF == asr.getType()) - wrappedParameter.setSwaRef(true); - else - wrappedParameter.setXOP(true); - } - } - - /** - * Update PMD according to attachment annotations that might be in place - * @param scanResult - * @param i - * @param parameter - */ - private void processAttachmentAnnotations(List<AttachmentScanResult> scanResult, int i, ParameterMetaData parameter) - { - AttachmentScanResult asr = ReflectiveAttachmentRefScanner.getResultByIndex(scanResult, i); - if (asr != null) - { - if (AttachmentScanResult.Type.SWA_REF == asr.getType()) - parameter.setSwaRef(true); - else - parameter.setXOP(true); - } - } - private void processMIMEBinding(EndpointMetaData epMetaData, OperationMetaData opMetaData, ParameterMetaData paramMetaData) { // process SWA metadata Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSServerMetaDataBuilder.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -29,7 +29,6 @@ import javax.xml.ws.RespectBindingFeature; import javax.xml.ws.WebServiceProvider; import javax.xml.ws.soap.AddressingFeature; -import javax.xml.ws.soap.MTOMFeature; import org.jboss.ws.api.annotation.EndpointConfig; import org.jboss.ws.api.annotation.WebContext; @@ -236,14 +235,6 @@ } } - // MTOM settings - if (portComp.isMtomEnabled()) - { - log.debug("Enabling MTOM"); - MTOMFeature feature = new MTOMFeature(true, portComp.getMtomThreshold()); - sepMetaData.getFeatures().addFeature(feature); - } - if (portComp.isAddressingEnabled()) { log.debug("Enabling Addressing"); AddressingFeature.Responses responses = getAddressFeatureResponses(portComp.getAddressingResponses()); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointFeature.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -28,9 +28,6 @@ */ public interface EndpointFeature { - /** Enable MTOM per endpoint */ - final static String MTOM = "http://org.jboss.ws/mtom"; - /** * Validate the XML stream upon dispatch. * Introduces an additional parsing overhead and could be disabled. Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/config/EndpointProperty.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -34,8 +34,6 @@ @Deprecated public class EndpointProperty { - public final static String MTOM_THRESHOLD = "http://org.jboss.ws/mtom#threshold"; - /** * Set to 0 in order to disable chunked encoding */ Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -105,8 +105,6 @@ { SUPPORTED_BINDINGS.add(Constants.SOAP11HTTP_BINDING); SUPPORTED_BINDINGS.add(Constants.SOAP12HTTP_BINDING); - SUPPORTED_BINDINGS.add(Constants.SOAP11HTTP_MTOM_BINDING); - SUPPORTED_BINDINGS.add(Constants.SOAP12HTTP_MTOM_BINDING); SUPPORTED_BINDINGS.add(Constants.HTTP_BINDING); } @@ -773,21 +771,8 @@ { CommonConfig config = getConfig(); - // SOAPBinding configuration - if (configurable instanceof CommonBindingProvider) + if (configurable instanceof DispatchBinding) { - log.debug("Configure SOAPBinding"); - - if (config.hasFeature(EndpointFeature.MTOM)) - { - CommonBindingProvider provider = (CommonBindingProvider)configurable; - ((CommonSOAPBinding)provider.getCommonBinding()).setMTOMEnabled(true); - if (log.isDebugEnabled()) - log.debug("Enable MTOM on endpoint " + getPortName()); - } - } - else if (configurable instanceof DispatchBinding) - { DispatchBinding dpb = (DispatchBinding)configurable; dpb.setValidateDispatch(config.hasFeature(EndpointFeature.VALIDATE_DISPATCH)); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/ParameterMetaData.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -40,8 +40,6 @@ import org.jboss.ws.core.jaxrpc.ParameterWrapping; import org.jboss.ws.core.jaxws.DynamicWrapperGenerator; import org.jboss.ws.core.utils.HolderUtils; -import org.jboss.ws.extensions.xop.jaxws.AttachmentScanResult; -import org.jboss.ws.extensions.xop.jaxws.ReflectiveAttachmentRefScanner; import org.jboss.ws.metadata.accessor.AccessorFactoryCreator; import org.jboss.ws.metadata.accessor.ReflectiveMethodAccessorFactoryCreator; import org.jboss.ws.metadata.config.EndpointFeature; @@ -72,8 +70,6 @@ private Set<String> mimeTypes; private boolean inHeader; private boolean isSwA; - private boolean isXOP; - private boolean isSwaRef; private List<WrappedParameter> wrappedParameters; private int index; @@ -336,26 +332,6 @@ this.isSwA = isSwA; } - public boolean isSwaRef() - { - return isSwaRef; - } - - public void setSwaRef(boolean swaRef) - { - isSwaRef = swaRef; - } - - public boolean isXOP() - { - return isXOP; - } - - public void setXOP(boolean isXOP) - { - this.isXOP = isXOP; - } - public boolean isSOAPArrayParam() { return soapArrayParam; @@ -480,35 +456,8 @@ javaType = getJavaType(); if (javaType == null) throw new WSException(BundleUtils.getMessage(bundle, "CANNOT_LOAD_JAVA_TYPE", javaTypeName)); - - initializeAttachmentParameter(epType); } - /** - * Identify MTOM and SWA:Ref parameter as these require special treatment. - * This only affects JAX-WS endpoints. - * - * Note: For SEI parameter annotations this happens within the metadata builder. - * @param epType - */ - private void initializeAttachmentParameter(Type epType) - { - if (epType == Type.JAXWS) - { - ReflectiveAttachmentRefScanner scanner = new ReflectiveAttachmentRefScanner(); - AttachmentScanResult scanResult = scanner.scanBean(javaType); - if (scanResult != null) - { - if (log.isDebugEnabled()) - log.debug("Identified attachment reference: " + xmlName + ", type=" + scanResult.getType()); - if (scanResult.getType() == AttachmentScanResult.Type.XOP) - setXOP(true); - else - setSwaRef(true); - } - } - } - private ClassLoader getClassLoader() { ClassLoader loader = opMetaData.getEndpointMetaData().getClassLoader(); @@ -583,12 +532,6 @@ buffer.append("\n mimeTypes=").append(getMimeTypes()); } - if (isXOP()) - { - buffer.append("\n isXOP=").append(isXOP()); - buffer.append("\n mimeTypes=").append(getMimeTypes()); - } - if (wrappedParameters != null) buffer.append("\n wrappedParameters=").append(wrappedParameters); Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/metadata/umdm/WrappedParameter.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -41,8 +41,6 @@ private boolean holder = false; private int index = -2; private Accessor accessor; - private boolean swaRef; - private boolean xop; private boolean xmlList; private String adapter = null; @@ -135,26 +133,6 @@ this.accessor = accessor; } - public boolean isSwaRef() - { - return swaRef; - } - - public void setSwaRef(boolean swaRef) - { - this.swaRef = swaRef; - } - - public boolean isXop() - { - return xop; - } - - public void setXOP(boolean xop) - { - this.xop = xop; - } - public boolean isXmlList() { return xmlList; Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -80,7 +80,6 @@ import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.core.utils.ThreadLocalAssociation; import org.jboss.ws.extensions.addressing.AddressingConstantsImpl; -import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServerEndpointMetaData; import org.jboss.ws.metadata.umdm.EndpointMetaData.Type; @@ -574,7 +573,6 @@ // Set the outbound headers if (headerSource != null && resMessage instanceof SOAPMessage) { - XOPContext.eagerlyCreateAttachments(); ((SOAPMessage)resMessage).saveChanges(); headerSource.setMimeHeaders(resMessage.getMimeHeaders()); } Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-client-config.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -8,11 +8,6 @@ </client-config> <client-config> - <config-name>Standard MTOM client</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </client-config> - - <client-config> <config-name>Standard WSAddressing Client</config-name> <post-handler-chain> <handler-chain-name>WSAddressing Handlers</handler-chain-name> @@ -23,4 +18,4 @@ </post-handler-chain> </client-config> -</jaxrpc-config> \ No newline at end of file +</jaxrpc-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/resources/META-INF/standard-jaxrpc-endpoint-config.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -8,11 +8,6 @@ </endpoint-config> <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </endpoint-config> - - <endpoint-config> <config-name>Standard WSAddressing Endpoint</config-name> <pre-handler-chain> <handler-chain-name>WSAddressing Handlers</handler-chain-name> @@ -23,4 +18,4 @@ </pre-handler-chain> </endpoint-config> -</jaxrpc-config> \ No newline at end of file +</jaxrpc-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxrpc.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -3423,174 +3423,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-doclit-appclient.jar"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-doclit_handler-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-doclit_handler-appclient.jar"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-rpclit-appclient.jar"/> - </fileset> - </jar> - -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - <include name="org/jboss/test/ws/appclient/AppclientKiller.class"/> - </fileset> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.appclient.AppclientKiller"/> - </manifest> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-xop-rpclit_handler-appclient.ear"> - <fileset dir="${tests.output.dir}/test-libs"> - <include name="jaxrpc-xop-rpclit_handler-appclient.jar"/> - </fileset> - </jar> -  </target> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -247,22 +247,6 @@ </webinf> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2259.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2259/Endpoint.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/EndpointImpl.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/CustomHandler.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2259/Photo.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws2259/WEB-INF"> - <include name="jaxws-endpoint-config.xml" /> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.native.jbossws-native-core"/> - </manifest> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2285.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2285/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> @@ -480,14 +464,6 @@ </classes> </war> -  - <war warfile="${tests.output.dir}/test-libs/jaxws-jbws3250.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3250/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws3250/*.class" /> - <exclude name="org/jboss/test/ws/jaxws/jbws3250/*TestCase*.class" /> - </classes> - </war> -  <war warfile="${tests.output.dir}/test-libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/test-resources/jaxws/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -364,32 +364,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common,javax.mail.api services export,javax.activation.api services export"/> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/common/config/ConfigFactoryTestCase.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -1,120 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.common.config; - -import java.io.File; - -import org.jboss.ws.metadata.config.JBossWSConfigFactory; -import org.jboss.ws.metadata.config.jaxrpc.CommonConfigJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.ConfigRootJAXRPC; -import org.jboss.ws.metadata.config.jaxrpc.EndpointConfigJAXRPC; -import org.jboss.wsf.spi.metadata.config.ConfigRoot; -import org.jboss.wsf.spi.metadata.config.EndpointConfig; -import org.jboss.wsf.spi.metadata.config.Feature; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; -import org.jboss.wsf.test.JBossWSTest; - -/** - * Test parsing of the JBossWS config - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Dec-2004 - */ -public class ConfigFactoryTestCase extends JBossWSTest -{ - - public void testJAXRPCObjectModelFactory() throws Exception - { - File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURI().toURL()); - - assertNotNull("Null config", config); - - assertEquals(3, config.getEndpointConfig().size()); - EndpointConfigJAXRPC epc1 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(0); - EndpointConfigJAXRPC epc2 = (EndpointConfigJAXRPC)config.getEndpointConfig().get(2); - - assertEquals("Standard Endpoint", epc1.getConfigName()); - assertNull(epc1.getPreHandlerChain()); - assertNull(epc1.getPostHandlerChain()); - assertFalse("MTOM should not be enabled", epc1.hasFeature("http://org.jboss.ws/mtom")); - - assertEquals("Standard WSSecurity Endpoint", epc2.getConfigName()); - UnifiedHandlerChainMetaData preChain = epc2.getPreHandlerChain(); - assertEquals(1, preChain.getHandlers().size()); - UnifiedHandlerMetaData h1 = (UnifiedHandlerMetaData)preChain.getHandlers().get(0); - assertEquals("WSSecurityHandlerInbound", h1.getHandlerName()); - assertEquals("org.jboss.ws.extensions.security.jaxrpc.WSSecurityHandlerInbound", h1.getHandlerClass()); - } - - public void testJAXWSFeatures() throws Exception - { - File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - - ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL()); - assertNotNull("Null config", config); - - EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard MTOM Endpoint"); - assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - - // disable feature - epConfig.setFeature(new Feature("http://org.jboss.ws/mtom"), false); - assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - } - - public void testJAXRPCFeatures() throws Exception - { - File confFile = getResourceFile("common/config/jaxrpc-endpoint-config.xml"); - assertTrue(confFile.exists()); - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRootJAXRPC config = (ConfigRootJAXRPC)factory.parse(confFile.toURI().toURL()); - assertNotNull("Null config", config); - - CommonConfigJAXRPC epConfig = (CommonConfigJAXRPC)config.getConfigByName("Standard MTOM Endpoint"); - assertTrue("Feature not set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - - // disable feature - epConfig.setFeature("http://org.jboss.ws/mtom", false); - assertFalse("Feature still set", epConfig.hasFeature("http://org.jboss.ws/mtom")); - } - - public void testProperties() throws Exception - { - File confFile = getResourceFile("common/config/jaxws-endpoint-config.xml"); - assertTrue(confFile.exists()); - - JBossWSConfigFactory factory = JBossWSConfigFactory.newInstance(); - ConfigRoot config = (ConfigRoot)factory.parse(confFile.toURI().toURL()); - assertNotNull("Null config", config); - - EndpointConfig epConfig = (EndpointConfig)config.getConfigByName("Standard WSSecurity Endpoint"); - String value = epConfig.getProperty("http://org.jboss.ws/mtom#threshold"); - assertNotNull("Property does not exist", value); - assertEquals("Wrong property valule", value, "5000"); - } -} Deleted: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/CustomHandler.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.wsdd; - -import org.jboss.ws.core.soap.TextImpl; -import org.jboss.ws.extensions.xop.XOPContext; -import org.jboss.ws.api.handler.GenericSOAPHandler; - -import javax.xml.ws.handler.MessageContext; -import javax.xml.ws.handler.soap.SOAPMessageContext; -import javax.xml.ws.WebServiceException; -import javax.xml.soap.*; - -/** - * Inbound the handler appends to the echo message, - * outbound it changes the boolean value of the checkMTOM invocation. - * - * @author Heiko.Braun(a)jboss.org - * @since Mar 12, 2007 - */ -public class CustomHandler extends GenericSOAPHandler { - - protected boolean handleInbound(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - if(soapBodyElement.getChildElements().hasNext()) - { - SOAPElement payload = (SOAPElement)soapBodyElement.getChildElements().next(); - SOAPElement message = (SOAPElement)payload.getChildElements().next(); - String value = message.getValue(); - message.setValue(value + "World"); - } - } - catch (SOAPException e) - { - throw new WebServiceException(e); - } - return true; - } - - protected boolean handleOutbound(MessageContext msgContext) - { - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - if(soapBodyElement.getChildElements().hasNext()) - { - SOAPElement payload = (SOAPElement)soapBodyElement.getChildElements().next(); - if(soapBodyElement.getElementQName().getLocalPart().indexOf("MTOM") != -1) - { - TextImpl response = (TextImpl)payload.getChildElements().next(); - String value = response.getValue(); - response.setValue( String.valueOf(XOPContext.isMTOMEnabled()) ); - } - - } - } - catch (SOAPException e) - { - throw new WebServiceException(e); - } - - return true; - } -} Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/TestDDOverrides.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -28,8 +28,6 @@ import javax.xml.namespace.QName; import javax.xml.ws.Service; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.soap.SOAPBinding; import java.net.URL; /** @@ -58,16 +56,4 @@ assertNotNull(response); assertEquals(response.msg, "HelloWorld"); } - - public void testMTOMOverride() throws Exception - { - QName serviceName = new QName("http://wsdd.jaxws.ws.test.jboss.org/", "WSDDEndpointImplService"); - URL wsdlURL = new URL(TARGET_ENDPOINT_ADDRESS + "?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - WSDDEndpoint port = service.getPort(WSDDEndpoint.class); - - assertTrue("MTOM should be enabled thorugh webservice.xml overrides", port.checkMTOMEnabled()); - - } } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/wsdd/WSDDEndpointImpl.java 2012-03-26 10:06:06 UTC (rev 16026) @@ -41,9 +41,6 @@ @WebMethod public Boolean checkMTOMEnabled() { - // At this point it's not set - // The MTOM property is avaialbel when the CommonSOAPBinding - // did bin the reponse. Therefore we delegate this task to the handler impl. return Boolean.FALSE; } Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxrpc-endpoint-config.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -9,20 +9,4 @@ <config-name>Standard Endpoint</config-name> </endpoint-config> - <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - <feature>http://org.jboss.ws/mtom</feature> - </endpoint-config> - - <endpoint-config> - <config-name>Standard WSSecurity 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.extensions.security.jaxrpc.WSSecurityHandlerInbound</j2ee:handler-class> - </handler> - </pre-handler-chain> - </endpoint-config> - </jaxrpc-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/src/test/resources/common/config/jaxws-endpoint-config.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -9,34 +9,4 @@ <config-name>Standard Endpoint</config-name> </endpoint-config> - <endpoint-config> - <config-name>Standard MTOM Endpoint</config-name> - - <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature> - - </endpoint-config> - - <endpoint-config> - - <config-name>Standard WSSecurity Endpoint</config-name> - - <pre-handler-chains> - <javaee:handler-chain> - <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings> - <javaee:handler> - <javaee:handler-name>WSSecurityHandlerInbound</javaee:handler-name> - <javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class> - </javaee:handler> - </javaee:handler-chain> - </pre-handler-chains> - - <feature><feature-name>http://org.jboss.ws/mtom</feature-name></feature> - - <property> - <property-name>http://org.jboss.ws/mtom#threshold</property-name> - <property-value>5000</property-value> - </property> - - </endpoint-config> - </jaxws-config> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 09:51:32 UTC (rev 16025) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-03-26 10:06:06 UTC (rev 16026) @@ -33,7 +33,6 @@  <modules> <module>native-tests</module> - <module>shared-tests</module> </modules>

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16025 - in shared-testsuite/branches/jbossws-shared-testsuite-4.0.x: testsuite/src/test/ant-import and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 05:51:32 -0400 (Mon, 26 Mar 2012) New Revision: 16025 Removed: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/mtom/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/resources/jaxrpc/samples/mtom/ Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxrpc.xml Log: [JBPAPP-7572][JBWS-3471] removing MTOM/XOP support - svn merge -r 16021:16022 https://svn.jboss.org/repos/jbossws/shared-testsuite/trunk Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976 + /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:15976,16022 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-03-26 09:46:09 UTC (rev 16024) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.0.x/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-03-26 09:51:32 UTC (rev 16025) @@ -326,32 +326,6 @@ </metainf> </jar> -  - <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="webservices.xml"/> - <include name="wsdl/**"/> - </webinf> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common,javax.mail.api services export,javax.activation.api services export"/> - </manifest> - </war> - <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/mtom/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> -  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-oneway.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes">

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16024 - in common/branches/jbossws-common-2.0.x: src/main/java/org/jboss/ws/common and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-03-26 05:46:09 -0400 (Mon, 26 Mar 2012) New Revision: 16024 Modified: common/branches/jbossws-common-2.0.x/ common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/Constants.java Log: [JBPAPP-7572][JBWS-3471] removing MTOM/XOP support - svn merge -r 16015:16016 https://svn.jboss.org/repos/jbossws/common/trunk Property changes on: common/branches/jbossws-common-2.0.x ___________________________________________________________________ Modified: svn:mergeinfo - /common/branches/asoldano:14028-14056 + /common/branches/asoldano:14028-14056 /common/trunk:16016 Modified: common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/Constants.java 2012-03-26 07:52:54 UTC (rev 16023) +++ common/branches/jbossws-common-2.0.x/src/main/java/org/jboss/ws/common/Constants.java 2012-03-26 09:46:09 UTC (rev 16024) @@ -64,10 +64,6 @@ static final String NS_SWA_MIME = "http://schemas.xmlsoap.org/wsdl/mime/"; /** Default namespace for WSDL-1.1 http://schemas.xmlsoap.org/wsdl/ */ static final String NS_WSDL11 = "http://schemas.xmlsoap.org/wsdl/"; - /** The namespace for the MTOM content type attribute. */ - static final String NS_XML_MIME = "http://www.w3.org/2005/05/xmlmime"; - /** The namespace for XOP. */ - static final String NS_XOP = "http://www.w3.org/2004/08/xop/include"; /** A constant representing the identity of the SOAP 1.1 over HTTP binding. */ public static final String SOAP11HTTP_BINDING = SOAPBinding.SOAP11HTTP_BINDING; @@ -115,14 +111,10 @@ static final String PREFIX_SOAP11_ENC = "soap11-enc"; static final String PREFIX_TNS = "tns"; static final String PREFIX_WSDL = "wsdl"; - static final String PREFIX_XOP = "xop"; static final String PREFIX_XSD = "xsd"; static final String PREFIX_XSI = "xsi"; static final String PREFIX_XML = "xml"; - /** XOP Include */ - static final QName NAME_XOP_INCLUDE = new QName(NS_XOP, "Include", PREFIX_XOP); - /** SOAP-1.1 roles */ static final String URI_SOAP11_NEXT_ACTOR = "http://schemas.xmlsoap.org/soap/actor/next"; @@ -257,8 +249,6 @@ static final QName TYPE_MIME_TEXT_PLAIN = new QName(NS_ATTACHMENT_MIME_TYPE, "text_plain"); static final QName TYPE_MIME_TEXT_XML = new QName(NS_ATTACHMENT_MIME_TYPE, "text_xml"); - static final QName TYPE_XMIME_DEFAULT = new QName(NS_XML_MIME, "base64Binary"); - /** For out of bound transport (i.e. in headers); http://www.w3.org/2004/08/wsdl/feature/AD/data */ static final String WSDL_PROPERTY_APPLICATION_DATA = "http://www.w3.org/2004/08/wsdl/feature/AD/data"; /** The key to the original message part name */

12 years, 1 month

1
0
0 / 0

JBossWS SVN: r16023 - in hudson/trunk/hudson-home/jobs: AS-7.1.0 and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-03-26 03:52:54 -0400 (Mon, 26 Mar 2012) New Revision: 16023 Modified: hudson/trunk/hudson-home/jobs/AS-7.0.2/config.xml hudson/trunk/hudson-home/jobs/AS-7.1.0/config.xml hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml Log: Skip AS tests during AS build Modified: hudson/trunk/hudson-home/jobs/AS-7.0.2/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.0.2/config.xml 2012-03-24 06:45:48 UTC (rev 16022) +++ hudson/trunk/hudson-home/jobs/AS-7.0.2/config.xml 2012-03-26 07:52:54 UTC (rev 16023) @@ -61,7 +61,7 @@ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m" export MAVEN_OPTS -./build.sh clean install -Dskip-download-sources -U -B</command> +./build.sh clean install -Dskip-download-sources -DskipTests=true -U -B</command> </hudson.tasks.Shell> </builders> <publishers> Modified: hudson/trunk/hudson-home/jobs/AS-7.1.0/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.1.0/config.xml 2012-03-24 06:45:48 UTC (rev 16022) +++ hudson/trunk/hudson-home/jobs/AS-7.1.0/config.xml 2012-03-26 07:52:54 UTC (rev 16023) @@ -61,7 +61,7 @@ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m" export MAVEN_OPTS -./build.sh clean install -Dskip-download-sources -U -B</command> +./build.sh clean install -Dskip-download-sources -DskipTests=true -U -B</command> </hudson.tasks.Shell> </builders> <publishers> Modified: hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml 2012-03-24 06:45:48 UTC (rev 16022) +++ hudson/trunk/hudson-home/jobs/AS-7.1.1/config.xml 2012-03-26 07:52:54 UTC (rev 16023) @@ -61,7 +61,7 @@ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m" export MAVEN_OPTS -./build.sh clean install -Dskip-download-sources -U -B</command> +./build.sh clean install -Dskip-download-sources -DskipTests=true -U -B</command> </hudson.tasks.Shell> </builders> <publishers> Modified: hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml =================================================================== --- hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml 2012-03-24 06:45:48 UTC (rev 16022) +++ hudson/trunk/hudson-home/jobs/AS-7.1.2/config.xml 2012-03-26 07:52:54 UTC (rev 16023) @@ -61,7 +61,7 @@ <command>MAVEN_OPTS="-Xmx1024m -Xms512m -XX:MaxPermSize=128m" export MAVEN_OPTS -./build.sh clean install -Dskip-download-sources -U -B</command> +./build.sh clean install -Dskip-download-sources -DskipTests=true -U -B</command> </hudson.tasks.Shell> </builders> <publishers>

12 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits March 2012