Return-Path: 
 <axis-cvs-return-2001-apmail-ws-axis-dev-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-axis-dev-archive@www.apache.org
Received: (qmail 3187 invoked from network); 7 Jul 2004 14:39:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 7 Jul 2004 14:39:41 -0000
Received: (qmail 81728 invoked by uid 500); 7 Jul 2004 10:44:32 -0000
Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org
Received: (qmail 81696 invoked by uid 500); 7 Jul 2004 10:44:31 -0000
Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:axis-cvs-help@ws.apache.org>
list-unsubscribe: <mailto:axis-cvs-unsubscribe@ws.apache.org>
list-post: <mailto:axis-cvs@ws.apache.org>
Delivered-To: mailing list axis-cvs@ws.apache.org
Received: (qmail 81681 invoked by uid 99); 7 Jul 2004 10:44:31 -0000
X-ASF-Spam-Status: No, hits=0.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Wed, 07 Jul 2004 03:44:30 -0700
Received: (qmail 72608 invoked by uid 1762); 7 Jul 2004 10:44:29 -0000
Date: 7 Jul 2004 10:44:29 -0000
Message-ID: <20040707104429.72607.qmail@minotaur.apache.org>
From: hemapani@apache.org
To: ws-axis-cvs@apache.org
Subject: cvs commit:
 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc
 BuildFileGenerator.java
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

hemapani    2004/07/07 03:44:29

  Modified:    contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc
                        BuildFileGenerator.java
  Log:
  make sure the final implementation jar file created in the output directory
  
  Revision  Changes    Path
  1.12      +6 -7      ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java
  
  Index: BuildFileGenerator.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BuildFileGenerator.java	7 Jul 2004 09:43:14 -0000	1.11
  +++ BuildFileGenerator.java	7 Jul 2004 10:44:29 -0000	1.12
  @@ -189,11 +189,11 @@
   				jarName = jarName.substring(index+1);
   			} 
   			
  -			
  -			File jarFile = new File(j2eewscontext.getMiscInfo().getOutPutPath()+"/"+ jarName + "-ewsimpl.jar");
  -			
  +			String finalJarFile = j2eewscontext.getMiscInfo().getOutPutPath() + "/"+ jarName + "-ewsimpl.jar";
  +			File jarFile = new File(finalJarFile);
  +			String tempFile = "${build}/lib/"+jarName + "-temp.jar";
               
  -			out.write("		<jar jarfile=\""+jarFile.getAbsolutePath()+"\" >\n");
  +			out.write("		<jar jarfile=\""+ tempFile + "\" basedir=\"${build.classes}\" >\n");
   			out.write("		<include name=\"**\" />\n");
   			out.write("		<manifest>\n");
   			out.write("			<section name=\"org/apache/ws4j2ee\">\n");
  @@ -204,14 +204,13 @@
   			out.write("		</jar>\n");
   			if(jarfile != null){
   				out.write("     <java classname=\"org.apache.geronimo.ews.ws4j2ee.utils.packager.Packager\" fork=\"no\" >\n");
  -				out.write("     	<arg value=\""+jarName+".jar\"/>\n");
  +				out.write("     	<arg value=\""+jarFile.getAbsolutePath()+"\"/>\n");
   				out.write("     	<classpath refid=\"classpath\" />\n");
   				for(int i = 0;i<classpathelements.size();i++){
   					out.write("     	<arg value=\""
   						+ ((File)classpathelements.get(i)).getAbsolutePath() + "\"/>\n");				
   				}
  -				out.write("     	<arg value=\"${build}/lib/"
  -						+ jarName + "-impl.jar\"/>\n"); 
  +				out.write("     	<arg value=\""	+ tempFile + "\"/>\n"); 
   				out.write("     </java>\n");
   			}
   //			out.write("		<delete dir=\"${build}\"/>\n");