Repository: ode Updated Branches: refs/heads/master 3a0d27002 -> 7b4c1a37f
http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml index a6aaa7d..bb33ff0 100644 --- a/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml +++ b/axis2-war/src/test/resources/TestRampartBasic/secured-processes/sample09-service.xml @@ -24,6 +24,7 @@ <items>Encrypt</items> <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass> <decryptionPropFile>TestRampartBasic/secured-processes/service.properties</decryptionPropFile> + <isBSPCompliant>false</isBSPCompliant> </action> </parameter> @@ -33,8 +34,8 @@ <user>service</user> <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier> <encryptionPropFile>TestRampartBasic/secured-processes/service.properties</encryptionPropFile> - <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass> - <EmbeddedKeyName>SessionKey</EmbeddedKeyName> + <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass> + <embeddedKeyName>SessionKey</embeddedKeyName> </action> </parameter> http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 index 0d4fa8e..ae32f63 100644 --- a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 +++ b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample08.axis2 @@ -23,7 +23,7 @@ <parameter name="OutflowSecurity"> <action> - <items>Timestamp Signature NoSerialization</items> + <items>Timestamp Signature</items> <user>client</user> <passwordCallbackClass>org.apache.rampart.samples.sample08.PWCBHandler</passwordCallbackClass> <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier> http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 index 0ec3c21..8002bf5 100644 --- a/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 +++ b/axis2-war/src/test/resources/TestRampartBasic/secured-services/sample09.axis2 @@ -24,9 +24,9 @@ <items>Encrypt</items> <user>client</user> <encryptionKeyIdentifier>EmbeddedKeyName</encryptionKeyIdentifier> - <EmbeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</EmbeddedKeyCallbackClass> + <embeddedKeyCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</embeddedKeyCallbackClass> <encryptionPropFile>TestRampartBasic/secured-services/client.properties</encryptionPropFile> - <EmbeddedKeyName>SessionKey</EmbeddedKeyName> + <embeddedKeyName>SessionKey</embeddedKeyName> </action> </parameter> @@ -35,6 +35,7 @@ <items>Encrypt</items> <passwordCallbackClass>org.apache.rampart.samples.sample09.PWCBHandler</passwordCallbackClass> <decryptionPropFile>TestRampartBasic/secured-services/client.properties</decryptionPropFile> + <isBSPCompliant>false</isBSPCompliant> </action> </parameter> http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar ---------------------------------------------------------------------- diff --git a/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar b/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar index d204a18..0d22c20 100644 Binary files a/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar and b/axis2-war/src/test/resources/TestRampartBasic/secured-services/services/sample09.aar differ http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java b/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java index 8b6db87..0ad4580 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/OMUtils.java @@ -181,20 +181,31 @@ public class OMUtils { } public static OMElement toOM(Element src, OMFactory omf, OMContainer parent) { - OMElement omElement = parent == null ? omf.createOMElement(src.getLocalName(), null) : - omf.createOMElement(src.getLocalName(), null, parent); - if (src.getNamespaceURI() != null) { - if (src.getPrefix() != null) - omElement.setNamespace(omf.createOMNamespace(src.getNamespaceURI(), src.getPrefix())); - else omElement.declareDefaultNamespace(src.getNamespaceURI()); + OMNamespace namespace = null; + + String srcPrefix = src.getPrefix(); + String srcNamespaceURI = src.getNamespaceURI(); + + //AXIOM 1.2.13 doesn't allow setting of default namespace unless a namespace has been associated with the OMElement at object creation, + //hence create the namespace first and use it during OMElement creation. + //Avoid using declareDefaultNamespace() as it's found to be adding an empty namespaceURI in some cases. + if (srcNamespaceURI != null) { + + //if no prefix then it's default namespace + if(srcPrefix == null) srcPrefix = ""; + + namespace = omf.createOMNamespace(srcNamespaceURI, srcPrefix); } + OMElement omElement = parent == null ? omf.createOMElement(src.getLocalName(), namespace) : + omf.createOMElement(src.getLocalName(), namespace, parent); + if (parent == null) { NSContext nscontext = DOMUtils.getMyNSContext(src); - injectNamespaces(omElement,nscontext.toMap()); + injectNamespaces(omElement,nscontext.toMap(),omf); } else { Map<String,String> nss = DOMUtils.getMyNamespaces(src); - injectNamespaces(omElement, nss); + injectNamespaces(omElement, nss,omf); } NamedNodeMap attrs = src.getAttributes(); @@ -235,11 +246,11 @@ public class OMUtils { } - private static void injectNamespaces(OMElement omElement, Map<String,String> nscontext) { + private static void injectNamespaces(OMElement omElement, Map<String,String> nscontext,OMFactory omf) { for (String prefix : nscontext.keySet()) { String uri = nscontext.get(prefix); if (prefix.equals("")) - omElement.declareDefaultNamespace(uri); + omElement.declareNamespace(omf.createOMNamespace(uri, "")); else omElement.declareNamespace(uri, prefix); } http://git-wip-us.apache.org/repos/asf/ode/blob/7b4c1a37/dependencies.rb ---------------------------------------------------------------------- diff --git a/dependencies.rb b/dependencies.rb index 3973059..84ed1f8 100644 --- a/dependencies.rb +++ b/dependencies.rb @@ -17,39 +17,43 @@ ANNONGEN = "annogen:annogen:jar:0.1.0" ANT = "ant:ant:jar:1.6.5" BACKPORT = "backport-util-concurrent:backport-util-concurrent:jar:3.1" AXIOM = [ group("axiom-api", "axiom-impl", "axiom-dom", - :under=>"org.apache.ws.commons.axiom", :version=>"1.2.12") ] + :under=>"org.apache.ws.commons.axiom", :version=>"1.2.13") ] AXIS2_ALL = [group("axis2-adb", "axis2-codegen", "axis2-kernel", "axis2-java2wsdl", "axis2-jibx", "axis2-saaj", "axis2-xmlbeans", :under=>"org.apache.axis2", - :version=>"1.5.6"), + :version=>"1.6.2"), group("woden-api", "woden-impl-dom", :under=>"org.apache.woden", :version=>"1.0M9"), "org.apache.axis2:axis2-transports:jar:1.0-i6", - "org.apache.axis2:axis2-transport-http:jar:1.5.6", - "org.apache.axis2:axis2-transport-local:jar:1.5.6", + "org.apache.axis2:axis2-transport-http:jar:1.6.2", + "org.apache.axis2:axis2-transport-local:jar:1.6.2", "org.apache.axis2:axis2-transport-tcp:jar:1.0.0", "org.apache.axis2:axis2-transport-jms:jar:1.0.0", "org.apache.httpcomponents:httpcore:jar:4.0"] AXIS2_MODULES = struct( - :mods => ["org.apache.rampart:rampart:mar:1.5.2", - "org.apache.rampart:rahas:mar:1.5.2", - "org.apache.axis2:addressing:mar:1.5.6", - "org.apache.axis2:mex:mar:1.5.6"], + :mods => ["org.apache.rampart:rampart:mar:1.6.2", + "org.apache.rampart:rahas:mar:1.6.2", + "org.apache.axis2:addressing:mar:1.6.2", + "org.apache.axis2:mex:mar:1.6.2"], :libs => [group("rampart-core", "rampart-policy", "rampart-trust", :under=>"org.apache.rampart", - :version=>"1.5.2"), - "org.apache.ws.security:wss4j:jar:1.5.12", - "org.apache.santuario:xmlsec:jar:1.4.2", - "org.apache.axis2:mex:jar:impl:1.5.6", + :version=>"1.6.2"), + "org.apache.ws.security:wss4j:jar:1.6.4", + "org.apache.santuario:xmlsec:jar:1.4.6", + "org.apache.axis2:mex:jar:impl:1.6.2", "org.opensaml:opensaml1:jar:1.1", - "org.opensaml:opensaml:jar:2.2.3", - "org.opensaml:openws:jar:1.4.2", - "org.opensaml:xmltooling:jar:1.3.2", + "org.opensaml:opensaml:jar:2.5.1-1", + "org.opensaml:openws:jar:1.4.2-1", + "org.opensaml:xmltooling:jar:1.3.2-1", "bouncycastle:bcprov-jdk15:jar:140", + "velocity:velocity:jar:1.5", + "joda-time:joda-time:jar:2.5", + "org.owasp.esapi:esapi:jar:2.0GA", + "org.apache.james:apache-mime4j-core:jar:0.7.2", BACKPORT] ) -AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.5.6" +AXIS2_WAR = "org.apache.axis2:axis2-webapp:war:1.6.2" COMMONS = struct( :codec =>"commons-codec:commons-codec:jar:1.3", :collections =>"commons-collections:commons-collections:jar:3.2.1", @@ -137,12 +141,12 @@ SPRING_OSGI = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"] SPRING_TEST = ["org.springframework:spring-test:jar:2.5.6"] TRANQL = [ "tranql:tranql-connector:jar:1.1", COMMONS.primitives ] WOODSTOX = "woodstox:wstx-asl:jar:3.2.4" -WSDL4J = "wsdl4j:wsdl4j:jar:1.6.2" +WSDL4J = "wsdl4j:wsdl4j:jar:1.6.3" XALAN = "xalan:xalan:jar:2.7.1" XERCES = "xerces:xercesImpl:jar:2.9.1" WS_COMMONS = struct( :axiom =>AXIOM, - :neethi =>"org.apache.neethi:neethi:jar:2.0.5", + :neethi =>"org.apache.neethi:neethi:jar:3.0.2", :xml_schema =>"org.apache.ws.commons.schema:XmlSchema:jar:1.4.7" ) XBEAN = [
