You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ews-dev@ws.apache.org by he...@apache.org on 2005/02/14 05:26:14 UTC
svn commit: r153710 [1/3] - in webservices/ews/trunk: ./ conf/
samples/clients/ samples/ejb/bookquote/ samples/ejb/echo/
samples/ejb/google/ samples/ejb/math/ samples/ejb/time/ samples/ejb/zip/
samples/servlet/echo/ samples/servlet/echo/org/apache/ws/echosample/
samples/servlet/math/ schema/ src/org/apache/geronimo/ews/jaxrpcmapping/
src/org/apache/geronimo/ews/ws4j2ee/context/
src/org/apache/geronimo/ews/ws4j2ee/context/impl/
src/org/apache/geronimo/ews/ws4j2ee/module/
src/org/apache/geronimo/ews/ws4j2ee/parsers/
src/org/apache/geronimo/ews/ws4j2ee/toWs/
src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/
src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/
src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/
src/org/apache/geronimo/ews/ws4j2ee/utils/
src/org/apache/geronimo/ews/ws4j2ee/utils/packager/
src/org/apache/geronimo/ews/ws4j2ee/wsutils/
test/org/apache/geronimo/ews/ws4j2ee/
test/org/apache/geronimo/ews/ws4j2ee/providerUsage/
test/org/apache/geronimo/ews/ws4j2ee/seviceRef/ test/testData/math/
Author: hemapani
Date: Sun Feb 13 20:26:05 2005
New Revision: 153710
URL: http://svn.apache.org/viewcvs?view=rev&rev=153710
Log:
make ews work on axis RC3,update the build
Added:
webservices/ews/trunk/conf/common.xml (with props)
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java (with props)
Removed:
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/PropertyStore.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/TemporaryRepository.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/
Modified:
webservices/ews/trunk/conf/jndi.properties
webservices/ews/trunk/conf/ws4j2ee.properties
webservices/ews/trunk/maven.xml
webservices/ews/trunk/samples/clients/ClientTest.java
webservices/ews/trunk/samples/ejb/bookquote/build.xml
webservices/ews/trunk/samples/ejb/echo/build.xml
webservices/ews/trunk/samples/ejb/google/build.xml
webservices/ews/trunk/samples/ejb/math/webservices.xml
webservices/ews/trunk/samples/ejb/time/build.xml
webservices/ews/trunk/samples/ejb/zip/build.xml
webservices/ews/trunk/samples/servlet/echo/build.xml
webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/Echo.java
webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoBean.java
webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoStruct.java
webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/SmallEchoStruct.java
webservices/ews/trunk/samples/servlet/math/webservices.xml
webservices/ews/trunk/schema/XMLSchema.dtd
webservices/ews/trunk/schema/datatypes.dtd
webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeBindingWriter.java
webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeEmitter.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/WebEndpointWrapperClassWriter.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java
webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ImplBeanPool.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/GenerateWithoutWSDLTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/WebDDTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java
webservices/ews/trunk/test/org/apache/geronimo/ews/ws4j2ee/seviceRef/ServiceRefTest.java
webservices/ews/trunk/test/testData/math/webservices.xml
Added: webservices/ews/trunk/conf/common.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/conf/common.xml?view=auto&rev=153710
==============================================================================
--- webservices/ews/trunk/conf/common.xml (added)
+++ webservices/ews/trunk/conf/common.xml Sun Feb 13 20:26:05 2005
@@ -0,0 +1,76 @@
+ <property name="build.sysclasspath" value="last"/>
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="maven.repo.local" location="${user.home}/.maven/repository"/>
+
+
+ <!---
+ <property file="ewx.properties"></property>
+ expcted properties
+ mapping.file
+ webservice.file
+ wsdl.file
+ -->
+
+
+
+ <path id="classpath" >
+ <path refid="local.classpath"/>
+ <pathelement location="target/classes"/>
+ <pathelement location="classes"/>
+ <fileset dir="${maven.repo.local}">
+ <include name="axis/**/*.jar"/>
+ <include name="commons-logging/**/*.jar"/>
+ <include name="commons-discovery/**/*.jar"/>
+ <include name="geronimo-spec/**/*.jar"/>
+ <include name="geronimo/**/*.jar"/>
+ <include name="sec/**/*.jar"/>
+ <include name="dom4j/**/*.jar"/>
+ <include name="jaxb-ri/**/*.jar"/>
+ <include name="xerces/**/*.jar"/>
+ <include name="ews/**/*.jar"/>
+ <include name="openejb/**/*.jar"/>
+ </fileset>
+ </path>
+
+ <target name="init">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <mkdir dir="${build.lib}"/>
+ </target>
+
+ <target name="compile" depends="init,copy-j2ee-resources">
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+
+
+
+ <target name="jar" depends="compile">
+ <copy todir="${build.classes}" preservelastmodified="true">
+ <fileset dir="${src}">
+ <include name="*.properties"/>
+ <include name="META-INF/*.xml"/>
+ <include name="WEB-INF/*.xml"/>
+ <include name="META-INF/*.wsdl"/>
+ <include name="META-INF/*.wsdd"/>
+ <include name="WEB-INF/*.wsdl"/>
+ <include name="WEB-INF/*.wsdd"/>
+ <include name="*.wsdl"/>
+ <include name="*.wsdd"/>
+ <exclude name="build**"/>
+ </fileset>
+ </copy>
+
+ <jar jarfile="echo-ewsimpl.jar" basedir="${build.classes}" />
+ </target>
+
+ <target name="dist" depends="jar"/>
+ <target name="clean">
+ <delete dir="${build}"/>
+ </target>
Propchange: webservices/ews/trunk/conf/common.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: webservices/ews/trunk/conf/jndi.properties
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/conf/jndi.properties?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/conf/jndi.properties (original)
+++ webservices/ews/trunk/conf/jndi.properties Sun Feb 13 20:26:05 2005
@@ -18,7 +18,7 @@
##
## Default JNDI Properties
##
-## $Revision: 1.2 $ $Date: 2004/07/28 15:21:23 $
+## $Revision: 1.2 $ $Date$
##
java.naming.factory.initial=com.sun.jndi.rmi.registry.RegistryContextFactory
Modified: webservices/ews/trunk/conf/ws4j2ee.properties
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/conf/ws4j2ee.properties?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/conf/ws4j2ee.properties (original)
+++ webservices/ews/trunk/conf/ws4j2ee.properties Sun Feb 13 20:26:05 2005
@@ -1,7 +1,7 @@
-maven.repo.local=/home/hemapani/.maven/repository
-j2ee-container-dd=geronimo.xml
-ws4j2ee-provider=j2ee
-axis-host=127.0.0.1
-axis-port=8080
-axis-webapps-lib=C:/Servers/jakarta-tomcat-4.1.12/webapps/axis/WEB-INF/lib
+maven.repo.local=/home/hemapani/.maven/repository
+j2ee-container-dd=geronimo.xml
+ws4j2ee-provider=j2ee
+axis-host=127.0.0.1
+axis-port=8080
+axis-webapps-lib=C:/Servers/jakarta-tomcat-4.1.12/webapps/axis/WEB-INF/lib
ejb-deploy=C:/Servers/jboss-3.2.3/server/default/deploy
Modified: webservices/ews/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/maven.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/maven.xml (original)
+++ webservices/ews/trunk/maven.xml Sun Feb 13 20:26:05 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- $Revision: 1.21 $ $Date: 2004/10/27 14:54:09 $ -->
+<!-- $Revision: 1.21 $ $Date$ -->
<project default="jar"
xmlns:j="jelly:core"
@@ -121,12 +121,14 @@
<preGoal name="test:test">
<j:jelly xmlns="jelly:ant">
- <ant:java classname="org.apache.geronimo.ews.ws4j2ee.utils.PropertyStore" fork="no" >
+ <!--
+ <ant:java classname="org.apache.geronimo.ews.ws4j2ee.utils.PropertyStore" fork="no" >
<ant:arg value="${maven.repo.local}"/>
<ant:classpath>
<pathelement location="${basedir}/target/classes"/>
</ant:classpath>
</ant:java>
+ -->
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/ejb/bookquote"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/ejb/google"/>
Modified: webservices/ews/trunk/samples/clients/ClientTest.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/clients/ClientTest.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/clients/ClientTest.java (original)
+++ webservices/ews/trunk/samples/clients/ClientTest.java Sun Feb 13 20:26:05 2005
@@ -1,56 +1,56 @@
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.rmi.RemoteException;
-
-import javax.xml.rpc.ServiceException;
-
-import junit.framework.TestCase;
-
-import org.apache.ws.echosample.Echo;
-import org.apache.ws.echosample.EchoServiceLocator;
-import org.apache.ws.echosample.EchoStruct;
-
-import com.jwsbook.jaxrpc.BookQuote;
-import com.jwsbook.jaxrpc.BookQuoteServiceLocator;
-
-
-public class ClientTest extends TestCase{
- public void testClients() throws Exception{
- try{
-// File file = new File("./conf/wsdd/client/secuirty-client-config.wsdd");
-// if(!file.exists())
-// throw new RuntimeException();
- System.setProperty("axis.ClientConfigFile",file.getAbsolutePath());
- BookQuoteServiceLocator locater = new BookQuoteServiceLocator();
- BookQuote port = locater.getBookQuotePort(new URL("http://127.0.0.1:5555/axis/services/BookQuotePort"));
- System.out.println("return value is "+port.getBookPrice("hello"));
-
- EchoServiceLocator elocator = new EchoServiceLocator();
- Echo eport = elocator.getechoPort(new URL("http://127.0.0.1:5555/axis/services/echoPort"));
-
- boolean booleanValue = true;
- double doubleValue = 124565;
- byte[] bytes = "hello".getBytes();
- float floatValue = 245235f;
- int intValue = 234;
- long longValue = 23453536;
- short shortvalue = new Short("23").shortValue();
- EchoStruct struct = new EchoStruct();
- struct.setStrVal("Hi");
-
- assertEquals(eport.echoBoolean(true),true);
- assertEquals(eport.echoDouble(doubleValue),doubleValue,2);
- System.out.println(eport.echoBytes(bytes));
- assertTrue(eport.echoFloat(floatValue) == floatValue);
- assertEquals(eport.echoInt(intValue),intValue);
- assertEquals(eport.echoLong(longValue),longValue);
- assertEquals(eport.echoStruct(struct),struct);
- assertEquals(eport.echoShort(shortvalue),shortvalue);
- }catch(Exception e){
- e.printStackTrace();
- throw e;
- }
- }
-}
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.rmi.RemoteException;
+
+import javax.xml.rpc.ServiceException;
+
+import junit.framework.TestCase;
+
+import org.apache.ws.echosample.Echo;
+import org.apache.ws.echosample.EchoServiceLocator;
+import org.apache.ws.echosample.EchoStruct;
+
+import com.jwsbook.jaxrpc.BookQuote;
+import com.jwsbook.jaxrpc.BookQuoteServiceLocator;
+
+
+public class ClientTest extends TestCase{
+ public void testClients() throws Exception{
+ try{
+// File file = new File("./conf/wsdd/client/secuirty-client-config.wsdd");
+// if(!file.exists())
+// throw new RuntimeException();
+ System.setProperty("axis.ClientConfigFile",file.getAbsolutePath());
+ BookQuoteServiceLocator locater = new BookQuoteServiceLocator();
+ BookQuote port = locater.getBookQuotePort(new URL("http://127.0.0.1:5555/axis/services/BookQuotePort"));
+ System.out.println("return value is "+port.getBookPrice("hello"));
+
+ EchoServiceLocator elocator = new EchoServiceLocator();
+ Echo eport = elocator.getechoPort(new URL("http://127.0.0.1:5555/axis/services/echoPort"));
+
+ boolean booleanValue = true;
+ double doubleValue = 124565;
+ byte[] bytes = "hello".getBytes();
+ float floatValue = 245235f;
+ int intValue = 234;
+ long longValue = 23453536;
+ short shortvalue = new Short("23").shortValue();
+ EchoStruct struct = new EchoStruct();
+ struct.setStrVal("Hi");
+
+ assertEquals(eport.echoBoolean(true),true);
+ assertEquals(eport.echoDouble(doubleValue),doubleValue,2);
+ System.out.println(eport.echoBytes(bytes));
+ assertTrue(eport.echoFloat(floatValue) == floatValue);
+ assertEquals(eport.echoInt(intValue),intValue);
+ assertEquals(eport.echoLong(longValue),longValue);
+ assertEquals(eport.echoStruct(struct),struct);
+ assertEquals(eport.echoShort(shortvalue),shortvalue);
+ }catch(Exception e){
+ e.printStackTrace();
+ throw e;
+ }
+ }
+}
Modified: webservices/ews/trunk/samples/ejb/bookquote/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/bookquote/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/bookquote/build.xml (original)
+++ webservices/ews/trunk/samples/ejb/bookquote/build.xml Sun Feb 13 20:26:05 2005
@@ -1,55 +1,55 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
- <property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
- <target name="compile" depends="init" unless="jars.uptodate">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
- <target name="jar" depends="compile" unless="jars.uptodate" >
- <mkdir dir="${build.classes}/META-INF/"/>
- <copy file ="${basedir}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
- <copy file ="${basedir}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
- <mkdir dir="${jar.dir}"/>
- <jar jarfile="${jar.dir}/bookquote.jar" basedir="${build.classes}" >
- <include name="**" />
- </jar>
-
- <copy todir="${build.classes}/META-INF">
- <fileset dir="${basedir}/META-INF/">
- <include name="**/*.xml"/>
- <exclude name="build.xml"/>
- </fileset>
- </copy>
-
- <copy file ="${jar.dir}/bookquote.jar" todir="${build.classes}"/>
- <jar jarfile="${jar.dir}/bookquote.ear" basedir="${build.classes}">
- <include name="**/webservices.xml" />
- <include name="**/application.xml" />
- <include name="**/*.jar" />
- <include name="**/*.war" />
- </jar>
-
- <delete dir="${build}"/>
- </target>
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/bookquote.jar">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are up to date = ${jars.uptodate}"></echo>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+ <target name="jar" depends="compile" unless="jars.uptodate" >
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <copy file ="${basedir}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
+ <copy file ="${basedir}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
+ <mkdir dir="${jar.dir}"/>
+ <jar jarfile="${jar.dir}/bookquote.jar" basedir="${build.classes}" >
+ <include name="**" />
+ </jar>
+
+ <copy todir="${build.classes}/META-INF">
+ <fileset dir="${basedir}/META-INF/">
+ <include name="**/*.xml"/>
+ <exclude name="build.xml"/>
+ </fileset>
+ </copy>
+
+ <copy file ="${jar.dir}/bookquote.jar" todir="${build.classes}"/>
+ <jar jarfile="${jar.dir}/bookquote.ear" basedir="${build.classes}">
+ <include name="**/webservices.xml" />
+ <include name="**/application.xml" />
+ <include name="**/*.jar" />
+ <include name="**/*.war" />
+ </jar>
+
+ <delete dir="${build}"/>
+ </target>
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/bookquote.jar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </target>
+
+</project>
Modified: webservices/ews/trunk/samples/ejb/echo/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/echo/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/echo/build.xml (original)
+++ webservices/ews/trunk/samples/ejb/echo/build.xml Sun Feb 13 20:26:05 2005
@@ -1,47 +1,47 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
- <property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
- <target name="compile" depends="init" unless="jars.uptodate">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
- <target name="jar" depends="compile" unless="jars.uptodate">
- <mkdir dir="${build.classes}/META-INF/"/>
- <copy file ="${basedir}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
- <copy file ="${basedir}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
- <mkdir dir="${jar.dir}"/>
- <jar jarfile="${jar.dir}/echo.jar" basedir="${build.classes}" >
- <include name="**" />
- </jar>
-
- <copy todir="${build.classes}/META-INF">
- <fileset dir="${basedir}/META-INF/">
- <include name="**/*.xml"/>
- <exclude name="build.xml"/>
- </fileset>
- </copy>
- <delete dir="${build}"/>
- </target>
-
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are up to date = ${jars.uptodate}"></echo>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <copy file ="${basedir}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
+ <copy file ="${basedir}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
+ <mkdir dir="${jar.dir}"/>
+ <jar jarfile="${jar.dir}/echo.jar" basedir="${build.classes}" >
+ <include name="**" />
+ </jar>
+
+ <copy todir="${build.classes}/META-INF">
+ <fileset dir="${basedir}/META-INF/">
+ <include name="**/*.xml"/>
+ <exclude name="build.xml"/>
+ </fileset>
+ </copy>
+ <delete dir="${build}"/>
+ </target>
+
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </target>
+
+</project>
Modified: webservices/ews/trunk/samples/ejb/google/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/google/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/google/build.xml (original)
+++ webservices/ews/trunk/samples/ejb/google/build.xml Sun Feb 13 20:26:05 2005
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
- <property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
-
- <target name="compile" depends="init" unless="jars.uptodate">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
- <target name="jar" depends="compile" unless="jars.uptodate">
- <mkdir dir="${build.classes}/META-INF/"/>
- <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
- <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
-
- <jar jarfile="${jar.dir}/google.jar" basedir="${build.classes}" >
- <include name="**" />
- <manifest>
- <section name="org/apache/ws4j2ee">
- <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
- <attribute name="Implementation-Vendor" value="Apache Web Services"/>
- </section>
- </manifest>
- </jar>
- <delete dir="${build}"/>
- </target>
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/google.jar">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are up to date = ${jars.uptodate}"></echo>
- </target>
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
+ <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
+
+ <jar jarfile="${jar.dir}/google.jar" basedir="${build.classes}" >
+ <include name="**" />
+ <manifest>
+ <section name="org/apache/ws4j2ee">
+ <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
+ <attribute name="Implementation-Vendor" value="Apache Web Services"/>
+ </section>
+ </manifest>
+ </jar>
+ <delete dir="${build}"/>
+ </target>
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/google.jar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </target>
+</project>
Modified: webservices/ews/trunk/samples/ejb/math/webservices.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/math/webservices.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/math/webservices.xml (original)
+++ webservices/ews/trunk/samples/ejb/math/webservices.xml Sun Feb 13 20:26:05 2005
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:ns1="http://www.Monson-Haefel.com/jwsbook/BookQuote"
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-http://www.ibm.com/standards/xml/webservices/j2ee/j2ee_web_services_1_1.xsd" version="1.1">
-<webservice-description>
- <webservice-description-name>MathFaceService</webservice-description-name>
- <wsdl-file>math.wsdl</wsdl-file>
- <jaxrpc-mapping-file>jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>MathFace</port-component-name>
- <wsdl-port xmlns:ns1="http://math.testData">ns1:math</wsdl-port>
- <service-endpoint-interface>testData.math.MathFace</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link >MathFace</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
+<?xml version="1.0" encoding="UTF-8"?>
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:ns1="http://www.Monson-Haefel.com/jwsbook/BookQuote"
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+http://www.ibm.com/standards/xml/webservices/j2ee/j2ee_web_services_1_1.xsd" version="1.1">
+<webservice-description>
+ <webservice-description-name>MathFaceService</webservice-description-name>
+ <wsdl-file>math.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>MathFace</port-component-name>
+ <wsdl-port xmlns:ns1="http://math.testData">ns1:math</wsdl-port>
+ <service-endpoint-interface>testData.math.MathFace</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link >MathFace</ejb-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Modified: webservices/ews/trunk/samples/ejb/time/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/time/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/time/build.xml (original)
+++ webservices/ews/trunk/samples/ejb/time/build.xml Sun Feb 13 20:26:05 2005
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
- <property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
-
- <target name="compile" depends="init" unless="jars.uptodate">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
- <target name="jar" depends="compile" unless="jars.uptodate">
- <mkdir dir="${build.classes}/META-INF/"/>
- <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
- <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
-
- <jar jarfile="${jar.dir}/time.jar" basedir="${build.classes}" >
- <include name="**" />
- <manifest>
- <section name="org/apache/ws4j2ee">
- <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
- <attribute name="Implementation-Vendor" value="Apache Web Services"/>
- </section>
- </manifest>
- </jar>
- <delete dir="${build}"/>
- </target>
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/time.jar">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are upto date = ${jars.uptodate}"></echo>
- </target>
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
+ <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
+
+ <jar jarfile="${jar.dir}/time.jar" basedir="${build.classes}" >
+ <include name="**" />
+ <manifest>
+ <section name="org/apache/ws4j2ee">
+ <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
+ <attribute name="Implementation-Vendor" value="Apache Web Services"/>
+ </section>
+ </manifest>
+ </jar>
+ <delete dir="${build}"/>
+ </target>
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/time.jar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are upto date = ${jars.uptodate}"></echo>
+ </target>
+</project>
Modified: webservices/ews/trunk/samples/ejb/zip/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/ejb/zip/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/ejb/zip/build.xml (original)
+++ webservices/ews/trunk/samples/ejb/zip/build.xml Sun Feb 13 20:26:05 2005
@@ -1,45 +1,45 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
-<property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
-
- <target name="compile" unless="jars.uptodate" depends="init">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
- <target name="jar" depends="compile" unless="jars.uptodate">
- <mkdir dir="${build.classes}/META-INF/"/>
- <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
- <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
-
- <jar jarfile="${jar.dir}/zip.jar" basedir="${build.classes}" >
- <include name="**" />
- <manifest>
- <section name="org/apache/ws4j2ee">
- <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
- <attribute name="Implementation-Vendor" value="Apache Web Services"/>
- </section>
- </manifest>
- </jar>
- <delete dir="${build}"/>
- </target>
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/zip.jar">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are upto date = ${jars.uptodate}"></echo>
- </target>
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+<property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+
+ <target name="compile" unless="jars.uptodate" depends="init">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <mkdir dir="${build.classes}/META-INF/"/>
+ <copy file ="${src}/META-INF/webservices.xml" todir="${build.classes}/META-INF"/>
+ <copy file ="${src}/META-INF/ejb-jar.xml" todir="${build.classes}/META-INF"/>
+
+ <jar jarfile="${jar.dir}/zip.jar" basedir="${build.classes}" >
+ <include name="**" />
+ <manifest>
+ <section name="org/apache/ws4j2ee">
+ <attribute name="Implementation-Title" value="Apache jsr109 impl"/>
+ <attribute name="Implementation-Vendor" value="Apache Web Services"/>
+ </section>
+ </manifest>
+ </jar>
+ <delete dir="${build}"/>
+ </target>
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/zip.jar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are upto date = ${jars.uptodate}"></echo>
+ </target>
+</project>
Modified: webservices/ews/trunk/samples/servlet/echo/build.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/echo/build.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/echo/build.xml (original)
+++ webservices/ews/trunk/samples/servlet/echo/build.xml Sun Feb 13 20:26:05 2005
@@ -1,43 +1,43 @@
-<?xml version="1.0"?>
-<project basedir="." default="jar">
- <property name="src" location="."/>
- <property name="build" location="build"/>
- <property name="build.classes" location="${build}/WEB-INF/classes"/>
- <property name="build.lib" location="${build}/lib"/>
- <property name="lib" location="lib"/>
- <property name="jar.dir" location="../../../target/generated/samples/"/>
-
- <target name="compile" depends="init" unless="jars.uptodate">
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- <javac destdir="${build.classes}" debug="on">
- <classpath refid="maven.dependency.classpath" />
- <src path="${src}"/>
- </javac>
- </target>
-
- <target name="jar" depends="compile" unless="jars.uptodate">
- <copy file ="${basedir}/WEB-INF/webservices.xml" todir="${build.classes}/.."/>
- <copy file ="${basedir}/WEB-INF/web.xml" todir="${build.classes}/.."/>
- <mkdir dir="${jar.dir}"/>
-
- <jar jarfile="${jar.dir}/echo.war" basedir="${build}" >
- <include name="**/*.class" />
- <include name="**/*.xml" />
- </jar>
- <delete dir="${build}"/>
- </target>
-
- <target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.war">
- <srcfiles dir="${src}">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.wsdl"/>
- <exclude name="${build}/**"/>
- </srcfiles>
- </uptodate>
- <echo message="the files are up to date = ${jars.uptodate}"></echo>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/WEB-INF/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="jar.dir" location="../../../target/generated/samples/"/>
+
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="maven.dependency.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <copy file ="${basedir}/WEB-INF/webservices.xml" todir="${build.classes}/.."/>
+ <copy file ="${basedir}/WEB-INF/web.xml" todir="${build.classes}/.."/>
+ <mkdir dir="${jar.dir}"/>
+
+ <jar jarfile="${jar.dir}/echo.war" basedir="${build}" >
+ <include name="**/*.class" />
+ <include name="**/*.xml" />
+ </jar>
+ <delete dir="${build}"/>
+ </target>
+
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.war">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </target>
+
+</project>
Modified: webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/Echo.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/Echo.java (original)
+++ webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/Echo.java Sun Feb 13 20:26:05 2005
@@ -1,17 +1,17 @@
-package org.apache.ws.echosample;
-public interface Echo extends java.rmi.Remote {
- public void echoVoid()throws java.rmi.RemoteException;
- public int echoInt(int in)throws java.rmi.RemoteException;
- public double echoDouble(double in)throws java.rmi.RemoteException;
- public float echoFloat(float in)throws java.rmi.RemoteException;
- public boolean echoBoolean(boolean in)throws java.rmi.RemoteException;
- public String echoString(String in)throws java.rmi.RemoteException;
- public short echoShort(short in)throws java.rmi.RemoteException;
- public long echoLong(long in)throws java.rmi.RemoteException;
- //public char echoChar(char in);
- public byte[] echoBytes(byte[] in)throws java.rmi.RemoteException;
- public void echoEvoid()throws java.rmi.RemoteException;
- public EchoStruct echoStruct(EchoStruct in)throws java.rmi.RemoteException;
- //public EchoStruct[] echoAStruct(EchoStruct[] in)throws java.rmi.RemoteException;
-
-}
+package org.apache.ws.echosample;
+public interface Echo extends java.rmi.Remote {
+ public void echoVoid()throws java.rmi.RemoteException;
+ public int echoInt(int in)throws java.rmi.RemoteException;
+ public double echoDouble(double in)throws java.rmi.RemoteException;
+ public float echoFloat(float in)throws java.rmi.RemoteException;
+ public boolean echoBoolean(boolean in)throws java.rmi.RemoteException;
+ public String echoString(String in)throws java.rmi.RemoteException;
+ public short echoShort(short in)throws java.rmi.RemoteException;
+ public long echoLong(long in)throws java.rmi.RemoteException;
+ //public char echoChar(char in);
+ public byte[] echoBytes(byte[] in)throws java.rmi.RemoteException;
+ public void echoEvoid()throws java.rmi.RemoteException;
+ public EchoStruct echoStruct(EchoStruct in)throws java.rmi.RemoteException;
+ //public EchoStruct[] echoAStruct(EchoStruct[] in)throws java.rmi.RemoteException;
+
+}
Modified: webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoBean.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoBean.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoBean.java (original)
+++ webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoBean.java Sun Feb 13 20:26:05 2005
@@ -1,48 +1,48 @@
-
-package org.apache.ws.echosample;
-public class EchoBean implements Echo{
- public void ejbCreate() {}
-
- public void echoVoid(){}
- public int echoInt(int in){
- return in;
- }
- public double echoDouble(double in){
- return in;
- }
- public float echoFloat(float in){
- return in;
- }
- public boolean echoBoolean(boolean in){
- return in;
- }
- public String echoString(String in){
- return in;
- }
- public short echoShort(short in){
- return in;
- }
- public long echoLong(long in){
- return in;
- }
- public char echoChar(char in){
- return in;
- }
- public byte[] echoBytes(byte[] in){
- return in;
- }
- public void echoEvoid(){
-
- }
- public EchoStruct echoStruct(EchoStruct in){
- return in;
- }
-// public EchoStruct[] echoAStruct(EchoStruct[] in){
-// return in;
-// }
-
- public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException {}
- public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException {}
- public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException {}
- public void setSessionContext(javax.ejb.SessionContext arg0)throws javax.ejb.EJBException, java.rmi.RemoteException {}
-}
+
+package org.apache.ws.echosample;
+public class EchoBean implements Echo{
+ public void ejbCreate() {}
+
+ public void echoVoid(){}
+ public int echoInt(int in){
+ return in;
+ }
+ public double echoDouble(double in){
+ return in;
+ }
+ public float echoFloat(float in){
+ return in;
+ }
+ public boolean echoBoolean(boolean in){
+ return in;
+ }
+ public String echoString(String in){
+ return in;
+ }
+ public short echoShort(short in){
+ return in;
+ }
+ public long echoLong(long in){
+ return in;
+ }
+ public char echoChar(char in){
+ return in;
+ }
+ public byte[] echoBytes(byte[] in){
+ return in;
+ }
+ public void echoEvoid(){
+
+ }
+ public EchoStruct echoStruct(EchoStruct in){
+ return in;
+ }
+// public EchoStruct[] echoAStruct(EchoStruct[] in){
+// return in;
+// }
+
+ public void ejbActivate() throws javax.ejb.EJBException, java.rmi.RemoteException {}
+ public void ejbPassivate() throws javax.ejb.EJBException, java.rmi.RemoteException {}
+ public void ejbRemove() throws javax.ejb.EJBException, java.rmi.RemoteException {}
+ public void setSessionContext(javax.ejb.SessionContext arg0)throws javax.ejb.EJBException, java.rmi.RemoteException {}
+}
Modified: webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoStruct.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoStruct.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoStruct.java (original)
+++ webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/EchoStruct.java Sun Feb 13 20:26:05 2005
@@ -1,285 +1,285 @@
-package org.apache.ws.echosample;
-
-import java.io.Serializable;
-
-public class EchoStruct implements Serializable{
- private int intVal;
- private double doubleVal;
- private byte[] bytesVal;
- private float floatVal;
- private long longVal;
- private short shortVal;
- private boolean boolaenVal;
-
- private String strVal;
-
- private int[] intaVal;
- private double[] doubleaVal;
- private byte[][] bytesaVal;
- private float[] floataVal;
- private long[] longaVal;
- private short[] shortaVal;
- private boolean[] boolaenaVal;
-
- private String[] straVal;
-
- private SmallEchoStruct sturctVal;
- private SmallEchoStruct sturctaVal;
-
- /**
- * @return
- */
- public boolean[] getBoolaenaVal() {
- return boolaenaVal;
- }
-
- /**
- * @return
- */
- public boolean isBoolaenVal() {
- return boolaenVal;
- }
-
- /**
- * @return
- */
- public byte[][] getBytesaVal() {
- return bytesaVal;
- }
-
- /**
- * @return
- */
- public byte[] getBytesVal() {
- return bytesVal;
- }
-
-
-
-
- /**
- * @return
- */
- public double[] getDoubleaVal() {
- return doubleaVal;
- }
-
- /**
- * @return
- */
- public double getDoubleVal() {
- return doubleVal;
- }
-
- /**
- * @return
- */
- public float[] getFloataVal() {
- return floataVal;
- }
-
- /**
- * @return
- */
- public float getFloatVal() {
- return floatVal;
- }
-
- /**
- * @return
- */
- public int[] getIntaVal() {
- return intaVal;
- }
-
- /**
- * @return
- */
- public int getIntVal() {
- return intVal;
- }
-
- /**
- * @return
- */
- public long[] getLongaVal() {
- return longaVal;
- }
-
- /**
- * @return
- */
- public long getLongVal() {
- return longVal;
- }
-
- /**
- * @return
- */
- public short[] getShortaVal() {
- return shortaVal;
- }
-
- /**
- * @return
- */
- public short getShortVal() {
- return shortVal;
- }
-
- /**
- * @return
- */
- public String[] getStraVal() {
- return straVal;
- }
-
- /**
- * @return
- */
- public String getStrVal() {
- return strVal;
- }
-
- /**
- * @param bs
- */
- public void setBoolaenaVal(boolean[] bs) {
- boolaenaVal = bs;
- }
-
- /**
- * @param b
- */
- public void setBoolaenVal(boolean b) {
- boolaenVal = b;
- }
-
- /**
- * @param bs
- */
- public void setBytesaVal(byte[][] bs) {
- bytesaVal = bs;
- }
-
- /**
- * @param bs
- */
- public void setBytesVal(byte[] bs) {
- bytesVal = bs;
- }
-
-
- /**
- * @param ds
- */
- public void setDoubleaVal(double[] ds) {
- doubleaVal = ds;
- }
-
- /**
- * @param d
- */
- public void setDoubleVal(double d) {
- doubleVal = d;
- }
-
- /**
- * @param fs
- */
- public void setFloataVal(float[] fs) {
- floataVal = fs;
- }
-
- /**
- * @param f
- */
- public void setFloatVal(float f) {
- floatVal = f;
- }
-
- /**
- * @param is
- */
- public void setIntaVal(int[] is) {
- intaVal = is;
- }
-
- /**
- * @param i
- */
- public void setIntVal(int i) {
- intVal = i;
- }
-
- /**
- * @param ls
- */
- public void setLongaVal(long[] ls) {
- longaVal = ls;
- }
-
- /**
- * @param l
- */
- public void setLongVal(long l) {
- longVal = l;
- }
-
- /**
- * @param ses
- */
- public void setShortaVal(short[] ses) {
- shortaVal = ses;
- }
-
- /**
- * @param s
- */
- public void setShortVal(short s) {
- shortVal = s;
- }
-
- /**
- * @param strings
- */
- public void setStraVal(String[] strings) {
- straVal = strings;
- }
-
- /**
- * @param string
- */
- public void setStrVal(String string) {
- strVal = string;
- }
-
- /**
- * @return
- */
- public SmallEchoStruct getSturctaVal() {
- return sturctaVal;
- }
-
- /**
- * @return
- */
- public SmallEchoStruct getSturctVal() {
- return sturctVal;
- }
-
- /**
- * @param struct
- */
- public void setSturctaVal(SmallEchoStruct struct) {
- sturctaVal = struct;
- }
-
- /**
- * @param struct
- */
- public void setSturctVal(SmallEchoStruct struct) {
- sturctVal = struct;
- }
-
-}
+package org.apache.ws.echosample;
+
+import java.io.Serializable;
+
+public class EchoStruct implements Serializable{
+ private int intVal;
+ private double doubleVal;
+ private byte[] bytesVal;
+ private float floatVal;
+ private long longVal;
+ private short shortVal;
+ private boolean boolaenVal;
+
+ private String strVal;
+
+ private int[] intaVal;
+ private double[] doubleaVal;
+ private byte[][] bytesaVal;
+ private float[] floataVal;
+ private long[] longaVal;
+ private short[] shortaVal;
+ private boolean[] boolaenaVal;
+
+ private String[] straVal;
+
+ private SmallEchoStruct sturctVal;
+ private SmallEchoStruct sturctaVal;
+
+ /**
+ * @return
+ */
+ public boolean[] getBoolaenaVal() {
+ return boolaenaVal;
+ }
+
+ /**
+ * @return
+ */
+ public boolean isBoolaenVal() {
+ return boolaenVal;
+ }
+
+ /**
+ * @return
+ */
+ public byte[][] getBytesaVal() {
+ return bytesaVal;
+ }
+
+ /**
+ * @return
+ */
+ public byte[] getBytesVal() {
+ return bytesVal;
+ }
+
+
+
+
+ /**
+ * @return
+ */
+ public double[] getDoubleaVal() {
+ return doubleaVal;
+ }
+
+ /**
+ * @return
+ */
+ public double getDoubleVal() {
+ return doubleVal;
+ }
+
+ /**
+ * @return
+ */
+ public float[] getFloataVal() {
+ return floataVal;
+ }
+
+ /**
+ * @return
+ */
+ public float getFloatVal() {
+ return floatVal;
+ }
+
+ /**
+ * @return
+ */
+ public int[] getIntaVal() {
+ return intaVal;
+ }
+
+ /**
+ * @return
+ */
+ public int getIntVal() {
+ return intVal;
+ }
+
+ /**
+ * @return
+ */
+ public long[] getLongaVal() {
+ return longaVal;
+ }
+
+ /**
+ * @return
+ */
+ public long getLongVal() {
+ return longVal;
+ }
+
+ /**
+ * @return
+ */
+ public short[] getShortaVal() {
+ return shortaVal;
+ }
+
+ /**
+ * @return
+ */
+ public short getShortVal() {
+ return shortVal;
+ }
+
+ /**
+ * @return
+ */
+ public String[] getStraVal() {
+ return straVal;
+ }
+
+ /**
+ * @return
+ */
+ public String getStrVal() {
+ return strVal;
+ }
+
+ /**
+ * @param bs
+ */
+ public void setBoolaenaVal(boolean[] bs) {
+ boolaenaVal = bs;
+ }
+
+ /**
+ * @param b
+ */
+ public void setBoolaenVal(boolean b) {
+ boolaenVal = b;
+ }
+
+ /**
+ * @param bs
+ */
+ public void setBytesaVal(byte[][] bs) {
+ bytesaVal = bs;
+ }
+
+ /**
+ * @param bs
+ */
+ public void setBytesVal(byte[] bs) {
+ bytesVal = bs;
+ }
+
+
+ /**
+ * @param ds
+ */
+ public void setDoubleaVal(double[] ds) {
+ doubleaVal = ds;
+ }
+
+ /**
+ * @param d
+ */
+ public void setDoubleVal(double d) {
+ doubleVal = d;
+ }
+
+ /**
+ * @param fs
+ */
+ public void setFloataVal(float[] fs) {
+ floataVal = fs;
+ }
+
+ /**
+ * @param f
+ */
+ public void setFloatVal(float f) {
+ floatVal = f;
+ }
+
+ /**
+ * @param is
+ */
+ public void setIntaVal(int[] is) {
+ intaVal = is;
+ }
+
+ /**
+ * @param i
+ */
+ public void setIntVal(int i) {
+ intVal = i;
+ }
+
+ /**
+ * @param ls
+ */
+ public void setLongaVal(long[] ls) {
+ longaVal = ls;
+ }
+
+ /**
+ * @param l
+ */
+ public void setLongVal(long l) {
+ longVal = l;
+ }
+
+ /**
+ * @param ses
+ */
+ public void setShortaVal(short[] ses) {
+ shortaVal = ses;
+ }
+
+ /**
+ * @param s
+ */
+ public void setShortVal(short s) {
+ shortVal = s;
+ }
+
+ /**
+ * @param strings
+ */
+ public void setStraVal(String[] strings) {
+ straVal = strings;
+ }
+
+ /**
+ * @param string
+ */
+ public void setStrVal(String string) {
+ strVal = string;
+ }
+
+ /**
+ * @return
+ */
+ public SmallEchoStruct getSturctaVal() {
+ return sturctaVal;
+ }
+
+ /**
+ * @return
+ */
+ public SmallEchoStruct getSturctVal() {
+ return sturctVal;
+ }
+
+ /**
+ * @param struct
+ */
+ public void setSturctaVal(SmallEchoStruct struct) {
+ sturctaVal = struct;
+ }
+
+ /**
+ * @param struct
+ */
+ public void setSturctVal(SmallEchoStruct struct) {
+ sturctVal = struct;
+ }
+
+}
Modified: webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/SmallEchoStruct.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/SmallEchoStruct.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/SmallEchoStruct.java (original)
+++ webservices/ews/trunk/samples/servlet/echo/org/apache/ws/echosample/SmallEchoStruct.java Sun Feb 13 20:26:05 2005
@@ -1,37 +1,37 @@
-
-package org.apache.ws.echosample;
-
-import java.io.Serializable;
-
-public class SmallEchoStruct implements Serializable{
- private String val1;
- private String val2;
- /**
- * @return
- */
- public String getVal1() {
- return val1;
- }
-
- /**
- * @return
- */
- public String getVal2() {
- return val2;
- }
-
- /**
- * @param string
- */
- public void setVal1(String string) {
- val1 = string;
- }
-
- /**
- * @param string
- */
- public void setVal2(String string) {
- val2 = string;
- }
-
-}
+
+package org.apache.ws.echosample;
+
+import java.io.Serializable;
+
+public class SmallEchoStruct implements Serializable{
+ private String val1;
+ private String val2;
+ /**
+ * @return
+ */
+ public String getVal1() {
+ return val1;
+ }
+
+ /**
+ * @return
+ */
+ public String getVal2() {
+ return val2;
+ }
+
+ /**
+ * @param string
+ */
+ public void setVal1(String string) {
+ val1 = string;
+ }
+
+ /**
+ * @param string
+ */
+ public void setVal2(String string) {
+ val2 = string;
+ }
+
+}
Modified: webservices/ews/trunk/samples/servlet/math/webservices.xml
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/samples/servlet/math/webservices.xml?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/samples/servlet/math/webservices.xml (original)
+++ webservices/ews/trunk/samples/servlet/math/webservices.xml Sun Feb 13 20:26:05 2005
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:ns1="http://www.Monson-Haefel.com/jwsbook/BookQuote"
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-http://www.ibm.com/standards/xml/webservices/j2ee/j2ee_web_services_1_1.xsd" version="1.1">
-<webservice-description>
- <webservice-description-name>MathFaceService</webservice-description-name>
- <wsdl-file>math.wsdl</wsdl-file>
- <jaxrpc-mapping-file>jaxrpc-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>MathFace</port-component-name>
- <wsdl-port xmlns:ns1="http://math.testData">ns1:math</wsdl-port>
- <service-endpoint-interface>testData.math.MathFace</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>MathFace</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
+<?xml version="1.0" encoding="UTF-8"?>
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:ns1="http://www.Monson-Haefel.com/jwsbook/BookQuote"
+xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+http://www.ibm.com/standards/xml/webservices/j2ee/j2ee_web_services_1_1.xsd" version="1.1">
+<webservice-description>
+ <webservice-description-name>MathFaceService</webservice-description-name>
+ <wsdl-file>math.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>MathFace</port-component-name>
+ <wsdl-port xmlns:ns1="http://math.testData">ns1:math</wsdl-port>
+ <service-endpoint-interface>testData.math.MathFace</service-endpoint-interface>
+ <service-impl-bean>
+ <servlet-link>MathFace</servlet-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
Modified: webservices/ews/trunk/schema/XMLSchema.dtd
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/schema/XMLSchema.dtd?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/schema/XMLSchema.dtd (original)
+++ webservices/ews/trunk/schema/XMLSchema.dtd Sun Feb 13 20:26:05 2005
@@ -1,7 +1,7 @@
<!-- DTD for XML Schemas: Part 1: Structures
Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.1 2004/02/01 22:06:39 dims Exp $ -->
+<!-- $Id$ -->
<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
<!-- prose copy in the structures REC is the definitive version --> <!--d-->
<!-- (which shouldn't differ from this one except for this --> <!--d-->
Modified: webservices/ews/trunk/schema/datatypes.dtd
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/schema/datatypes.dtd?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/schema/datatypes.dtd (original)
+++ webservices/ews/trunk/schema/datatypes.dtd Sun Feb 13 20:26:05 2005
@@ -1,6 +1,6 @@
<!--
DTD for XML Schemas: Part 2: Datatypes
- $Id: datatypes.dtd,v 1.1 2004/02/01 22:06:38 dims Exp $
+ $Id$
Note this DTD is NOT normative, or even definitive. - - the
prose copy in the datatypes REC is the definitive version
(which shouldn't differ from this one except for this comment
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeBindingWriter.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeBindingWriter.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeBindingWriter.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeBindingWriter.java Sun Feb 13 20:26:05 2005
@@ -98,12 +98,7 @@
protected Generator getJavaImplWriter(J2eeEmitter emitter,
BindingEntry bEntry,
SymbolTable st) {
-// if(emitter.isUsedbyws4j2ee()){
-// return null;
-// }else{
-// return new J2eeImplWriter(emitter, bEntry, st);
-// }
- return null;//new J2eeImplWriter(emitter, bEntry, st);
+ return new J2eeImplWriter(emitter, bEntry, st);
}
/**
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeEmitter.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeEmitter.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeEmitter.java Sun Feb 13 20:26:05 2005
@@ -410,15 +410,19 @@
// A CollectionElement is an array that might need a holder
-// boolean isType = (type instanceof Type ||
-// type instanceof CollectionElement);
-// if (type.getNode() != null &&
-// type.isReferenced() &&
-// isType &&
-// type.getBaseType() == null) {
- Generator gen = getFactory().getGenerator(type, symbolTable);
- gen.generate();
-// }
+
+
+ boolean isType = ((type instanceof Type)
+ || (type instanceof CollectionElement));
+
+ if ((type.getNode() != null)
+ && !type.getNode().getLocalName().equals("attributeGroup")
+ && type.isReferenced() && isType
+ && (type.getBaseType() == null)) {
+ Generator gen = getFactory().getGenerator(type, symbolTable);
+
+ gen.generate();
+ }
}
Map types = symbolTable.getTypeIndex();
Collection typeCollection = types.values();
@@ -441,6 +445,7 @@
isType &&
type.getBaseType() == null) {
Generator gen = getFactory().getGenerator(type, symbolTable);
+ //System.out.println("B= " +type.getQName());
gen.generate();
}
}
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java Sun Feb 13 20:26:05 2005
@@ -16,7 +16,6 @@
package org.apache.geronimo.ews.ws4j2ee.context;
-import java.util.HashMap;
import java.util.Map;
import org.apache.geronimo.ews.jaxrpcmapping.J2eeEmitter;
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java Sun Feb 13 20:26:05 2005
@@ -16,7 +16,6 @@
package org.apache.geronimo.ews.ws4j2ee.context.impl;
-import java.util.HashMap;
import java.util.Map;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java Sun Feb 13 20:26:05 2005
@@ -19,8 +19,6 @@
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.UnrecoverableGenerationFault;
import org.apache.geronimo.ews.ws4j2ee.utils.FileUtils;
-import org.apache.geronimo.ews.ws4j2ee.utils.UncompressingJarClassLoader;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -35,7 +33,6 @@
*/
public class EARModule implements Module {
private Module pkgModule;
- private UncompressingJarClassLoader cl;
private Vector classPathElements;
private ClassLoader parentCL;
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java Sun Feb 13 20:26:05 2005
@@ -20,7 +20,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.impl.EJBDDContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.EJBContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.utils.EWSUtils;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -44,7 +43,7 @@
public void parse(InputStream inputStream) throws GenerationFault {
try {
- Document doc = EWSUtils.createDocument(inputStream);
+ Document doc = Utils.createDocument(inputStream);
Element root = doc.getDocumentElement();
NodeList beaneles = root.getElementsByTagName("enterprise-beans");
if (beaneles.getLength() > 0) {
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java Sun Feb 13 20:26:05 2005
@@ -19,7 +19,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.webservices.client.ServiceReferanceImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferanceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.utils.EWSUtils;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -52,7 +51,7 @@
public ServiceReferanceParser(InputStream inputStream) throws GenerationFault {
try {
- Document doc = EWSUtils.createDocument(inputStream);
+ Document doc = Utils.createDocument(inputStream);
Element root = doc.getDocumentElement();
Element serviceref = findServiceReferance(root);
if (serviceref != null)
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java Sun Feb 13 20:26:05 2005
@@ -21,7 +21,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.WebContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.UnrecoverableGenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.utils.EWSUtils;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -55,7 +54,7 @@
}
public void parse(InputStream inputStream) throws GenerationFault {
- Document doc = EWSUtils.createDocument(inputStream);
+ Document doc = Utils.createDocument(inputStream);
Element root = doc.getDocumentElement();
NodeList sevlele = root.getElementsByTagName("servlet");
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java Sun Feb 13 20:26:05 2005
@@ -21,7 +21,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.impl.EJBDDContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.EJBContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.utils.EWSUtils;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -48,7 +47,7 @@
EjbJarDocument ejbjarDoc = EjbJarDocument.Factory.parse(inputStream);
EjbJarDocument.EjbJar ejbjar = ejbjarDoc.getEjbJar();
ejbjar.selectPath("ejb-jar/enterprise-beans/session/home");
- Document doc = EWSUtils.createDocument(inputStream);
+ Document doc = Utils.createDocument(inputStream);
Element root = doc.getDocumentElement();
NodeList beaneles = root.getElementsByTagName("enterprise-beans");
if (beaneles.getLength() > 0) {
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java Sun Feb 13 20:26:05 2005
@@ -59,8 +59,4 @@
public Generator createWebContainerDDGenerator(J2EEWebServiceContext j2eewscontext)
throws GenerationFault;
-
- public Generator createPropertyFileGenerator(J2EEWebServiceContext j2eewscontext)
- throws GenerationFault;
-
}
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java Sun Feb 13 20:26:05 2005
@@ -90,10 +90,6 @@
factory.getGenerationFactory().createBuildFileGenerator(wscontext);
if (buildFileGen != null)
buildFileGen.generate();
- Generator propertyFileGen =
- factory.getGenerationFactory().createPropertyFileGenerator(wscontext);
- if (propertyFileGen != null)
- propertyFileGen.generate();
}
public void executeAnt() throws GenerationFault {
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java Sun Feb 13 20:26:05 2005
@@ -597,9 +597,7 @@
// }
// Default to SOAP 1.2 JAX-RPC mapping
- if (emitter.getDefaultTypeMapping() == null) {
- emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
- }
+ emitter.setDefaultTypeMapping(DefaultTypeMappingImpl.getSingleton());
return true; // a-OK
}
Modified: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java?view=diff&r1=153709&r2=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java (original)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java Sun Feb 13 20:26:05 2005
@@ -34,8 +34,7 @@
import org.apache.geronimo.ews.ws4j2ee.toWs.ejb.EJBRemoteWriter;
import org.apache.geronimo.ews.ws4j2ee.toWs.ejb.SessionBeanWriter;
import org.apache.geronimo.ews.ws4j2ee.toWs.handlers.HandlerGenerator;
-import org.apache.geronimo.ews.ws4j2ee.toWs.misc.BuildFileGenerator;
-import org.apache.geronimo.ews.ws4j2ee.toWs.misc.PropertyFileGenerator;
+import org.apache.geronimo.ews.ws4j2ee.toWs.misc.BuildFileConfigurer;
import org.apache.geronimo.ews.ws4j2ee.toWs.wrapperWs.WrapperWsGenerator;
import org.apache.geronimo.ews.ws4j2ee.toWs.ws.ClientSideWsGenerator;
import org.apache.geronimo.ews.ws4j2ee.toWs.ws.ServerSideWsGenerator;
@@ -112,17 +111,12 @@
public Generator createBuildFileGenerator(J2EEWebServiceContext j2eewscontext)
throws GenerationFault {
- return new BuildFileGenerator(j2eewscontext);
+ return new BuildFileConfigurer(j2eewscontext);
}
public Generator createWebContainerDDGenerator(J2EEWebServiceContext j2eewscontext)
throws GenerationFault {
return new WebContainerDDGenerator(j2eewscontext);
- }
-
- public Generator createPropertyFileGenerator(J2EEWebServiceContext j2eewscontext)
- throws GenerationFault {
- return new PropertyFileGenerator(j2eewscontext);
}
}
Added: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java
URL: http://svn.apache.org/viewcvs/webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java?view=auto&rev=153710
==============================================================================
--- webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java (added)
+++ webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java Sun Feb 13 20:26:05 2005
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.geronimo.ews.ws4j2ee.toWs.misc;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.ews.ws4j2ee.context.InputOutputFile;
+import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
+import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
+import org.apache.geronimo.ews.ws4j2ee.toWs.Generator;
+import org.apache.geronimo.ews.ws4j2ee.toWs.dd.JaxrpcMapperGenerator;
+import org.apache.geronimo.ews.ws4j2ee.utils.FileUtils;
+
+/**
+ * @author Srinath Perera(hemapani@opensource.lk)
+ */
+public class BuildFileConfigurer implements Generator {
+ private J2EEWebServiceContext j2eewscontext;
+
+ protected static Log log =
+ LogFactory.getLog(JaxrpcMapperGenerator.class.getName());
+
+ public BuildFileConfigurer(J2EEWebServiceContext j2eewscontext) throws GenerationFault {
+ this.j2eewscontext = j2eewscontext;
+ }
+
+ public void generate() throws GenerationFault {
+ try {
+ FileUtils.copyFile(new File("conf/common.xml"),new File(j2eewscontext.getMiscInfo().getOutPutPath() + "/common.xml"));
+
+ String buildfile = j2eewscontext.getMiscInfo().getOutPutPath() + "/build.xml";
+ if (j2eewscontext.getMiscInfo().isVerbose())
+ log.info("genarating " + buildfile + ".................");
+ PrintWriter out = new PrintWriter(new FileWriter(buildfile));
+
+
+ out.write("<?xml version=\"1.0\"?>\n");
+ out.write("<!DOCTYPE project [\n");
+ out.write(" <!ENTITY properties SYSTEM \"file:common.xml\">\n");
+ out.write("]>\n");
+ out.write("<project basedir=\".\" default=\"dist\">\n");
+
+ out.write("\t&properties;\n");
+
+ writeproperty("mapping.file",j2eewscontext.getMiscInfo().getJaxrpcfile(), out);
+ writeproperty("wsdl.file",j2eewscontext.getMiscInfo().getWsdlFile(), out);
+ writeproperty("webservice.file",j2eewscontext.getMiscInfo().getWsconffile(), out);
+
+ out.write(" <path id=\"local.classpath\" >\n");
+ File file = new File(".");
+ File tempfile = new File(file,"target/classes");
+ if(tempfile.exists()){
+ out.write(" <pathelement location=\""+tempfile.getCanonicalPath()+"\"/>\n");
+ }
+
+ tempfile = new File(file,"target/test-classes");
+ if(tempfile.exists()){
+ out.write(" <pathelement location=\""+tempfile.getCanonicalPath()+"\"/>\n");
+ }
+
+ ArrayList classpathelements = j2eewscontext.getMiscInfo().getClasspathElements();
+ if (classpathelements != null) {
+ for (int i = 0; i < classpathelements.size(); i++) {
+ File pathFile = (File) classpathelements.get(i);
+ System.out.println(pathFile.getName());
+ out.write(" <pathelement location=\""
+ + pathFile.getCanonicalPath() + "\"/>\n");
+ }
+ }
+ out.write(" </path>\n");
+
+
+
+
+ out.write("\t<target name=\"copy-j2ee-resources\">\n");
+
+
+
+ for (int i = 0; i < classpathelements.size(); i++) {
+ File pathelement = (File) classpathelements.get(i);
+ if(pathelement.isFile() ){
+ out.write(" <unzip src=\""+pathelement.getCanonicalPath()+"\" dest=\"${build.classes}\"></unzip>\n");
+ }else{
+ out.write(" <copy todir=\"${build.classes}\">\n");
+ out.write(" <fileset dir=\""+pathelement.getCanonicalPath()+"\">\n");
+ out.write(" <include name=\"**/*.class\"/>\n");
+ out.write(" <include name=\"**/*.xml\"/>\n");
+ out.write(" <include name=\"**/*.wsdl\"/>\n");
+ out.write(" </fileset>\n");
+ out.write(" </copy>\n");
+ }
+
+ }
+ out.write("\t</target>\n");
+
+
+ out.write("</project>\n");
+ out.close();
+ } catch (IOException e) {
+ log.error(e);
+ throw GenerationFault.createGenerationFault(e);
+ }
+ }
+
+ private StringTokenizer getClasspathComponets() {
+ String classpath = System.getProperty("java.class.path");
+ String spearator = System.getProperties().getProperty("path.separator");
+ return new StringTokenizer(classpath, spearator);
+ }
+
+ private void writeproperty(String property, InputOutputFile file, PrintWriter out) throws GenerationFault {
+ try {
+ if (file != null) {
+ String fileName = file.fileName();
+ if (fileName != null) {
+ File absFile = new File(fileName);
+ if (absFile.exists())
+ out.write("<property name=\""+property+"\" value=\""+absFile.getCanonicalPath()+"\"/>\n");
+ }
+ }
+ } catch (Exception e) {
+ }
+ }
+}
Propchange: webservices/ews/trunk/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java
------------------------------------------------------------------------------
svn:executable = *
---------------------------------------------------------------------
To unsubscribe, e-mail: ews-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: ews-dev-help@ws.apache.org