cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1513220 - in /cxf/trunk: ./ common/ common/wstx-msv-validation/ common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ common/wstx-msv-validation/src/main/resources/META-INF/cxf/ common/wstx-msv-validation/src/main/re...
Date Mon, 12 Aug 2013 18:35:39 GMT
Author: dkulp
Date: Mon Aug 12 18:35:38 2013
New Revision: 1513220

URL: http://svn.apache.org/r1513220
Log:
Move the woodstox based validation into core.  Create new interceptors that would allow it
to be used for all validation.  Change aegis to use the new stax validation.

Added:
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/EmbeddedSchema.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Messages.properties
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/resources/org/apache/cxf/wstx_msv_validation/Messages.properties
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ResolvingGrammarReaderController.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/Stax2ValidationUtils.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
      - copied, changed from r1513219, cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
      - copied, changed from r1513219, cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
    cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
      - copied, changed from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
Removed:
    cxf/trunk/common/pom.xml
    cxf/trunk/common/wstx-msv-validation/pom.xml
    cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/EmbeddedSchema.java
    cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ResolvingGrammarReaderController.java
    cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/Stax2ValidationUtils.java
    cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
    cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
    cxf/trunk/common/wstx-msv-validation/src/main/resources/META-INF/cxf/bus-extensions.txt
    cxf/trunk/common/wstx-msv-validation/src/main/resources/org/apache/cxf/wstx_msv_validation/Messages.properties
    cxf/trunk/core/src/main/java/org/apache/cxf/io/StaxValidationManager.java
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java
Modified:
    cxf/trunk/core/pom.xml
    cxf/trunk/distribution/manifest/pom.xml
    cxf/trunk/distribution/pom.xml
    cxf/trunk/osgi/bundle/all/pom.xml
    cxf/trunk/osgi/bundle/minimal/pom.xml
    cxf/trunk/pom.xml
    cxf/trunk/rt/databinding/aegis/pom.xml
    cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java

Modified: cxf/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/core/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/core/pom.xml (original)
+++ cxf/trunk/core/pom.xml Mon Aug 12 18:35:38 2013
@@ -42,7 +42,7 @@
             org.apache.cxf.*
         </cxf.osgi.export>
         <cxf.osgi.import>
-            com.ctc.wstx.stax*;resolution:=optional,
+            com.ctc.wstx*;resolution:=optional,
             org.codehaus.stax2*;resolution:=optional,
             com.sun*;resolution:=optional,
             org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}",
@@ -175,6 +175,19 @@
             <artifactId>org.osgi.compendium</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>net.java.dev.msv</groupId>
+            <artifactId>msv-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>net.java.dev.msv</groupId>
+                    <artifactId>msv-testharness</artifactId>
+                </exclusion>
+            </exclusions>
+            <optional>true</optional>
+            <scope>provided</scope>
+        </dependency>
+        
     </dependencies>
 
     <build>

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/EmbeddedSchema.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java&p1=cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/EmbeddedSchema.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/EmbeddedSchema.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/EmbeddedSchema.java Mon
Aug 12 18:35:38 2013
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cxf.wstx_msv_validation;
+package org.apache.cxf.staxutils.validation;
 
 import org.w3c.dom.Element;
 

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Messages.properties
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/resources/org/apache/cxf/wstx_msv_validation/Messages.properties)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Messages.properties?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Messages.properties&p1=cxf/trunk/common/wstx-msv-validation/src/main/resources/org/apache/cxf/wstx_msv_validation/Messages.properties&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
    (empty)

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ResolvingGrammarReaderController.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java&p1=cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ResolvingGrammarReaderController.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/ResolvingGrammarReaderController.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/ResolvingGrammarReaderController.java
Mon Aug 12 18:35:38 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.wstx_msv_validation;
+package org.apache.cxf.staxutils.validation;
 
 import java.io.IOException;
 import java.util.Map;

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/Stax2ValidationUtils.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java&p1=cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/Stax2ValidationUtils.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/Stax2ValidationUtils.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/Stax2ValidationUtils.java
Mon Aug 12 18:35:38 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.wstx_msv_validation;
+package org.apache.cxf.staxutils.validation;
 
 import java.util.Map;
 import java.util.TreeMap;

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
(from r1513219, cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java&p1=cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationInInterceptor.java
Mon Aug 12 18:35:38 2013
@@ -17,38 +17,27 @@
  * under the License.
  */
 
-package org.apache.cxf.aegis.databinding;
+package org.apache.cxf.staxutils.validation;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
-import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
-import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.ServiceUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.io.StaxValidationManager;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.ServiceInfo;
 
-public class AegisSchemaValidationInInterceptor extends AbstractPhaseInterceptor<Message>
{
-    private static final Logger LOG = LogUtils.getL7dLogger(AegisSchemaValidationInInterceptor.class);
-    
-    private ServiceInfo service;
-    private Bus bus;
-    
-    public AegisSchemaValidationInInterceptor(Bus bus, ServiceInfo service) {
-        super(Phase.READ);
-        this.bus = bus;
-        this.service = service;
-        addBefore(StartBodyInterceptor.class.getName());
-        addAfter(ReadHeadersInterceptor.class.getName());
+public class StaxSchemaValidationInInterceptor extends AbstractPhaseInterceptor<Message>
{
+    private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationInInterceptor.class);
+        
+    public StaxSchemaValidationInInterceptor() {
+        super(Phase.PRE_UNMARSHAL);
     }
 
 
@@ -64,9 +53,14 @@ public class AegisSchemaValidationInInte
     
     private void setSchemaInMessage(Message message, XMLStreamReader reader) throws XMLStreamException
 {
         if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)) {
-            StaxValidationManager mgr = bus.getExtension(StaxValidationManager.class);
-            if (mgr != null) {
-                mgr.setupValidation(reader, service);
+            try {
+                WoodstoxValidationImpl mgr = new WoodstoxValidationImpl();
+                if (mgr != null) {
+                    mgr.setupValidation(reader, message.getExchange().getService().getServiceInfos().get(0));
+                }
+            } catch (Throwable t) {
+                //likely no MSV or similar
+                LOG.log(Level.FINE, "Problem initializing MSV validation", t);
             }
         }
     }

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
(from r1513219, cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java&p1=cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisSchemaValidationInInterceptor.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/StaxSchemaValidationOutInterceptor.java
Mon Aug 12 18:35:38 2013
@@ -17,56 +17,50 @@
  * under the License.
  */
 
-package org.apache.cxf.aegis.databinding;
+package org.apache.cxf.staxutils.validation;
 
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.cxf.Bus;
 import org.apache.cxf.annotations.SchemaValidation.SchemaValidationType;
-import org.apache.cxf.binding.soap.interceptor.ReadHeadersInterceptor;
-import org.apache.cxf.binding.soap.interceptor.StartBodyInterceptor;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.helpers.ServiceUtils;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.io.StaxValidationManager;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
-import org.apache.cxf.service.model.ServiceInfo;
 
-public class AegisSchemaValidationInInterceptor extends AbstractPhaseInterceptor<Message>
{
-    private static final Logger LOG = LogUtils.getL7dLogger(AegisSchemaValidationInInterceptor.class);
-    
-    private ServiceInfo service;
-    private Bus bus;
-    
-    public AegisSchemaValidationInInterceptor(Bus bus, ServiceInfo service) {
-        super(Phase.READ);
-        this.bus = bus;
-        this.service = service;
-        addBefore(StartBodyInterceptor.class.getName());
-        addAfter(ReadHeadersInterceptor.class.getName());
+public class StaxSchemaValidationOutInterceptor extends AbstractPhaseInterceptor<Message>
{
+    private static final Logger LOG = LogUtils.getL7dLogger(StaxSchemaValidationOutInterceptor.class);
+        
+    public StaxSchemaValidationOutInterceptor() {
+        super(Phase.PRE_MARSHAL);
     }
 
 
     public void handleMessage(Message message) throws Fault {
-        XMLStreamReader xmlReader = message.getContent(XMLStreamReader.class);
+        XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
         try {
-            setSchemaInMessage(message, xmlReader);
+            setSchemaInMessage(message, writer);
         } catch (XMLStreamException e) {
             throw new Fault(new org.apache.cxf.common.i18n.Message("SCHEMA_ERROR", LOG),

                             e);
         }
     }
     
-    private void setSchemaInMessage(Message message, XMLStreamReader reader) throws XMLStreamException
 {
-        if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.IN, message)) {
-            StaxValidationManager mgr = bus.getExtension(StaxValidationManager.class);
-            if (mgr != null) {
-                mgr.setupValidation(reader, service);
+    private void setSchemaInMessage(Message message, XMLStreamWriter writer) throws XMLStreamException
 {
+        if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, message)) {
+            try {
+                WoodstoxValidationImpl mgr = new WoodstoxValidationImpl();
+                if (mgr != null) {
+                    mgr.setupValidation(writer, message.getExchange().getService().getServiceInfos().get(0));
+                }
+            } catch (Throwable t) {
+                //likely no MSV or similar
+                LOG.log(Level.FINE, "Problem initializing MSV validation", t);
             }
         }
     }

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java&p1=cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/W3CMultiSchemaFactory.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/W3CMultiSchemaFactory.java
Mon Aug 12 18:35:38 2013
@@ -21,7 +21,7 @@
  * carries a ASL 2.0 license.
  */
 
-package org.apache.cxf.wstx_msv_validation;
+package org.apache.cxf.staxutils.validation;
 
 import java.util.Map;
 

Copied: cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
(from r1513219, cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java)
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java?p2=cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java&p1=cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java&r1=1513219&r2=1513220&rev=1513220&view=diff
==============================================================================
--- cxf/trunk/common/wstx-msv-validation/src/main/java/org/apache/cxf/wstx_msv_validation/WoodstoxValidationImpl.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/staxutils/validation/WoodstoxValidationImpl.java
Mon Aug 12 18:35:38 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cxf.wstx_msv_validation;
+package org.apache.cxf.staxutils.validation;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -26,36 +26,28 @@ import javax.xml.stream.XMLStreamExcepti
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.apache.cxf.Bus;
-import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.io.StaxValidationManager;
 import org.apache.cxf.service.model.ServiceInfo;
 
 /**
  * 
  */
-@NoJSR250Annotations
-public class WoodstoxValidationImpl implements StaxValidationManager {
+public class WoodstoxValidationImpl {
     private static final Logger LOG = LogUtils.getL7dLogger(WoodstoxValidationImpl.class);
     
-    private Bus bus;
     private Stax2ValidationUtils utils;
 
     
-    public WoodstoxValidationImpl(Bus b) {
-        bus = b;
-        
+    public WoodstoxValidationImpl() {
         try {
             utils = new Stax2ValidationUtils();
         } catch (Throwable e) {
             LOG.log(Level.FINE, "Problem initializing MSV validation", e);
             return;
         }
-        
-        if (null != bus) {
-            bus.setExtension(this, StaxValidationManager.class);
-        }
+    }
+    public boolean canValidate() {
+        return utils != null;
     }
 
 

Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Mon Aug 12 18:35:38 2013
@@ -222,11 +222,6 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-wstx-msv-validation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Mon Aug 12 18:35:38 2013
@@ -230,11 +230,6 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-wstx-msv-validation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
             <artifactId>cxf-rt-databinding-xmlbeans</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/trunk/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/all/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/all/pom.xml (original)
+++ cxf/trunk/osgi/bundle/all/pom.xml Mon Aug 12 18:35:38 2013
@@ -216,17 +216,6 @@
             <artifactId>cxf-rt-databinding-aegis</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-wstx-msv-validation</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>net.java.dev.msv</groupId>
-                    <artifactId>msv-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: cxf/trunk/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/osgi/bundle/minimal/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/osgi/bundle/minimal/pom.xml (original)
+++ cxf/trunk/osgi/bundle/minimal/pom.xml Mon Aug 12 18:35:38 2013
@@ -71,11 +71,6 @@
             <artifactId>cxf-rt-databinding-aegis</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>cxf-wstx-msv-validation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

Modified: cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/pom.xml (original)
+++ cxf/trunk/pom.xml Mon Aug 12 18:35:38 2013
@@ -173,7 +173,6 @@
 
     <modules>
         <module>parent</module>
-        <module>common</module>
         <module>core</module>
         <module>tools</module>
         <module>testutils</module>

Modified: cxf/trunk/rt/databinding/aegis/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/pom.xml?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/pom.xml (original)
+++ cxf/trunk/rt/databinding/aegis/pom.xml Mon Aug 12 18:35:38 2013
@@ -97,9 +97,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-wstx-msv-validation</artifactId>
-            <version>${project.version}</version>
+            <groupId>net.java.dev.msv</groupId>
+            <artifactId>msv-core</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java?rev=1513220&r1=1513219&r2=1513220&view=diff
==============================================================================
--- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
(original)
+++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisDatabinding.java
Mon Aug 12 18:35:38 2013
@@ -60,6 +60,7 @@ import org.apache.cxf.service.model.Mess
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
+import org.apache.cxf.staxutils.validation.StaxSchemaValidationInInterceptor;
 import org.apache.cxf.wsdl.WSDLConstants;
 import org.apache.ws.commons.schema.XmlSchema;
 import org.apache.ws.commons.schema.XmlSchemaAnnotated;
@@ -232,7 +233,7 @@ public class AegisDatabinding extends Ab
         aegisContext.initialize();
         this.service = s;
         s.getInInterceptors()
-            .add(new AegisSchemaValidationInInterceptor(getBus(), s.getServiceInfos().get(0)));
+            .add(new StaxSchemaValidationInInterceptor());
 
         Set<AegisType> deps = new HashSet<AegisType>();
 



Mime
View raw message