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/01/25 07:37:48 UTC

svn commit: r126351 - in webservices/ews/branches/provider-based: . conf conf/META-INF/services samples/ejb/bookquote samples/ejb/bookquote/META-INF samples/ejb/echo samples/ejb/echo/META-INF samples/ejb/google samples/ejb/time samples/ejb/time/META-INF samples/ejb/zip samples/ejb/zip/META-INF 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/context/webservices/server/jaxb src/org/apache/geronimo/ews/ws4j2ee/module src/org/apache/geronimo/ews/ws4j2ee/parsers src/org/apache/geronimo/ews/ws4j2ee/parsers/gbeans src/org/apache/geronimo/ews/ws4j2ee/toWs src/org/apache/geronimo/ews/ws4j2ee/toWs/handlers 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/toWs/ws 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 test/org/apache/geronimo/ews/ws4j2ee test/org/apache/geronimo/ews/ws4j2ee/gbeans test/org/apache/geronimo/ews/ws4j2ee/providerUsage test/org/apache/geronimo/ews/ws4j2ee/utils

Author: hemapani
Date: Mon Jan 24 22:37:45 2005
New Revision: 126351

URL: http://svn.apache.org/viewcvs?view=rev&rev=126351
Log:
changes heading to use only providers and remove the code generation as much as possible
Added:
   webservices/ews/branches/provider-based/conf/common.xml
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/Packager.java
Removed:
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/jaxrpcmapping/JAXBJaxRpcMapper.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/jaxb/
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/EJBDDParser.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/gbeans/
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/handlers/
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/PropertyFileGenerator.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/PropertyStore.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/TemporaryRepository.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ContextAccssible.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/GeronimoUtils.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ImplBeanPool.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEFault.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEProvider.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/JaxRpcRuntime.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/PropertyLoader.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/WSDDJavaJ2EEProvider.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/AppTest.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/NaughtyTest.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/gbeans/
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/utils/
Modified:
   webservices/ews/branches/provider-based/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider
   webservices/ews/branches/provider-based/maven.xml
   webservices/ews/branches/provider-based/project.xml
   webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml
   webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml
   webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml
   webservices/ews/branches/provider-based/samples/ejb/echo/build.xml
   webservices/ews/branches/provider-based/samples/ejb/google/build.xml
   webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml
   webservices/ews/branches/provider-based/samples/ejb/time/build.xml
   webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml
   webservices/ews/branches/provider-based/samples/ejb/zip/build.xml
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java
   webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java
   webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java

Modified: webservices/ews/branches/provider-based/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider&r1=126350&p2=webservices/ews/branches/provider-based/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider&r2=126351
==============================================================================
Binary files. No diff available.

Added: webservices/ews/branches/provider-based/conf/common.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/conf/common.xml?view=auto&rev=126351
==============================================================================
--- (empty file)
+++ webservices/ews/branches/provider-based/conf/common.xml	Mon Jan 24 22:37:45 2005
@@ -0,0 +1,80 @@
+	<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="${jar.file}" basedir="${build.classes}" >
+			<include name="**"/>
+			<exclude name="**/*BindingImpl.class"/>
+			<exclude name="*${impl.file}*"/>			
+		</jar>
+	</target>
+
+	<target name="dist" depends="jar"/>
+  	<target name="clean">
+		<delete dir="${build}"/>
+	</target>

Modified: webservices/ews/branches/provider-based/maven.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/maven.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/maven.xml&r1=126350&p2=webservices/ews/branches/provider-based/maven.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/maven.xml	(original)
+++ webservices/ews/branches/provider-based/maven.xml	Mon Jan 24 22:37:45 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,13 +121,14 @@
     
     <preGoal name="test:test">
         <j:jelly xmlns="jelly:ant">
+			<!--
 			<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"/>
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/ejb/time"/>

Modified: webservices/ews/branches/provider-based/project.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/project.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/project.xml&r1=126350&p2=webservices/ews/branches/provider-based/project.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/project.xml	(original)
+++ webservices/ews/branches/provider-based/project.xml	Mon Jan 24 22:37:45 2005
@@ -333,5 +333,17 @@
         
 
     </dependencies>
+    
+    <reports>
+        <!-- <report>maven-license-plugin</report> -->
+        <report>maven-checkstyle-plugin</report>
+        <report>maven-pmd-plugin</report>
+        <!-- <report>maven-simian-plugin</report> -->
+        <report>maven-jdepend-plugin</report>
+        <!-- <report>maven-jxr-plugin</report> -->
+        <report>maven-javadoc-plugin</report>
+        <report>maven-junit-report-plugin</report>
+        <report>maven-clover-plugin</report>
+    </reports>
 </project>
 

Modified: webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/bookquote/META-INF/webservices.xml	Mon Jan 24 22:37:45 2005
@@ -1,32 +1,32 @@
-<?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">
-<description>BookQuoteService</description>
-	<display-name>BookQuoteService</display-name>
-	<webservice-description >
-		<description>BookQuoteService</description>
-		<display-name>BookQuoteService</display-name>
-		<webservice-description-name >BookQuoteService</webservice-description-name>
-		<wsdl-file >BookQuote.wsdl</wsdl-file>
-		<jaxrpc-mapping-file >BookQuote.xml</jaxrpc-mapping-file>
-		<port-component >
-			<description >BookQuote</description>
-			<display-name >BookQuote</display-name>
-			
-			<icon xml:lang="en-us" id="ID000298">
-				<small-icon>token</small-icon>
-				<large-icon>token</large-icon>
-			</icon>
-
-			<port-component-name >BookQuote</port-component-name>
-			<wsdl-port id="ID000311">ns1:BookQuotePort</wsdl-port>
-			<service-endpoint-interface >com.jwsbook.jaxrpc.BookQuote</service-endpoint-interface>
-			<service-impl-bean >
-				<ejb-link >com.jwsbook.jaxrpc.BookQuoteBean</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">
+<description>BookQuoteService</description>
+	<display-name>BookQuoteService</display-name>
+	<webservice-description >
+		<description>BookQuoteService</description>
+		<display-name>BookQuoteService</display-name>
+		<webservice-description-name >BookQuoteService</webservice-description-name>
+		<wsdl-file >BookQuote.wsdl</wsdl-file>
+		<jaxrpc-mapping-file >BookQuote.xml</jaxrpc-mapping-file>
+		<port-component >
+			<description >BookQuote</description>
+			<display-name >BookQuote</display-name>
+			
+			<icon xml:lang="en-us" id="ID000298">
+				<small-icon>token</small-icon>
+				<large-icon>token</large-icon>
+			</icon>
+
+			<port-component-name >BookQuote</port-component-name>
+			<wsdl-port id="ID000311">ns1:BookQuotePort</wsdl-port>
+			<service-endpoint-interface >com.jwsbook.jaxrpc.BookQuote</service-endpoint-interface>
+			<service-impl-bean >
+				<ejb-link >com.jwsbook.jaxrpc.BookQuoteBean</ejb-link>
+			</service-impl-bean>
+		</port-component>
+	</webservice-description>
+</webservices>

Modified: webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/bookquote/build.xml	Mon Jan 24 22:37:45 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/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/echo/META-INF/webservices.xml	Mon Jan 24 22:37:45 2005
@@ -1,32 +1,32 @@
-<?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://echosample.ws.apache.org"
-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">
-    <description>echo Service</description>
-	<display-name>echo</display-name>
-	<webservice-description >
-		<description>echo</description>
-		<display-name>echo</display-name>
-		<webservice-description-name >echoService</webservice-description-name>
-		<wsdl-file >echo.wsdl</wsdl-file>
-		<jaxrpc-mapping-file >echomapping.xml</jaxrpc-mapping-file>
-		<port-component >
-			<description >echo</description>
-			<display-name >echo</display-name>
-			
-			<icon xml:lang="en-us" id="ID000298">
-				<small-icon>token</small-icon>
-				<large-icon>token</large-icon>
-			</icon>
-
-			<port-component-name >echo</port-component-name>
-			<wsdl-port id="ID000311">ns1:echoPort</wsdl-port>
-			<service-endpoint-interface >org.apache.ws.echosample.Echo</service-endpoint-interface>
-			<service-impl-bean >
-				<ejb-link >echo</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://echosample.ws.apache.org"
+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">
+    <description>echo Service</description>
+	<display-name>echo</display-name>
+	<webservice-description >
+		<description>echo</description>
+		<display-name>echo</display-name>
+		<webservice-description-name >echoService</webservice-description-name>
+		<wsdl-file >echo.wsdl</wsdl-file>
+		<jaxrpc-mapping-file >echomapping.xml</jaxrpc-mapping-file>
+		<port-component >
+			<description >echo</description>
+			<display-name >echo</display-name>
+			
+			<icon xml:lang="en-us" id="ID000298">
+				<small-icon>token</small-icon>
+				<large-icon>token</large-icon>
+			</icon>
+
+			<port-component-name >echo</port-component-name>
+			<wsdl-port id="ID000311">ns1:echoPort</wsdl-port>
+			<service-endpoint-interface >org.apache.ws.echosample.Echo</service-endpoint-interface>
+			<service-impl-bean >
+				<ejb-link >echo</ejb-link>
+			</service-impl-bean>
+		</port-component>
+	</webservice-description>
+</webservices>

Modified: webservices/ews/branches/provider-based/samples/ejb/echo/build.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/echo/build.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/echo/build.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/echo/build.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/echo/build.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/echo/build.xml	Mon Jan 24 22:37:45 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/branches/provider-based/samples/ejb/google/build.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/google/build.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/google/build.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/google/build.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/google/build.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/google/build.xml	Mon Jan 24 22:37:45 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/branches/provider-based/samples/ejb/time/META-INF/webservices.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/time/META-INF/webservices.xml	Mon Jan 24 22:37:45 2005
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-             http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-             version="1.1">
-  <display-name>Time WebService</display-name>
-  <webservice-description>
-    <webservice-description-name>Time WebService</webservice-description-name>
-    <wsdl-file>TimePort.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>TimeMapping.xml</jaxrpc-mapping-file>
-    <port-component>
-      <description>port component description</description>
-      <port-component-name>TimePort</port-component-name>
-
-      <!-- Should be the right way to use QName with JAXB parsing --> 
-     <wsdl-port xmlns:time="jonas:Time">time:TimePort</wsdl-port> 
-
-      <service-endpoint-interface>org.objectweb.jonas.jtests.beans.time.TimeBean</service-endpoint-interface>
-      <service-impl-bean>
-        <ejb-link>TimeBeanSLR</ejb-link>
-      </service-impl-bean>
-    </port-component>
-  </webservice-description>
+<?xml version="1.0"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+             http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
+             version="1.1">
+  <display-name>Time WebService</display-name>
+  <webservice-description>
+    <webservice-description-name>Time WebService</webservice-description-name>
+    <wsdl-file>TimePort.wsdl</wsdl-file>
+    <jaxrpc-mapping-file>TimeMapping.xml</jaxrpc-mapping-file>
+    <port-component>
+      <description>port component description</description>
+      <port-component-name>TimePort</port-component-name>
+
+      <!-- Should be the right way to use QName with JAXB parsing --> 
+     <wsdl-port xmlns:time="jonas:Time">time:TimePort</wsdl-port> 
+
+      <service-endpoint-interface>org.objectweb.jonas.jtests.beans.time.TimeBean</service-endpoint-interface>
+      <service-impl-bean>
+        <ejb-link>TimeBeanSLR</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
 </webservices>

Modified: webservices/ews/branches/provider-based/samples/ejb/time/build.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/time/build.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/time/build.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/time/build.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/time/build.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/time/build.xml	Mon Jan 24 22:37:45 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/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/zip/META-INF/webservices.xml	Mon Jan 24 22:37:45 2005
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-             http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-             version="1.1">
-  <display-name>French Zip</display-name>
-  <webservice-description>
-    <webservice-description-name>French Zip WebService</webservice-description-name>
-    <wsdl-file>FrenchZip.wsdl</wsdl-file>
-    <jaxrpc-mapping-file>FrenchZipMapping.xml</jaxrpc-mapping-file>
-    <port-component>
-      <description>port component description</description>
-      <port-component-name>TimePort</port-component-name>
-
-      <!-- Should be the right way to use QName with JAXB parsing --> 
-     <wsdl-port xmlns:ns="http://tempuri.org/">ns:IODCODESPOSTAUXPort</wsdl-port> 
-
-      <service-endpoint-interface>org.objectweb.jonas.zip.Zip</service-endpoint-interface>
-      <service-impl-bean>
-        <ejb-link>ZipBean</ejb-link>
-      </service-impl-bean>
-    </port-component>
-  </webservice-description>
+<?xml version="1.0"?>
+
+<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+             http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
+             version="1.1">
+  <display-name>French Zip</display-name>
+  <webservice-description>
+    <webservice-description-name>French Zip WebService</webservice-description-name>
+    <wsdl-file>FrenchZip.wsdl</wsdl-file>
+    <jaxrpc-mapping-file>FrenchZipMapping.xml</jaxrpc-mapping-file>
+    <port-component>
+      <description>port component description</description>
+      <port-component-name>TimePort</port-component-name>
+
+      <!-- Should be the right way to use QName with JAXB parsing --> 
+     <wsdl-port xmlns:ns="http://tempuri.org/">ns:IODCODESPOSTAUXPort</wsdl-port> 
+
+      <service-endpoint-interface>org.objectweb.jonas.zip.Zip</service-endpoint-interface>
+      <service-impl-bean>
+        <ejb-link>ZipBean</ejb-link>
+      </service-impl-bean>
+    </port-component>
+  </webservice-description>
 </webservices>

Modified: webservices/ews/branches/provider-based/samples/ejb/zip/build.xml
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/samples/ejb/zip/build.xml?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/samples/ejb/zip/build.xml&r1=126350&p2=webservices/ews/branches/provider-based/samples/ejb/zip/build.xml&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/samples/ejb/zip/build.xml	(original)
+++ webservices/ews/branches/provider-based/samples/ejb/zip/build.xml	Mon Jan 24 22:37:45 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>

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/jaxrpcmapping/JAXBJaxRpcMapper.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/jaxrpcmapping/JAXBJaxRpcMapper.java?view=auto&rev=126350
==============================================================================

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java	Mon Jan 24 22:37:45 2005
@@ -169,4 +169,8 @@
     public void setCompile(boolean compile);
     
     public Object getProprty(Object key);
+    
+    public boolean isNeedClientJar();
+
+    public void setNeedClientJar(boolean b);
 }

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/ContextFactoryImpl.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java	Mon Jan 24 22:37:45 2005
@@ -55,6 +55,7 @@
     private ArrayList classpathelements;
     private boolean compile = true;
     private Map map;
+    private boolean needClientJar = true;
 
     private WSCFHandler[] handlers;
 
@@ -320,4 +321,21 @@
     public Object getProprty(Object key) {
         return map.get(key);
     }
+    
+    
+   
+    /**
+     * @return
+     */
+    public boolean isNeedClientJar() {
+        return needClientJar;
+    }
+
+    /**
+     * @param b
+     */
+    public void setNeedClientJar(boolean b) {
+        needClientJar = b;
+    }
+
 }

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/module/EARModule.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/DomEJBDDParser.java	Mon Jan 24 22:37:45 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) {

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/EJBDDParser.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/EJBDDParser.java?view=auto&rev=126350
==============================================================================

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/ServiceReferanceParser.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/WebDDParser.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/parsers/XMLBeansEJBDDParser.java	Mon Jan 24 22:37:45 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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/GenerationFactory.java	Mon Jan 24 22:37:45 2005
@@ -32,8 +32,6 @@
     public Generator createEJBGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault;
 
-    public Generator createWrapperWsGenerator(J2EEWebServiceContext j2eewscontext)
-            throws GenerationFault;
 
     public Generator createClientSideWsGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault;
@@ -45,8 +43,6 @@
     public Generator createServerSideWsGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault;
 
-    public Generator createHandlerGenerator(J2EEWebServiceContext j2eewscontext)
-            throws GenerationFault;
 
     public Generator createJaxrpcMapperGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault;
@@ -59,8 +55,10 @@
 
     public Generator createWebContainerDDGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault;
-
-    public Generator createPropertyFileGenerator(J2EEWebServiceContext j2eewscontext)
-            throws GenerationFault;
-
+            
+//    public Generator createHandlerGenerator(J2EEWebServiceContext j2eewscontext)
+//            throws GenerationFault;
+//    public Generator createWrapperWsGenerator(J2EEWebServiceContext j2eewscontext)
+//            throws GenerationFault;
+            
 }

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java	Mon Jan 24 22:37:45 2005
@@ -16,6 +16,9 @@
 
 package org.apache.geronimo.ews.ws4j2ee.toWs;
 
+import java.io.FileInputStream;
+import java.util.HashMap;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
@@ -26,9 +29,6 @@
 import org.apache.geronimo.ews.ws4j2ee.utils.MiscFactory;
 import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
 
-import java.io.FileInputStream;
-import java.util.HashMap;
-
 /**
  * <p>this class genarate the code when the WSDL presents.</p>
  */
@@ -90,8 +90,8 @@
             clientStubGen.generate();
             ContextValidator cvalidator = new ContextValidator(wscontext);
             //cvalidator.validateWithWSDL();
-            Generator handlerGen = factory.getGenerationFactory().createHandlerGenerator(wscontext);
-            handlerGen.generate();
+//            Generator handlerGen = factory.getGenerationFactory().createHandlerGenerator(wscontext);
+//            handlerGen.generate();
         } catch (Exception e) {
             e.printStackTrace();
             throw GenerationFault.createGenerationFault(e);

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java	Mon Jan 24 22:37:45 2005
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
 import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
+import org.apache.geronimo.ews.ws4j2ee.toWs.misc.Packager;
 
 import java.io.File;
 
@@ -73,36 +74,36 @@
         j2eeContainerDDGen.generate();
     }
 
-    public void generateWrapperWs() throws GenerationFault {
-        Generator wrapgen =
-                factory.getGenerationFactory().createWrapperWsGenerator(wscontext);
-        wrapgen.generate();
-    }
-
-    public void generatedHandlers() throws GenerationFault {
-        Generator handlerGen =
-                factory.getGenerationFactory().createHandlerGenerator(wscontext);
-        handlerGen.generate();
-    }
+//    public void generateWrapperWs() throws GenerationFault {
+//        Generator wrapgen =
+//                factory.getGenerationFactory().createWrapperWsGenerator(wscontext);
+//        wrapgen.generate();
+//    }
+//
+//    public void generatedHandlers() throws GenerationFault {
+//        Generator handlerGen =
+//                factory.getGenerationFactory().createHandlerGenerator(wscontext);
+//        handlerGen.generate();
+//    }
 
     public void generateBuildFile() throws GenerationFault {
         Generator buildFileGen =
                 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 {
-        if (wscontext.getMiscInfo().isCompile()) {
+    public void createClientJar() throws GenerationFault {
+        if (wscontext.getMiscInfo().isCompile() && wscontext.getMiscInfo().isNeedClientJar()) {
             org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter executer
                     = new org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter(wscontext);
             executer.execute(wscontext.getMiscInfo().getOutPutPath() + "/build.xml");
         }
     }
+    
+    public void packageServerJar()throws GenerationFault{
+        new Packager(wscontext).generate();
+    }
 
     public void emmit() throws GenerationFault {
         prepareOutPutDir();
@@ -111,9 +112,9 @@
         if (ejbBased) {
             generateEJB();
         }
-        generateWrapperWs();
-        generatedHandlers();
+//        generateWrapperWs();
+//        generatedHandlers();
         generateBuildFile();
-        executeAnt();
+        createClientJar();
     }
 }

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/impl/GenerationFactoryImpl.java	Mon Jan 24 22:37:45 2005
@@ -33,10 +33,7 @@
 import org.apache.geronimo.ews.ws4j2ee.toWs.ejb.EJBLocalHomeWriter;
 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.wrapperWs.WrapperWsGenerator;
+import org.apache.geronimo.ews.ws4j2ee.toWs.misc.BuildFileConfigurer;
 import org.apache.geronimo.ews.ws4j2ee.toWs.ws.ClientSideWsGenerator;
 import org.apache.geronimo.ews.ws4j2ee.toWs.ws.ServerSideWsGenerator;
 import org.apache.geronimo.ews.ws4j2ee.toWs.wsdl.WSDLGenerator;
@@ -73,10 +70,15 @@
         return new EJBGenerator(j2eewscontext);
     }
 
-    public Generator createWrapperWsGenerator(J2EEWebServiceContext j2eewscontext)
-            throws GenerationFault {
-        return new WrapperWsGenerator(j2eewscontext);
-    }
+//    public Generator createWrapperWsGenerator(J2EEWebServiceContext j2eewscontext)
+//            throws GenerationFault {
+//        return new WrapperWsGenerator(j2eewscontext);
+//    }
+//
+//    public Generator createHandlerGenerator(J2EEWebServiceContext j2eewscontext)
+//            throws GenerationFault {
+//        return new HandlerGenerator(j2eewscontext);
+//    }
 
     public Generator createClientSideWsGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault {
@@ -95,10 +97,6 @@
         return new ServerSideWsGenerator(j2eewscontext);
     }
 
-    public Generator createHandlerGenerator(J2EEWebServiceContext j2eewscontext)
-            throws GenerationFault {
-        return new HandlerGenerator(j2eewscontext);
-    }
 
     public Generator createJaxrpcMapperGenerator(J2EEWebServiceContext j2eewscontext)
             throws GenerationFault {
@@ -112,17 +110,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/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java?view=auto&rev=126351
==============================================================================
--- (empty file)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileConfigurer.java	Mon Jan 24 22:37:45 2005
@@ -0,0 +1,166 @@
+/*
+ * 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);
+            
+            String classFile = null;
+            if(j2eewscontext.getMiscInfo().isImplwithEJB()){
+                classFile = j2eewscontext.getEJBDDContext().getImplBean();
+            }else{
+                classFile = j2eewscontext.getWebDDContext().getServletClass();
+            }
+            
+            out.write("<property  name=\"impl.file\" value=\""+classFile.replace('.','/')+"\"/>\n");
+            
+            String jarName =
+                 j2eewscontext
+                     .getWSDLContext()
+                     .getTargetPortType()
+                     .getName()
+                     .toLowerCase();
+             int index = jarName.lastIndexOf(".");
+             if (index > 0) {
+                 jarName = jarName.substring(index + 1)+"-ewsimpl-client.jar";
+             }
+            out.write("<property  name=\"jar.file\" value=\""+jarName+"\"/>\n");
+            
+            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) {
+        }
+    }
+}

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java?view=auto&rev=126350
==============================================================================

Added: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/Packager.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/Packager.java?view=auto&rev=126351
==============================================================================
--- (empty file)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/Packager.java	Mon Jan 24 22:37:45 2005
@@ -0,0 +1,120 @@
+/*
+ * 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.util.ArrayList;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+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;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.taskdefs.GUnzip;
+import org.apache.tools.ant.taskdefs.Jar;
+import org.apache.tools.ant.types.FileSet;
+
+public class Packager implements Generator {
+    private J2EEWebServiceContext j2eewscontext;
+
+    protected static Log log =
+        LogFactory.getLog(JaxrpcMapperGenerator.class.getName());
+
+    public Packager(J2EEWebServiceContext j2eewscontext)
+        throws GenerationFault {
+        this.j2eewscontext = j2eewscontext;
+    }
+
+    public void generate() throws GenerationFault {
+        try {
+            Project project = new Project();
+            project.init();
+            project.setCoreLoader(
+                Thread.currentThread().getContextClassLoader());
+
+            File outDir = new File(j2eewscontext.getMiscInfo().getOutPutPath());
+            outDir.mkdirs();
+            File tempDir = new File(outDir, "temp");
+
+            ArrayList classpathelements =
+                j2eewscontext.getMiscInfo().getClasspathElements();
+
+            Copy copyer = new Copy();
+            copyer.setProject(project);
+            copyer.setTodir(tempDir);
+            FileSet fileset = new FileSet();
+            fileset.setDir(outDir);
+            fileset.setIncludes("META-INF/*.xml");
+            copyer.addFileset(fileset);
+            copyer.execute();
+
+
+            for (int i = 0; i < classpathelements.size(); i++) {
+                File pathelement = (File) classpathelements.get(i);
+                if (pathelement.isFile()) {
+                    GUnzip unpacker = new GUnzip();
+                    unpacker.setProject(project);
+                    unpacker.setSrc(pathelement);
+                    unpacker.setDest(tempDir);
+                    unpacker.execute();
+                } else {
+                    copyer = new Copy();
+                    copyer.setProject(project);
+                    copyer.setTodir(tempDir);
+                    fileset = new FileSet();
+                    fileset.setDir(pathelement);
+                    fileset.setIncludes("**/*.class");
+                    fileset.setIncludes("**/*.xml");
+                    fileset.setIncludes("**/*.wsdl");
+                    copyer.addFileset(fileset);
+                    copyer.execute();
+                }
+
+            }
+            FileUtils.copyFile(
+                new File(outDir, "deploy.wsdd"),
+                new File(tempDir, "deploy.wsdd"));
+            Jar jarer = new Jar();
+            jarer.setProject(project);
+            jarer.setBasedir(tempDir);
+            String jarName =
+                j2eewscontext
+                    .getWSDLContext()
+                    .getTargetPortType()
+                    .getName()
+                    .toLowerCase();
+            int index = jarName.lastIndexOf(".");
+            if (index > 0) {
+                jarName = jarName.substring(index + 1)+"-ewsimpl.jar";
+            }
+            File file = new File(outDir, jarName);
+            if(file.exists()){
+                file.delete();
+                file.createNewFile();
+            }
+            System.out.println(file.getAbsoluteFile());
+            jarer.setDestFile(file);
+            jarer.execute(); 
+        } catch (Exception e) {
+            throw GenerationFault.createGenerationFault(e);
+        } 
+    }
+}

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/PropertyFileGenerator.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/PropertyFileGenerator.java?view=auto&rev=126350
==============================================================================

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java	Mon Jan 24 22:37:45 2005
@@ -69,7 +69,6 @@
  * This is Wsdl2java's deploy Writer.  It writes the deploy.wsdd file.
  */
 public class J2eeDeployWriter extends JavaWriter {
-    protected boolean useProvider = false;
     /**
      * Field definition
      */
@@ -97,11 +96,6 @@
         if (wscontext == null) {
             throw new RuntimeException("wscontext can not be null");
         }
-        String val = System.getProperty("useProvider");
-        if(val != null){
-            useProvider = true;
-        }
-        
     }    // ctor
 
     /**
@@ -358,39 +352,19 @@
             }
         }
         String useStr = " use=\"" + use + "\"";
-//		if(provider!= null){
-//			pw.println("  <service name=\"" + serviceName + "\" provider=\""
-//					+ provider + "\"" + styleStr + useStr + ">");
-//			WSCFHandler[] handlers = wscontext.getMiscInfo().getHandlers();	
-//			for(int i = 0;i<handlers.length;i++){
-//				writeHandler(pw,handlers[i]);
-//			}	
-//		}else{
-//			pw.println("  <service name=\"" + serviceName + "\" provider=\""
-//					+ prefix + ":RPC" + "\"" + styleStr + useStr + ">");
-//		}
-        if (this.useProvider) {
-            String continer = wscontext.getMiscInfo().getTargetJ2EEContainer();
-            if (GenerationConstants.GERONIMO_CONTAINER.equals(continer)) {
-//                pw.println("    <service name=\"" + serviceName + "\" provider=\"java:geronimo\""
-//                        + styleStr + useStr + ">");
-                pw.println("    <service name=\"" + serviceName + "\" provider=\"Handler\""
-                        + styleStr + useStr + ">");
-                pw.println("      <parameter name=\"handlerClass\" value=\"org.apache.geronimo.axis.GeronimoProvider\"/>");
-            } else {
-//                pw.println("  <service name=\"" + serviceName + "\" provider=\"java:ews\""
-//                        + styleStr + useStr + ">");
-                pw.println("    <service name=\"" + serviceName + "\" provider=\"Handler\"" 
-                      + styleStr + useStr + ">");
-                pw.println("      <parameter name=\"handlerClass\" value=\"org.apache.geronimo.ews.ws4j2ee.wsutils.EWSProvider\"/>");
-              //pw.println("        <java:provider  java:className=\"org.apache.geronimo.ews.ws4j2ee.wsutils.EWSProvider\" java:isStatic=\"true\"/>\n");
-                        //
-                        //java:className
-            }
-        } else {
-            pw.println("  <service name=\"" + serviceName + "\" provider=\"java:j2ee\""
+        String continer = wscontext.getMiscInfo().getTargetJ2EEContainer();
+        if (GenerationConstants.GERONIMO_CONTAINER.equals(continer)) {
+            pw.println("    <service name=\"" + serviceName + "\" provider=\"Handler\""
                     + styleStr + useStr + ">");
+            pw.println("      <parameter name=\"handlerClass\" value=\"org.apache.geronimo.axis.GeronimoProvider\"/>");
+        } else {
+            pw.println("    <service name=\"" + serviceName + "\" provider=\"Handler\"" 
+                  + styleStr + useStr + ">");
+            pw.println("      <parameter name=\"handlerClass\" value=\"org.apache.geronimo.ews.ws4j2ee.wsutils.EWSProvider\"/>");
+                    //
+                    //java:className
         }
+
         EJBContext ejbcontext = wscontext.getEJBDDContext();
         if (ejbcontext != null) {
             pw.println("      <parameter name=\""+EWSProvider.OPTION_USE_EJB+"\" value=\"ejb\"/>");
@@ -459,14 +433,9 @@
         } else {
             className += "Impl";
         }
-        if (this.useProvider) {
-            WebContext webContext = wscontext.getWebDDContext();
-            if (webContext != null) {
-                pw.println("      <parameter name=\"className\" value=\"" + webContext.getServletClass()
-                        + "\"/>");
-            }
-        } else {
-            pw.println("      <parameter name=\"className\" value=\"" + className
+        WebContext webContext = wscontext.getWebDDContext();
+        if (webContext != null) {
+            pw.println("      <parameter name=\"className\" value=\"" + webContext.getServletClass()
                     + "\"/>");
         }
         pw.println("      <parameter name=\"wsdlPortType\" value=\""

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java	Mon Jan 24 22:37:45 2005
@@ -16,25 +16,15 @@
 
 package org.apache.geronimo.ews.ws4j2ee.utils;
 
+import java.io.File;
+import java.util.jar.JarOutputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
-import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
 import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.utils.packager.ModulePackager;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Ant;
-import org.apache.tools.ant.taskdefs.Javac;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.Path;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.jar.JarOutputStream;
 
 /**
  * <p>To call this Class and execute a ant task the $JAVA_HOME/lib/tool.jar need
@@ -84,20 +74,20 @@
         }
     }
 
-    public void execute() throws GenerationFault {
-        try {
-            Class.forName("com.sun.tools.javac.Main");
-            File outDir = new File(wscontext.getMiscInfo().getOutPutPath());
-            File dest = new File(outDir, "build/classes");
-            compile(outDir, dest);
-            createModule(outDir, dest);
-        } catch (IOException e) {
-            log.error(e);
-            throw GenerationFault.createGenerationFault(e);
-        } catch (ClassNotFoundException e) {
-            System.out.println("Ant file will not be run programatcally as the " +
-                    "$JAVA_HOME/lib/tool.jar is not in the class path. To run the ant " +
-                    "prgramatically add that jar to classpath");
+//    public void execute() throws GenerationFault {
+//        try {
+//            Class.forName("com.sun.tools.javac.Main");
+//            File outDir = new File(wscontext.getMiscInfo().getOutPutPath());
+//            File dest = new File(outDir, "build/classes");
+//            compile(outDir, dest);
+//            createModule(outDir, dest);
+//        } catch (IOException e) {
+//            log.error(e);
+//            throw GenerationFault.createGenerationFault(e);
+//        } catch (ClassNotFoundException e) {
+//            System.out.println("Ant file will not be run programatcally as the " +
+//                    "$JAVA_HOME/lib/tool.jar is not in the class path. To run the ant " +
+//                    "prgramatically add that jar to classpath");
 //NOW as the code is used by Geronimo we can not afford to let the build
 //failure tests beside if you use maven it works fine. it will find your maven 
 //repository itself :) 
@@ -105,126 +95,126 @@
 //          System.out.println(e.getMessage() +
 //          "if it is a compile error you may not have set the maven reposiroty " +
 //          "directory in the conf/ws4j2ee.propertites Build fill ignore the faliure");
-        }
-    }
-
-    private void createModule(File outDir, File dest) throws IOException {
-        String jarName = wscontext.getWSDLContext().getTargetPortType().getName().toLowerCase();
-        int index = jarName.lastIndexOf(".");
-        if (index > 0) {
-            jarName = jarName.substring(index + 1);
-        }
-        ModulePackager module = new ModulePackager(new File(outDir, jarName + "-ewsImpl.jar"));
-        module.addClassFiles(dest);
-        ArrayList classpathelements = wscontext.getMiscInfo().getClasspathElements();
-        if (classpathelements != null) {
-            for (int i = 0; i < classpathelements.size(); i++) {
-                module.addJarFile((File) classpathelements.get(i));
-            }
-        }
-        File dir = outDir;
-        File[] files = dir.listFiles();
-        if (files != null) {
-            for (int i = 0; i < files.length; i++) {
-                String file = files[i].getName();
-                if (files[i].isFile() &&
-                        !(file.endsWith(".jar") ||
-                        file.endsWith(".zip") ||
-                        file.endsWith(".war") ||
-                        file.endsWith(".ear") ||
-                        file.endsWith(".java"))
-                ) {
-                    module.addFileToJar(file, files[i]);
-                }
-            }
-        }
-        dir = new File(outDir, "META-INF");
-        files = dir.listFiles();
-        if (files != null) {
-            for (int i = 0; i < files.length; i++) {
-                String file = files[i].getName();
-                if (files[i].isFile() &&
-                        !(file.endsWith(".jar") ||
-                        file.endsWith(".zip") ||
-                        file.endsWith(".war") ||
-                        file.endsWith(".ear") ||
-                        file.endsWith(".java"))
-                ) {
-                    module.addFileToJar("META-INF/" + file, files[i]);
-                }
-            }
-        }
-        module.finalizeJar();
-    }
-
-    private void compile(File outDir, File destDir) throws IOException {
-        Project project = new Project();
-        project.init();
-        project.setCoreLoader(Thread.currentThread().getContextClassLoader());
-        Javac comp = new Javac();
-        comp.setProject(project);
-        destDir.mkdirs();
-        comp.setDestdir(destDir);
-        Path path = new Path(project);
-        path.setLocation(outDir);
-        comp.setSrcdir(path);
-        File repository = findMavenRepository();
-        if (repository != null) {
-            Path compileClasspath = new Path(project);
-            FileSet fileset = new FileSet();
-            fileset.setDir(repository);
-            fileset.setIncludes("axis/**/*.jar");
-            fileset.setIncludes("geronimo-spec/**/*.jar");
-            fileset.setIncludes("geronimo/**/*.jar");
-            fileset.setIncludes("sec/**/*.jar");
-            fileset.setIncludes("dom4j/**/*.jar");
-            fileset.setIncludes("jaxb-ri/**/*.jar");
-            fileset.setIncludes("xerces/**/*.jar");
-            fileset.setIncludes("ews/**/*.jar");
-            fileset.setIncludes("openejb/**/*.jar");
-            compileClasspath.addFileset(fileset);
-            comp.setClasspath(compileClasspath);
-        } else {
-        }
-        comp.init();
-        comp.execute();
-    }
-
-    private File findMavenRepository() throws IOException {
-        Properties pro = new Properties();
-        InputStream prpertyIn = null;
-        File file = new File(GenerationConstants.WS4J2EE_PROPERTY_FILE);
-        if (file.exists()) {
-            prpertyIn = new FileInputStream(file);
-        } else {
-            file = new File("modules/axis/target/" + GenerationConstants.WS4J2EE_PROPERTY_FILE);
-            if (file.exists()) {
-                prpertyIn = new FileInputStream(file);
-            } else {
-                file = new File("target/" + GenerationConstants.WS4J2EE_PROPERTY_FILE);
-                if (file.exists()) {
-                    prpertyIn = new FileInputStream(file);
-                } else {
-                    prpertyIn = getClass().getClassLoader().getResourceAsStream(GenerationConstants.WS4J2EE_PROPERTY_FILE);
-                }
-            }
-        }
-        if (prpertyIn != null) {
-            String location = null;
-            try {
-                pro.load(prpertyIn);
-                location = pro.getProperty(GenerationConstants.MAVEN_LOCAL_REPOSITARY);
-            } finally {
-                prpertyIn.close();
-            }
-            if (location != null) {
-                File locationFile = new File(location);
-                if (locationFile.exists()) {
-                    return locationFile;
-                }
-            }
-        }
-        return null;
-    }
+//        }
+//    }
+//
+//    private void createModule(File outDir, File dest) throws IOException {
+//        String jarName = wscontext.getWSDLContext().getTargetPortType().getName().toLowerCase();
+//        int index = jarName.lastIndexOf(".");
+//        if (index > 0) {
+//            jarName = jarName.substring(index + 1);
+//        }
+//        ModulePackager module = new ModulePackager(new File(outDir, jarName + "-ewsImpl.jar"));
+//        module.addClassFiles(dest);
+//        ArrayList classpathelements = wscontext.getMiscInfo().getClasspathElements();
+//        if (classpathelements != null) {
+//            for (int i = 0; i < classpathelements.size(); i++) {
+//                module.addJarFile((File) classpathelements.get(i));
+//            }
+//        }
+//        File dir = outDir;
+//        File[] files = dir.listFiles();
+//        if (files != null) {
+//            for (int i = 0; i < files.length; i++) {
+//                String file = files[i].getName();
+//                if (files[i].isFile() &&
+//                        !(file.endsWith(".jar") ||
+//                        file.endsWith(".zip") ||
+//                        file.endsWith(".war") ||
+//                        file.endsWith(".ear") ||
+//                        file.endsWith(".java"))
+//                ) {
+//                    module.addFileToJar(file, files[i]);
+//                }
+//            }
+//        }
+//        dir = new File(outDir, "META-INF");
+//        files = dir.listFiles();
+//        if (files != null) {
+//            for (int i = 0; i < files.length; i++) {
+//                String file = files[i].getName();
+//                if (files[i].isFile() &&
+//                        !(file.endsWith(".jar") ||
+//                        file.endsWith(".zip") ||
+//                        file.endsWith(".war") ||
+//                        file.endsWith(".ear") ||
+//                        file.endsWith(".java"))
+//                ) {
+//                    module.addFileToJar("META-INF/" + file, files[i]);
+//                }
+//            }
+//        }
+//        module.finalizeJar();
+//    }
+//
+//    private void compile(File outDir, File destDir) throws IOException {
+//        Project project = new Project();
+//        project.init();
+//        project.setCoreLoader(Thread.currentThread().getContextClassLoader());
+//        Javac comp = new Javac();
+//        comp.setProject(project);
+//        destDir.mkdirs();
+//        comp.setDestdir(destDir);
+//        Path path = new Path(project);
+//        path.setLocation(outDir);
+//        comp.setSrcdir(path);
+//        File repository = findMavenRepository();
+//        if (repository != null) {
+//            Path compileClasspath = new Path(project);
+//            FileSet fileset = new FileSet();
+//            fileset.setDir(repository);
+//            fileset.setIncludes("axis/**/*.jar");
+//            fileset.setIncludes("geronimo-spec/**/*.jar");
+//            fileset.setIncludes("geronimo/**/*.jar");
+//            fileset.setIncludes("sec/**/*.jar");
+//            fileset.setIncludes("dom4j/**/*.jar");
+//            fileset.setIncludes("jaxb-ri/**/*.jar");
+//            fileset.setIncludes("xerces/**/*.jar");
+//            fileset.setIncludes("ews/**/*.jar");
+//            fileset.setIncludes("openejb/**/*.jar");
+//            compileClasspath.addFileset(fileset);
+//            comp.setClasspath(compileClasspath);
+//        } else {
+//        }
+//        comp.init();
+//        comp.execute();
+//    }
+//
+//    private File findMavenRepository() throws IOException {
+//        Properties pro = new Properties();
+//        InputStream prpertyIn = null;
+//        File file = new File(GenerationConstants.WS4J2EE_PROPERTY_FILE);
+//        if (file.exists()) {
+//            prpertyIn = new FileInputStream(file);
+//        } else {
+//            file = new File("modules/axis/target/" + GenerationConstants.WS4J2EE_PROPERTY_FILE);
+//            if (file.exists()) {
+//                prpertyIn = new FileInputStream(file);
+//            } else {
+//                file = new File("target/" + GenerationConstants.WS4J2EE_PROPERTY_FILE);
+//                if (file.exists()) {
+//                    prpertyIn = new FileInputStream(file);
+//                } else {
+//                    prpertyIn = getClass().getClassLoader().getResourceAsStream(GenerationConstants.WS4J2EE_PROPERTY_FILE);
+//                }
+//            }
+//        }
+//        if (prpertyIn != null) {
+//            String location = null;
+//            try {
+//                pro.load(prpertyIn);
+//                location = pro.getProperty(GenerationConstants.MAVEN_LOCAL_REPOSITARY);
+//            } finally {
+//                prpertyIn.close();
+//            }
+//            if (location != null) {
+//                File locationFile = new File(location);
+//                if (locationFile.exists()) {
+//                    return locationFile;
+//                }
+//            }
+//        }
+//        return null;
+//    }
 
 }

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/FileUtils.java	Mon Jan 24 22:37:45 2005
@@ -20,6 +20,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,6 +37,20 @@
 public class FileUtils {
     protected static Log log =
             LogFactory.getLog(FileUtils.class.getName());
+            
+    public static void copyFile(File in, File out) throws GenerationFault {
+        try {
+            FileInputStream ins = new FileInputStream(in);
+            FileOutputStream outs = new FileOutputStream(out);
+            copyFile(ins, outs);
+            ins.close();
+            outs.close();
+        } catch (Exception e) {
+            throw GenerationFault.createGenerationFault(e);
+        }
+    }
+    
+                
     public static void copyFile(InputStream in, OutputStream out) throws GenerationFault {
         try {
             byte[] buf = new byte[1024];

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/PropertyStore.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/PropertyStore.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/TemporaryRepository.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/TemporaryRepository.java?view=auto&rev=126350
==============================================================================

Modified: webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java&r1=126350&p2=webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java	(original)
+++ webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/utils/Utils.java	Mon Jan 24 22:37:45 2005
@@ -16,44 +16,30 @@
 
 package org.apache.geronimo.ews.ws4j2ee.utils;
 
-import org.apache.axis.Constants;
-import org.apache.axis.encoding.Base64;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.apache.axis.AxisFault;
 import org.apache.axis.utils.ClassUtils;
 import org.apache.axis.utils.JavaUtils;
 import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
 import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
-import org.apache.geronimo.ews.ws4j2ee.wsutils.J2EEFault;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
 import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
+import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Stack;
-import java.util.StringTokenizer;
-
 /**
  * This class was taken from the axis XMLUtils. It should be properly adopted if to be used permanantly
  */
@@ -66,657 +52,6 @@
             "javax.xml.parsers.SAXParserFactory";
 
     private static DocumentBuilderFactory dbf = getDOMFactory();
-    private static SAXParserFactory saxFactory;
-    private static Stack saxParsers = new Stack();
-
-    private static String empty = new String("");
-    private static ByteArrayInputStream bais = new ByteArrayInputStream(empty.getBytes());
-
-    static {
-        // Initialize SAX Parser factory defaults
-        initSAXFactory(null, true, false);
-    }
-
-    /**
-     * Encode a string appropriately for XML.
-     * Lifted from ApacheSOAP 2.2 (org.apache.soap.Utils)
-     *
-     * @param orig the String to encode
-     * @return a String in which XML special chars are repalced by entities
-     */
-    public static String xmlEncodeString(String orig) {
-        if (orig == null) {
-            return "";
-        }
-        char[] chars = orig.toCharArray();
-
-        // if the string doesn't have any of the magic characters, leave
-        // it alone.
-        boolean needsEncoding = false;
-        search:
-        for (int i = 0; i < chars.length; i++) {
-            switch (chars[i]) {
-                case '&':
-                case '"':
-                case '\'':
-                case '<':
-                case '>':
-                    needsEncoding = true;
-                    break search;
-            }
-        }
-        if (!needsEncoding) return orig;
-        StringBuffer strBuf = new StringBuffer();
-        for (int i = 0; i < chars.length; i++) {
-            switch (chars[i]) {
-                case '&':
-                    strBuf.append("&amp;");
-                    break;
-                case '\"':
-                    strBuf.append("&quot;");
-                    break;
-                case '\'':
-                    strBuf.append("&apos;");
-                    break;
-                case '<':
-                    strBuf.append("&lt;");
-                    break;
-                case '\r':
-                    strBuf.append("&#xd;");
-                    break;
-                case '>':
-                    strBuf.append("&gt;");
-                    break;
-                default   :
-                    if (((int) chars[i]) > 127) {
-                        strBuf.append("&#");
-                        strBuf.append((int) chars[i]);
-                        strBuf.append(";");
-                    } else {
-                        strBuf.append(chars[i]);
-                    }
-            }
-        }
-        return strBuf.toString();
-    }
-
-    /**
-     * Initialize the SAX parser factory.
-     *
-     * @param factoryClassName The (optional) class name of the desired
-     *                         SAXParserFactory implementation. Will be
-     *                         assigned to the system property
-     *                         <b>javax.xml.parsers.SAXParserFactory</b>
-     *                         unless this property is already set.
-     *                         If <code>null</code>, leaves current setting
-     *                         alone.
-     * @param namespaceAware   true if we want a namespace-aware parser
-     * @param validating       true if we want a validating parser
-     */
-    public static void initSAXFactory(String factoryClassName,
-                                      boolean namespaceAware,
-                                      boolean validating) {
-        if (factoryClassName != null) {
-            try {
-                saxFactory = (SAXParserFactory) Class.forName(factoryClassName).
-                        newInstance();
-                /*
-                 * Set the system property only if it is not already set to
-                 * avoid corrupting environments in which Axis is embedded.
-                 */
-                if (System.getProperty(saxParserFactoryProperty) == null) {
-                    System.setProperty(saxParserFactoryProperty,
-                            factoryClassName);
-                }
-            } catch (Exception e) {
-//                log.error(Messages.getMessage("exception00"), e);
-                saxFactory = null;
-            }
-        } else {
-            saxFactory = SAXParserFactory.newInstance();
-        }
-        saxFactory.setNamespaceAware(namespaceAware);
-        saxFactory.setValidating(validating);
-
-        // Discard existing parsers
-        saxParsers.clear();
-    }
-
-    private static DocumentBuilderFactory getDOMFactory() {
-        DocumentBuilderFactory dbf;
-        try {
-            dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-        } catch (Exception e) {
-//            log.error(Messages.getMessage("exception00"), e );
-            dbf = null;
-        }
-        return (dbf);
-    }
-
-    private static boolean tryReset = true;
-
-    /** Get a SAX parser instance from the JAXP factory.
-     *
-     * @return a SAXParser instance.
-     */
-//    public static synchronized SAXParser getSAXParser() {
-//        if(!saxParsers.empty()) {
-//            return (SAXParser )saxParsers.pop();
-//        }
-//
-//        try {
-//            SAXParser parser = saxFactory.newSAXParser();
-//            parser.getParser().setEntityResolver(new DefaultEntityResolver());
-//            XMLReader reader = parser.getXMLReader(); 
-//            reader.setEntityResolver(new DefaultEntityResolver());
-//            reader.setFeature("http://xml.org/sax/features/namespace-prefixes", false);
-//            return parser;
-//        } catch (ParserConfigurationException e) {
-//            log.error(Messages.getMessage("parserConfigurationException00"), e);
-//            return null;
-//        } catch (SAXException se) {
-//            log.error(Messages.getMessage("SAXException00"), se);
-//            return null;
-//        }
-//    }
-//
-//
-//    /** Return a SAX parser for reuse.
-//     * @param parser A SAX parser that is available for reuse
-//     */
-//    public static void releaseSAXParser(SAXParser parser) {
-//        if(!tryReset) return;
-//
-//        //Free up possible ref. held by past contenthandler.
-//        try{
-//            XMLReader xmlReader= parser.getXMLReader();
-//            if(null != xmlReader){
-////                xmlReader.setContentHandler(doNothingContentHandler);
-////                xmlReader.setDTDHandler(doNothingContentHandler);
-////                xmlReader.setEntityResolver(doNothingContentHandler);
-////                xmlReader.setErrorHandler(doNothingContentHandler);
-//                synchronized (XMLUtils.class ) {
-//                    saxParsers.push(parser);
-//                }
-//            }
-//            else {
-//                tryReset= false;
-//            }
-//        } catch (org.xml.sax.SAXException e) {
-//            tryReset= false;
-//        }
-//    }
-    /**
-     * Get an empty new Document
-     * @return Document
-     * @throws ParserConfigurationException if construction problems occur
-     */
-//    public static Document newDocument() 
-//         throws ParserConfigurationException
-//    {
-//        synchronized (dbf) {
-//            return dbf.newDocumentBuilder().newDocument();
-//        }
-//    }
-
-    /**
-     * Get a new Document read from the input source
-     *
-     * @return Document
-     * @throws ParserConfigurationException if construction problems occur
-     * @throws SAXException                 if the document has xml sax problems
-     * @throws IOException                  if i/o exceptions occur
-     */
-    public static Document newDocument(InputSource inp)
-            throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilder db;
-        synchronized (dbf) {
-            db = dbf.newDocumentBuilder();
-        }
-//        db.setEntityResolver(new DefaultEntityResolver());
-//        db.setErrorHandler( new ParserErrorHandler() );
-        return (db.parse(inp));
-    }
-
-    /**
-     * Get a new Document read from the input stream
-     *
-     * @return Document
-     * @throws ParserConfigurationException if construction problems occur
-     * @throws SAXException                 if the document has xml sax problems
-     * @throws IOException                  if i/o exceptions occur
-     */
-    public static Document newDocument(InputStream inp)
-            throws ParserConfigurationException, SAXException, IOException {
-        return Utils.newDocument(new InputSource(inp));
-    }
-
-    /**
-     * Get a new Document read from the indicated uri
-     *
-     * @return Document
-     * @throws ParserConfigurationException if construction problems occur
-     * @throws SAXException                 if the document has xml sax problems
-     * @throws IOException                  if i/o exceptions occur
-     */
-    public static Document newDocument(String uri)
-            throws ParserConfigurationException, SAXException, IOException {
-        // call the authenticated version as there might be 
-        // username/password info embeded in the uri.
-        return Utils.newDocument(uri, null, null);
-    }
-
-    /**
-     * Create a new document from the given URI, use the username and password
-     * if the URI requires authentication.
-     *
-     * @param uri      the resource to get
-     * @param username basic auth username
-     * @param password basic auth password
-     * @throws ParserConfigurationException if construction problems occur
-     * @throws SAXException                 if the document has xml sax problems
-     * @throws IOException                  if i/o exceptions occur
-     */
-    public static Document newDocument(String uri, String username, String password)
-            throws ParserConfigurationException, SAXException, IOException {
-        InputSource ins = Utils.getInputSourceFromURI(uri, username, password);
-        Document doc = Utils.newDocument(ins);
-        // Close the Stream
-        if (ins.getByteStream() != null) {
-            ins.getByteStream().close();
-        } else if (ins.getCharacterStream() != null) {
-            ins.getCharacterStream().close();
-        }
-        return doc;
-    }
-
-//    private static String privateElementToString(Element element,
-//                                                 boolean omitXMLDecl)
-//    {
-//        return DOM2Writer.nodeToString(element, omitXMLDecl);
-//    }
-
-    /**
-     * turn an element into an XML fragment
-     * @param element
-     * @return stringified element
-     */
-//    public static String ElementToString(Element element) {
-//        return privateElementToString(element, true);
-//    }
-
-    /**
-     * turn a whole DOM document into XML
-     * @param doc DOM document
-     * @return string representation of the document, including XML declaration
-     */
-//    public static String DocumentToString(Document doc) {
-//        return privateElementToString(doc.getDocumentElement(), false);
-//    }
-
-//    public static void privateElementToWriter(Element element, Writer writer,
-//                                              boolean omitXMLDecl,
-//                                              boolean pretty) {
-//        DOM2Writer.serializeAsXML(element, writer, omitXMLDecl, pretty);
-//    }
-//
-//    public static void ElementToStream(Element element, OutputStream out) {
-//        Writer writer = getWriter(out);
-//        privateElementToWriter(element, writer, true, false);
-//    }
-
-//    public static void PrettyElementToStream(Element element, OutputStream out) {
-//        Writer writer = getWriter(out);
-//        privateElementToWriter(element, writer, true, true);
-//    }
-//
-//    public static void ElementToWriter(Element element, Writer writer) {
-//        privateElementToWriter(element, writer, true, false);
-//    }
-
-//    public static void PrettyElementToWriter(Element element, Writer writer) {
-//        privateElementToWriter(element, writer, true, true);
-//    }
-//
-//    public static void DocumentToStream(Document doc, OutputStream out) {
-//        Writer writer = getWriter(out);
-//        privateElementToWriter(doc.getDocumentElement(), writer, false, false);
-//    }
-//
-//    public static void PrettyDocumentToStream(Document doc, OutputStream out) {
-//        Writer writer = getWriter(out);
-//        privateElementToWriter(doc.getDocumentElement(), writer, false, true);
-//    }
-//    
-//    private static Writer getWriter(OutputStream os) {
-//        Writer writer = null;
-//        try {
-//            writer = new OutputStreamWriter(os, "UTF-8");
-//        } catch (UnsupportedEncodingException uee) {
-//            log.error(Messages.getMessage("exception00"), uee);
-//            writer = new OutputStreamWriter(os);
-//        }
-//        return writer;
-//    }
-//
-//    public static void DocumentToWriter(Document doc, Writer writer) {
-//        privateElementToWriter(doc.getDocumentElement(), writer, false, false);
-//    }
-//
-//    public static void PrettyDocumentToWriter(Document doc, Writer writer) {
-//        privateElementToWriter(doc.getDocumentElement(), writer, false, true);
-//    }
-    /**
-     * Convert a simple string to an element with a text node
-     * 
-     * @param namespace - element namespace
-     * @param name - element name
-     * @param string - value of the text node
-     * @return element - an XML Element, null if no element was created
-     */ 
-//    public static Element StringToElement(String namespace, String name, String string) {
-//        try {
-//            Document doc = XMLUtils.newDocument();
-//            Element element = doc.createElementNS(namespace, name);
-//            Text text = doc.createTextNode(string);
-//            element.appendChild(text);
-//            return element;
-//        } 
-//        catch (ParserConfigurationException e) {
-//            // This should not occur
-//            throw new InternalException(e);
-//        }
-//    }
-
-    /**
-     * get the inner XML inside an element as a string. This is done by
-     * converting the XML to its string representation, then extracting the
-     * subset between beginning and end tags.
-     *
-     * @param element
-     * @return textual body of the element, or null for no inner body
-     */
-//    public static String getInnerXMLString(Element element) {
-//        String elementString = ElementToString(element);
-//        int start, end;
-//        start = elementString.indexOf(">") + 1;
-//        end = elementString.lastIndexOf("</");
-//        if (end > 0)
-//            return elementString.substring(start,end);
-//        else
-//            return null;
-//    }
-    public static String getPrefix(String uri, Node e) {
-        while (e != null && (e.getNodeType() == Element.ELEMENT_NODE)) {
-            NamedNodeMap attrs = e.getAttributes();
-            for (int n = 0; n < attrs.getLength(); n++) {
-                Attr a = (Attr) attrs.item(n);
-                String name;
-                if ((name = a.getName()).startsWith("xmlns:") &&
-                        a.getNodeValue().equals(uri)) {
-                    return name.substring(6);
-                }
-            }
-            e = e.getParentNode();
-        }
-        return null;
-    }
-
-    public static String getNamespace(String prefix, Node e) {
-        while (e != null && (e.getNodeType() == Node.ELEMENT_NODE)) {
-            Attr attr =
-                    ((Element) e).getAttributeNodeNS(Constants.NS_URI_XMLNS, prefix);
-            if (attr != null) return attr.getValue();
-            e = e.getParentNode();
-        }
-        return null;
-    }
-
-    /**
-     * Return a QName when passed a string like "foo:bar" by mapping
-     * the "foo" prefix to a namespace in the context of the given Node.
-     *
-     * @return a QName generated from the given string representation
-     */
-    public static QName getQNameFromString(String str, Node e) {
-        if (str == null || e == null)
-            return null;
-        int idx = str.indexOf(':');
-        if (idx > -1) {
-            String prefix = str.substring(0, idx);
-            String ns = getNamespace(prefix, e);
-            if (ns == null)
-                return null;
-            return new QName(ns, str.substring(idx + 1));
-        } else {
-            return new QName("", str);
-        }
-    }
-
-    /**
-     * Return a string for a particular QName, mapping a new prefix
-     * if necessary.
-     */
-    public static String getStringForQName(QName qname, Element e) {
-        String uri = qname.getNamespaceURI();
-        String prefix = getPrefix(uri, e);
-        if (prefix == null) {
-            int i = 1;
-            prefix = "ns" + i;
-            while (getNamespace(prefix, e) != null) {
-                i++;
-                prefix = "ns" + i;
-            }
-            e.setAttributeNS(Constants.NS_URI_XMLNS,
-                    "xmlns:" + prefix, uri);
-        }
-        return prefix + ":" + qname.getLocalPart();
-    }
-
-    /**
-     * Concat all the text and cdata node children of this elem and return
-     * the resulting text.
-     * (by Matt Duftler)
-     *
-     * @param parentEl the element whose cdata/text node values are to
-     *                 be combined.
-     * @return the concatanated string.
-     */
-    public static String getChildCharacterData(Element parentEl) {
-        if (parentEl == null) {
-            return null;
-        }
-        Node tempNode = parentEl.getFirstChild();
-        StringBuffer strBuf = new StringBuffer();
-        CharacterData charData;
-        while (tempNode != null) {
-            switch (tempNode.getNodeType()) {
-                case Node.TEXT_NODE:
-                case Node.CDATA_SECTION_NODE:
-                    charData = (CharacterData) tempNode;
-                    strBuf.append(charData.getData());
-                    break;
-            }
-            tempNode = tempNode.getNextSibling();
-        }
-        return strBuf.toString();
-    }
-    
-//    public static class ParserErrorHandler implements ErrorHandler
-//    {
-//        protected static Log log =
-//            LogFactory.getLog(ParserErrorHandler.class.getName());
-//        /**
-//         * Returns a string describing parse exception details
-//         */
-//        private String getParseExceptionInfo(SAXParseException spe) {
-//            String systemId = spe.getSystemId();
-//            if (systemId == null) {
-//                systemId = "null";
-//            }
-//            String info = "URI=" + systemId +
-//                " Line=" + spe.getLineNumber() +
-//                ": " + spe.getMessage();
-//            return info;
-//        }
-//
-//        // The following methods are standard SAX ErrorHandler methods.
-//        // See SAX documentation for more info.
-//
-////        public void warning(SAXParseException spe) throws SAXException {
-////            if (log.isDebugEnabled())
-////                log.debug( Messages.getMessage("warning00", getParseExceptionInfo(spe)));
-////        }
-//        
-//        public void error(SAXParseException spe) throws SAXException {
-//            String message = "Error: " + getParseExceptionInfo(spe);
-//            throw new SAXException(message);
-//        }
-//
-//        public void fatalError(SAXParseException spe) throws SAXException {
-//            String message = "Fatal Error: " + getParseExceptionInfo(spe);
-//            throw new SAXException(message);
-//        }
-//    }
-
-
-    /**
-     * Utility to get the bytes uri.
-     * Does NOT handle authenticated URLs,
-     * use getInputSourceFromURI(uri, username, password)
-     *
-     * @param uri the resource to get
-     * @see #getInputSourceFromURI(String uri, String username, String password)
-     */
-    public static InputSource getInputSourceFromURI(String uri) {
-        return new InputSource(uri);
-    }
-
-    /**
-     * Utility to get the bytes uri
-     *
-     * @param source the resource to get
-     */
-//    public static InputSource sourceToInputSource(Source source) {
-//        if (source instanceof SAXSource) {
-//            return ((SAXSource) source).getInputSource();
-//        } else if (source instanceof DOMSource) {
-//            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-//            Node node = ((DOMSource)source).getNode();
-//            if (node instanceof Document) {
-//                node = ((Document)node).getDocumentElement();
-//            }
-//            Element domElement = (Element)node;
-//            PrettyElementToStream(domElement, baos);
-//            InputSource  isource = new InputSource(source.getSystemId());
-//            isource.setByteStream(new ByteArrayInputStream(baos.toByteArray()));
-//            return isource;
-//        } else if (source instanceof StreamSource) {
-//            StreamSource ss      = (StreamSource) source;
-//            InputSource  isource = new InputSource(ss.getSystemId());
-//            isource.setByteStream(ss.getInputStream());
-//            isource.setCharacterStream(ss.getReader());
-//            isource.setPublicId(ss.getPublicId());
-//            return isource;
-//        } else {
-//            return getInputSourceFromURI(source.getSystemId());
-//        }
-//    }
-
-    /**
-     * Utility to get the bytes at a protected uri
-     * This will retrieve the URL if a username and password are provided.
-     * The java.net.URL class does not do Basic Authentication, so we have to
-     * do it manually in this routine.
-     * If no username is provided, we create an InputSource from the uri
-     * and let the InputSource go fetch the contents.
-     *
-     * @param uri      the resource to get
-     * @param username basic auth username
-     * @param password basic auth password
-     */
-    private static InputSource getInputSourceFromURI(String uri,
-                                                     String username,
-                                                     String password)
-            throws IOException, ProtocolException, UnsupportedEncodingException {
-        URL wsdlurl = null;
-        try {
-            wsdlurl = new URL(uri);
-        } catch (MalformedURLException e) {
-            // we can't process it, it might be a 'simple' foo.wsdl
-            // let InputSource deal with it
-            return new InputSource(uri);
-        }
-        
-        // if no authentication, just let InputSource deal with it
-        if (username == null && wsdlurl.getUserInfo() == null) {
-            return new InputSource(uri);
-        }
-        
-        // if this is not an HTTP{S} url, let InputSource deal with it
-        if (!wsdlurl.getProtocol().startsWith("http")) {
-            return new InputSource(uri);
-        }
-        URLConnection connection = wsdlurl.openConnection();
-        // Does this work for https???
-        if (!(connection instanceof HttpURLConnection)) {
-            // can't do http with this URL, let InputSource deal with it
-            return new InputSource(uri);
-        }
-        HttpURLConnection uconn = (HttpURLConnection) connection;
-        String userinfo = wsdlurl.getUserInfo();
-        uconn.setRequestMethod("GET");
-        uconn.setAllowUserInteraction(false);
-        uconn.setDefaultUseCaches(false);
-        uconn.setDoInput(true);
-        uconn.setDoOutput(false);
-        uconn.setInstanceFollowRedirects(true);
-        uconn.setUseCaches(false);
-
-        // username/password info in the URL overrides passed in values 
-        String auth = null;
-        if (userinfo != null) {
-            auth = userinfo;
-        } else if (username != null) {
-            auth = (password == null) ? username : username + ":" + password;
-        }
-        if (auth != null) {
-            uconn.setRequestProperty("Authorization",
-                    "Basic " +
-                    base64encode(auth.getBytes(charEncoding)));
-        }
-        uconn.connect();
-        return new InputSource(uconn.getInputStream());
-    }
-
-    public static final String base64encode(byte[] bytes) {
-        return new String(Base64.encode(bytes));
-    }
-
-    public static InputSource getEmptyInputSource() {
-        return new InputSource(bais);
-    }
-
-    /**
-     * Find a Node with a given QName
-     *
-     * @param node parent node
-     * @param name QName of the child we need to find
-     * @return child node
-     */
-    public static Node findNode(Node node, QName name) {
-        if (name.getNamespaceURI().equals(node.getNamespaceURI()) &&
-                name.getLocalPart().equals(node.getLocalName()))
-            return node;
-        NodeList children = node.getChildNodes();
-        for (int i = 0; i < children.getLength(); i++) {
-            Node ret = findNode(children.item(i), name);
-            if (ret != null)
-                return ret;
-        }
-        return null;
-    }
 
     public static String getClassNameFromQuallifiedName(String qualifiedName) {
         int index = qualifiedName.lastIndexOf('.');
@@ -762,7 +97,7 @@
                 + "." + firstCharacterToUpperCase(JavaUtils.xmlNameToJava(qname.getLocalPart()));
     }
 
-    public static Method getJavaMethod(String className, String methodName) throws J2EEFault {
+    public static Method getJavaMethod(String className, String methodName) throws AxisFault {
         String primKey = null;
         Class sei;
         try {
@@ -778,8 +113,7 @@
                 throw new org.apache.geronimo.ews.ws4j2ee.toWs.UnrecoverableGenerationFault("Method " + methodName + " not found in the class" + className);
             return callMethod;
         } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            throw new J2EEFault(e);
+            throw AxisFault.makeFault(e);
         }
     }
 
@@ -956,6 +290,50 @@
         File parent = file.getParentFile();
         parent.mkdirs();
     }
+    private static DocumentBuilderFactory getDOMFactory() {
+          DocumentBuilderFactory dbf;
+          try {
+              dbf = DocumentBuilderFactory.newInstance();
+              dbf.setNamespaceAware(true);
+          } catch (Exception e) {
+//              log.error(Messages.getMessage("exception00"), e );
+              dbf = null;
+          }
+          return (dbf);
+      }
+      
+    public static Document createDocument(InputStream in) throws GenerationFault {
+        try {
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setNamespaceAware(true);
+            dbf.setValidating(false);
+            dbf.setExpandEntityReferences(false);
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            EntityResolver er = new EntityResolver() {
+                public InputSource resolveEntity(String publicId,
+                                                 String systemId)
+                        throws SAXException, IOException {
+                    InputStream is = null;
+                    if ("http://java.sun.com/dtd/ejb-jar_2_0.dtd".equalsIgnoreCase(systemId)) {
+                        return getInputSource(Utils.class.getClassLoader().getResourceAsStream("ejb-jar_2_0.dtd"));
+                    } else if ("http://java.sun.com/dtd/web-app_2_3.dtd".equalsIgnoreCase(systemId))
+                        return getInputSource(Utils.class.getClassLoader().getResourceAsStream("web-app_2_3.dtd"));
+                    return null;
+                }
+
+                private InputSource getInputSource(InputStream is) throws IOException {
+                    if (is == null)
+                        throw new IOException("error at the project set up can not find entity");
+                    return new InputSource(is);
+                }
+            };
+            db.setEntityResolver(er);
+            return db.parse(in);
+        } catch (Exception e) {
+            throw GenerationFault.createGenerationFault(e);
+        }
+    }
+
 
 }
 

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ContextAccssible.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ContextAccssible.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/GeronimoUtils.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/GeronimoUtils.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ImplBeanPool.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/ImplBeanPool.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEFault.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEFault.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEProvider.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/J2EEProvider.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/JaxRpcRuntime.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/JaxRpcRuntime.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/PropertyLoader.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/PropertyLoader.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/WSDDJavaJ2EEProvider.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/src/org/apache/geronimo/ews/ws4j2ee/wsutils/WSDDJavaJ2EEProvider.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/AppTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/AppTest.java?view=auto&rev=126350
==============================================================================

Deleted: /webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/NaughtyTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/NaughtyTest.java?view=auto&rev=126350
==============================================================================

Modified: webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java&r1=126350&p2=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java	(original)
+++ webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/JaxRpcMappingTest.java	Mon Jan 24 22:37:45 2005
@@ -32,7 +32,6 @@
 import org.apache.geronimo.ews.AbstractTestCase;
 import org.apache.geronimo.ews.jaxrpcmapping.J2eeEmitter;
 import org.apache.geronimo.ews.jaxrpcmapping.JaxRpcMapper;
-
 import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
 import org.apache.geronimo.ews.ws4j2ee.context.JaxRpcMapperContext;
 import org.apache.geronimo.ews.ws4j2ee.context.wsdl.WSDLContext;

Modified: webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java&r1=126350&p2=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java	(original)
+++ webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java	Mon Jan 24 22:37:45 2005
@@ -17,11 +17,11 @@
 
 import java.io.File;
 import java.io.FileOutputStream;
-import java.io.FileWriter;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.MalformedURLException;
 import java.net.ServerSocket;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -41,42 +41,33 @@
 /**
  * @author Srinath Perera(hemapani@opensource.lk)
  */
-public class WebApplicationTest extends AbstractTestCase{
-    private boolean useTcpMon = true;
-    private tcpmon tcpmon;
+public class WebApplicationTest extends AbstractTestCase {
     private int sendPort = 4444;
     private int serverport = 4444;
     private SimpleAxisServer sas;
-    
+
     public WebApplicationTest(String testName) {
         super(testName);
     }
     protected void setUp() throws Exception {
-        if(useTcpMon){
-            sendPort = 5555;
-            tcpmon = new tcpmon(sendPort,"127.0.0.1",serverport);
-            
-        }
-        
-        
         File wsddFile = new File(getTestFile("target/server-config.wsdd"));
         wsddFile.delete();
         wsddFile.createNewFile();
         OutputStream out = new FileOutputStream(wsddFile);
-        
-        InputStream in = Thread.currentThread().getContextClassLoader()
-            .getResourceAsStream("org/apache/axis/server/server-config.wsdd");
-        
+
+        InputStream in =
+            Thread.currentThread().getContextClassLoader().getResourceAsStream(
+                "org/apache/axis/server/server-config.wsdd");
+
         byte[] buf = new byte[1024];
         int read = in.read(buf);
-    
-        while(read > 0){
-            out.write(buf,0,read);
+
+        while (read > 0) {
+            out.write(buf, 0, read);
             read = in.read(buf);
         }
         in.close();
         out.close();
-                        
 
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
@@ -86,53 +77,110 @@
         sas.setServerSocket(new ServerSocket(serverport));
         sas.setMyConfig(wsdddoc.getDeployment());
         sas.start();
-        
+
     }
-    
-    
-    public void testEcho()throws Exception{
-        String[] args2 = new String[]{
-               getTestFile("target/generated/samples/echo.war"),"-o",
-                outDir+"withoutWSDL/echo-war/"};
-        Ws4J2ee.main(args2);
-
-        File jarFile = new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
-        
-        URLClassLoader cl = new URLClassLoader(new URL[]{jarFile.toURL()},Thread.currentThread().getContextClassLoader());
-        InputStream deplydd = cl.getResourceAsStream("deploy.wsdd");
-        assertNotNull(deplydd);
-
-        ClassLoader parentClassLoder = ClassUtils.getDefaultClassLoader();
-        ClassUtils.setDefaultClassLoader(cl);
-        AdminClient adminClient = new AdminClient();
-
-        URL requestUrl = new URL("http://localhost:"+sendPort+"/axis/services/AdminService");
-        Call call = adminClient.getCall();
-        call.setTargetEndpointAddress(requestUrl);
-        String result = adminClient.process(null, deplydd);
-        System.out.println(result);
-
-        Class echoLoacaterClass = ClassUtils.forName("org.apache.ws.echosample.EchoServiceLocator");
-        Class structClass = ClassUtils.forName("org.apache.ws.echosample.EchoStruct");
-
-        Object echoLoacater = echoLoacaterClass.newInstance();
-        Method getportMethod = echoLoacaterClass.getMethod("getechoPort", new Class[]{URL.class});
-
-        URL serviceURL = new URL("http://localhost:"+sendPort+"/axis/services/echoPort");
-        Object echoPort = getportMethod.invoke(echoLoacater, new Object[]{serviceURL});
-        Class echoClass = echoPort.getClass();
-
-        Method echoStringMethod = echoClass.getMethod("echoString", new Class[]{String.class});
-        String in = "Hello";
-        assertEquals(in,echoStringMethod.invoke(echoPort, new Object[]{in}));
-
-        
-        Method echostuctMethod = echoClass.getMethod("echoStruct", new Class[]{structClass});
-        Object structval = structClass.newInstance();
-        Object structret = echostuctMethod.invoke(echoPort, new Object[]{structval});
-        
-        System.out.println("Sucssessful");
-        
+
+    public void testEcho() throws Exception {
+        try {
+
+            String[] args2 =
+                new String[] {
+                    getTestFile("target/generated/samples/echo.war"),
+                    "-o",
+                    outDir + "withoutWSDL/echo-war/" };
+            Ws4J2ee.main(args2);
+
+//            File jarFile =
+//                new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
+            URL jarFileURL =
+                new URL("file","","target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
+
+            URLClassLoader cl =
+                new URLClassLoader(
+                    new URL[] { jarFileURL},
+                    Thread.currentThread().getContextClassLoader());
+            InputStream deplydd = cl.getResourceAsStream("deploy.wsdd");
+            assertNotNull(deplydd);
+
+            ClassLoader parentClassLoder = ClassUtils.getDefaultClassLoader();
+            ClassUtils.setDefaultClassLoader(cl);
+            AdminClient adminClient = new AdminClient();
+
+            URL requestUrl =
+                new URL(
+                    "http://localhost:"
+                        + sendPort
+                        + "/axis/services/AdminService");
+            Call call = adminClient.getCall();
+            call.setTargetEndpointAddress(requestUrl);
+            String result = adminClient.process(null, deplydd);
+            System.out.println(result);
+
+            ClassUtils.setClassLoader(
+                "org.apache.ws.echosample.EchoStruct",
+                cl);
+            Class echoLoacaterClass =
+                ClassUtils.forName(
+                    "org.apache.ws.echosample.EchoServiceLocator");
+            Class structClass =
+                ClassUtils.forName("org.apache.ws.echosample.EchoStruct");
+
+            Object echoLoacater = echoLoacaterClass.newInstance();
+            Method getportMethod =
+                echoLoacaterClass.getMethod(
+                    "getechoPort",
+                    new Class[] { URL.class });
+
+            URL serviceURL =
+                new URL(
+                    "http://localhost:" + sendPort + "/axis/services/echoPort");
+            Object echoPort =
+                getportMethod.invoke(echoLoacater, new Object[] { serviceURL });
+            Class echoClass = echoPort.getClass();
+
+            Method echoStringMethod =
+                echoClass.getMethod("echoString", new Class[] { String.class });
+            String in = "Hello";
+            assertEquals(
+                in,
+                echoStringMethod.invoke(echoPort, new Object[] { in }));
+
+            Method echostuctMethod =
+                echoClass.getMethod("echoStruct", new Class[] { structClass });
+            Object structval = structClass.newInstance();
+            Object structret =
+                echostuctMethod.invoke(echoPort, new Object[] { structval });
+
+            System.out.println("Sucssessful");
+        } catch (MalformedURLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (SecurityException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalArgumentException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (Throwable e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+
     }
     protected void tearDown() throws Exception {
         sas.stop();

Modified: webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java&r1=126350&p2=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java	(original)
+++ webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/XMLBeansTest.java	Mon Jan 24 22:37:45 2005
@@ -15,19 +15,22 @@
  */
 package org.apache.geronimo.ews.ws4j2ee;
 
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.util.jar.JarFile;
 
 import noNamespace.EjbJarDocument;
 
 import org.apache.geronimo.ews.AbstractTestCase;
 import org.apache.xmlbeans.XmlObject;
 
-import com.sun.java.xml.ns.j2Ee.DisplayNameType;
 import com.sun.java.xml.ns.j2Ee.WebservicesDocument;
 import com.sun.java.xml.ns.j2Ee.WebservicesType;
 
-import junit.framework.TestCase;
-
 /**
  * @author Srinath Perera(hemapani@opensource.lk)
  */
@@ -63,7 +66,7 @@
 //    
     }    
     
-    public void testWSDD()throws Exception{
+    public void xtestWSDD()throws Exception{
         WebservicesDocument wsDoc = WebservicesDocument.Factory.parse(
             new FileInputStream(getTestFile("samples/ejb/echo/META-INF/webservices.xml")));
         WebservicesType ws =  wsDoc.getWebservices();
@@ -72,5 +75,4 @@
         XmlObject[] vals = wsDoc.selectPath("declare namespace j2ee=\'http://java.sun.com/xml/ns/j2ee\' j2ee:webservices/j2ee:display-name");
         //System.out.println(((DisplayNameType)vals[0]).getStringValue());
     }
-
 }

Modified: webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java
Url: http://svn.apache.org/viewcvs/webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java?view=diff&rev=126351&p1=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java&r1=126350&p2=webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java&r2=126351
==============================================================================
--- webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java	(original)
+++ webservices/ews/branches/provider-based/test/org/apache/geronimo/ews/ws4j2ee/providerUsage/POJOBasedEWSWithProviderTest.java	Mon Jan 24 22:37:45 2005
@@ -40,7 +40,7 @@
  * @author Srinath Perera(hemapani@opensource.lk)
  */
 public class POJOBasedEWSWithProviderTest extends AbstractTestCase{
-    private boolean useTcpMon = false;
+    private boolean useTcpMon = true;
     private tcpmon tcpmon;
     private int sendPort = 4444;
     private int serverport = 4444;
@@ -95,14 +95,18 @@
                 outDir+"withoutWSDL/echo-war/"};
         Ws4J2ee.main(args2);
         
-        File jarFile = new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
+        File ServerJarFile = new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
+        File clientJarFile = new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl-client.jar");
         
-        URLClassLoader cl = new URLClassLoader(new URL[]{jarFile.toURL()},Thread.currentThread().getContextClassLoader());
-        InputStream deplydd = cl.getResourceAsStream("deploy.wsdd");
+        URLClassLoader clientCl = new URLClassLoader(new URL[]{clientJarFile.toURL()},Thread.currentThread().getContextClassLoader());
+        URLClassLoader serverCl = new URLClassLoader(new URL[]{ServerJarFile.toURL()},Thread.currentThread().getContextClassLoader());
+        
+        ClassUtils.setDefaultClassLoader(serverCl);        
+        
+        
+        InputStream deplydd = serverCl.getResourceAsStream("deploy.wsdd");
         assertNotNull(deplydd);
 
-        ClassLoader parentClassLoder = ClassUtils.getDefaultClassLoader();
-        ClassUtils.setDefaultClassLoader(cl);
         AdminClient adminClient = new AdminClient();
 
         URL requestUrl = new URL("http://localhost:"+sendPort+"/axis/services/AdminService");
@@ -111,8 +115,8 @@
         String result = adminClient.process(null, deplydd);
         System.out.println(result);
 
-        Class echoLoacaterClass = ClassUtils.forName("org.apache.ws.echosample.EchoServiceLocator");
-        Class structClass = ClassUtils.forName("org.apache.ws.echosample.EchoStruct");
+        Class echoLoacaterClass = Class.forName("org.apache.ws.echosample.EchoServiceLocator",true,clientCl);
+        Class structClass = Class.forName("org.apache.ws.echosample.EchoStruct",true,clientCl);
 
         Object echoLoacater = echoLoacaterClass.newInstance();
         Method getportMethod = echoLoacaterClass.getMethod("getechoPort", new Class[]{URL.class});

---------------------------------------------------------------------
To unsubscribe, e-mail: ews-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: ews-dev-help@ws.apache.org