axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdani...@apache.org
Subject svn commit: r745116 - in /webservices/axis2/trunk/java: ./ modules/codegen/ modules/codegen/test-resources/wsdls/ modules/codegen/test/org/apache/axis2/wsdl/ modules/codegen/test/org/apache/axis2/wsdl/codegen/ modules/codegen/test/org/apache/axis2/wsdl...
Date Tue, 17 Feb 2009 15:21:29 GMT
Author: gdaniels
Date: Tue Feb 17 15:21:27 2009
New Revision: 745116

URL: http://svn.apache.org/viewvc?rev=745116&view=rev
Log:
Merge changes from 1.5 branch.

Added:
    webservices/axis2/trunk/java/modules/codegen/build-wsdls.xml
      - copied, changed from r745088, webservices/axis2/branches/java/1_5/modules/codegen/build-wsdls.xml
    webservices/axis2/trunk/java/modules/codegen/test-resources/wsdls/
      - copied from r745088, webservices/axis2/branches/java/1_5/modules/codegen/test-resources/wsdls/
    webservices/axis2/trunk/java/modules/codegen/test-resources/wsdls/Version.wsdl
      - copied unchanged from r745088, webservices/axis2/branches/java/1_5/modules/codegen/test-resources/wsdls/Version.wsdl
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/XML2JavaMappingTest.java
      - copied unchanged from r745088, webservices/axis2/branches/java/1_5/modules/codegen/test/org/apache/axis2/wsdl/codegen/XML2JavaMappingTest.java
    webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/util/JavaUtilsTests.java
      - copied unchanged from r745088, webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/util/JavaUtilsTests.java
Modified:
    webservices/axis2/trunk/java/   (props changed)
    webservices/axis2/trunk/java/modules/codegen/pom.xml
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
    webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml

Propchange: webservices/axis2/trunk/java/
------------------------------------------------------------------------------
    svn:mergeinfo = /webservices/axis2/branches/java/1_5:745088

Copied: webservices/axis2/trunk/java/modules/codegen/build-wsdls.xml (from r745088, webservices/axis2/branches/java/1_5/modules/codegen/build-wsdls.xml)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/build-wsdls.xml?p2=webservices/axis2/trunk/java/modules/codegen/build-wsdls.xml&p1=webservices/axis2/branches/java/1_5/modules/codegen/build-wsdls.xml&r1=745088&r2=745116&rev=745116&view=diff
==============================================================================
--- webservices/axis2/branches/java/1_5/modules/codegen/build-wsdls.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/build-wsdls.xml Tue Feb 17 15:21:27 2009
@@ -24,8 +24,6 @@
 	<target name="wsdl-codegen" unless="test.skip">
 		<!-- Set a property that can be picked up from the ant build.xml's -->
 
-		<echo>Var is ${maven.class.path}</echo>
-
 		<property name="maven.junit.jvmargs" value="" />
 		<path id="maven.dependency.classpath">
 			<path refid="maven.compile.classpath" />

Modified: webservices/axis2/trunk/java/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/pom.xml?rev=745116&r1=745115&r2=745116&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/codegen/pom.xml Tue Feb 17 15:21:27 2009
@@ -33,15 +33,27 @@
     <description>Axis2 Code Generation module</description>
     <dependencies>
         <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-adb</artifactId>
-            <version>${version}</version>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>axis2-kernel</artifactId>
+          <version>${project.version}</version>
         </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>axis2-adb</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>axis2-transport-local</artifactId>
+        <version>${transport.local.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>axis2-transport-http</artifactId>
+        <version>${transport.http.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -94,31 +106,64 @@
             </testResource>
         </testResources>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <inherited>true</inherited>
+            <configuration>
+              <skip>false</skip>
+              <includes>
+                <include>**/*Test.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
-                    <execution>
-                        <id>process-resources</id>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <tasks>
-                                <tstamp>
-                                    <format property="build.time" pattern="MMM dd, yyyy
(hh:mm:ss z)" locale="en"/>
-                                </tstamp>
-                                <copy toDir="${basedir}/target/classes/" overwrite="true"
filtering="on">
-                                    <fileset dir="${basedir}/src/" includes="**/*.xsl"/>
-                                    <filterset begintoken="#" endtoken="#">
-                                        <filter token="axisVersion" value="${version}"/>
-                                        <filter token="today" value=" Built on : ${build.time}"/>
-                                    </filterset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
+                  <execution>
+                    <id>generate-test-sources</id>
+                    <phase>generate-test-sources</phase>
+                    <configuration>
+                      <tasks>
+                        <!-- Set a property that can be picked up from the ant build.xml's
-->
+                        <property name="maven.class.path" refid="maven.test.classpath"/>
+                        <echo>Building WSDLs...</echo>
+                        <property name="axis2.home" value="${basedir}/../target"/>
+                        <property name="maven.junit.jvmargs" value=""/>
+                        <path id="maven.dependency.classpath">
+                          <path refid="maven.compile.classpath"/>
+                        </path>
+                        <ant antfile="build-wsdls.xml" inheritall="true" inheritrefs="true"
+                             dir="." target="wsdl-codegen"/>
+                      </tasks>
+                    </configuration>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </execution>
+                  <execution>
+                    <id>process-resources</id>
+                    <phase>process-resources</phase>
+                    <configuration>
+                      <tasks>
+                        <tstamp>
+                          <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss
z)" locale="en"/>
+                        </tstamp>
+                        <copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
+                          <fileset dir="${basedir}/src/" includes="**/*.xsl"/>
+                          <filterset begintoken="#" endtoken="#">
+                            <filter token="axisVersion" value="${version}"/>
+                            <filter token="today" value=" Built on : ${build.time}"/>
+                          </filterset>
+                        </copy>
+                      </tasks>
+                    </configuration>
+                    <goals>
+                      <goal>run</goal>
+                    </goals>
+                  </execution>
                 </executions>
             </plugin>
         </plugins>

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java?rev=745116&r1=745115&r2=745116&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/WSDLServiceBuilderTest.java
Tue Feb 17 15:21:27 2009
@@ -55,13 +55,12 @@
         outLocation.mkdirs();
         if (testResourceFile.exists()) {
             File files [] = testResourceFile.listFiles();
-            for (int i = 0; i < files.length; i++) {
-                File file1 = files[i];
+            for (File file1 : files) {
                 if (file1.isFile() && file1.getName().endsWith(".wsdl")) {
                     if (file1.getName().equals("ping-modified.wsdl") ||
-                            file1.getName().equals("ping-unbound.wsdl") ||
-                            file1.getName().equals("wsat.wsdl") ||
-                            file1.getName().equals("no-service.wsdl")) {
+                        file1.getName().equals("ping-unbound.wsdl") ||
+                        file1.getName().equals("wsat.wsdl") ||
+                        file1.getName().equals("no-service.wsdl")) {
                         continue;
                     }
                     try {

Modified: webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java?rev=745116&r1=745115&r2=745116&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java
(original)
+++ webservices/axis2/trunk/java/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java
Tue Feb 17 15:21:27 2009
@@ -21,19 +21,16 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.namespace.Constants;
-import org.apache.axis2.wsdl.codegen.schema.exception.DummySchemaGenerationException;
 
 import javax.xml.namespace.QName;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 
 public class AxisServiceTopElementSchemaGeneratorTest extends TestCase {
 
-    public void testSchemaGeneration(){
+    public void testSchemaGeneration() throws Exception {
 
         AxisServiceTopElementSchemaGenerator schemaGenerator = new AxisServiceTopElementSchemaGenerator(null);
 
@@ -61,19 +58,12 @@
         topElement.setTypeQName(new QName("http://test2.com","testComplexType2"));
         topElements.add(topElement);
 
-
         Map schemaMap = schemaGenerator.getSchemaMap(topElements);
-        try {
-            List xmlSchemaList = schemaGenerator.getXmlSchemaList(schemaMap);
-            org.apache.ws.commons.schema.XmlSchema xmlSchema;
-            for (Iterator iter = xmlSchemaList.iterator();iter.hasNext();){
-                xmlSchema = (org.apache.ws.commons.schema.XmlSchema) iter.next();
-//                xmlSchema.write(System.out);
-            }
-        } catch (DummySchemaGenerationException e) {
-            e.printStackTrace();  //To change body of catch statement use File | Settings
| File Templates.
-        }
+        schemaGenerator.getXmlSchemaList(schemaMap);
 
+//        List xmlSchemaList = schemaGenerator.getXmlSchemaList(schemaMap);
+//        for (Object aXmlSchemaList : xmlSchemaList) {
+//            ((org.apache.ws.commons.schema.XmlSchema)aXmlSchemaList).write(System.out);
+//        }
     }
-
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml?rev=745116&r1=745115&r2=745116&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/axis2_default.xml
Tue Feb 17 15:21:27 2009
@@ -154,13 +154,13 @@
         <!--uncomment following parameter , and set as you required.-->
         <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     <!--</transportReceiver>-->
+    <!--<transportSender name="tcp"-->
+                   <!--class="org.apache.axis2.transport.tcp.TCPTransportSender"/>-->
 
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp"
-                     class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local"
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"



Mime
View raw message