svn commit: r1190469 - /axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Author: veithen
Date: Fri Oct 28 17:44:13 2011
New Revision: 1190469
URL: http://svn.apache.org/viewvc?rev=1190469&view=rev
Log:
Made SAAJ compatible with the change introduced by AXIOM-385.
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1190469&r1=1190468&r2=1190469&view=diff
==
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Fri Oct 28 17:44:13 2011
@@ -19,6 +19,7 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.om.impl.dom.TextImpl;
@@ -197,7 +198,7 @@ public class SOAPEnvelopeImpl extends SO
} else {
// Else this is a header
TextImpl doomText = new TextImpl(text,
this.element.getOMFactory());
-doomText.setNextOMSibling((NodeImpl)firstChild);
+doomText.setNextOMSibling((OMNode)firstChild);
doomText.setPreviousOMSibling(null);
element.setFirstChild(doomText);
((NodeImpl)firstChild).setPreviousOMSibling(doomText);
svn commit: r1190470 - in /axis/axis2/java/core/branches/1_6: ./ modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Author: veithen
Date: Fri Oct 28 17:49:19 2011
New Revision: 1190470
URL: http://svn.apache.org/viewvc?rev=1190470&view=rev
Log:
Merged r1190469 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 17:49:19 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618,1184808,1184810,1184816
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618,1184808,1184810,1184816,1190469
Modified:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java?rev=1190470&r1=1190469&r2=1190470&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPEnvelopeImpl.java
Fri Oct 28 17:49:19 2011
@@ -19,6 +19,7 @@
package org.apache.axis2.saaj;
+import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.impl.dom.DocumentImpl;
import org.apache.axiom.om.impl.dom.NodeImpl;
import org.apache.axiom.om.impl.dom.TextImpl;
@@ -197,7 +198,7 @@ public class SOAPEnvelopeImpl extends SO
} else {
// Else this is a header
TextImpl doomText = new TextImpl(text,
this.element.getOMFactory());
-doomText.setNextOMSibling((NodeImpl)firstChild);
+doomText.setNextOMSibling((OMNode)firstChild);
doomText.setPreviousOMSibling(null);
element.setFirstChild(doomText);
((NodeImpl)firstChild).setPreviousOMSibling(doomText);
svn commit: r1190499 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
Author: veithen
Date: Fri Oct 28 19:01:32 2011
New Revision: 1190499
URL: http://svn.apache.org/viewvc?rev=1190499&view=rev
Log:
AXIS2-4524 / AXIS2-4878 / AXIS2-5118 / AXIS2-5119: Also implement
BeanInfoCachingClassLoader on JarFileClassLoader so that the cache works in all
deployment scenarios.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java?rev=1190499&r1=1190498&r2=1190499&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
Fri Oct 28 19:01:32 2011
@@ -41,12 +41,14 @@ import java.util.jar.Manifest;
*
* @version $Rev$ $Date$
*/
-public class JarFileClassLoader extends MultiParentClassLoader {
+public class JarFileClassLoader extends MultiParentClassLoader implements
BeanInfoCachingClassLoader {
private static final URL[] EMPTY_URLS = new URL[0];
private final UrlResourceFinder resourceFinder = new UrlResourceFinder();
private final AccessControlContext acc;
+private final BeanInfoCache beanInfoCache = new BeanInfoCache();
+
/**
* Creates a JarFileClassLoader that is a child of the system class loader.
* @param urls a list of URLs from which classes and resources should be
loaded
@@ -342,4 +344,8 @@ public class JarFileClassLoader extends
String sealed = getAttribute(Attributes.Name.SEALED,
packageAttributes, mainAttributes);
return sealed != null && "true".equalsIgnoreCase(sealed);
}
+
+public final BeanInfoCache getBeanInfoCache() {
+return beanInfoCache;
+}
}
\ No newline at end of file
svn commit: r1190525 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/databinding/utils/ modules/kernel/src/org/apache/axis2/classloader/ modules/kernel/src/org/apache/axis
Author: veithen
Date: Fri Oct 28 19:48:48 2011
New Revision: 1190525
URL: http://svn.apache.org/viewvc?rev=1190525&view=rev
Log:
AXIS2-4524 / AXIS2-4878 / AXIS2-5118 / AXIS2-5119: Merged r1166132 and r1190499
to the 1.6 branch.
Added:
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/classloader/BeanInfoCache.java
- copied unchanged from r1166132,
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/BeanInfoCache.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/classloader/BeanInfoCachingClassLoader.java
- copied unchanged from r1166132,
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/classloader/BeanInfoCachingClassLoader.java
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/classloader/JarFileClassLoader.java
axis/axis2/java/core/branches/1_6/modules/kernel/src/org/apache/axis2/deployment/DeploymentClassLoader.java
Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 19:48:48 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1167045,1174618,1184808,1184810,1184816,1190469
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1190469,1190499
Modified:
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1190525&r1=1190524&r2=1190525&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Fri Oct 28 19:48:48 2011
@@ -22,7 +22,6 @@ package org.apache.axis2.databinding.uti
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
-import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
@@ -44,6 +43,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.*;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.classloader.BeanInfoCache;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
@@ -97,19 +97,7 @@ public class BeanUtil {
private static BeanInfo getBeanInfo(Class beanClass, Class beanSuperclass)
throws IntrospectionException {
-BeanInfo beanInfo;
-try {
-if (beanSuperclass != null)
- beanInfo = Introspector.getBeanInfo(beanClass, beanSuperclass);
-else
-beanInfo = Introspector.getBeanInfo(beanClass);
-}
-catch (IntrospectionException e) {
-throw e;
-}
-
-
-return beanInfo;
+return BeanInfoCache.getCachedBeanInfo(beanClass, beanSuperclass);
}
pr
svn commit: r1190533 - /axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Author: veithen
Date: Fri Oct 28 20:09:11 2011
New Revision: 1190533
URL: http://svn.apache.org/viewvc?rev=1190533&view=rev
Log:
Fixed an incorrect usage of the Axiom API that caused Rampart to depend on the
issue described in AXIOM-385.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1190533&r1=1190532&r2=1190533&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Fri Oct 28 20:09:11 2011
@@ -143,7 +143,7 @@ public class Axis2Util {
env.getXMLStreamReader(), factory, nsURI);
SOAPEnvelope envelope = (stAXSOAPModelBuilder)
.getSOAPEnvelope();
-((OMNode) envelope.getParent()).build();
+envelope.getParent().build();
//Set the processed flag of the processed headers
SOAPHeader header = envelope.getHeader();
svn commit: r1190600 - in /axis/axis2/java/rampart/trunk: modules/rampart-integration/pom.xml pom.xml release-docs/README.txt
Author: veithen
Date: Fri Oct 28 21:41:15 2011
New Revision: 1190600
URL: http://svn.apache.org/viewvc?rev=1190600&view=rev
Log:
Fixed the build on older JDK 1.5 versions.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
axis/axis2/java/rampart/trunk/release-docs/README.txt
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1190600&r1=1190599&r2=1190600&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Fri Oct
28 21:41:15 2011
@@ -75,6 +75,18 @@
+
+copy-endorsed
+process-resources
+
+copy-dependencies
+
+
+
org.apache.xerces,org.apache.xalan
+
${project.build.directory}/endorsed
+true
+
+
@@ -560,6 +572,13 @@
+
+maven-surefire-plugin
+
+
+
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
+
+
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1190600&r1=1190599&r2=1190600&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Fri Oct 28 21:41:15 2011
@@ -153,6 +153,10 @@
axis2-mar-maven-plugin
1.5.4
+
+maven-surefire-plugin
+2.10
+
Modified: axis/axis2/java/rampart/trunk/release-docs/README.txt
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/release-docs/README.txt?rev=1190600&r1=1190599&r2=1190600&view=diff
==
--- axis/axis2/java/rampart/trunk/release-docs/README.txt (original)
+++ axis/axis2/java/rampart/trunk/release-docs/README.txt Fri Oct 28 21:41:15
2011
@@ -64,14 +64,18 @@ http://www.bouncycastle.org/latest_relea
lib/security directory as the last line.
security.provider.X=org.bouncycastle.jce.provider.BouncyCastleProvider
-Test cases written for SAML 2.0 support requires endorsing the JDK's default
JAXP
+On older JDKs, the SAML 2.0 support requires endorsing the JDK's default JAXP
implementation with Xerces(http://xerces.apache.org/mirrors.cgi#binary) and
-Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). So before
building Rampart from the
-source distribution, you need to copy resolver-x.x.x.jar,
serializer-x.x.x.jar, xercesImpl-x.x.x.jar
+Xalan(http://xml.apache.org/xalan-j/downloads.html#latest-release). To do that,
+you need to copy resolver-x.x.x.jar, serializer-x.x.x.jar,
xercesImpl-x.x.x.jar
and xml-apis-x.x.x.jar from the Xerces binary distribution and xalan-x.x.x.jar
from the xalan binary
distribution to the endorsed directory. If you are using Sun JDK, endorsed
directory is located at
$JAVA_HOME/jre/lib/endorsed.
+Note that during the build these JARs are added automatically to the boot
classpath
+of the JVM running the unit tests. Therefore this is only necessary at
runtime, not
+when building Rampart.
+
When Rampart is deployed in a particular application server, please refer to
the endorsing mechanism
recommended for that server and endorse the JAXP implementation using the set
of jars mentioned above.
svn commit: r1190617 - in /axis/axis2/java/rampart/branches/1_6: ./ modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java modules/rampart-integration/pom.xml pom.xml release-docs/R
Author: veithen
Date: Fri Oct 28 21:58:42 2011
New Revision: 1190617
URL: http://svn.apache.org/viewvc?rev=1190617&view=rev
Log:
Merged r1190533 and r1190600 to the 1.6 branch.
Modified:
axis/axis2/java/rampart/branches/1_6/ (props changed)
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_6/pom.xml
axis/axis2/java/rampart/branches/1_6/release-docs/README.txt
Propchange: axis/axis2/java/rampart/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 21:58:42 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
+/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
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1190617&r1=1190616&r2=1190617&view=diff
==
---
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/branches/1_6/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Fri Oct 28 21:58:42 2011
@@ -132,7 +132,7 @@ public class Axis2Util {
env.getXMLStreamReader(), factory, nsURI);
SOAPEnvelope envelope = (stAXSOAPModelBuilder)
.getSOAPEnvelope();
-((OMNode) envelope.getParent()).build();
+envelope.getParent().build();
//Set the processed flag of the processed headers
SOAPHeader header = envelope.getHeader();
Modified:
axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml?rev=1190617&r1=1190616&r2=1190617&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_6/modules/rampart-integration/pom.xml
Fri Oct 28 21:58:42 2011
@@ -75,6 +75,18 @@
+
+copy-endorsed
+process-resources
+
+copy-dependencies
+
+
+
org.apache.xerces,org.apache.xalan
+
${project.build.directory}/endorsed
+true
+
+
@@ -560,6 +572,13 @@
+
+maven-surefire-plugin
+
+
+
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separator}${project.build.directory}/endorsed/serializer.jar${path.separator}${project.build.directory}/endorsed/xalan.jar
+
+
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=1190617&r1=1190616&r2=1190617&view=diff
==
--- axis/axis2/java/rampart/branches/1_6/pom.xml (original)
+++ axis/axis2/java/rampart/branches/1_6/pom.xml Fri Oct 28 21:58:42 2011
@@ -153,6 +153,10 @@
axis2-mar-maven-plugin
1.5.4
+
+maven-surefire-plugin
+2.10
+
svn commit: r1190635 - in /axis/axis2/java/rampart/branches/1_5_x: ./ modules/documentation/src/site/xdoc/download/1.5.1/ modules/rampart-core/src/main/java/org/apache/rampart/util/ modules/rampart-in
Author: veithen
Date: Fri Oct 28 22:23:10 2011
New Revision: 1190635
URL: http://svn.apache.org/viewvc?rev=1190635&view=rev
Log:
Merged r1190533 and r1190600 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-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/1_5_x/pom.xml
axis/axis2/java/rampart/branches/1_5_x/release-docs/README.txt
Propchange: axis/axis2/java/rampart/branches/1_5_x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 28 22:23:10 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
+/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
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 Fri Oct 28 22:23:10 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
+/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
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java?rev=1190635&r1=1190634&r2=1190635&view=diff
==
---
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
(original)
+++
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
Fri Oct 28 22:23:10 2011
@@ -131,7 +131,7 @@ public class Axis2Util {
env.getXMLStreamReader(), factory, nsURI);
SOAPEnvelope envelope = (stAXSOAPModelBuilder)
.getSOAPEnvelope();
-((OMNode) envelope.getParent()).build();
+envelope.getParent().build();
//Set the processed flag of the processed headers
SOAPHeader header = envelope.getHeader();
Modified:
axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml?rev=1190635&r1=1190634&r2=1190635&view=diff
==
--- axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
(original)
+++ axis/axis2/java/rampart/branches/1_5_x/modules/rampart-integration/pom.xml
Fri Oct 28 22:23:10 2011
@@ -75,6 +75,18 @@
+
+copy-endorsed
+process-resources
+
+copy-dependencies
+
+
+
org.apache.xerces,org.apache.xalan
+
${project.build.directory}/endorsed
+true
+
+
@@ -548,6 +560,13 @@
+
+maven-surefire-plugin
+
+
+
-Xbootclasspath/p:${project.build.directory}/endorsed/xml-apis.jar${path.separator}${project.build.directory}/endorsed/xercesImpl.jar${path.separator}${project.build.directory}/endorsed/resolver.jar${path.separ
