You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/14 09:47:02 UTC
svn commit: r1398029 - in /axis/axis1/java/trunk: ./ axis-ant/ axis-codegen/
axis-codegen/src/ axis-codegen/src/main/ axis-codegen/src/main/java/
axis-codegen/src/main/java/org/ axis-codegen/src/main/java/org/apache/
axis-codegen/src/main/java/org/apac...
Author: veithen
Date: Sun Oct 14 07:47:01 2012
New Revision: 1398029
URL: http://svn.apache.org/viewvc?rev=1398029&view=rev
Log:
Moved the code generator to a separate Maven module.
Added:
axis/axis1/java/trunk/axis-codegen/ (with props)
axis/axis1/java/trunk/axis-codegen/pom.xml (with props)
axis/axis1/java/trunk/axis-codegen/src/
axis/axis1/java/trunk/axis-codegen/src/main/
axis/axis1/java/trunk/axis-codegen/src/main/java/
axis/axis1/java/trunk/axis-codegen/src/main/java/org/
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/
- copied from r1397948, axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/toJava/
axis/axis1/java/trunk/axis-codegen/src/test/
axis/axis1/java/trunk/axis-codegen/src/test/java/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/
axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java (with props)
Removed:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/toJava/
Modified:
axis/axis1/java/trunk/axis-ant/pom.xml
axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestJavaUtils.java
axis/axis1/java/trunk/axis-tools/pom.xml
axis/axis1/java/trunk/axis/pom.xml
axis/axis1/java/trunk/integration/pom.xml
axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/pom.xml
axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-ant/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-ant/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-ant/pom.xml (original)
+++ axis/axis1/java/trunk/axis-ant/pom.xml Sun Oct 14 07:47:01 2012
@@ -41,6 +41,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>ant</groupId>
<artifactId>ant</artifactId>
<version>1.5.1</version>
Propchange: axis/axis1/java/trunk/axis-codegen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 14 07:47:01 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: axis/axis1/java/trunk/axis-codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/pom.xml?rev=1398029&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-codegen/pom.xml (added)
+++ axis/axis1/java/trunk/axis-codegen/pom.xml Sun Oct 14 07:47:01 2012
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<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>
+ <parent>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>axis-codegen</artifactId>
+ <name>Code Generator</name>
+ <url>${baseUrl}/codegen</url>
+ <distributionManagement>
+ <site>
+ <id>axis</id>
+ <url>${baseSiteUrl}/codegen</url>
+ </site>
+ </distributionManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ <report>dependencies</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Propchange: axis/axis1/java/trunk/axis-codegen/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java?rev=1398029&r1=1397948&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java (original)
+++ axis/axis1/java/trunk/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java Sun Oct 14 07:47:01 2012
@@ -1062,17 +1062,6 @@ public class Utils extends org.apache.ax
isXsNode(type.getNode(), "attributeGroup")))));
}
-
- /**
- * Determines if the DOM Node represents an xs:<node>
- */
- public static boolean isXsNode (Node node, String nameName)
- {
- return (node.getLocalName().equals(nameName)
- && Constants.isSchemaXSD (node.getNamespaceURI ()));
- }
-
-
public static QName getItemQName(TypeEntry te) {
if (te instanceof DefinedElement) {
te = te.getRefType();
Added: axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java?rev=1398029&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java (added)
+++ axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java Sun Oct 14 07:47:01 2012
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis.wsdl.toJava;
+
+import junit.framework.TestCase;
+
+public class TestUtils extends TestCase {
+ /**
+ * Test for Bug 17995 - wsdl2java converts namespace to uncompilable packages
+ */
+ public void testPackageNaming() {
+ assertEquals("_0._1.util.liberty", Utils.makePackageName("urn:liberty:util:1.0"));
+ }
+}
Propchange: axis/axis1/java/trunk/axis-codegen/src/test/java/org/apache/axis/wsdl/toJava/TestUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java (original)
+++ axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java Sun Oct 14 07:47:01 2012
@@ -23,9 +23,9 @@ import org.apache.axis.wsdl.symbolTable.
import org.apache.axis.wsdl.symbolTable.ServiceEntry;
import org.apache.axis.wsdl.symbolTable.SymTabEntry;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
-import org.apache.axis.wsdl.toJava.Utils;
import org.apache.axis.wsdl.symbolTable.Type;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
+import org.apache.axis.wsdl.symbolTable.Utils;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java (original)
+++ axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java Sun Oct 14 07:47:01 2012
@@ -1065,4 +1065,13 @@ public class Utils {
String ret = (String)TYPES.get(type);
return (ret == null) ? type : ret;
}
+
+ /**
+ * Determines if the DOM Node represents an xs:<node>
+ */
+ public static boolean isXsNode (Node node, String nameName)
+ {
+ return (node.getLocalName().equals(nameName)
+ && Constants.isSchemaXSD (node.getNamespaceURI ()));
+ }
}
Modified: axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestJavaUtils.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestJavaUtils.java?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestJavaUtils.java (original)
+++ axis/axis1/java/trunk/axis-rt-core/src/test/java/test/utils/TestJavaUtils.java Sun Oct 14 07:47:01 2012
@@ -2,7 +2,6 @@ package test.utils;
import junit.framework.TestCase;
import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.wsdl.toJava.Utils;
import javax.xml.rpc.holders.ByteHolder;
import javax.xml.rpc.holders.LongHolder;
@@ -96,13 +95,6 @@ public class TestJavaUtils extends TestC
}
/**
- * Test for Bug 17995 - wsdl2java converts namespace to uncompilable packages
- */
- public void testPackageNaming() {
- assertEquals("_0._1.util.liberty", Utils.makePackageName("urn:liberty:util:1.0"));
- }
-
- /**
* test the convert() function
* verify that we can convert to the Collection, List, and Set interfaces
* NOTE : These should be split out into separate tests...
Modified: axis/axis1/java/trunk/axis-tools/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-tools/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-tools/pom.xml (original)
+++ axis/axis1/java/trunk/axis-tools/pom.xml Sun Oct 14 07:47:01 2012
@@ -43,6 +43,11 @@
<artifactId>axis-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<reporting>
<plugins>
Modified: axis/axis1/java/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Sun Oct 14 07:47:01 2012
@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>axis-tools</artifactId>
<version>${project.version}</version>
</dependency>
@@ -68,6 +73,7 @@
<includes>
<include>${project.groupId}:axis-rt-core</include>
<include>${project.groupId}:axis-rt-databinding-castor</include>
+ <include>${project.groupId}:axis-codegen</include>
<include>${project.groupId}:axis-tools</include>
</includes>
</artifactSet>
Modified: axis/axis1/java/trunk/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/integration/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/integration/pom.xml (original)
+++ axis/axis1/java/trunk/integration/pom.xml Sun Oct 14 07:47:01 2012
@@ -35,6 +35,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>axis-standalone-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/pom.xml (original)
+++ axis/axis1/java/trunk/maven/maven-java2wsdl-plugin/pom.xml Sun Oct 14 07:47:01 2012
@@ -45,6 +45,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>nsmap</artifactId>
<version>${project.version}</version>
</dependency>
Modified: axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml (original)
+++ axis/axis1/java/trunk/maven/maven-wsdl2java-plugin/pom.xml Sun Oct 14 07:47:01 2012
@@ -45,6 +45,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>axis-codegen</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>nsmap</artifactId>
<version>${project.version}</version>
</dependency>
Modified: axis/axis1/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1398029&r1=1398028&r2=1398029&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Sun Oct 14 07:47:01 2012
@@ -58,23 +58,24 @@
<inceptionYear>2000</inceptionYear>
<modules>
<module>axis</module>
- <module>axis-rt-core</module>
- <module>axis-jaxrpc</module>
- <module>axis-saaj</module>
<module>axis-ant</module>
- <module>maven</module>
- <module>axis-standalone-server</module>
+ <module>axis-codegen</module>
+ <module>axis-jaxrpc</module>
+ <module>axis-jms</module>
+ <module>axis-rt-core</module>
<module>axis-rt-databinding-castor</module>
<module>axis-rt-transports-http-javanet</module>
- <module>axis-jms</module>
+ <module>axis-saaj</module>
+ <module>axis-standalone-server</module>
<module>axis-testutils</module>
<module>axis-tools</module>
+ <module>axis-war</module>
+ <module>distribution</module>
<module>integration</module>
- <module>interop-mock</module>
<module>interop</module>
- <module>axis-war</module>
+ <module>interop-mock</module>
+ <module>maven</module>
<module>samples</module>
- <module>distribution</module>
</modules>
<dependencyManagement>
<dependencies>