Author: nandana
Date: Wed Feb 25 07:06:39 2009
New Revision: 747687
URL: http://svn.apache.org/viewvc?rev=747687&view=rev
Log:
Adding bouncycastle to the distribution and upgrading to new version , adding
OpenSAML2 dependancy and OpenSAML repo ,
Added:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties
(with props)
Modified:
webservices/rampart/trunk/java/modules/distribution/bin.xml
webservices/rampart/trunk/java/modules/distribution/pom.xml
webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
webservices/rampart/trunk/java/pom.xml
Modified: webservices/rampart/trunk/java/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/distribution/bin.xml?rev=747687&r1=747686&r2=747687&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/distribution/bin.xml (original)
+++ webservices/rampart/trunk/java/modules/distribution/bin.xml Wed Feb 25
07:06:39 2009
@@ -18,6 +18,7 @@
<include>org.apache.santuario:xmlsec:jar</include>
<include>opensaml:opensaml:jar</include>
<include>org.apache.ws.security:wss4j:jar</include>
+ <include>bouncycastle:bcprov-jdk15:jar</include>
<include>org.apache.rampart:rampart-core:jar</include>
<include>org.apache.rampart:rampart-policy:jar</include>
<include>org.apache.rampart:rampart-trust:jar</include>
Modified: webservices/rampart/trunk/java/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/distribution/pom.xml?rev=747687&r1=747686&r2=747687&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/distribution/pom.xml Wed Feb 25
07:06:39 2009
@@ -106,8 +106,8 @@
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- <version>${bcprov.jdk13.version}</version>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>${bcprov.jdk14.version}</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
Modified: webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/pom.xml?rev=747687&r1=747686&r2=747687&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
(original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/pom.xml Wed Feb
25 07:06:39 2009
@@ -712,7 +712,7 @@
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
<version>${pom.version}</version>
- </dependency>
+ </dependency>
<!--dependency>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
Added:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties?rev=747687&view=auto
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties
(added)
+++
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties
Wed Feb 25 07:06:39 2009
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# This is the logging properties that goes to the war, there are two logging
conf kept at the
+# svn, one for developement (one at src/test-resources) and other for
producation
+
+# Uncomment the next line to disable all logging.
+#org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+
+# Uncomment the next line to enable the simple log based logging
+#org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog
+
+# Uncomment the next line to enable log4j based logging
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger
Propchange:
webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/commons-logging.properties
------------------------------------------------------------------------------
svn:executable = *
Modified: webservices/rampart/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/pom.xml?rev=747687&r1=747686&r2=747687&view=diff
==============================================================================
--- webservices/rampart/trunk/java/pom.xml (original)
+++ webservices/rampart/trunk/java/pom.xml Wed Feb 25 07:06:39 2009
@@ -117,6 +117,21 @@
<name>Apache ws.zones - 2</name>
<url>http://ws.zones.apache.org/repository2</url>
</repository>
+ <repository>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>warn</checksumPolicy>
+ </snapshots>
+ <id>open-saml</id>
+ <name>OpenSAML</name>
+ <url>http://shibboleth.internet2.edu/downloads/maven2/</url>
+ </repository>
</repositories>
@@ -254,6 +269,11 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@ -346,11 +366,6 @@
<version>${jaxen.version}</version>
</dependency>
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>${backport_util_concurrent.version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servletapi.version}</version>
@@ -384,11 +399,16 @@
</dependency>
<dependency>
- <groupId>opensaml</groupId>
+ <groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${opensaml.version}</version>
</dependency>
<dependency>
+ <groupId>opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
@@ -415,6 +435,16 @@
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.6</version>
+ </dependency>
</dependencies>
@@ -428,8 +458,8 @@
<dependencies>
<dependency>
<groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk13</artifactId>
- <version>${bcprov.jdk13.version}</version>
+ <artifactId>bcprov-jdk14</artifactId>
+ <version>${bcprov.jdk14.version}</version>
</dependency>
</dependencies>
</profile>
@@ -485,8 +515,8 @@
<woden.version>1.0-SNAPSHOT</woden.version>
<addressing.mar.version>SNAPSHOT</addressing.mar.version>
- <xmlsec.version>1.4.1</xmlsec.version>
- <opensaml.version>1.1</opensaml.version>
+ <xmlsec.version>1.4.2</xmlsec.version>
+ <opensaml.version>2.2.3</opensaml.version>
<XmlSchema.version>1.4-SNAPSHOT</XmlSchema.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
@@ -501,13 +531,12 @@
<stax.api.version>1.0.1</stax.api.version>
<xml.apis.version>1.3.04</xml.apis.version>
- <bcprov.jdk13.version>132</bcprov.jdk13.version>
- <bcprov.jdk15.version>132</bcprov.jdk15.version>
+ <bcprov.jdk14.version>140</bcprov.jdk14.version>
+ <bcprov.jdk15.version>140</bcprov.jdk15.version>
<commons.codec.version>1.3</commons.codec.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
<commons.logging.version>1.1.1</commons.logging.version>
-
<backport_util_concurrent.version>3.1</backport_util_concurrent.version>
<servletapi.version>2.3</servletapi.version>
