Author: veithen
Date: Sat Feb 19 10:19:53 2011
New Revision: 1072296
URL: http://svn.apache.org/viewvc?rev=1072296&view=rev
Log:
Updated the Axis2 trunk to use Neethi 3.0.0-SNAPSHOT again, using the patch
provided by Dan Kulp.
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM10AssertionBuilder.java
Sat Feb 19 10:19:53 2011
@@ -43,7 +43,7 @@ import javax.xml.namespace.QName;
* The builder will be picked by the
* "org.apache.neethi.AssertionBuilderFactory".
*/
-public class MTOM10AssertionBuilder implements AssertionBuilder {
+public class MTOM10AssertionBuilder implements AssertionBuilder<OMElement> {
private static Log log = LogFactory.getLog(MTOM10AssertionBuilder.class);
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/builders/MTOM11AssertionBuilder.java
Sat Feb 19 10:19:53 2011
@@ -39,7 +39,7 @@ import org.apache.neethi.builders.Assert
* "org.apache.neethi.AssertionBuilderFactory".
*/
-public class MTOM11AssertionBuilder implements AssertionBuilder{
+public class MTOM11AssertionBuilder implements AssertionBuilder<OMElement> {
private static Log log = LogFactory.getLog(MTOM10AssertionBuilder.class);
Modified:
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java?rev=1072296&r1=1072295&r2=1072296&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
(original)
+++
axis/axis2/java/core/trunk/modules/mtompolicy/src/org/apache/axis2/policy/model/MTOMAssertion.java
Sat Feb 19 10:19:53 2011
@@ -52,5 +52,8 @@ public abstract class MTOMAssertion impl
this.optional = isOptional;
}
+ public boolean isIgnorable() {
+ return false;
+ }
}
\ No newline at end of file
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=1072296&r1=1072295&r2=1072296&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sat Feb 19 10:19:53 2011
@@ -68,8 +68,7 @@
<properties>
<!-- Tracking SNAPSHOT(s) of a few projects -->
<axiom.version>1.2.12-SNAPSHOT</axiom.version>
- <!--TODO: fix the compatibility issues with the Neethi trunk and bring
back to 3.0.0-SNAPSHOT-->
- <neethi.version>2.0.4</neethi.version>
+ <neethi.version>3.0.0-SNAPSHOT</neethi.version>
<woden.version>1.0-SNAPSHOT</woden.version>
<!-- Use released versions for these projects -->
