Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/EchoData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/EchoData.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/EchoData.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/EchoData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,5 @@
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/";>
+ <env:Body>
+ <getData xmlns="http://services.aegis.cxf.apache.org"/>
+ </env:Body>
+</env:Envelope>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/GetData.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,5 @@
+<data xmlns="urn:MyInterface">
+ <name>junk</name>
+ <useless>true</useless>
+ <FOO>foo</FOO>
+</data>
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,6 @@
+<myInterface2 xmlns="urn:MyInterface2">
+ <myInterface xmlns="urn:MyInterface">
+ <name>junk</name>
+ <useless>true</useless>
+ </myInterface>
+</myInterface2>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/MyInterface2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,4 @@
+<b:bean xmlns:b="urn:Bean">
+ <b:bleh>bleh</b:bleh>
+ <b:howdy>howdy</b:howdy>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,6 @@
+<b:bean xmlns:b="urn:Bean" nonsattribute="hi">
+ <b:bleh>bleh</b:bleh>
+ <b:howdy>howdy</b:howdy>
+ <another>asdf</another>
+ <b:yetanother></b:yetanother>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,4 @@
+<b:bean xmlns:b="urn:Bean">
+ <b:bleh>bleh</b:bleh>
+ <b:howdycustom>howdy</b:howdycustom>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1 @@
+<b:bean b:bleh="bleh" b:howdy="howdy" xmlns:b="urn:Bean"/>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1 @@
+<b:bean b:bleh="bleh" b:howdy="howdy" xmlns:b="urn:Bean"/>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean5.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,4 @@
+<b:bean xmlns:b="urn:Bean" xmlns:a="urn:anotherns">
+ <a:bleh>bleh</a:bleh>
+ <a:howdy>howdy</a:howdy>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean6.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,4 @@
+<b:bean xmlns:b="urn:Bean">
+ <b:bleh/>
+ <b:howdy>howdy</b:howdy>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean7.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1 @@
+<b:bean b2:bleh="bleh" b2:howdy="howdy" xmlns:b="urn:Bean"
xmlns:b2="urn:Bean2"/>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean8.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml?view=auto&rev=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
(added)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
Thu Apr 19 21:53:54 2007
@@ -0,0 +1,6 @@
+<b:bean xmlns:b="urn:Bean" xsi:type="b:SimpleBean"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
+ <b:bleh xsi:type="xsd:foo">bleh</b:bleh>
+ <b:howdy xsi:type="xsd:int">howdy</b:howdy>
+</b:bean>
\ No newline at end of file
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/bean9.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified:
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java
(original)
+++
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java
Thu Apr 19 21:53:54 2007
@@ -29,7 +29,7 @@
import org.w3c.dom.Node;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.aegis.Aegis;
+import org.apache.cxf.aegis.databinding.AegisDatabinding;
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.junit.Before;
@@ -48,12 +48,12 @@
new
QName("urn:xfire:inheritance", "InheritanceService"));
Map<String, Object> props = new HashMap<String, Object>();
- props.put(Aegis.WRITE_XSI_TYPE_KEY, "true");
+ props.put(AegisDatabinding.WRITE_XSI_TYPE_KEY, "true");
List<String> l = new ArrayList<String>();
l.add(Employee.class.getName());
- props.put(Aegis.OVERRIDE_TYPES_KEY, l);
+ props.put(AegisDatabinding.OVERRIDE_TYPES_KEY, l);
sf.getServiceFactory().setProperties(props);
sf.create();
Modified: incubator/cxf/trunk/rt/ws/addr/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/pom.xml?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
--- incubator/cxf/trunk/rt/ws/addr/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/addr/pom.xml Thu Apr 19 21:53:54 2007
@@ -72,11 +72,6 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</dependency>
Modified:
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
(original)
+++
incubator/cxf/trunk/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/soap/MAPCodec.java
Thu Apr 19 21:53:54 2007
@@ -34,16 +34,12 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
import org.apache.cxf.common.logging.LogUtils;
@@ -70,8 +66,7 @@
public class MAPCodec extends AbstractSoapInterceptor {
private static final Logger LOG = LogUtils.getL7dLogger(MAPCodec.class);
- private static SOAPFactory soapFactory;
-
+
/**
* REVISIT: map usage that the *same* interceptor instance
* is used in all chains.
@@ -193,8 +188,6 @@
marshaller);
propogateAction(maps.getAction(), message);
applyMAPValidation(message);
- } catch (SOAPException se) {
- LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", se);
} catch (JAXBException je) {
LOG.log(Level.WARNING, "SOAP_HEADER_ENCODE_FAILURE_MSG", je);
}
@@ -418,7 +411,7 @@
* @param header the SOAP header
* @param maps the current MAPs
*/
- private void discardMAPs(Element header, AddressingProperties maps) throws
SOAPException {
+ private void discardMAPs(Element header, AddressingProperties maps) {
NodeList headerElements =
header.getElementsByTagNameNS(maps.getNamespaceURI(), "*");
for (int i = 0; i < headerElements.getLength(); i++) {
@@ -464,12 +457,11 @@
* @exception SOAPFaultException if the MAPs are invalid
* @exception SOAPException if SOAPFault cannot be constructed
*/
- private void applyMAPValidation(SoapMessage message)
- throws SOAPException {
+ private void applyMAPValidation(SoapMessage message) {
String faultName = ContextUtils.retrieveMAPFaultName(message);
if (faultName != null) {
String reason = ContextUtils.retrieveMAPFaultReason(message);
- throw createSOAPFaultException(faultName,
+ throw createSOAPFaut(faultName,
Names.WSA_NAMESPACE_PREFIX,
Names.WSA_NAMESPACE_NAME,
reason);
@@ -477,35 +469,16 @@
}
/**
- * @return SOAPFactory
- */
- private static synchronized SOAPFactory getSOAPFactory() throws
SOAPException {
- if (soapFactory == null) {
- soapFactory = SOAPFactory.newInstance();
- }
- return soapFactory;
- }
-
- /**
- * Create a SOAPFaultException.
+ * Create a SoapFault.
*
* @param localName the fault local name
* @param prefix the fault prefix
* @param namespace the fault namespace
* @param reason the fault reason
- * @return a new SOAPFaultException
+ * @return a new SoapFault
*/
- private SOAPFaultException createSOAPFaultException(String localName,
- String prefix,
- String namespace,
- String reason)
- throws SOAPException {
- SOAPFactory factory = getSOAPFactory();
- SOAPFault fault = factory.createFault();
- Name qname = factory.createName(localName, prefix, namespace);
- fault.setFaultCode(qname);
- fault.setFaultString(reason);
- return new SOAPFaultException(fault);
+ private SoapFault createSOAPFaut(String localName, String prefix, String
namespace, String reason) {
+ return new SoapFault(reason, new QName(namespace, localName, prefix));
}
/**
Modified:
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/addr/src/test/java/org/apache/cxf/ws/addressing/soap/MAPCodecTest.java
Thu Apr 19 21:53:54 2007
@@ -31,13 +31,13 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
-import javax.xml.ws.soap.SOAPFaultException;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import junit.framework.TestCase;
+import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.ExchangeImpl;
@@ -51,7 +51,6 @@
import org.apache.cxf.ws.addressing.RelatesToType;
import org.apache.cxf.ws.addressing.v200408.AttributedURI;
import org.apache.cxf.ws.addressing.v200408.Relationship;
-
import org.easymock.IArgumentMatcher;
import org.easymock.classextension.EasyMock;
import org.easymock.classextension.IMocksControl;
@@ -160,10 +159,10 @@
try {
codec.handleMessage(message);
fail("expected SOAPFaultException on invalid MAP");
- } catch (SOAPFaultException sfe) {
+ } catch (SoapFault sfe) {
assertEquals("unexpected fault string",
"Duplicate Message ID urn:uuid:12345",
- sfe.getFault().getFaultString());
+ sfe.getMessage());
}
control.verify();
verifyMessage(message, false, true, true);
Modified:
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractWSS4JInterceptor.java
Thu Apr 19 21:53:54 2007
@@ -41,7 +41,7 @@
static {
HEADERS.add(new QName(WSConstants.WSSE_NS, "Security"));
HEADERS.add(new QName(WSConstants.WSSE11_NS, "Security"));
- HEADERS.add(new QName("http://www.w3.org/2001/04/xmlenc";,
"EncryptedData"));
+ HEADERS.add(new QName(WSConstants.ENC_NS, "EncryptedData"));
}
private Map<String, String> properties = new HashMap<String, String>();
Modified:
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Thu Apr 19 21:53:54 2007
@@ -19,6 +19,7 @@
package org.apache.cxf.ws.security.wss4j;
import java.security.cert.X509Certificate;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
import java.util.logging.Level;
@@ -171,7 +172,7 @@
X509Certificate returnCert = actionResult.getCertificate();
if (returnCert != null && !verifyTrust(returnCert, reqData)) {
- LOG.warning("WThe certificate used for the signature is
not trusted");
+ LOG.warning("The certificate used for the signature is not
trusted");
throw new SoapFault(new Message("UNTRUSTED_CERT", LOG),
version.getSender());
}
msg.put(SIGNATURE_RESULT, actionResult);
@@ -241,7 +242,7 @@
* All ok up to this point. Now construct and setup the security result
* structure. The service may fetch this and check it.
*/
- Vector<Object> results =
(Vector<Object>)msg.get(WSHandlerConstants.RECV_RESULTS);
+ List<Object> results =
(Vector<Object>)msg.get(WSHandlerConstants.RECV_RESULTS);
if (results == null) {
results = new Vector<Object>();
msg.put(WSHandlerConstants.RECV_RESULTS, results);
@@ -254,13 +255,10 @@
XMLStreamReader reader = StaxUtils.createXMLStreamReader(new
DOMSource(body));
// advance just past body
int evt = reader.next();
- int i = 0;
- while (reader.hasNext() && i < 1
- && (evt != XMLStreamConstants.END_ELEMENT || evt !=
XMLStreamConstants.START_ELEMENT)) {
- reader.next();
- i++;
+ while (reader.hasNext()
+ && (evt == XMLStreamConstants.END_ELEMENT || evt ==
XMLStreamConstants.START_ELEMENT)) {
+ evt = reader.next();
}
-
msg.setContent(XMLStreamReader.class, reader);
}
@@ -271,7 +269,7 @@
}
if (action == null) {
LOG.warning("No security action was defined!");
- throw new SoapFault("No securityaction was defined!",
version.getReceiver());
+ throw new SoapFault("No security action was defined!",
version.getReceiver());
}
return action;
}
Modified:
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JOutInterceptor.java
Thu Apr 19 21:53:54 2007
@@ -39,10 +39,12 @@
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.util.WSSecurityUtil;
-
public class WSS4JOutInterceptor extends AbstractWSS4JInterceptor {
- private static final Logger LOG =
Logger.getLogger(WSS4JOutInterceptor.class.getName());
- private static final Logger TIME_LOG =
Logger.getLogger(WSS4JOutInterceptor.class.getName() + "-Time");
+ private static final Logger LOG = Logger
+ .getLogger(WSS4JOutInterceptor.class.getName());
+
+ private static final Logger TIME_LOG = Logger
+ .getLogger(WSS4JOutInterceptor.class.getName() + "-Time");
public WSS4JOutInterceptor() {
super();
@@ -87,7 +89,8 @@
Vector actions = new Vector();
String action = getString(WSHandlerConstants.ACTION, mc);
if (action == null) {
- throw new SoapFault(new Message("NO_ACTION", LOG),
version.getReceiver());
+ throw new SoapFault(new Message("NO_ACTION", LOG), version
+ .getReceiver());
}
int doAction = WSSecurityUtil.decodeAction(action, actions);
@@ -99,9 +102,11 @@
* For every action we need a username, so get this now. The
* username defined in the deployment descriptor takes precedence.
*/
- reqData.setUsername((String)getOption(WSHandlerConstants.USER));
- if (reqData.getUsername() == null ||
reqData.getUsername().equals("")) {
- String username = (String)getProperty(reqData.getMsgContext(),
WSHandlerConstants.USER);
+ reqData.setUsername((String) getOption(WSHandlerConstants.USER));
+ if (reqData.getUsername() == null
+ || reqData.getUsername().equals("")) {
+ String username = (String) getProperty(reqData.getMsgContext(),
+ WSHandlerConstants.USER);
if (username != null) {
reqData.setUsername(username);
}
@@ -113,12 +118,14 @@
* username is available and then get a passowrd.
*/
if ((doAction & (WSConstants.SIGN | WSConstants.UT |
WSConstants.UT_SIGN)) != 0
- && reqData.getUsername() == null ||
reqData.getUsername().equals("")) {
+ && reqData.getUsername() == null
+ || reqData.getUsername().equals("")) {
/*
* We need a username - if none throw an SoapFault. For
* encryption there is a specific parameter to get a username.
*/
- throw new SoapFault(new Message("NO_USERNAME", LOG),
version.getReceiver());
+ throw new SoapFault(new Message("NO_USERNAME", LOG), version
+ .getReceiver());
}
if (doDebug) {
LOG.fine("Action: " + doAction);
@@ -140,7 +147,8 @@
if (saaj == null) {
LOG.warning("SAAJOutHandler must be enabled for WS-Security!");
- throw new SoapFault(new Message("NO_SAAJ_DOC", LOG),
version.getReceiver());
+ throw new SoapFault(new Message("NO_SAAJ_DOC", LOG), version
+ .getReceiver());
}
Document doc = saaj.getSOAPPart();
@@ -157,7 +165,7 @@
}
doSenderAction(doAction, doc, reqData, actions, !Boolean.TRUE
- .equals(org.apache.cxf.message.Message.REQUESTOR_ROLE));
+ .equals(getProperty(mc,
org.apache.cxf.message.Message.REQUESTOR_ROLE)));
if (doTimeDebug) {
t2 = System.currentTimeMillis();
@@ -165,16 +173,18 @@
if (doTimeDebug) {
t3 = System.currentTimeMillis();
- TIME_LOG
- .fine("Send request: total= " + (t3 - t0) + " request
preparation= " + (t1 - t0)
- + " request processing= " + (t2 - t1) + " request to
CXF= " + (t3 - t2) + "\n");
+ TIME_LOG.fine("Send request: total= " + (t3 - t0)
+ + " request preparation= " + (t1 - t0)
+ + " request processing= " + (t2 - t1)
+ + " request to CXF= " + (t3 - t2) + "\n");
}
if (doDebug) {
LOG.fine("WSDoAllSender: exit invoke()");
}
} catch (WSSecurityException e) {
- throw new SoapFault(new Message("SECURITY_FAILED", LOG), e,
version.getSender());
+ throw new SoapFault(new Message("SECURITY_FAILED", LOG), e, version
+ .getSender());
} finally {
reqData.clear();
reqData = null;
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
Thu Apr 19 21:53:54 2007
@@ -33,18 +33,17 @@
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.test.AbstractCXFTest;
+import org.apache.ws.security.WSConstants;
public abstract class AbstractSecurityTest extends AbstractCXFTest {
public AbstractSecurityTest() {
super();
- addNamespace("wsse",
-
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd";);
- addNamespace("ds", "http://www.w3.org/2000/09/xmldsig#";);
+ addNamespace("wsse", WSConstants.WSSE_NS);
+ addNamespace("ds", WSConstants.SIG_NS);
addNamespace("s", Soap11.getInstance().getNamespace());
- addNamespace("xenc", "http://www.w3.org/2001/04/xmlenc#";);
- addNamespace("wsu",
-
"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";);
+ addNamespace("xenc", WSConstants.ENC_NS);
+ addNamespace("wsu", WSConstants.WSU_NS);
}
protected Document readDocument(String name) throws SAXException,
IOException,
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
Thu Apr 19 21:53:54 2007
@@ -90,7 +90,7 @@
}
@Test
- public void testEncyprtionPlusSig() throws Exception {
+ public void testEncryptionPlusSig() throws Exception {
wsIn.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT
+ " "
+
WSHandlerConstants.SIGNATURE);
wsOut.setProperty(WSHandlerConstants.ACTION,
WSHandlerConstants.ENCRYPT + " "
Modified:
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?view=diff&rev=530639&r1=530638&r2=530639
==============================================================================
---
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
(original)
+++
incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
Thu Apr 19 21:53:54 2007
@@ -113,6 +113,72 @@
X509Certificate certificate = result.getCertificate();
assertNotNull(certificate);
}
+
+ @Test
+ public void testDirectReferenceSignature() throws Exception {
+ Document doc = readDocument("wsse-request-clean.xml");
+
+ WSS4JOutInterceptor handler = new WSS4JOutInterceptor();
+
+ SoapMessage msg = new SoapMessage(new MessageImpl());
+ Exchange ex = new ExchangeImpl();
+ ex.setInMessage(msg);
+
+ SOAPMessage saajMsg = MessageFactory.newInstance().createMessage();
+ SOAPPart part = saajMsg.getSOAPPart();
+ part.setContent(new DOMSource(doc));
+ saajMsg.saveChanges();
+
+ msg.setContent(SOAPMessage.class, saajMsg);
+
+ msg.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE);
+ msg.put(WSHandlerConstants.SIG_PROP_FILE,
"META-INF/cxf/outsecurity.properties");
+ msg.put(WSHandlerConstants.USER, "myalias");
+ msg.put(WSHandlerConstants.SIG_KEY_ID, "DirectReference");
+ msg.put("password", "myAliasPassword");
+ msg.put(WSHandlerConstants.PASSWORD_TYPE, WSConstants.PASSWORD_TEXT);
+
+ handler.handleMessage(msg);
+
+ doc = part;
+
+ assertValid("//wsse:Security", doc);
+ // Check to see that the binary security token was inserted in the
header
+ assertValid("//wsse:Security/wsse:BinarySecurityToken", doc);
+ assertValid("//wsse:Security/ds:Signature", doc);
+
+ byte[] docbytes = getMessageBytes(doc);
+ XMLStreamReader reader = StaxUtils.createXMLStreamReader(new
ByteArrayInputStream(docbytes));
+
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+
+ dbf.setValidating(false);
+ dbf.setIgnoringComments(false);
+ dbf.setIgnoringElementContentWhitespace(true);
+ dbf.setNamespaceAware(true);
+
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ db.setEntityResolver(new NullResolver());
+ doc = StaxUtils.read(db, reader, false);
+
+ WSS4JInInterceptor inHandler = new WSS4JInInterceptor();
+
+ SoapMessage inmsg = new SoapMessage(new MessageImpl());
+ ex.setInMessage(inmsg);
+ inmsg.setContent(SOAPMessage.class, saajMsg);
+
+ inHandler.setProperty(WSHandlerConstants.ACTION,
WSHandlerConstants.SIGNATURE);
+ inHandler.setProperty(WSHandlerConstants.SIG_PROP_FILE,
"META-INF/cxf/insecurity.properties");
+
+ inHandler.handleMessage(inmsg);
+
+ WSSecurityEngineResult result =
+ (WSSecurityEngineResult)
inmsg.get(WSS4JInInterceptor.SIGNATURE_RESULT);
+ assertNotNull(result);
+ X509Certificate certificate = result.getCertificate();
+ assertNotNull(certificate);
+ }
+
private byte[] getMessageBytes(Document doc) throws Exception {
// XMLOutputFactory factory = XMLOutputFactory.newInstance();
