cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r576562 - in /incubator/cxf/trunk: distribution/pom.xml distribution/src/main/appended-resources/META-INF/NOTICE distribution/src/main/release/release_notes.txt parent/pom.xml rt/ws/security/pom.xml
Date Mon, 17 Sep 2007 19:10:58 GMT
Author: dkulp
Date: Mon Sep 17 12:10:57 2007
New Revision: 576562

URL: http://svn.apache.org/viewvc?rev=576562&view=rev
Log:
Remove bcprov jar from kits.   Update distro NOTICE file with additional stuff
from the NOTICE files of the jars

Modified:
    incubator/cxf/trunk/distribution/pom.xml
    incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/NOTICE
    incubator/cxf/trunk/distribution/src/main/release/release_notes.txt
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/rt/ws/security/pom.xml

Modified: incubator/cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/pom.xml?rev=576562&r1=576561&r2=576562&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/pom.xml (original)
+++ incubator/cxf/trunk/distribution/pom.xml Mon Sep 17 12:10:57 2007
@@ -191,11 +191,18 @@
             <artifactId>cxf-rt-ws-policy</artifactId>
             <version>${pom.version}</version>
         </dependency>
-		<dependency>
+		    <dependency>
             <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>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>

Modified: incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/NOTICE?rev=576562&r1=576561&r2=576562&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/NOTICE (original)
+++ incubator/cxf/trunk/distribution/src/main/appended-resources/META-INF/NOTICE Mon Sep 17
12:10:57 2007
@@ -23,5 +23,21 @@
 This Product also includes software developed by David Heinemeier Hansson.
    (http://dev.rubyonrails.org/browser/trunk/activesupport/lib/active_support/inflections.rb)
 
+
+Portions of the included XmlSchema library are Copyright 2006 International Business Machines
Corp.
+
+
+Portions of the included xml-apis library were originally based on the following:
+   - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+   - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+   - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+
+
+Portions of the included xbean library were originally based on the following:
+   - software copyright (c) 2000-2003, BEA Systems, <http://www.bea.com/>.
+
+
 Additional copyright notices and license terms applicable are
 present in the licenses directory of this distribution.
+
+

Modified: incubator/cxf/trunk/distribution/src/main/release/release_notes.txt
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/distribution/src/main/release/release_notes.txt?rev=576562&r1=576561&r2=576562&view=diff
==============================================================================
--- incubator/cxf/trunk/distribution/src/main/release/release_notes.txt (original)
+++ incubator/cxf/trunk/distribution/src/main/release/release_notes.txt Mon Sep 17 12:10:57
2007
@@ -49,6 +49,17 @@
 
 For more details, see the Installation Guide.
 
+
+2.3 Bouncy Castle/JCE 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.   
+
+
+
 3. Building the Samples
 
 Building the samples included in the binary distribution is easy. Change to

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=576562&r1=576561&r2=576562&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Mon Sep 17 12:10:57 2007
@@ -730,6 +730,11 @@
                 <artifactId>commons-lang</artifactId>
                 <version>2.1</version>
             </dependency>
+            <dependency>
+                <groupId>bouncycastle</groupId>
+                <artifactId>bcprov-jdk14</artifactId>
+                <version>136</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?rev=576562&r1=576561&r2=576562&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Mon Sep 17 12:10:57 2007
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>bouncycastle</groupId>
             <artifactId>bcprov-jdk14</artifactId>
-            <version>136</version>
             <scope>runtime</scope>
         </dependency>
 



Mime
View raw message