October 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r16938 - in stack/cxf/trunk: modules/dist and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-22 10:08:18 -0400 (Mon, 22 Oct 2012) New Revision: 16938 Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: removing AS 710 support, adding AS 713 support Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/build.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -68,33 +68,33 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss710.home" value="${profiles.profile.properties.jboss710.home}"> - <isset property="profiles.profile.properties.jboss710.home"/> - </condition> <condition property="jboss711.home" value="${profiles.profile.properties.jboss711.home}"> <isset property="profiles.profile.properties.jboss711.home"/> </condition> <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> <isset property="profiles.profile.properties.jboss712.home"/> </condition> + <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}"> + <isset property="profiles.profile.properties.jboss713.home"/> + </condition> <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> - <fail message="jboss home not set, use jboss710.home=value, jboss711.home=value, jboss712.home=value or jboss720.home=value to set"> + <fail message="jboss home not set, use jboss711.home=value, jboss712.home=value, jboss713.home=value or jboss720.home=value to set"> <condition> <and> <not> - <isset property="jboss710.home"/> - </not> - <not> <isset property="jboss711.home"/> </not> <not> <isset property="jboss712.home"/> </not> <not> + <isset property="jboss713.home"/> + </not> + <not> <isset property="jboss720.home"/> </not> </and> @@ -102,9 +102,9 @@ </fail> <echo/> - <echo message="jboss710.home=${jboss710.home}"/> <echo message="jboss711.home=${jboss711.home}"/> <echo message="jboss712.home=${jboss712.home}"/> + <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> </target> Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -32,21 +32,21 @@ <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss710</classifier> + <classifier>jboss711</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss711</classifier> + <classifier>jboss712</classifier> </dependency> <dependency> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> + <classifier>jboss713</classifier> </dependency> <dependency> @@ -133,17 +133,17 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-server-integration</artifactId> + <artifactId>jbossws-jboss711-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-server-integration</artifactId> + <artifactId>jbossws-jboss712-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> + <artifactId>jbossws-jboss713-server-integration</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -199,15 +199,15 @@ <configuration> <target> <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-jboss710.txt"> - <param name="targetName" expression="jboss710" /> - </xslt> <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> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss712.txt"> <param name="targetName" expression="jboss712" /> </xslt> + <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss713.txt"> + <param name="targetName" expression="jboss713" /> + </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss720.txt"> <param name="targetName" expression="jboss720" /> </xslt> @@ -239,17 +239,17 @@  <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-tests-integration</artifactId> + <artifactId>jbossws-jboss711-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: stack/cxf/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2012-10-22 14:08:18 UTC (rev 16938) @@ -13,16 +13,16 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss710 ant deploy-jboss711 ant deploy-jboss712 + ant deploy-jboss713 ant deploy-jboss720 By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when running the ant script: - ant -Dspring=true deploy-jboss712 + ant -Dspring=true deploy-jboss713 Please note Spring is required for advanced configuration only, whenever users want to provide their own jbossws-cxf.xml Spring configuration file. Modified: stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2012-10-22 14:08:18 UTC (rev 16938) @@ -3,13 +3,13 @@ # # Optional JBoss Home -jboss710.home=(a)jboss710.home@ jboss711.home=(a)jboss711.home@ jboss712.home=(a)jboss712.home@ +jboss713.home=(a)jboss713.home@ jboss720.home=(a)jboss720.home@ -# The JBoss server under test. This can be [jboss710|jboss711|jboss712|jboss720] -jbossws.integration.target=jboss712 +# The JBoss server under test. This can be [jboss711|jboss712|jboss713|jboss720] +jbossws.integration.target=jboss713 # The JBoss settings jboss.bind.address=localhost Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -54,35 +54,6 @@ </target>  -  -  - - <target name="target-jboss710"> - <property name="jbossws.integration.target" value="jboss710"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <copy todir="${jboss710.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"> - <exclude name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> -  - <installModules targetDir="${jboss710.home}/modules"> - <fileset dir="${deploy.structure}/modules"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </installModules> - </target> - - <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> - <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> - </target> - -    @@ -141,6 +112,35 @@ </target>  +  +  + + <target name="target-jboss713"> + <property name="jbossws.integration.target" value="jboss713"/> + <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> + </target> + + <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x,check-spring,install-spring-module71x" description="Deploy jbossws to jboss713"> + <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> + <copy todir="${jboss713.home}" overwrite="true" verbose="true"> + <fileset dir="${deploy.structure}"> + <exclude name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> +  + <installModules targetDir="${jboss713.home}/modules"> + <fileset dir="${deploy.structure}/modules"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </installModules> + </target> + + <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> + <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> + </target> + +    Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -33,14 +33,14 @@  <property file="${target.properties.file}"/> - <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> <property name="jboss711.available.file" value="${jboss711.home}/jboss-modules.jar"/> <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> + <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <available property="jboss710.available" file="${jboss710.available.file}"/> <available property="jboss711.available" file="${jboss711.available.file}"/> <available property="jboss712.available" file="${jboss712.available.file}"/> + <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> <tstamp> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -59,9 +59,9 @@ <condition property="jbossws.integration.jboss71x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> </or> </condition> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -51,15 +51,6 @@ <phase>package</phase> </execution> <execution> - <id>jboss710</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss710</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss711</id> <goals><goal>jar</goal></goals> <phase>package</phase> @@ -78,6 +69,15 @@ </configuration> </execution> <execution> + <id>jboss713</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss713</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory> + </configuration> + </execution> + <execution> <id>jboss720</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -31,29 +31,29 @@ <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss710/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-cxf-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" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss711/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-cxf-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy file="${src.dir}/jbossws-jaxrpc-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/jaxrpc-deployment-aspects.xml" /> <copy Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -605,19 +605,19 @@ </profile>  <profile> - <id>jboss710</id> + <id>jboss711</id> <properties> - <jboss.version>${jboss710.version}</jboss.version> - <jbossws.integration.target>jboss710</jbossws.integration.target> + <jboss.version>${jboss711.version}</jboss.version> + <jbossws.integration.target>jboss711</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-tests-integration</artifactId> + <artifactId>jbossws-jboss711-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -629,62 +629,28 @@ <endorseddirs>${project.build.directory}/endorsed</endorseddirs> </compilerArguments> </configuration> - <executions> - <execution> - <id>default-testCompile</id> - <phase>test-compile</phase> - <configuration> - <testExcludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> - </testExcludes> - </configuration> - <goals> - <goal>testCompile</goal> - </goals> - </execution> - </executions> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} ${surefire.default-mgmt-serurity.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed</argLine> <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples21xTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/oasis/WSSecurityPolicyExamples23xTestCase.*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/jbws1666/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefClientTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> @@ -701,19 +667,19 @@ </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> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss711-tests-integration</artifactId> + <artifactId>jbossws-jboss712-tests-integration</artifactId> </dependency> </dependencies> <build> @@ -745,7 +711,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/WSTrustPicketLinkTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/trust/PicketLinkSTService*</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws2978/**</exclude> @@ -763,19 +728,19 @@ </profile>  <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss713.version}</jboss.version> + <jbossws.integration.target>jboss713</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> </dependency> </dependencies> <build> Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml (rev 0) +++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -0,0 +1,115 @@ + + +<server xmlns="urn:jboss:domain:1.3"> + + <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/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) +++ stack/cxf/trunk/pom.xml 2012-10-22 14:08:18 UTC (rev 16938) @@ -64,13 +64,13 @@ <jbossws.common.version>2.1.0.Final</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.1-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss710.version>4.1.1-SNAPSHOT</jbossws.jboss710.version> <jbossws.jboss711.version>4.1.1-SNAPSHOT</jbossws.jboss711.version> <jbossws.jboss712.version>4.1.1-SNAPSHOT</jbossws.jboss712.version> + <jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version> <jbossws.native.version>4.1.0.Final</jbossws.native.version> - <jboss710.version>7.1.0.Final</jboss710.version> <jboss711.version>7.1.1.Final</jboss711.version> <jboss712.version>7.1.2.Final</jboss712.version> + <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <ejb.api.version>1.0.1.Final</ejb.api.version> <cxf.version>2.7.1-SNAPSHOT</cxf.version> @@ -150,16 +150,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-server-integration</artifactId> - <version>${jbossws.jboss710.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss710-tests-integration</artifactId> - <version>${jbossws.jboss710.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss711-server-integration</artifactId> <version>${jbossws.jboss711.version}</version> </dependency> @@ -179,6 +169,16 @@ <version>${jbossws.jboss712.version}</version> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss713-server-integration</artifactId> + <version>${jbossws.jboss713.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> + <version>${jbossws.jboss713.version}</version> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss720.version}</version> @@ -1346,18 +1346,6 @@ </profile>  - <profile> - <id>jboss710</id> - <properties> - <jbossws.integration.target>jboss710</jbossws.integration.target> - <jboss.home>${jboss710.home}</jboss.home> - </properties> - </profile> - -  @@ -1382,6 +1370,18 @@ </profile>  + <profile> + <id>jboss713</id> + <properties> + <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.home>${jboss713.home}</jboss.home> + </properties> + </profile> + +

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16937 - in stack/native/trunk: modules/core/src/main/scripts and 31 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-22 10:06:11 -0400 (Mon, 22 Oct 2012) New Revision: 16937 Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/integration/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/integration/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/integration/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/api/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/api/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/api/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/common/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/common/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/common/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-core/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-core/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-core/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-services/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-services/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-services/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/spi/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/spi/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/spi/main/module.xml stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/xb/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/xb/main/ stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/xb/main/module.xml stack/native/trunk/modules/testsuite/src/test/resources/jboss713/ stack/native/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml Removed: stack/native/trunk/modules/resources/src/main/resources/modules/jboss712/ stack/native/trunk/modules/testsuite/src/test/resources/jboss712/ Modified: stack/native/trunk/build.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/distro/build-setup.xml stack/native/trunk/modules/dist/src/main/distro/build.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml Log: removing AS 712 support, adding AS 713 support Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/build.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -65,18 +65,18 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss712.home" value="${profiles.profile.properties.jboss712.home}"> - <isset property="profiles.profile.properties.jboss712.home"/> + <condition property="jboss713.home" value="${profiles.profile.properties.jboss713.home}"> + <isset property="profiles.profile.properties.jboss713.home"/> </condition> <condition property="jboss720.home" value="${profiles.profile.properties.jboss720.home}"> <isset property="profiles.profile.properties.jboss720.home"/> </condition> - <fail message="jboss home not set, use jboss712.home=value or jboss720.home=value to set"> + <fail message="jboss home not set, use jboss713.home=value or jboss720.home=value to set"> <condition> <and> <not> - <isset property="jboss712.home"/> + <isset property="jboss713.home"/> </not> <not> <isset property="jboss720.home"/> @@ -86,7 +86,7 @@ </fail> <echo/> - <echo message="jboss712.home=${jboss712.home}"/> + <echo message="jboss713.home=${jboss713.home}"/> <echo message="jboss720.home=${jboss720.home}"/> </target> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -31,7 +31,7 @@ <copy file="${src.dir}/jbossws-native-config-as7.xml" - tofile="${dest.dir}/jbossws-jboss712/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" + tofile="${dest.dir}/jbossws-jboss713/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> <copy Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/dist/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -30,7 +30,7 @@ <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-resources</artifactId> <version>${project.version}</version> - <classifier>jboss712</classifier> + <classifier>jboss713</classifier> </dependency> <dependency> @@ -60,7 +60,7 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> + <artifactId>jbossws-jboss713-server-integration</artifactId> <scope>provided</scope> </dependency> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -42,7 +42,7 @@ <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="modules-jbossid" value="jboss712"/> + <param name="modules-jbossid" value="jboss713"/> </antcall> </target> @@ -69,32 +69,32 @@ </target>  -  +   - <target name="target-jboss712"> - <property name="jbossws.integration.target" value="jboss712"/> + <target name="target-jboss713"> + <property name="jbossws.integration.target" value="jboss713"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - <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"> + <target name="deploy-jboss713" depends="undeploy-jboss713,deploy-structure-jboss71x" description="Deploy jbossws to jboss713"> + <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> + <copy todir="${jboss713.home}" overwrite="true" verbose="true"> <fileset dir="${deploy.structure}"> <exclude name="**/jboss/as/webservices/**/module.xml"/> </fileset> </copy>  - <installModules targetDir="${jboss712.home}/modules"> + <installModules targetDir="${jboss713.home}/modules"> <fileset dir="${deploy.structure}/modules"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> </target> - <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="true"/> + <target name="undeploy-jboss713" depends="target-jboss713,init" description="Remove jbossws from jboss713"> + <fail message="Not available: ${jboss713.available.file}" unless="jboss713.available"/> + <macro-undeploy-jbossws-modules targetdir="${jboss713.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/native/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/dist/src/main/distro/build-setup.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -34,10 +34,10 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss712.available.file" value="${jboss712.home}/jboss-modules.jar"/> + <property name="jboss713.available.file" value="${jboss713.home}/jboss-modules.jar"/> <property name="jboss720.available.file" value="${jboss720.home}/jboss-modules.jar"/> - <available property="jboss712.available" file="${jboss712.available.file}"/> + <available property="jboss713.available" file="${jboss713.available.file}"/> <available property="jboss720.available" file="${jboss720.available.file}"/> <tstamp> Modified: stack/native/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/dist/src/main/distro/build.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -59,7 +59,7 @@ <condition property="jbossws.integration.jboss71x" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> </or> </condition> Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -59,9 +59,9 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> - <include>org.jboss.ws:jbossws-jboss712-server-integration:jar</include> + <include>org.jboss.ws:jbossws-jboss713-server-integration:jar</include> </includes> - <outputFileNameMapping>jbossws-jboss712.jar</outputFileNameMapping> + <outputFileNameMapping>jbossws-jboss713.jar</outputFileNameMapping> <scope>provided</scope> <useProjectArtifact>false</useProjectArtifact> </dependencySet> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/resources/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -43,12 +43,12 @@ <phase>package</phase> </execution> <execution> - <id>jboss712</id> + <id>jboss713</id> <goals><goal>jar</goal></goals> <phase>package</phase> <configuration> - <classifier>jboss712</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss712/jbossws.beans</classesDirectory> + <classifier>jboss713</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss713/jbossws.beans</classesDirectory> </configuration> </execution> <execution> Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/integration/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/as/webservices/server/integration/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/api/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/api/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/common/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/common/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-core/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-core/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-services/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/native/jbossws-native-services/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/spi/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/ws/spi/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/xb/main/module.xml =================================================================== (Binary files differ) Property changes on: stack/native/trunk/modules/resources/src/main/resources/modules/jboss713/org/jboss/xb/main/module.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -250,19 +250,19 @@ </profile>  <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jboss.version>${jboss712.version}</jboss.version> - <jbossws.integration.target>jboss712</jbossws.integration.target> + <jboss.version>${jboss713.version}</jboss.version> + <jbossws.integration.target>jboss713</jbossws.integration.target> </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> + <artifactId>jbossws-jboss713-tests-integration</artifactId> </dependency> </dependencies> <build> Added: stack/native/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml =================================================================== --- stack/native/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml (rev 0) +++ stack/native/trunk/modules/testsuite/src/test/resources/jboss713/appclient-ws.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -0,0 +1,115 @@ + + +<server xmlns="urn:jboss:domain:1.3"> + + <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/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-10-22 13:55:37 UTC (rev 16936) +++ stack/native/trunk/pom.xml 2012-10-22 14:06:11 UTC (rev 16937) @@ -61,8 +61,8 @@ <jbossws.common.version>2.1.0.Final</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.0.Final</jbossws.shared.testsuite.version> - <jbossws.jboss712.version>4.1.0.Final</jbossws.jboss712.version> - <jboss712.version>7.1.2.Final</jboss712.version> + <jbossws.jboss713.version>4.1.1-SNAPSHOT</jbossws.jboss713.version> + <jboss713.version>7.1.3.Final</jboss713.version> <jboss720.version>7.2.0.Alpha1-SNAPSHOT</jboss720.version> <javassist.version>3.15.0-GA</javassist.version> <ejb.api.version>1.0.1.Final</ejb.api.version> @@ -115,13 +115,13 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-server-integration</artifactId> - <version>${jbossws.jboss712.version}</version> + <artifactId>jbossws-jboss713-server-integration</artifactId> + <version>${jbossws.jboss713.version}</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss712-tests-integration</artifactId> - <version>${jbossws.jboss712.version}</version> + <artifactId>jbossws-jboss713-tests-integration</artifactId> + <version>${jbossws.jboss713.version}</version> </dependency>  <dependency> @@ -361,14 +361,14 @@ </profile>  <profile> - <id>jboss712</id> + <id>jboss713</id> <properties> - <jbossws.integration.target>jboss712</jbossws.integration.target> - <jboss.home>${jboss712.home}</jboss.home> + <jbossws.integration.target>jboss713</jbossws.integration.target> + <jboss.home>${jboss713.home}</jboss.home> </properties> </profile>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16936 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-22 09:55:37 -0400 (Mon, 22 Oct 2012) New Revision: 16936 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: removing AS 710 support, adding AS 713 support Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-10-22 13:48:43 UTC (rev 16935) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-10-22 13:55:37 UTC (rev 16936) @@ -31,15 +31,15 @@ <target name="tests-prepare" depends="prepare">  - <condition property="jboss.home" value="${jboss710.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss710"/> - </condition> <condition property="jboss.home" value="${jboss711.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss711"/> </condition> <condition property="jboss.home" value="${jboss712.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss712"/> </condition> + <condition property="jboss.home" value="${jboss713.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss713"/> + </condition> <condition property="jboss.home" value="${jboss720.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss720"/> </condition>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16935 - in container/jboss71/branches/jbossws-jboss713: server-integration and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2012-10-22 09:48:43 -0400 (Mon, 22 Oct 2012) New Revision: 16935 Modified: container/jboss71/branches/jbossws-jboss713/ container/jboss71/branches/jbossws-jboss713/server-integration/ container/jboss71/branches/jbossws-jboss713/tests-integration/ Log: fixing svn:ignore Property changes on: container/jboss71/branches/jbossws-jboss713 ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Property changes on: container/jboss71/branches/jbossws-jboss713/server-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target Property changes on: container/jboss71/branches/jbossws-jboss713/tests-integration ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16933 - in stack/native/tags/jbossws-native-3.1.2.SP14: modules/client and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 08:20:27 -0400 (Fri, 19 Oct 2012) New Revision: 16933 Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/client/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/core/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/endorsed/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/management/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/resources/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/framework-tests/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/native-tests/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/pom.xml stack/native/tags/jbossws-native-3.1.2.SP14/pom.xml Log: Fixing poms Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/client/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/client/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/client/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/core/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/core/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/core/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/endorsed/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/endorsed/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/endorsed/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/management/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/management/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/management/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/resources/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/resources/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/resources/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/framework-tests/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/framework-tests/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/framework-tests/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/native-tests/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/native-tests/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-testsuite</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/modules/testsuite/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native</artifactId> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/native/tags/jbossws-native-3.1.2.SP14/pom.xml =================================================================== --- stack/native/tags/jbossws-native-3.1.2.SP14/pom.xml 2012-10-19 12:07:14 UTC (rev 16932) +++ stack/native/tags/jbossws-native-3.1.2.SP14/pom.xml 2012-10-19 12:20:27 UTC (rev 16933) @@ -17,7 +17,7 @@ <artifactId>jbossws-native</artifactId> <packaging>pom</packaging> - <version>3.1.2-SNAPSHOT</version> + <version>3.1.2.SP14</version>  <parent>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16932 - stack/native/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 08:07:14 -0400 (Fri, 19 Oct 2012) New Revision: 16932 Added: stack/native/tags/jbossws-native-3.1.2.SP14/ Log: Tagging jbossws-native-3.1.2.SP14

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16931 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 06:14:41 -0400 (Fri, 19 Oct 2012) New Revision: 16931 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-5784] Also enabling on 720 Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-19 10:12:39 UTC (rev 16930) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-19 10:14:41 UTC (rev 16931) @@ -873,9 +873,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16930 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 06:12:39 -0400 (Fri, 19 Oct 2012) New Revision: 16930 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-5784] Enabling tests on 71x Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-19 10:09:18 UTC (rev 16929) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-10-19 10:12:39 UTC (rev 16930) @@ -691,9 +691,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> @@ -756,9 +753,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes> @@ -820,9 +814,6 @@  <exclude>org/jboss/test/ws/jaxws/jbws3441/**</exclude> -  - <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase*</exclude> -  <exclude>org/jboss/test/ws/jaxws/jbws3552/**</exclude> </excludes>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16929 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 06:09:18 -0400 (Fri, 19 Oct 2012) New Revision: 16929 Modified: stack/cxf/trunk/pom.xml Log: Moving to latest snapshots of ASIL Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-10-19 10:08:31 UTC (rev 16928) +++ stack/cxf/trunk/pom.xml 2012-10-19 10:09:18 UTC (rev 16929) @@ -64,9 +64,9 @@ <jbossws.common.version>2.1.0.Final</jbossws.common.version> <jbossws.common.tools.version>1.1.0.Final</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.1.1-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss710.version>4.1.0.Final</jbossws.jboss710.version> - <jbossws.jboss711.version>4.1.0.Final</jbossws.jboss711.version> - <jbossws.jboss712.version>4.1.0.Final</jbossws.jboss712.version> + <jbossws.jboss710.version>4.1.1-SNAPSHOT</jbossws.jboss710.version> + <jbossws.jboss711.version>4.1.1-SNAPSHOT</jbossws.jboss711.version> + <jbossws.jboss712.version>4.1.1-SNAPSHOT</jbossws.jboss712.version> <jbossws.native.version>4.1.0.Final</jbossws.native.version> <jboss710.version>7.1.0.Final</jboss710.version> <jboss711.version>7.1.1.Final</jboss711.version>

11 years, 6 months

1
0
0 / 0

JBossWS SVN: r16928 - in container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices: deployers and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-10-19 06:08:31 -0400 (Fri, 19 Oct 2012) New Revision: 16928 Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_EJB.java container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/EJBEndpoint.java container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/AbstractSecurityMetaDataAccessorEJB.java container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/util/DotNames.java Log: [JBPAPP-8545][AS7-5784] Fixing 710 ASIL Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/WSLogger.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -253,4 +253,9 @@ @LogMessage(level = ERROR) @Message(id = 15592, value = "Cannot unregister record processor with JMX server") void cannotUnregisterRecordProcessor(); -} + + @LogMessage(level = WARN) + @Message(id = 15596, value = "Multiple EJB3 endpoints in the same deployment with different declared security roles; be aware this might be a security risk if you're not controlling allowed roles (@RolesAllowed) on each ws endpoint method.") + void multipleEndpointsWithDifferentDeclaredSecurityRoles(); + +} \ No newline at end of file Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_EJB.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_EJB.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/deployers/WSIntegrationProcessorJAXWS_EJB.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -25,6 +25,8 @@ import static org.jboss.as.webservices.util.ASHelper.getAnnotations; import static org.jboss.as.webservices.util.ASHelper.getJaxwsDeployment; import static org.jboss.as.webservices.util.ASHelper.getRequiredAttachment; +import static org.jboss.as.webservices.util.DotNames.DECLARE_ROLES_ANNOTATION; +import static org.jboss.as.webservices.util.DotNames.PERMIT_ALL_ANNOTATION; import static org.jboss.as.webservices.util.DotNames.ROLES_ALLOWED_ANNOTATION; import static org.jboss.as.webservices.util.DotNames.WEB_CONTEXT_ANNOTATION; import static org.jboss.as.webservices.util.DotNames.WEB_SERVICE_ANNOTATION; @@ -85,7 +87,7 @@ final String webServiceClassName = webServiceClassInfo.name().toString(); final List<ComponentDescription> componentDescriptions = moduleDescription.getComponentsByClassName(webServiceClassName); final List<SessionBeanComponentDescription> sessionBeans = getSessionBeans(componentDescriptions); - final Set<String> securityRoles = getSecurityRoles(unit, webServiceClassInfo); // TODO: assembly processed for each endpoint! + final Set<String> securityRoles = getDeclaredSecurityRoles(unit, webServiceClassInfo); // TODO: assembly processed for each endpoint! final WebContextAnnotationWrapper webCtx = getWebContextWrapper(webServiceClassInfo); final String authMethod = webCtx.getAuthMethod(); final boolean isSecureWsdlAccess = webCtx.isSecureWsdlAccess(); @@ -118,7 +120,7 @@ return sessionBeans; } - private static Set<String> getSecurityRoles(final DeploymentUnit unit, final ClassInfo webServiceClassInfo) { + private static Set<String> getDeclaredSecurityRoles(final DeploymentUnit unit, final ClassInfo webServiceClassInfo) { final Set<String> securityRoles = new HashSet<String>(); // process assembly-descriptor DD section @@ -140,12 +142,36 @@ // process @RolesAllowed annotation if (webServiceClassInfo.annotations().containsKey(ROLES_ALLOWED_ANNOTATION)) { - final AnnotationInstance allowedRoles = webServiceClassInfo.annotations().get(ROLES_ALLOWED_ANNOTATION).get(0); - for (final String roleName : allowedRoles.value().asStringArray()) { - securityRoles.add(roleName); + final List<AnnotationInstance> allowedRoles = webServiceClassInfo.annotations().get(ROLES_ALLOWED_ANNOTATION); + for (final AnnotationInstance allowedRole : allowedRoles) { + if (allowedRole.target().equals(webServiceClassInfo)) { + for (final String roleName : allowedRole.value().asStringArray()) { + securityRoles.add(roleName); + } + } } } + // process @DeclareRoles annotation + if (webServiceClassInfo.annotations().containsKey(DECLARE_ROLES_ANNOTATION)) { + final List<AnnotationInstance> declareRoles = webServiceClassInfo.annotations().get(DECLARE_ROLES_ANNOTATION); + for (final AnnotationInstance declareRole : declareRoles) { + if (declareRole.target().equals(webServiceClassInfo)) { + for (final String roleName : declareRole.value().asStringArray()) { + securityRoles.add(roleName); + } + } + } + } + + // process @PermitAll annotation + if (webServiceClassInfo.annotations().containsKey(PERMIT_ALL_ANNOTATION)) { + final AnnotationInstance permitAll = webServiceClassInfo.annotations().get(PERMIT_ALL_ANNOTATION).iterator().next(); + if (permitAll.target().equals(webServiceClassInfo)) { + securityRoles.add("*"); + } + } + return (securityRoles.size() > 0) ? Collections.unmodifiableSet(securityRoles) : Collections.<String>emptySet(); } Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/EJBEndpoint.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/EJBEndpoint.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/metadata/model/EJBEndpoint.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -35,16 +35,16 @@ public static final String EJB_COMPONENT_VIEW_NAME = EJBEndpoint.class.getPackage().getName() + "EjbComponentViewName"; private final SessionBeanComponentDescription ejbMD; private final ServiceName viewName; - private final Set<String> securityRoles; + private final Set<String> declaredSecurityRoles; private final String authMethod; private final boolean secureWsdlAccess; private final String transportGuarantee; - public EJBEndpoint(final SessionBeanComponentDescription ejbMD, final ServiceName viewName, final Set<String> securityRoles, final String authMethod, final boolean secureWsdlAccess, final String transportGuarantee) { + public EJBEndpoint(final SessionBeanComponentDescription ejbMD, final ServiceName viewName, final Set<String> declaredSecurityRoles, final String authMethod, final boolean secureWsdlAccess, final String transportGuarantee) { super(ejbMD.getComponentName(), ejbMD.getComponentClassName()); this.ejbMD = ejbMD; this.viewName = viewName; - this.securityRoles = securityRoles; + this.declaredSecurityRoles = declaredSecurityRoles; this.authMethod = authMethod; this.secureWsdlAccess = secureWsdlAccess; this.transportGuarantee = transportGuarantee; @@ -66,8 +66,8 @@ return ejbMD.getSecurityDomain(); } - public Set<String> getSecurityRoles() { - return securityRoles; + public Set<String> getDeclaredSecurityRoles() { + return declaredSecurityRoles; } public String getAuthMethod() { Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/AbstractSecurityMetaDataAccessorEJB.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/AbstractSecurityMetaDataAccessorEJB.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -24,9 +24,11 @@ import static org.jboss.as.webservices.WSMessages.MESSAGES; import java.util.List; +import java.util.Set; import org.jboss.as.ee.structure.Attachments; import org.jboss.as.server.deployment.DeploymentUnit; +import org.jboss.as.webservices.WSLogger; import org.jboss.as.webservices.metadata.model.EJBEndpoint; import org.jboss.metadata.ear.jboss.JBossAppMetaData; import org.jboss.metadata.ear.spec.EarMetaData; @@ -75,8 +77,16 @@ public SecurityRolesMetaData getSecurityRoles(final Deployment dep) { final SecurityRolesMetaData securityRolesMD = new SecurityRolesMetaData(); + Set<String> firstEndpointDeclaredSecurityRoles = null; for (final EJBEndpoint ejbEndpoint : getEjbEndpoints(dep)) { - for (final String roleName : ejbEndpoint.getSecurityRoles()) { + final Set<String> declaredSecurityRoles = ejbEndpoint.getDeclaredSecurityRoles(); + if (firstEndpointDeclaredSecurityRoles == null) { + firstEndpointDeclaredSecurityRoles = declaredSecurityRoles; + } else if (!firstEndpointDeclaredSecurityRoles.equals(declaredSecurityRoles)) { + WSLogger.ROOT_LOGGER.multipleEndpointsWithDifferentDeclaredSecurityRoles(); + } + // union of declared security roles from all endpoints... + for (final String roleName : declaredSecurityRoles) { final SecurityRoleMetaData securityRoleMD = new SecurityRoleMetaData(); securityRoleMD.setRoleName(roleName); securityRolesMD.add(securityRoleMD); Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataCreator.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -302,7 +302,7 @@ if (hasAuthMethod) { final SecurityMetaDataAccessorEJB ejbMDAccessor = getEjbSecurityMetaDataAccessor(dep); final SecurityRolesMetaData securityRolesMD = ejbMDAccessor.getSecurityRoles(dep); - final boolean hasSecurityRolesMD = securityRolesMD != null; + final boolean hasSecurityRolesMD = securityRolesMD != null && !securityRolesMD.isEmpty(); if (hasSecurityRolesMD) { ROOT_LOGGER.creatingSecurityRoles(); Modified: container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/util/DotNames.java =================================================================== --- container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/util/DotNames.java 2012-10-19 10:02:32 UTC (rev 16927) +++ container/jboss71/branches/jbossws-jboss710/server-integration/src/main/java/org/jboss/as/webservices/util/DotNames.java 2012-10-19 10:08:31 UTC (rev 16928) @@ -22,6 +22,8 @@ package org.jboss.as.webservices.util; +import javax.annotation.security.DeclareRoles; +import javax.annotation.security.PermitAll; import javax.annotation.security.RolesAllowed; import javax.ejb.Singleton; import javax.ejb.Stateless; @@ -51,6 +53,8 @@ public static final DotName JAXWS_SERVICE_CLASS = DotName.createSimple(Service.class.getName()); public static final DotName OBJECT_CLASS = DotName.createSimple(Object.class.getName()); public static final DotName ROLES_ALLOWED_ANNOTATION = DotName.createSimple(RolesAllowed.class.getName()); + public static final DotName PERMIT_ALL_ANNOTATION = DotName.createSimple(PermitAll.class.getName()); + public static final DotName DECLARE_ROLES_ANNOTATION = DotName.createSimple(DeclareRoles.class.getName()); public static final DotName SERVLET_CLASS = DotName.createSimple(Servlet.class.getName()); public static final DotName SINGLETON_ANNOTATION = DotName.createSimple(Singleton.class.getName()); public static final DotName STATELESS_ANNOTATION = DotName.createSimple(Stateless.class.getName());

11 years, 6 months

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 October 2012