February 2013 - jbossws-commits - Jboss List Archives

JBossWS SVN: r17278 - thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/src/main/java/org/apache/ws/security/message.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2013-02-08 05:21:01 -0500 (Fri, 08 Feb 2013) New Revision: 17278 Modified: thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/src/main/java/org/apache/ws/security/message/WSSecSignature.java Log: [BZ908807] Merged changes from -r 1443423:1443424 WSS-421 Modified: thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/src/main/java/org/apache/ws/security/message/WSSecSignature.java =================================================================== --- thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-02-07 18:29:48 UTC (rev 17277) +++ thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/src/main/java/org/apache/ws/security/message/WSSecSignature.java 2013-02-08 10:21:01 UTC (rev 17278) @@ -108,6 +108,7 @@ private X509Certificate useThisCert = null; private Element securityHeader = null; private boolean useCustomSecRef; + private boolean bstAddedToSecurityHeader = false; public WSSecSignature() { super(); @@ -443,10 +444,10 @@ * @param secHeader The security header */ public void prependBSTElementToHeader(WSSecHeader secHeader) { - if (bstToken != null) { + if (bstToken != null && !bstAddedToSecurityHeader) { WSSecurityUtil.prependChildElement(secHeader.getSecurityHeader(), bstToken.getElement()); + bstAddedToSecurityHeader = true; } - bstToken = null; } /** @@ -454,11 +455,11 @@ * @param secHeader The security header */ public void appendBSTElementToHeader(WSSecHeader secHeader) { - if (bstToken != null) { + if (bstToken != null && !bstAddedToSecurityHeader) { Element secHeaderElement = secHeader.getSecurityHeader(); secHeaderElement.appendChild(bstToken.getElement()); + bstAddedToSecurityHeader = true; } - bstToken = null; } /**

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17277 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-07 13:29:48 -0500 (Thu, 07 Feb 2013) New Revision: 17277 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Changes on deployment macros to copy modules' content on new AS720 structure (see AS7-6344) Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-07 15:57:37 UTC (rev 17276) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2013-02-07 18:29:48 UTC (rev 17277) @@ -46,11 +46,16 @@ </fileset> </jandex> <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss710"/> </antcall> + <copy toDir="${deploy.structure}/modules"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss710"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> </target>  @@ -79,7 +84,7 @@ <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="true"/> + <macro-undeploy-jbossws-modules targetdir="${jboss711.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  @@ -108,7 +113,7 @@ <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"/> + <macro-undeploy-jbossws-modules targetdir="${jboss712.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  @@ -137,7 +142,7 @@ <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"/> + <macro-undeploy-jbossws-modules targetdir="${jboss713.home}/modules" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  @@ -162,11 +167,16 @@ </fileset> </jandex> <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss720"/> </antcall> + <copy toDir="${deploy.structure}/modules/system/layers/base"> + <fileset dir="${deploy.artifacts.dir}/modules/jboss720"> + <include name="**/jboss/as/webservices/**/module.xml"/> + </fileset> + </copy> </target>  @@ -186,8 +196,8 @@ </fileset> </copy>  - <installModules targetDir="${jboss720.home}/modules"> - <fileset dir="${deploy.structure}/modules"> + <installModules targetDir="${jboss720.home}/modules/system/layers/base/"> + <fileset dir="${deploy.structure}/modules/system/layers/base"> <include name="**/jboss/as/webservices/**/module.xml"/> </fileset> </installModules> @@ -195,7 +205,7 @@ <target name="undeploy-jboss720" depends="target-jboss720,init" description="Remove jbossws from jboss720"> <fail message="Not available: ${jboss720.available.file}" unless="jboss720.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss720.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss720.home}/modules/system/layers/base" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target>  @@ -211,7 +221,7 @@ <target name="install-spring-module71x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modules-jbossid" value="jboss710"/> </antcall> @@ -219,7 +229,7 @@ <target name="install-spring-module72x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> + <param name="installserver" value="${deploy.structure}/modules/system/layers/base"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> <param name="modules-jbossid" value="jboss720"/> </antcall> Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-07 15:57:37 UTC (rev 17276) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2013-02-07 18:29:48 UTC (rev 17277) @@ -142,11 +142,6 @@ <exclude name="**/spring/**/module.xml"/> </fileset> </installModules> - <copy toDir="@{targetdir}"> - <fileset dir="@{thirdpartydir}/modules/@{modules-jbossid}"> - <include name="**/jboss/as/webservices/**/module.xml"/> - </fileset> - </copy> </sequential> </macrodef> @@ -164,7 +159,7 @@ <target name="deploy-jbossws-cxf-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target>  @@ -194,7 +189,7 @@ <target name="deploy-spring-module"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> - <macro-install-spring-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/> + <macro-install-spring-modules targetdir="${installserver}" thirdpartydir="${thirdpartydir}" modules-jbossid="${modules-jbossid}"/> </target>  @@ -207,24 +202,23 @@ <attribute name="modifyjbossintegration"/> <sequential> - <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/modules/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/> + <loadfile property="jbossws.modules.conf" srcfile="@{targetdir}/org/jboss/as/webservices/jbossws-modules.conf" failonerror="false"/> <loadfile property="jbossws.modules.conf" srcfile="@{defaultmodulesconf}" failonerror="false"/> - <property name="jboss.modules" value="@{targetdir}/modules"/> - <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.modules}"> + <fileset dir="@{targetdir}"> <include name="**/org/jboss/as/webservices/main/jbossws-*-resources*"/> <include name="**/org/jboss/as/webservices/main/jbossws-jboss*"/> </fileset> </delete> + <property name="jboss.modules" value="@{targetdir}"/> <antcall target="remove-jboss-integration-module"> <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> </antcall>  <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.modules}" includes="${jbossws.modules.conf}"/> + <fileset dir="@{targetdir}" includes="${jbossws.modules.conf}"/> </delete> </sequential> </macrodef>

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17276 - thirdparty/wss4j/tags.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2013-02-07 10:57:37 -0500 (Thu, 07 Feb 2013) New Revision: 17276 Added: thirdparty/wss4j/tags/wss4j-1.6.5_BZ908807/ Log: [BZ908807] Create one off patch branch for wss4j

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17275 - thirdparty/wss4j/branches/wss4j-1.6.5.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-07 10:54:04 -0500 (Thu, 07 Feb 2013) New Revision: 17275 Modified: thirdparty/wss4j/branches/wss4j-1.6.5/ Log: Setting svn:ignore Property changes on: thirdparty/wss4j/branches/wss4j-1.6.5 ___________________________________________________________________ Added: svn:ignore + target

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17273 - thirdparty/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: mmusaji Date: 2013-02-07 10:25:35 -0500 (Thu, 07 Feb 2013) New Revision: 17273 Added: thirdparty/cxf/branches/cxf-2.4.6-patch01_BZ908807/ Log: [BZ908807] Create one off patch branch

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17272 - in stack/cxf/branches/jbossws-cxf-4.1.x: modules/addons and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-04 17:29:43 -0500 (Mon, 04 Feb 2013) New Revision: 17272 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml Log: Preparing for next dev cycle Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/addons/transports/http/httpserver/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/client/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/dist/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/endorsed/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/resources/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/server/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/cxf-tests/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/modules/testsuite/shared-tests/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) +++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-04 22:29:43 UTC (rev 17272) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.3-SNAPSHOT</version>  <parent>

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17271 - in stack/cxf/tags/jbossws-cxf-4.1.2.Final: modules/addons and 10 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-04 06:16:52 -0500 (Mon, 04 Feb 2013) New Revision: 17271 Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/transports/http/httpserver/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/client/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/dist/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/endorsed/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/resources/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/server/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-spring-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/shared-tests/pom.xml stack/cxf/tags/jbossws-cxf-4.1.2.Final/pom.xml Log: Fixing poms Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/transports/http/httpserver/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/addons/transports/http/httpserver/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-addons</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/client/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/client/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/client/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/dist/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/dist/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/dist/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/endorsed/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/endorsed/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/endorsed/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/resources/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/resources/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/resources/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/server/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/server/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/server/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-spring-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-spring-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-tests/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/cxf-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/shared-tests/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/modules/testsuite/shared-tests/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-testsuite</artifactId> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version> <relativePath>../pom.xml</relativePath> </parent> Modified: stack/cxf/tags/jbossws-cxf-4.1.2.Final/pom.xml =================================================================== --- stack/cxf/tags/jbossws-cxf-4.1.2.Final/pom.xml 2013-02-04 10:14:23 UTC (rev 17270) +++ stack/cxf/tags/jbossws-cxf-4.1.2.Final/pom.xml 2013-02-04 11:16:52 UTC (rev 17271) @@ -32,7 +32,7 @@ <description>JBossWS CXF stack</description> - <version>4.1.2-SNAPSHOT</version> + <version>4.1.2.Final</version>  <parent> @@ -43,9 +43,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/branches/jbossws-cx...</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/branches/jbossws-cxf-4...</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/stack/cxf/tags/jbossws-cxf-4....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/stack/cxf/tags/jbossws-cxf-4.1.2...</url> </scm>

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17270 - stack/cxf/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-04 05:14:23 -0500 (Mon, 04 Feb 2013) New Revision: 17270 Added: stack/cxf/tags/jbossws-cxf-4.1.2.Final/ Log: Tagging jbossws-cxf-4.1.2.Final

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17269 - stack/cxf/branches/jbossws-cxf-4.1.x.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-04 03:43:23 -0500 (Mon, 04 Feb 2013) New Revision: 17269 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml Log: [JBWS-3590] Moving to Apache CXF 2.6.6 Modified: stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-01 16:19:16 UTC (rev 17268) +++ stack/cxf/branches/jbossws-cxf-4.1.x/pom.xml 2013-02-04 08:43:23 UTC (rev 17269) @@ -73,7 +73,7 @@ <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.6.6-SNAPSHOT</cxf.version> + <cxf.version>2.6.6</cxf.version> <cxf.asm.version>3.3.1</cxf.asm.version> <cxf.xjcplugins.version>2.6.0</cxf.xjcplugins.version> <jboss.common.core.version>2.2.17.GA</jboss.common.core.version>

11 years, 3 months

1
0
0 / 0

JBossWS SVN: r17268 - in thirdparty/cxf/branches/cxf-2.2.12/rt: ws/security/src/main/java/org/apache/cxf/ws/security/wss4j and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2013-02-01 11:19:16 -0500 (Fri, 01 Feb 2013) New Revision: 17268 Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java Log: [JBPAPP-10585] backporting CXF-4629 Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java 2013-02-01 16:18:10 UTC (rev 17267) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/core/src/main/java/org/apache/cxf/interceptor/URIMappingInterceptor.java 2013-02-01 16:19:16 UTC (rev 17268) @@ -46,6 +46,7 @@ import org.apache.cxf.message.Exchange; import org.apache.cxf.message.Message; import org.apache.cxf.message.MessageContentsList; +import org.apache.cxf.message.MessageUtils; import org.apache.cxf.phase.Phase; import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingInfo; @@ -55,6 +56,7 @@ import org.apache.cxf.service.model.ServiceModelUtil; public class URIMappingInterceptor extends AbstractInDatabindingInterceptor { + public static final String URIMAPPING_SKIP = URIMappingInterceptor.class.getName() + ".skip"; private static final Logger LOG = LogUtils.getL7dLogger(URIMappingInterceptor.class); @@ -73,6 +75,9 @@ } return; } + if (MessageUtils.getContextualBoolean(message, URIMAPPING_SKIP, false)) { + return; + } String opName = getOperationName(message); if (LOG.isLoggable(Level.FINE)) { Modified: thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java 2013-02-01 16:18:10 UTC (rev 17267) +++ thirdparty/cxf/branches/cxf-2.2.12/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java 2013-02-01 16:19:16 UTC (rev 17268) @@ -49,6 +49,7 @@ import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.interceptor.URIMappingInterceptor; import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; import org.apache.cxf.staxutils.StaxUtils; @@ -145,7 +146,13 @@ } public final boolean isGET(SoapMessage message) { String method = (String)message.get(SoapMessage.HTTP_REQUEST_METHOD); - return "GET".equals(method) && message.getContent(XMLStreamReader.class) == null; + boolean isGet = + "GET".equals(method) && message.getContent(XMLStreamReader.class) == null; + if (isGet) { + //make sure we skip the URIMapping as we cannot apply security requirements to that + message.put(URIMappingInterceptor.URIMAPPING_SKIP, Boolean.TRUE); + } + return isGet; } public void handleMessage(SoapMessage msg) throws Fault {

11 years, 3 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 February 2013