svn commit: r1090216 - /axis/axis2/java/sandesha/trunk/pom.xml
Author: veithen Date: Fri Apr 8 12:08:27 2011 New Revision: 1090216 URL: http://svn.apache.org/viewvc?rev=1090216&view=rev Log: Changed Neethi version to current trunk. 3.0.0-SNAPSHOT is no longer available. Modified: axis/axis2/java/sandesha/trunk/pom.xml Modified: axis/axis2/java/sandesha/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/pom.xml?rev=1090216&r1=1090215&r2=1090216&view=diff == --- axis/axis2/java/sandesha/trunk/pom.xml (original) +++ axis/axis2/java/sandesha/trunk/pom.xml Fri Apr 8 12:08:27 2011 @@ -439,7 +439,7 @@ 1.7.0-SNAPSHOT 1.7.0-SNAPSHOT 1.2.12-SNAPSHOT -3.0.0-SNAPSHOT +3.0.1-SNAPSHOT 1.1.1 3.8.2 1.2.15
svn commit: r1090243 - /axis/axis2/java/core/branches/1_5/modules/parent/pom.xml
Author: veithen Date: Fri Apr 8 13:29:35 2011 New Revision: 1090243 URL: http://svn.apache.org/viewvc?rev=1090243&view=rev Log: Updated Neethi version to 2.0.5. Modified: axis/axis2/java/core/branches/1_5/modules/parent/pom.xml Modified: axis/axis2/java/core/branches/1_5/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_5/modules/parent/pom.xml?rev=1090243&r1=1090242&r2=1090243&view=diff == --- axis/axis2/java/core/branches/1_5/modules/parent/pom.xml (original) +++ axis/axis2/java/core/branches/1_5/modules/parent/pom.xml Fri Apr 8 13:29:35 2011 @@ -99,7 +99,7 @@ 2.5 1.1 2.0.7 -2.0.5-SNAPSHOT +2.0.5 1.4.9 1.6R7 2.3
svn commit: r1090360 - /axis/axis2/java/sandesha/branches/1_4/pom.xml
Author: veithen Date: Fri Apr 8 17:37:17 2011 New Revision: 1090360 URL: http://svn.apache.org/viewvc?rev=1090360&view=rev Log: Updated Neethi to 2.0.5. Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml Modified: axis/axis2/java/sandesha/branches/1_4/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/branches/1_4/pom.xml?rev=1090360&r1=1090359&r2=1090360&view=diff == --- axis/axis2/java/sandesha/branches/1_4/pom.xml (original) +++ axis/axis2/java/sandesha/branches/1_4/pom.xml Fri Apr 8 17:37:17 2011 @@ -427,7 +427,7 @@ 1.5.5-SNAPSHOT 1.5.2-SNAPSHOT 1.2.11 -2.0.5-SNAPSHOT +2.0.5 1.1.1 3.8.2 1.2.15
svn commit: r1090429 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Author: veithen
Date: Fri Apr 8 20:19:38 2011
New Revision: 1090429
URL: http://svn.apache.org/viewvc?rev=1090429&view=rev
Log:
Neethi now supports DOM elements. Therefore we don't need to convert DOM
elements to stream any more. Alos, DOM2Writer seems to have a bug that causes
processing of some policies to fail.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java?rev=1090429&r1=1090428&r2=1090429&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/PolicyUtil.java
Fri Apr 8 20:19:38 2011
@@ -21,7 +21,6 @@ package org.apache.axis2.util;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.util.Iterator;
import java.util.List;
@@ -29,7 +28,6 @@ import javax.xml.stream.FactoryConfigura
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Transformer;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
@@ -46,8 +44,6 @@ import org.apache.neethi.PolicyComponent
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.PolicyReference;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
public class PolicyUtil {
public static String getSafeString(String unsafeString) {
@@ -172,28 +168,15 @@ public class PolicyUtil {
public static PolicyComponent getPolicyComponent(org.w3c.dom.Element
element) {
if (Constants.isPolicyElement(element.getNamespaceURI(),
(element.getLocalName( {
- return PolicyEngine.getPolicy(nodeToStream(element));
+ return PolicyEngine.getPolicy(element);
} else if (Constants.isPolicyRef(element.getNamespaceURI(),
element.getLocalName())) {
- return
PolicyEngine.getPolicyReferene(nodeToStream(element));
+ return PolicyEngine.getPolicyReference(element);
}
throw new IllegalArgumentException(
"Argument is neither a nor a
element");
}
- private static InputStream nodeToStream(org.w3c.dom.Element element) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Transformer tf;
- try {
- // tf =
TransformerFactory.newInstance().newTransformer();
- // tf.transform(new DOMSource(element), new
StreamResult(baos));
- String nodeString = DOM2Writer.nodeToString(element);
- return new ByteArrayInputStream(nodeString.getBytes());
- } catch (Exception e) {
- throw new RuntimeException("Unable to process policy");
- }
- }
-
public static String policyComponentToString(PolicyComponent
policyComponent)
throws XMLStreamException, FactoryConfigurationError {
svn commit: r1090457 - /axis/axis2/java/core/trunk/modules/parent/pom.xml
Author: veithen
Date: Fri Apr 8 21:36:59 2011
New Revision: 1090457
URL: http://svn.apache.org/viewvc?rev=1090457&view=rev
Log:
Exclude the transitive Woodstox dependency from Neethi. Otherwise we will end
up with two versions of Woodstox.
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=1090457&r1=1090456&r2=1090457&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Fri Apr 8 21:36:59 2011
@@ -612,6 +612,12 @@
org.apache.neethi
neethi
${neethi.version}
+
+
+org.codehaus.woodstox
+woodstox-core-asl
+
+
org.apache.ant
svn commit: r1090533 - in /axis/axis2/java/rampart/trunk: modules/rampart-core/pom.xml modules/rampart-trust/pom.xml pom.xml
Author: veithen
Date: Sat Apr 9 06:52:17 2011
New Revision: 1090533
URL: http://svn.apache.org/viewvc?rev=1090533&view=rev
Log:
Moved the DOOM dependency to the right module(s).
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml?rev=1090533&r1=1090532&r2=1090533&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/pom.xml Sat Apr 9
06:52:17 2011
@@ -67,6 +67,10 @@
rampart-trust
${project.version}
+
+org.apache.ws.commons.axiom
+axiom-dom
+
Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml?rev=1090533&r1=1090532&r2=1090533&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-trust/pom.xml Sat Apr 9
06:52:17 2011
@@ -62,6 +62,10 @@
rampart-policy
${project.version}
+
+org.apache.ws.commons.axiom
+axiom-dom
+
Modified: axis/axis2/java/rampart/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/pom.xml?rev=1090533&r1=1090532&r2=1090533&view=diff
==
--- axis/axis2/java/rampart/trunk/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/pom.xml Sat Apr 9 06:52:17 2011
@@ -202,10 +202,6 @@
${axis2.version}
compile
-
-org.apache.ws.commons.axiom
-axiom-dom
-
