You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by tw...@apache.org on 2006/11/06 19:42:32 UTC

svn commit: r471815 - in /incubator/uima/uimaj/trunk/uimaj-adapter-soap: ./ src/main/java/org/apache/uima/adapter/soap/ src/main/java/org/apache/uima/adapter/soap/axis11/

Author: twgoetz
Date: Mon Nov  6 10:42:30 2006
New Revision: 471815

URL: http://svn.apache.org/viewvc?view=rev&rev=471815
Log:
Adam's patch for the Maven build.

Modified:
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java
    incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/pom.xml Mon Nov  6 10:42:30 2006
@@ -1,24 +1,45 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache.uima</groupId>
-	<artifactId>uimaj-adapter-soap</artifactId>
-	<packaging>jar</packaging>
-	<version>1.0-SNAPSHOT</version>
-	<name>Apache UIMA Java SOAP Adapter</name>
-	<url>http://maven.apache.org</url>
-	<parent>
-		<groupId>org.apache.uima</groupId>
-		<artifactId>uimaj</artifactId>
-		<version>1.0-SNAPSHOT</version>
-	</parent>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.uima</groupId>
-			<artifactId>uimaj-core</artifactId>
-			<version>1.0-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.uima</groupId>
+	<artifactId>uimaj-adapter-soap</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0-SNAPSHOT</version>
+	<name>Apache UIMA Java SOAP Adapter</name>
+	<url>http://maven.apache.org</url>
+	<parent>
+		<groupId>org.apache.uima</groupId>
+		<artifactId>uimaj</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.uima</groupId>
+			<artifactId>uimaj-core</artifactId>
+			<version>1.0-SNAPSHOT</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.3</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-jaxrpc</artifactId>
+			<version>1.3</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.0.2</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>uima-adapter-soap</finalName>
+	</build>	
 </project>

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineServiceStub.java Mon Nov  6 10:42:30 2006
@@ -32,13 +32,12 @@
 import org.apache.axis.attachments.AttachmentUtils;
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
-
 import org.apache.uima.analysis_engine.AnalysisEngineServiceStub;
 import org.apache.uima.analysis_engine.ResultSpecification;
 import org.apache.uima.analysis_engine.metadata.AnalysisEngineMetaData;
+import org.apache.uima.analysis_engine.service.impl.ServiceDataCargo;
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.text.TCASException;
-import org.apache.uima.reference_impl.analysis_engine.service.ServiceDataCargo;
 import org.apache.uima.resource.ResourceServiceException;
 import org.apache.uima.resource.metadata.ResourceMetaData;
 

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisAnalysisEngineService_impl.java Mon Nov  6 10:42:30 2006
@@ -20,11 +20,10 @@
 package org.apache.uima.adapter.soap;
 
 import org.apache.axis.AxisFault;
-
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.ResultSpecification;
-import org.apache.uima.reference_impl.analysis_engine.service.AnalysisEngineService_impl;
-import org.apache.uima.reference_impl.analysis_engine.service.ServiceDataCargo;
+import org.apache.uima.analysis_engine.service.impl.AnalysisEngineService_impl;
+import org.apache.uima.analysis_engine.service.impl.ServiceDataCargo;
 import org.apache.uima.resource.ResourceServiceException;
 import org.apache.uima.resource.metadata.ResourceMetaData;
 import org.apache.uima.util.Level;

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceManager.java Mon Nov  6 10:42:30 2006
@@ -25,12 +25,11 @@
 import org.apache.axis.AxisFault;
 import org.apache.axis.Handler;
 import org.apache.axis.MessageContext;
-
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.reference_impl.analysis_engine.service.AnalysisEngineService_impl;
-import org.apache.uima.reference_impl.resource.service.ResourceService_impl;
+import org.apache.uima.analysis_engine.service.impl.AnalysisEngineService_impl;
 import org.apache.uima.resource.ResourceSpecifier;
+import org.apache.uima.resource.service.impl.ResourceService_impl;
 import org.apache.uima.util.Level;
 import org.apache.uima.util.Logger;
 import org.apache.uima.util.XMLInputSource;

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/AxisResourceServiceStub.java Mon Nov  6 10:42:30 2006
@@ -27,7 +27,6 @@
 
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
-
 import org.apache.uima.resource.ResourceServiceException;
 import org.apache.uima.resource.ResourceServiceStub;
 import org.apache.uima.resource.metadata.ResourceMetaData;

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializer.java Mon Nov  6 10:42:30 2006
@@ -21,6 +21,7 @@
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.io.Serializable;
 
 import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
@@ -33,10 +34,9 @@
 import org.apache.axis.message.SOAPBodyElement;
 import org.apache.axis.soap.SOAPConstants;
 import org.apache.axis.utils.Messages;
+import org.apache.uima.internal.util.SerializationUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-
-import org.apache.uima.reference_impl.util.SerializationUtils;
 
 /**
  * An Axis deserializer for {@link Serializable} objects.  The serialized bytes

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinaryDeserializerFactory.java Mon Nov  6 10:42:30 2006
@@ -25,7 +25,6 @@
 import org.apache.axis.Constants;
 import org.apache.axis.Version;
 import org.apache.axis.encoding.DeserializerFactory;
-
 import org.apache.uima.adapter.soap.axis11.BinaryDeserializer_Axis11;
 
 /**

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializer.java Mon Nov  6 10:42:30 2006
@@ -36,11 +36,10 @@
 import org.apache.axis.encoding.Serializer;
 import org.apache.axis.soap.SOAPConstants;
 import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.uima.internal.util.SerializationUtils;
 import org.w3c.dom.Element;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
-
-import org.apache.uima.reference_impl.util.SerializationUtils;
 
 /**
  * An Axis serializer for {@link Serializable} objects.  The serialized bytes

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/BinarySerializerFactory.java Mon Nov  6 10:42:30 2006
@@ -27,7 +27,6 @@
 import org.apache.axis.Constants;
 import org.apache.axis.Version;
 import org.apache.axis.encoding.SerializerFactory;
-
 import org.apache.uima.adapter.soap.axis11.BinarySerializer_Axis11;
 
 /**

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/SoapAnalysisEngineServiceAdapter.java Mon Nov  6 10:42:30 2006
@@ -24,7 +24,7 @@
 
 import org.apache.uima.Constants;
 import org.apache.uima.analysis_engine.AnalysisEngineServiceStub;
-import org.apache.uima.reference_impl.analysis_engine.service.AnalysisEngineServiceAdapter;
+import org.apache.uima.analysis_engine.service.impl.AnalysisEngineServiceAdapter;
 import org.apache.uima.resource.ResourceInitializationException;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.URISpecifier;

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializer.java Mon Nov  6 10:42:30 2006
@@ -24,15 +24,14 @@
 import org.apache.axis.encoding.DeserializationContext;
 import org.apache.axis.encoding.DeserializerImpl;
 import org.apache.axis.message.SOAPHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.LocatorImpl;
-
 import org.apache.uima.UIMAFramework;
-import org.apache.uima.reference_impl.util.SaxDeserializer_impl;
 import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLParser;
 import org.apache.uima.util.XMLizable;
+import org.apache.uima.util.impl.SaxDeserializer_impl;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.LocatorImpl;
 
 /**
  * An Axis deserializer for any {@link XMLizable} object.

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlDeserializerFactory.java Mon Nov  6 10:42:30 2006
@@ -25,7 +25,6 @@
 import org.apache.axis.Constants;
 import org.apache.axis.Version;
 import org.apache.axis.encoding.DeserializerFactory;
-
 import org.apache.uima.adapter.soap.axis11.XmlDeserializer_Axis11;
 
 /**

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializer.java Mon Nov  6 10:42:30 2006
@@ -27,12 +27,11 @@
 import org.apache.axis.encoding.SerializationContext;
 import org.apache.axis.encoding.Serializer;
 import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.uima.util.XMLizable;
 import org.w3c.dom.Element;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.uima.util.XMLizable;
 
 /**
  * An Axis serializer for any {@link XMLizable} object.

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/XmlSerializerFactory.java Mon Nov  6 10:42:30 2006
@@ -27,7 +27,6 @@
 import org.apache.axis.Constants;
 import org.apache.axis.Version;
 import org.apache.axis.encoding.SerializerFactory;
-
 import org.apache.uima.adapter.soap.axis11.XmlSerializer_Axis11;
 
 /**

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinaryDeserializer_Axis11.java Mon Nov  6 10:42:30 2006
@@ -21,6 +21,7 @@
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.io.Serializable;
 
 import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
@@ -33,10 +34,9 @@
 import org.apache.axis.message.SOAPBodyElement;
 import org.apache.axis.soap.SOAPConstants;
 import org.apache.axis.utils.Messages;
+import org.apache.uima.internal.util.SerializationUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-
-import org.apache.uima.reference_impl.util.SerializationUtils;
 
 /**
  * An Axis deserializer for {@link Serializable} objects.  The serialized bytes

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/BinarySerializer_Axis11.java Mon Nov  6 10:42:30 2006
@@ -36,11 +36,10 @@
 import org.apache.axis.encoding.Serializer;
 import org.apache.axis.soap.SOAPConstants;
 import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.uima.internal.util.SerializationUtils;
 import org.w3c.dom.Element;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
-
-import org.apache.uima.reference_impl.util.SerializationUtils;
 
 /**
  * An Axis serializer for {@link Serializable} objects.  The serialized bytes

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlDeserializer_Axis11.java Mon Nov  6 10:42:30 2006
@@ -24,14 +24,14 @@
 import org.apache.axis.encoding.DeserializationContext;
 import org.apache.axis.encoding.DeserializerImpl;
 import org.apache.axis.message.SOAPHandler;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.LocatorImpl;
-
 import org.apache.uima.UIMAFramework;
-import org.apache.uima.reference_impl.util.SaxDeserializer_impl;
 import org.apache.uima.util.InvalidXMLException;
 import org.apache.uima.util.XMLParser;
+import org.apache.uima.util.XMLizable;
+import org.apache.uima.util.impl.SaxDeserializer_impl;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.LocatorImpl;
 
 /**
  * An Axis deserializer for any {@link XMLizable} object.

Modified: incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java?view=diff&rev=471815&r1=471814&r2=471815
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-adapter-soap/src/main/java/org/apache/uima/adapter/soap/axis11/XmlSerializer_Axis11.java Mon Nov  6 10:42:30 2006
@@ -27,12 +27,11 @@
 import org.apache.axis.encoding.SerializationContext;
 import org.apache.axis.encoding.Serializer;
 import org.apache.axis.wsdl.fromJava.Types;
+import org.apache.uima.util.XMLizable;
 import org.w3c.dom.Element;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-
-import org.apache.uima.util.XMLizable;
 
 /**
  * An Axis serializer for any {@link XMLizable} object.