Author: dkulp
Date: Tue Oct 7 12:44:12 2008
New Revision: 702604
URL: http://svn.apache.org/viewvc?rev=702604&view=rev
Log:
Merged revisions 702602 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r702602 | dkulp | 2008-10-07 15:42:50 -0400 (Tue, 07 Oct 2008) | 2 lines
Update to bouncycastle 140 and xalan 2.7.1 as we can ship stuff that allows
ws-security to now work out of the box
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/manifest/pom.xml
cxf/branches/2.1.x-fixes/distribution/pom.xml
cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
cxf/branches/2.1.x-fixes/distribution/src/main/release/release_notes.txt
cxf/branches/2.1.x-fixes/parent/pom.xml
cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 7 12:44:12 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,702267,702547,702561,702580
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,702267,702547,702561,702580,702602
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/manifest/pom.xml?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/manifest/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/manifest/pom.xml Tue Oct 7 12:44:12
2008
@@ -214,12 +214,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: cxf/branches/2.1.x-fixes/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/pom.xml?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/pom.xml Tue Oct 7 12:44:12 2008
@@ -220,16 +220,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -269,16 +259,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/lib/WHICH_JARS Tue
Oct 7 12:44:12 2008
@@ -58,8 +58,9 @@
- stax-utils.jar
For WS-Security support:
-- bcprov-jdk14.jar
-- xalan.jar (version 2.7.1 preferred)
+- bcprov-jdk15.jar
+- xalan.jar
+- serializer.jar
- wss4j.jar
- xmlsec.jar
Modified:
cxf/branches/2.1.x-fixes/distribution/src/main/release/release_notes.txt
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/release_notes.txt?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/release_notes.txt
(original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/release_notes.txt
Tue Oct 7 12:44:12 2008
@@ -42,25 +42,6 @@
For more details, see the Installation Guide.
-2.3 Bouncy Castle/JCE and Xalan requirement for WS-Security
-
-To use the WS-Security features of CXF, you need to obtain a JCE crypto
provider
-that implements the algorithms that you plan to use. One option is to download
-the Bouncy Castle jar from:
-http://bouncycastle.org/download/bcprov-jdk14-136.jar
-and add that to the lib directory or classpath.
-
-You also need to have xalan available as the xmlsec code has direct
-dependencies on xalan. However, all recent versions of xalan (2.5.0 - 2.7.1)
-have bugs in them that prevent the JAX-WS TCK from passing if it's on the
-classpath. Specifically, reading an EndpointReference via
-EndpointReference.readFrom(Source) may not result in an EndpointReference that
-is completely usable as namespace declarations may be lost.
-
-The latest version of the WSS4J library that is used to implement WS-Security
-requires the opensaml jar to be on the classpath. This is different than
previous
-versions that only required it if doing SAML assertions. When upgrading
-to CXF 2.1.2, you will need to add the opensaml jar to your application.
3. Building the Samples
Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Oct 7 12:44:12 2008
@@ -878,8 +878,8 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>136</version>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>140</version>
</dependency>
<dependency>
Modified: cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml?rev=702604&r1=702603&r2=702604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml Tue Oct 7 12:44:12 2008
@@ -74,14 +74,14 @@
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
</exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk13</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk14</artifactId>
+ </exclusion>
<exclusion>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
@@ -92,24 +92,24 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.0</version>
+ <version>2.7.1</version>
<exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
+ <artifactId>bcprov-jdk15</artifactId>
<scope>runtime</scope>
</dependency>
