[jboss-svn-commits] JBL Code SVN: r20722 - labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice.

[jboss-svn-commits at lists.jboss.org]

Author: jim.ma
Date: 2008-06-24 03:38:35 -0400 (Tue, 24 Jun 2008)
New Revision: 20722

Modified:
   labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JBossWSDeploymentGenerator.java
Log:
Generate the temporary file under ServerDeployTmp directory

Modified: labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JBossWSDeploymentGenerator.java
===================================================================
--- labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JBossWSDeploymentGenerator.java	2008-06-24 07:11:12 UTC (rev 20721)
+++ labs/jbossesb/workspace/jimma/product/rosetta/src/org/jboss/internal/soa/esb/webservice/JBossWSDeploymentGenerator.java	2008-06-24 07:38:35 UTC (rev 20722)
@@ -35,32 +35,36 @@
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.util.ClassUtil;
+import org.jboss.system.server.ServerConfig;
+import org.jboss.system.server.ServerConfigLocator;
 import org.jboss.util.file.JarUtils;
 
 public class JBossWSDeploymentGenerator {
 	private Logger logger = Logger.getLogger(getClass());
-	public String warName;
-	public CopyOnWriteArrayList<File> warFileList = new CopyOnWriteArrayList<File>();
-	public CopyOnWriteArrayList<File> earFileList = new CopyOnWriteArrayList<File>();
+	private String warName;
+	protected CopyOnWriteArrayList<File> warFileList = new CopyOnWriteArrayList<File>();
+	protected CopyOnWriteArrayList<File> earFileList = new CopyOnWriteArrayList<File>();
 	public String tmpDir = System.getProperty("java.io.tmpdir");
-	public ESBServiceEndpointInfo endpointInfo;
-
+	protected ESBServiceEndpointInfo endpointInfo;
+	protected File tempDeployDir = null;
+    
 	public JBossWSDeploymentGenerator(ESBServiceEndpointInfo endpoint) {
 		endpointInfo = endpoint;
 		warName = (endpoint.getServiceCategory().toLowerCase() + "-" + endpoint
 				.getServiceName()).toLowerCase()
 				+ ".war";
-
+		ServerConfig config = ServerConfigLocator.locate();
+		tempDeployDir = config.getServerTempDeployDir();
 	}
 
 	private File generateEar() throws Exception {
 		try {
 			addFileToEar(generateEarAppXml());
-			File warTmp = File.createTempFile(endpointInfo.getEndpointName()
-					+ "ear", "dir");
-			warTmp.delete();
-			warTmp.mkdirs();
-			File earDir = new File(warTmp.getPath() + File.separator + "sub");
+			File earTmp = File.createTempFile("tmp", endpointInfo.getEndpointName()
+					+ ".ear", tempDeployDir);
+			earTmp.delete();
+			earTmp.mkdirs();
+			File earDir = new File(earTmp.getPath() + File.separator + "contents");
 			earDir.mkdir();
 
 			for (File file : earFileList) {
@@ -79,7 +83,7 @@
 			String earName = endpointInfo.getServiceCategory().toLowerCase()
 					+ "-" + endpointInfo.getServiceName().toLowerCase()
 					+ ".ear";
-			File earFile = new File(warTmp + File.separator + earName);
+			File earFile = new File(earTmp + File.separator + earName);
 			earFile.createNewFile();
 			FileOutputStream fout = new FileOutputStream(earFile);
 			JarUtils.jar(fout, earDir.listFiles());
@@ -98,11 +102,11 @@
 			addFileToWar(generateWebXml());
 			addFileToWar(generateWSDLFile());
 			addFileToWar(generateJbossWebXml());
-			File warTmp = File.createTempFile(endpointInfo.getEndpointName()
-					+ "war", "dir");
+			File warTmp = File.createTempFile("tmp", endpointInfo.getEndpointName()
+					+ ".war", tempDeployDir);
 			warTmp.delete();
 			warTmp.mkdirs();
-			File warDir = new File(warTmp.getPath() + File.separator + "sub");
+			File warDir = new File(warTmp.getPath() + File.separator + "contents");
 			warDir.mkdir();
 
 			for (File file : warFileList) {
@@ -133,7 +137,8 @@
 		}
 
 	}
-    //Directly deploy the generated webservice war file in esb server
+
+	// Directly deploy the generated webservice war file in esb server
 	public void deployWar(File esbFile) throws WebServicePublishException {
 		File wsWar;
 		try {
@@ -157,7 +162,8 @@
 				+ esbFile.getName());
 
 	}
-    //package the web serivice war as a subdeployment of ESB archive
+
+	// package the web serivice war as a subdeployment of ESB archive
 	public void injectWarToESBArchive(File esbFile)
 			throws WebServicePublishException {
 		File warFile;
@@ -173,7 +179,7 @@
 		if (esbFile.exists() && esbFile.isFile()) {
 			try {
 				FileInputStream fin = new FileInputStream(esbFile);
-				File tmpDir = File.createTempFile(esbFile.getName(), ".tmp");
+				File tmpDir = File.createTempFile("tmp", esbFile.getName(), tempDeployDir);
 				tmpDir.delete();
 				tmpDir.mkdirs();
 				JarUtils.unjar(fin, tmpDir);
@@ -205,7 +211,9 @@
 						+ esbFile.getName());
 
 	}
-	//wrap the generated web service .war as an .ear and package it as a subdeployment of ESB archive
+
+	// wrap the generated web service .war as an .ear and package it as a
+	// subdeployment of ESB archive
 	public void injectEarToESBArchive(File esbFile)
 			throws WebServicePublishException {
 		File earFile;
@@ -221,7 +229,7 @@
 		if (esbFile.exists() && esbFile.isFile()) {
 			try {
 				FileInputStream fin = new FileInputStream(esbFile);
-				File tmpDir = File.createTempFile(esbFile.getName(), ".tmp");
+				File tmpDir = File.createTempFile("tmp", esbFile.getName(), tempDeployDir);
 				tmpDir.delete();
 				tmpDir.mkdirs();
 				JarUtils.unjar(fin, tmpDir);