Author: ningjiang Date: Mon Nov 15 12:04:29 2010 New Revision: 1035239 URL: http://svn.apache.org/viewvc?rev=1035239&view=rev Log: Merged revisions 1035233 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes
................ r1035233 | ningjiang | 2010-11-15 19:47:29 +0800 (Mon, 15 Nov 2010) | 9 lines Merged revisions 1035220 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1035220 | ningjiang | 2010-11-15 18:55:16 +0800 (Mon, 15 Nov 2010) | 1 line Update the examples module name ........ ................ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Nov 15 12:04:29 2010 @@ -1,2 +1,2 @@ -/cxf/branches/2.3.x-fixes:1034170 -/cxf/trunk:1034165 +/cxf/branches/2.3.x-fixes:1034170,1035233 +/cxf/trunk:1034165,1035220 Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssc/pom.xml Mon Nov 15 12:04:29 2010 @@ -19,6 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples.interopfest</groupId> + <name>CXF Interopfest WS-SC Demo </name> <artifactId>ws-sc</artifactId> <parent> <groupId>org.apache.cxf.samples</groupId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec10/pom.xml Mon Nov 15 12:04:29 2010 @@ -19,6 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples.interopfest</groupId> + <name>CXF Interopfest WS-SEC10 Demo</name> <artifactId>ws-sec10</artifactId> <parent> <groupId>org.apache.cxf.samples</groupId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wssec11/pom.xml Mon Nov 15 12:04:29 2010 @@ -19,6 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples.interopfest</groupId> + <name>CXF Interopfest WS-SEC11 Demo</name> <artifactId>ws-sec11</artifactId> <parent> <groupId>org.apache.cxf.samples</groupId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml Mon Nov 15 12:04:29 2010 @@ -19,6 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples.interopfest</groupId> + <name>CXF Interopfest WS-TRUST10 Demo</name> <artifactId>ws-trust10</artifactId> <parent> <groupId>org.apache.cxf.samples</groupId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/pom.xml Mon Nov 15 12:04:29 2010 @@ -19,6 +19,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples.interopfest</groupId> + <name>CXF Interopfest WS-TRUST13 Demo</name> <artifactId>ws-trust13</artifactId> <parent> <groupId>org.apache.cxf.samples</groupId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/pom.xml Mon Nov 15 12:04:29 2010 @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples</groupId> <artifactId>wssec_sign_enc</artifactId> - <name>WS-Security Demo</name> + <name>CXF WS-Security Sign Encoding Demo</name> <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml Mon Nov 15 12:04:29 2010 @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples</groupId> <artifactId>wssec_ut</artifactId> - <name>WS-Security Demo</name> + <name>CXF WS-Security UT Demo</name> <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml Mon Nov 15 12:04:29 2010 @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples</groupId> <artifactId>wssec_ut_policy</artifactId> - <name>WS-Security Demo</name> + <name>WS-Security UT Policy Demo</name> <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> Modified: cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml?rev=1035239&r1=1035238&r2=1035239&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml (original) +++ cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml Mon Nov 15 12:04:29 2010 @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.cxf.samples</groupId> <artifactId>wssec_ut_sign</artifactId> - <name>WS-Security Demo</name> + <name>WS-Security UT Sign Demo</name> <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId>
