You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ru...@apache.org on 2005/10/04 07:24:05 UTC
svn commit: r293534 - in /webservices/axis2/trunk/java/modules: common/
common/src/org/apache/axis2/util/ integration/
saaj/src/org/apache/axis2/util/ security/
wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/
wsdl/src/org/apache/axis2/wsdl/util/ xml/src...
Author: ruchithf
Date: Mon Oct 3 22:23:22 2005
New Revision: 293534
URL: http://svn.apache.org/viewcvs?rev=293534&view=rev
Log:
Moving XMLUtils to 'common' module and removing duplicates
Added:
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Base64.java
- copied, changed from r293526, webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/Base64.java
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/DefaultEntityResolver.java
- copied, changed from r293525, webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/XMLUtils.java
- copied, changed from r293525, webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
Removed:
webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/util/XMLUtils.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/Base64.java
Modified:
webservices/axis2/trunk/java/modules/common/project.xml
webservices/axis2/trunk/java/modules/integration/project.xml
webservices/axis2/trunk/java/modules/security/project.xml
webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/DataHandlerUtils.java
webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
Modified: webservices/axis2/trunk/java/modules/common/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/project.xml?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/project.xml (original)
+++ webservices/axis2/trunk/java/modules/common/project.xml Mon Oct 3 22:23:22 2005
@@ -48,6 +48,22 @@
</properties>
</dependency>
<dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>${stax.api.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>axis</groupId>
+ <artifactId>axis-wsdl4j</artifactId>
+ <version>${axis.wsdl4j.version}</version>
+ <properties>
+ <module>true</module>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>maven-itest-plugin</groupId>
<artifactId>maven-itest-plugin</artifactId>
<version>${maven.itest.plugin.version}</version>
Copied: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Base64.java (from r293526, webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/Base64.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Base64.java?p2=webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Base64.java&p1=webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/Base64.java&r1=293526&r2=293534&rev=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/Base64.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/Base64.java Mon Oct 3 22:23:22 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.attachments;
+package org.apache.axis2.util;
import java.io.IOException;
import java.io.OutputStream;
Copied: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/DefaultEntityResolver.java (from r293525, webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/DefaultEntityResolver.java?p2=webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/DefaultEntityResolver.java&p1=webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java&r1=293525&r2=293534&rev=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/DefaultEntityResolver.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/DefaultEntityResolver.java Mon Oct 3 22:23:22 2005
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.util;
+package org.apache.axis2.util;
import org.xml.sax.InputSource;
Copied: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/XMLUtils.java (from r293525, webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/XMLUtils.java?p2=webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/XMLUtils.java&p1=webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java&r1=293525&r2=293534&rev=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/util/XMLUtils.java (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/util/XMLUtils.java Mon Oct 3 22:23:22 2005
@@ -14,10 +14,8 @@
* limitations under the License.
*/
-package org.apache.axis2.wsdl.util;
+package org.apache.axis2.util;
-import com.ibm.wsdl.Constants;
-import org.apache.axis2.attachments.Base64;
import org.w3c.dom.Attr;
import org.w3c.dom.CharacterData;
import org.w3c.dom.Document;
@@ -31,12 +29,6 @@
import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -47,6 +39,15 @@
import java.net.URL;
import java.net.URLConnection;
import java.util.Stack;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import com.ibm.wsdl.Constants;
public class XMLUtils {
Modified: webservices/axis2/trunk/java/modules/integration/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/project.xml?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/project.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/project.xml Mon Oct 3 22:23:22 2005
@@ -34,6 +34,11 @@
</dependency>
<dependency>
<groupId>axis2</groupId>
+ <artifactId>axis2-wsdl</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>axis2</groupId>
<artifactId>axis2-security</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
@@ -52,7 +57,7 @@
<dependency>
<groupId>axis2</groupId>
- <artifactId>axis2-wsdl</artifactId>
+ <artifactId>axis2-databinding</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
<dependency>
Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Mon Oct 3 22:23:22 2005
@@ -41,6 +41,11 @@
<artifactId>axis2-wsdl</artifactId>
<version>${pom.currentVersion}</version>
</dependency>
+ <dependency>
+ <groupId>axis2</groupId>
+ <artifactId>axis2-databinding</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
<dependency>
<groupId>axis2</groupId>
Modified: webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/wsdl/src/org/apache/axis2/wsdl/builder/wsdl4j/WSDL1ToWOMBuilder.java Mon Oct 3 22:23:22 2005
@@ -16,23 +16,24 @@
package org.apache.axis2.wsdl.builder.wsdl4j;
+import org.apache.axis2.util.XMLUtils;
import org.apache.axis2.wsdl.WSDLVersionWrapper;
import org.apache.axis2.wsdl.builder.WOMBuilder;
import org.apache.axis2.wsdl.builder.WSDLComponentFactory;
-import org.apache.axis2.wsdl.util.XMLUtils;
import org.apache.wsdl.WSDLDescription;
import org.apache.wsdl.impl.WSDLDescriptionImpl;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
public class WSDL1ToWOMBuilder implements WOMBuilder {
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/DataHandlerUtils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/DataHandlerUtils.java?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/DataHandlerUtils.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/attachments/DataHandlerUtils.java Mon Oct 3 22:23:22 2005
@@ -16,6 +16,8 @@
*/
package org.apache.axis2.attachments;
+import org.apache.axis2.util.Base64;
+
public class DataHandlerUtils {
public static Object getDataHandlerFromText(String value, String mimeType)
Modified: webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java?rev=293534&r1=293533&r2=293534&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java (original)
+++ webservices/axis2/trunk/java/modules/xml/src/org/apache/axis2/om/impl/llom/OMTextImpl.java Mon Oct 3 22:23:22 2005
@@ -17,7 +17,6 @@
package org.apache.axis2.om.impl.llom;
-import org.apache.axis2.attachments.Base64;
import org.apache.axis2.om.OMAttribute;
import org.apache.axis2.om.OMConstants;
import org.apache.axis2.om.OMElement;
@@ -27,12 +26,14 @@
import org.apache.axis2.om.OMXMLParserWrapper;
import org.apache.axis2.om.impl.OMOutputImpl;
import org.apache.axis2.om.impl.llom.mtom.MTOMStAXSOAPModelBuilder;
+import org.apache.axis2.util.Base64;
import org.apache.axis2.util.UUIDGenerator;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
import java.io.IOException;
import java.io.InputStream;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
public class OMTextImpl extends OMNodeImpl implements OMText, OMConstants {
protected String value = null;