svn commit: r1222136 - /axis/axis2/java/rampart/trunk/modules/distribution/bin.xml
Author: veithen Date: Thu Dec 22 09:49:14 2011 New Revision: 1222136 URL: http://svn.apache.org/viewvc?rev=1222136&view=rev Log: Include the Xerces version expected by OpenSAML in the distribution. Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Modified: axis/axis2/java/rampart/trunk/modules/distribution/bin.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/distribution/bin.xml?rev=1222136&r1=1222135&r2=1222136&view=diff == --- axis/axis2/java/rampart/trunk/modules/distribution/bin.xml (original) +++ axis/axis2/java/rampart/trunk/modules/distribution/bin.xml Thu Dec 22 09:49:14 2011 @@ -32,6 +32,9 @@ commons-collections:commons-collections:jar org.opensaml:openws:jar commons-lang:commons-lang:jar +org.apache.xerces:xercesImpl:jar +org.apache.xerces:resolver:jar +org.apache.xerces:serializer:jar
svn commit: r1222149 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/documentation/src/site/xdoc/download/1.5.1/download.xml modules/rampart-samples/basic/build.xml modules/rampart-samples/po
Author: veithen Date: Thu Dec 22 10:16:50 2011 New Revision: 1222149 URL: http://svn.apache.org/viewvc?rev=1222149&view=rev Log: RAMPART-338: Merged r1221926 to the 1.5 branch. Modified: axis/axis2/java/rampart/branches/1_5_x/ (props changed) 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/modules/rampart-samples/basic/build.xml axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml Propchange: axis/axis2/java/rampart/branches/1_5_x/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 22 10:16:50 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 +/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 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 10:16:50 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 +/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 Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml?rev=1222149&r1=1222148&r2=1222149&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml Thu Dec 22 10:16:50 2011 @@ -23,9 +23,6 @@ - - - @@ -165,8 +162,12 @@ - - + + + + + + @@ -221,8 +222,12 @@ - - + + + + + + Modified: axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml?rev=1222149&r1=1222148&r2=1222149&view=diff == --- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml (original) +++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml Thu Dec 22 10:16:50 2011 @@ -24,10 +24,6 @@ - - - - @@ -137,9 +133,13 @@ - - - + + + + + + + @@ -192,9 +192,13 @@ - - - + +
svn commit: r1222159 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/documentation/src/site/xdoc/download/1.5.1/download.xml modules/rampart-samples/basic/build.xml modules/rampart-samples/po
Author: veithen
Date: Thu Dec 22 10:29:15 2011
New Revision: 1222159
URL: http://svn.apache.org/viewvc?rev=1222159&view=rev
Log:
Merged r1221940 (witch changes) to the 1.5 branch to get log4j working in the
samples.
Modified:
axis/axis2/java/rampart/branches/1_5_x/ (props changed)
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/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 10:29:15 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
+/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
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 10:29:15 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
+/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
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml?rev=1222159&r1=1222158&r2=1222159&view=diff
==
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/basic/build.xml
Thu Dec 22 10:29:15 2011
@@ -30,6 +30,15 @@
+
+
+
+
+
+
+
+
+
@@ -155,7 +164,6 @@
-
@@ -196,11 +204,7 @@
-
-
-
-
-
+
@@ -211,7 +215,6 @@
-
@@ -250,9 +253,7 @@
-
-
-
+
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml?rev=1222159&r1=1222158&r2=1222159&view=diff
==
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-samples/policy/build.xml
Thu Dec 22 10:29:15 2011
@@ -30,7 +30,16 @@
http://localhost:${client.port}/axis2/services"/>
-
+
+
+
+
+
+
+
+
+
+
@@ -126,7 +135,6 @@
-
@@ -169,11 +177,7 @@
-
svn commit: r1222165 - in /axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/ax
Author: sagara
Date: Thu Dec 22 10:36:02 2011
New Revision: 1222165
URL: http://svn.apache.org/viewvc?rev=1222165&view=rev
Log:
Added initial codes for AXIS2-5217.
Added:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
(with props)
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
(with props)
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Axis2Server.java
(with props)
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/Constants.java
(with props)
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/util/RepoHelper.java
(with props)
Added:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml?rev=1222165&view=auto
==
--- axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
(added)
+++ axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
Thu Dec 22 10:36:02 2011
@@ -0,0 +1,78 @@
+
+
+
+
+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";>
+ 4.0.0
+
+ org.apache.axis2
+ axis2-parent
+ 1.7.0-SNAPSHOT
+ ../../parent/pom.xml
+
+ simple-server-maven-plugin
+ Apache Axis2 Simple HTTP server Maven Plugin
+ maven-plugin
+ The Axis2 Plugin for Maven that allows to run simple HTTP
server.
+ http://axis.apache.org/axis2/java/core/
+
+
scm:svn:http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin
+
scm:svn:https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin
+
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin
+
+
+
+
+ maven-plugin-plugin
+
+ axis2
+
+
+
+
+
+
+ org.apache.maven
+ maven-plugin-api
+
+
+ org.apache.maven
+ maven-plugin-descriptor
+
+
+ org.codehaus.plexus
+ plexus-classworlds
+
+
+ org.apache.axis2
+ axis2-kernel
+ ${project.version}
+
+
+ org.apache.axis2
+ axis2-adb
+ ${project.version}
+
+
+ org.apache.axis2
+ axis2-transport-http
+ ${project.version}
+
+
+ org.apache.axis2
+ axis2-transport-local
+ ${project.version}
+
+
+
Propchange:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/pom.xml
--
svn:eol-style = native
Added:
axis/axis2/java/core/trunk/modules/tool/simple-server-maven-plugin/src/main/java/org/apache/axis2/maven2/server/SimpleHttpServerMojo.java
URL:
http://svn.apache.org/viewvc/axis
svn commit: r1222168 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: sagara
Date: Thu Dec 22 10:39:12 2011
New Revision: 1222168
URL: http://svn.apache.org/viewvc?rev=1222168&view=rev
Log:
Added dependency management for AXIS2-5217.
Modified:
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1222168&r1=1222167&r2=1222168&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Thu Dec 22 10:39:12 2011
@@ -104,6 +104,8 @@
2.0.8
1.1
2.0.7
+
2.0.7
+2.4
1.4.9
1.6R7
2.3
@@ -143,7 +145,7 @@
Axis2 User List
java-user-subscr...@axis.apache.org
java-user-unsubscr...@axis.apache.org
-java-u...@axis.apache.org
+
java-user@axis.apache.ormaven.plugin.descriptor.versiong
http://mail-archives.apache.org/mod_mbox/axis-java-user/
http://markmail.org/search/list:org.apache.ws.axis-user
@@ -784,11 +786,21 @@
${maven.archiver.version}
+ org.apache.maven
+ maven-plugin-descriptor
+
${maven.plugin.descriptor.version}
+
+
org.codehaus.plexus
plexus-utils
${plexus.utils.version}
+ org.codehaus.plexus
+ plexus-classworlds
+ ${plexus.classworlds.version}
+
+
org.apache.maven.shared
maven-plugin-testing-harness
test
svn commit: r1222169 - /axis/axis2/java/core/trunk/pom.xml
Author: sagara Date: Thu Dec 22 10:42:44 2011 New Revision: 1222169 URL: http://svn.apache.org/viewvc?rev=1222169&view=rev Log: Added new module AXIS2-5217. Modified: axis/axis2/java/core/trunk/pom.xml Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1222169&r1=1222168&r2=1222169&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Thu Dec 22 10:42:44 2011 @@ -68,6 +68,7 @@ modules/tool/axis2-mar-maven-plugin modules/tool/axis2-repo-maven-plugin modules/tool/axis2-wsdl2code-maven-plugin +modules/tool/simple-server-maven-plugin modules/webapp modules/xmlbeans modules/scripting
svn commit: r1222171 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-samples/basic/build.xml modules/rampart-samples/policy/build.xml
Author: veithen Date: Thu Dec 22 10:48:14 2011 New Revision: 1222171 URL: http://svn.apache.org/viewvc?rev=1222171&view=rev Log: RAMPART-338: Merged r1221926 to the 1.6 branch. Modified: axis/axis2/java/rampart/branches/1_6/ (props changed) axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml Propchange: axis/axis2/java/rampart/branches/1_6/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Dec 22 10:48:14 2011 @@ -1 +1 @@ -/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994 +/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926 Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1222171&r1=1222170&r2=1222171&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml Thu Dec 22 10:48:14 2011 @@ -23,9 +23,6 @@ - - - @@ -165,8 +162,12 @@ - - + + + + + + @@ -221,8 +222,12 @@ - - + + + + + + Modified: axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1222171&r1=1222170&r2=1222171&view=diff == --- axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml (original) +++ axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml Thu Dec 22 10:48:14 2011 @@ -24,10 +24,6 @@ - - - - @@ -137,9 +133,13 @@ - - - + + + + + + + @@ -192,9 +192,13 @@ - - - + + + + + + + @@ -248,8 +252,12 @@ - - + + + + + +
svn commit: r1222176 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-samples/basic/build.xml modules/rampart-samples/policy/build.xml
Author: veithen
Date: Thu Dec 22 10:57:51 2011
New Revision: 1222176
URL: http://svn.apache.org/viewvc?rev=1222176&view=rev
Log:
Merged r1221940 to the 1.6 branch to get log4j working in the samples.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 10:57:51 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221940
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml?rev=1222176&r1=1222175&r2=1222176&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/basic/build.xml
Thu Dec 22 10:57:51 2011
@@ -30,6 +30,15 @@
+
+
+
+
+
+
+
+
+
@@ -155,7 +164,6 @@
-
@@ -196,11 +204,7 @@
-
-
-
-
-
+
@@ -211,7 +215,6 @@
-
@@ -250,9 +253,7 @@
-
-
-
+
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml?rev=1222176&r1=1222175&r2=1222176&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-samples/policy/build.xml
Thu Dec 22 10:57:51 2011
@@ -30,7 +30,16 @@
http://localhost:${client.port}/axis2/services"/>
-
+
+
+
+
+
+
+
+
+
+
@@ -126,7 +135,6 @@
-
@@ -169,11 +177,7 @@
-
-
-
-
-
+
@@ -185,7 +189,6 @@
-
@@ -229,11 +232,7 @@
-
-
-
-
-
+
@@ -244,7 +243,6 @@
-
@@ -281,9 +279,7 @@
-
-
svn propchange: r1222159 - svn:log
Author: veithen Revision: 1222159 Modified property: svn:log Modified: svn:log at Thu Dec 22 10:58:38 2011 -- --- svn:log (original) +++ svn:log Thu Dec 22 10:58:38 2011 @@ -1 +1 @@ -Merged r1221940 (witch changes) to the 1.5 branch to get log4j working in the samples. +Merged r1221940 (with changes) to the 1.5 branch to get log4j working in the samples.
svn commit: r1222181 - in /axis/axis2/java/rampart/branches/1_5_x: ./ legal/ modules/distribution/ modules/documentation/src/site/xdoc/download/1.5.1/
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 @@
org.opensaml:xmltooling:jar
joda-time:joda-time:jar
org.slf4j:slf4j-api:jar
-org.slf4j:slf4j-jdk14:jar
+org.slf4j:slf4j-jcl:jar
velocity:velocity:jar
commons-collections:commons-collections:jar
org.opensaml:openws:jar
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 @@
bcprov-jdk15
${bcprov.jdk15.version}
+
+org.slf4j
+slf4j-jcl
+
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 @@
1.5.5
+org.slf4j
+slf4j-jcl
+1.5.5
+
+
log4j
log4j
1.2.15
svn commit: r1222184 - in /axis/axis2/java/rampart/branches/1_6: ./ legal/slf4j-jcl-LICENSE.txt legal/slf4j-jdk14-LICENSE.txt modules/distribution/bin.xml modules/distribution/pom.xml pom.xml
Author: veithen
Date: Thu Dec 22 11:27:13 2011
New Revision: 1222184
URL: http://svn.apache.org/viewvc?rev=1222184&view=rev
Log:
Merged r1221937 and r1222136 to the 1.6 branch to make OpenSAML work in the
samples.
Added:
axis/axis2/java/rampart/branches/1_6/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_6/legal/slf4j-jdk14-LICENSE.txt
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec 22 11:27:13 2011
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221940
+/axis/axis2/java/rampart/trunk:1072266-1072267,1072300,1072313-1072314,1072316,1072321,1072324,1073746,1074043,1074447,1074534,1075676,1075683-1075684,1083686,1087998,1088013,1088558,1088571,1089599,1129515,1129552,1130570,1131278,1132548,1132564,1134446,1134683,1137396,1144616,1157613,1157670,1157672,1157674,1157724,1157731,1172842,1175271,1175324,1177260,1177279,1177413,1178193,1186491,1190533,1190600,1194848,1194994,1221926,1221937,1221940,1222136
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml?rev=1222184&r1=1222183&r2=1222184&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/bin.xml Thu Dec
22 11:27:13 2011
@@ -27,11 +27,14 @@
org.opensaml:xmltooling:jar
joda-time:joda-time:jar
org.slf4j:slf4j-api:jar
-org.slf4j:slf4j-jdk14:jar
+org.slf4j:slf4j-jcl:jar
velocity:velocity:jar
commons-collections:commons-collections:jar
org.opensaml:openws:jar
commons-lang:commons-lang:jar
+org.apache.xerces:xercesImpl:jar
+org.apache.xerces:resolver:jar
+org.apache.xerces:serializer:jar
Modified: axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml?rev=1222184&r1=1222183&r2=1222184&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/modules/distribution/pom.xml Thu Dec
22 11:27:13 2011
@@ -144,6 +144,10 @@
bcprov-jdk15
${bcprov.jdk15.version}
+
+org.slf4j
+slf4j-jcl
+
Modified: axis/axis2/java/rampart/branches/1_6/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/pom.xml?rev=1222184&r1=1222183&r2=1222184&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Thu Dec 22 11:27:13 2011
@@ -301,6 +301,11 @@
1.5.5
+org.slf4j
+slf4j-jcl
+1.5.5
+
+
log4j
log4j
1.2.15
svn commit: r1222510 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Author: veithen
Date: Thu Dec 22 23:34:24 2011
New Revision: 1222510
URL: http://svn.apache.org/viewvc?rev=1222510&view=rev
Log:
Corrected an incorrect String to XML conversion that may cause charset encoding
issues.
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Modified:
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=1222510&r1=1222509&r2=1222510&view=diff
==
---
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
Thu Dec 22 23:34:24 2011
@@ -1108,8 +1108,8 @@
private static org.apache.neethi.Policy getPolicy (java.lang.String
policyString) {
- java.io.ByteArrayInputStream bais = new
java.io.ByteArrayInputStream(policyString.getBytes());
- return org.apache.neethi.PolicyEngine.getPolicy(bais);
+ return
org.apache.neethi.PolicyEngine.getPolicy(org.apache.axiom.om.OMXMLBuilderFactory.createOMBuilder(
+ new
java.io.StringReader(policyString)).getDocument().getXMLStreamReader(false));
}
/
