Author: dims
Date: Sat Jun 2 08:32:48 2007
New Revision: 543752
URL: http://svn.apache.org/viewvc?view=rev&rev=543752
Log:
move a few classes from Java2WSDL module into kernel and switch around the
dependency, java2wsdl now depends on kernel
Added:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
(contents, props changed)
- copied, changed from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/
- copied from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/bytecode/
Removed:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/bytecode/
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
webservices/axis2/trunk/java/modules/java2wsdl/project.xml
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL11.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/kernel/project.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
Sat Jun 2 08:32:48 2007
@@ -25,12 +25,12 @@
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.databinding.typemapping.SimpleTypeMapper;
import org.apache.axis2.databinding.utils.reader.ADBXMLStreamReaderImpl;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
import org.apache.axis2.util.Loader;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jam.JClass;
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
(original)
+++
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/databinding/utils/reader/ADBXMLStreamReaderImpl.java
Sat Jun 2 08:32:48 2007
@@ -5,7 +5,7 @@
import org.apache.axiom.om.OMNamespace;
import org.apache.axis2.databinding.ADBBean;
import org.apache.axis2.databinding.utils.BeanUtil;
-import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import javax.activation.DataHandler;
import javax.xml.namespace.NamespaceContext;
Modified:
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Sat Jun 2 08:32:48 2007
@@ -16,13 +16,13 @@
import org.apache.axis2.databinding.utils.reader.NullXMLStreamReader;
import org.apache.axis2.description.AxisMessage;
import org.apache.axis2.description.AxisService;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.util.StreamWrapper;
import org.apache.ws.commons.schema.XmlSchemaComplexType;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.XmlSchemaSequence;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamReader;
@@ -30,7 +30,6 @@
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Arrays;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis2/trunk/java/modules/java2wsdl/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/pom.xml?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/pom.xml Sat Jun 2 08:32:48
2007
@@ -27,6 +27,11 @@
<name>Apache Axis 2.0 - Java2WSDL</name>
<description>To generate WSDL file for a given Java class</description>
<dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifactid}</artifactId>
Modified: webservices/axis2/trunk/java/modules/java2wsdl/project.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/project.xml?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/project.xml (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/project.xml Sat Jun 2
08:32:48 2007
@@ -27,6 +27,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${pom.currentVersion}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
<version>${axiom.version}</version>
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL11.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL11.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL11.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDL11.java
Sat Jun 2 08:32:48 2007
@@ -7,7 +7,8 @@
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.axis2.description.java2wsdl.TypeTable;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.codehaus.jam.JMethod;
import org.codehaus.jam.JClass;
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLBuilder.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,11 @@
package org.apache.ws.java2wsdl;
import org.apache.axiom.om.OMElement;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.SchemaGenerator;
+import org.apache.axis2.description.java2wsdl.NamespaceGenerator;
+import org.apache.axis2.description.java2wsdl.DefaultNamespaceGenerator;
+import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
import java.io.OutputStream;
import java.util.ArrayList;
@@ -149,7 +154,7 @@
* @throws Exception
*/
public void generateWSDL() throws Exception {
- SchemaGenerator schemaGenerator = new SchemaGenerator(classLoader,
+ SchemaGenerator schemaGenerator = new SchemaGenerator(classLoader,
className,
getSchemaTargetNamespace(),
getSchemaTargetNamespacePrefix());
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,8 @@
package org.apache.ws.java2wsdl;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLUtils;
import java.io.File;
import java.io.FileOutputStream;
@@ -11,7 +13,6 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Map;
-import java.util.Vector;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLTask.java
Sat Jun 2 08:32:48 2007
@@ -6,6 +6,7 @@
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Reference;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import java.util.ArrayList;
import java.util.HashMap;
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOption.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,6 @@
package org.apache.ws.java2wsdl.utils;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import java.util.ArrayList;
/*
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLCommandLineOptionParser.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,6 @@
package org.apache.ws.java2wsdl.utils;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import java.util.ArrayList;
import java.util.HashMap;
Modified:
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
(original)
+++
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/Java2WSDLOptionsValidator.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,6 @@
package org.apache.ws.java2wsdl.utils;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Sat Jun 2 08:32:48 2007
@@ -28,11 +28,6 @@
<description>Core Parts of Axis 2.0. This includes Axis 2.0 engine,
Client API, Addressing support, etc.,</description>
<dependencies>
<dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
Modified: webservices/axis2/trunk/java/modules/kernel/project.xml
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/project.xml?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/project.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/project.xml Sat Jun 2 08:32:48
2007
@@ -36,12 +36,6 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-java2wsdl</artifactId>
- <version>${pom.currentVersion}</version>
- </dependency>
-
<!-- external JARs -->
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/POJODeployer.java
Sat Jun 2 08:32:48 2007
@@ -7,6 +7,7 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.java2wsdl.AnnotationConstants;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.util.Loader;
import org.apache.axis2.wsdl.WSDLConstants;
@@ -15,7 +16,6 @@
import org.apache.axis2.i18n.Messages;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.java2wsdl.AnnotationConstants;
import org.codehaus.jam.JAnnotation;
import org.codehaus.jam.JClass;
import org.codehaus.jam.JamClassIterator;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Sat Jun 2 08:32:48 2007
@@ -33,6 +33,8 @@
import org.apache.axis2.description.ParameterInclude;
import org.apache.axis2.description.PolicyInclude;
import org.apache.axis2.description.WSDL2Constants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.TypeTable;
import org.apache.axis2.engine.MessageReceiver;
import org.apache.axis2.engine.ObjectSupplier;
import org.apache.axis2.engine.ServiceLifeCycle;
@@ -41,8 +43,6 @@
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
Sat Jun 2 08:32:48 2007
@@ -20,6 +20,10 @@
import org.apache.axis2.description.Flow;
import org.apache.axis2.description.HandlerDescription;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.java2wsdl.TypeTable;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.AnnotationConstants;
+import org.apache.axis2.description.java2wsdl.SchemaGenerator;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.engine.Handler;
import org.apache.axis2.engine.MessageReceiver;
@@ -28,10 +32,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.ws.java2wsdl.AnnotationConstants;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import org.codehaus.jam.JAnnotation;
import org.codehaus.jam.JMethod;
import org.codehaus.jam.JClass;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Sat Jun 2 08:32:48 2007
@@ -20,6 +20,10 @@
import org.apache.axiom.om.OMElement;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
+import org.apache.axis2.description.java2wsdl.TypeTable;
+import org.apache.axis2.description.java2wsdl.AnnotationConstants;
+import org.apache.axis2.description.java2wsdl.SchemaGenerator;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.addressing.AddressingConstants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
@@ -56,10 +60,6 @@
import org.apache.ws.commons.schema.XmlSchemaObjectCollection;
import org.apache.ws.commons.schema.utils.NamespaceMap;
import org.apache.ws.commons.schema.utils.NamespacePrefixList;
-import org.apache.ws.java2wsdl.AnnotationConstants;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
-import org.apache.ws.java2wsdl.SchemaGenerator;
-import org.apache.ws.java2wsdl.utils.TypeTable;
import org.codehaus.jam.JAnnotation;
import org.codehaus.jam.JMethod;
import org.w3c.dom.Document;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
Sat Jun 2 08:32:48 2007
@@ -15,12 +15,12 @@
import org.apache.axis2.util.WSDLSerializationUtil;
import org.apache.axis2.wsdl.SOAPHeaderMessage;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyReference;
import org.apache.neethi.PolicyRegistry;
import org.apache.ws.commons.schema.XmlSchema;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
import javax.xml.namespace.QName;
import java.io.StringReader;
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/AnnotationConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/AnnotationConstants.java
Sat Jun 2 08:32:48 2007
@@ -1,4 +1,4 @@
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/DefaultNamespaceGenerator.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
Sat Jun 2 08:32:48 2007
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
+
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
/**
* This class provides the default implementatoin for mapping java classes to
namespaces
@@ -28,7 +30,7 @@
public static final String SCHEMA_NAMESPACE_EXTN = "/xsd";
/* (non-Javadoc)
- * @see
org.apache.ws.java2wsdl.NamespaceGenerator#namespaceFromPackageName(java.lang.String)
+ * @see
org.apache.axis2.description.java2wsdl.NamespaceGenerator#namespaceFromPackageName(java.lang.String)
*/
public StringBuffer namespaceFromPackageName(String packageName) {
@@ -60,7 +62,7 @@
}
/* (non-Javadoc)
- * @see
org.apache.ws.java2wsdl.NamespaceGenerator#schemaNamespaceFromPackageName(java.lang.String)
+ * @see
org.apache.axis2.description.java2wsdl.NamespaceGenerator#schemaNamespaceFromPackageName(java.lang.String)
*/
public StringBuffer schemaNamespaceFromPackageName(String packageName) {
if (packageName.length() > 0) {
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/DefaultNamespaceGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLConstants.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
Sat Jun 2 08:32:48 2007
@@ -1,4 +1,4 @@
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLUtils.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
Sat Jun 2 08:32:48 2007
@@ -1,6 +1,9 @@
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
import org.apache.axiom.om.OMElement;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
+import org.apache.axis2.description.java2wsdl.NamespaceGenerator;
+import org.apache.axis2.description.java2wsdl.DefaultNamespaceGenerator;
import javax.xml.transform.Source;
import javax.xml.transform.Templates;
@@ -11,7 +14,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
-import java.io.StringReader;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/Java2WSDLUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/NamespaceGenerator.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
Sat Jun 2 08:32:48 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
/**
* This interface must be implemented to provide custom implemtations for,
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/NamespaceGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/SchemaGenerator.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
Sat Jun 2 08:32:48 2007
@@ -1,4 +1,4 @@
-package org.apache.ws.java2wsdl;
+package org.apache.axis2.description.java2wsdl;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaCollection;
@@ -10,8 +10,10 @@
import org.apache.ws.commons.schema.XmlSchemaImport;
import org.apache.ws.commons.schema.XmlSchemaSequence;
import org.apache.ws.commons.schema.utils.NamespaceMap;
-import org.apache.ws.java2wsdl.bytecode.MethodTable;
-import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.axis2.description.java2wsdl.bytecode.MethodTable;
+import org.apache.axis2.description.java2wsdl.TypeTable;
+import org.apache.axis2.description.java2wsdl.AnnotationConstants;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.codehaus.jam.JAnnotation;
@@ -36,7 +38,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import java.lang.reflect.Modifier;
/*
* Copyright 2004,2005 The Apache Software Foundation.
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/SchemaGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
(from r543740,
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java)
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java?view=diff&rev=543752&p1=webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java&r1=543740&p2=webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/utils/TypeTable.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
Sat Jun 2 08:32:48 2007
@@ -1,7 +1,6 @@
-package org.apache.ws.java2wsdl.utils;
+package org.apache.axis2.description.java2wsdl;
import org.apache.axiom.om.OMElement;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Propchange:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/TypeTable.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java?view=diff&rev=543752&r1=543740&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ChainedParamReader.java
Sat Jun 2 08:32:48 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ws.java2wsdl.bytecode;
+package org.apache.axis2.description.java2wsdl.bytecode;
import java.io.IOException;
import java.lang.reflect.Constructor;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java?view=diff&rev=543752&r1=543740&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ClassReader.java
Sat Jun 2 08:32:48 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ws.java2wsdl.bytecode;
+package org.apache.axis2.description.java2wsdl.bytecode;
import java.io.ByteArrayInputStream;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java?view=diff&rev=543752&r1=543740&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/MethodTable.java
Sat Jun 2 08:32:48 2007
@@ -1,4 +1,4 @@
-package org.apache.ws.java2wsdl.bytecode;
+package org.apache.axis2.description.java2wsdl.bytecode;
import java.lang.reflect.Method;
import java.util.HashMap;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java?view=diff&rev=543752&r1=543740&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamNameExtractor.java
Sat Jun 2 08:32:48 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ws.java2wsdl.bytecode;
+package org.apache.axis2.description.java2wsdl.bytecode;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java?view=diff&rev=543752&r1=543740&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/java2wsdl/bytecode/ParamReader.java
Sat Jun 2 08:32:48 2007
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.apache.ws.java2wsdl.bytecode;
+package org.apache.axis2.description.java2wsdl.bytecode;
import java.io.IOException;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Sat Jun 2 08:32:48 2007
@@ -26,6 +26,7 @@
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.deployment.util.PhasesInfo;
import org.apache.axis2.description.*;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.i18n.Messages;
import org.apache.axis2.phaseresolver.PhaseResolver;
import org.apache.axis2.transport.MessageFormatter;
@@ -33,7 +34,6 @@
import org.apache.axis2.util.Utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
import javax.xml.namespace.QName;
import java.net.URL;
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
(original)
+++
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/WSDLSerializationUtil.java
Sat Jun 2 08:32:48 2007
@@ -23,6 +23,7 @@
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisDescription;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.axis2.wsdl.SOAPHeaderMessage;
import org.apache.axis2.wsdl.SOAPModuleMessage;
@@ -34,7 +35,6 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMText;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
Modified:
webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
URL:
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java?view=diff&rev=543752&r1=543751&r2=543752
==============================================================================
---
webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
(original)
+++
webservices/axis2/trunk/java/modules/tool/axis2-java2wsdl-maven-plugin/src/main/java/org/apache/axis2/maven2/java2wsdl/Java2WSDLMojo.java
Sat Jun 2 08:32:48 2007
@@ -28,8 +28,8 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine;
-import org.apache.ws.java2wsdl.Java2WSDLConstants;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.apache.axis2.description.java2wsdl.Java2WSDLConstants;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
