Author: veithen
Date: Thu Dec 22 11:18:42 2011
New Revision: 1222181
URL: http://svn.apache.org/viewvc?rev=1222181&view=rev
Log:
Merged r1221937 to the 1.5 branch to make OpenSAML work in the samples.
Added:
axis/axis2/java/rampart/branches/1_5_x/legal/slf4j-jcl-LICENSE.txt
- copied unchanged from r1221937,
axis/axis2/java/rampart/trunk/legal/slf4j-jcl-LICENSE.txt
Removed:
axis/axis2/java/rampart/branches/1_5_x/legal/slf4j-jdk14-LICENSE.txt
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
(props changed)
axis/axis2/java/rampart/branches/1_5_x/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 11:18:42 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221940
+/axis/axis2/java/rampart/trunk:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221937,1221940
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml?rev=1222181&r1=1222180&r2=1222181&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/bin.xml Thu Dec
22 11:18:42 2011
@@ -27,7 +27,7 @@
<include>org.opensaml:xmltooling:jar</include>
<include>joda-time:joda-time:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jdk14:jar</include>
+ <include>org.slf4j:slf4j-jcl:jar</include>
<include>velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>org.opensaml:openws:jar</include>
Modified: axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml?rev=1222181&r1=1222180&r2=1222181&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/distribution/pom.xml Thu Dec
22 11:18:42 2011
@@ -144,6 +144,10 @@
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </dependency>
</dependencies>
</project>
Propchange:
axis/axis2/java/rampart/branches/1_5_x/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 11:18:42 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221940
+/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/download.xml:1052172-1052173,1072178,1072180,1072182,1072187,1072313,1072316,1075676,1083686,1089599,1130570,1131278,1132548,1134683,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175324,1177260,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221937,1221940
Modified: axis/axis2/java/rampart/branches/1_5_x/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/pom.xml?rev=1222181&r1=1222180&r2=1222181&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/1_5_x/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_5_x/pom.xml Thu Dec 22 11:18:42 2011
@@ -295,6 +295,11 @@
<version>1.5.5</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
