svn commit: r661762 - /ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java

[jaz-3]

Author: jaz
Date: Fri May 30 08:24:39 2008
New Revision: 661762

URL: http://svn.apache.org/viewvc?rev=661762&view=rev
Log:
added additional data to the dataMap; cleaned up imports

Modified:
    ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java

Modified: ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java?rev=661762&r1=661761&r2=661762&view=diff
==============================================================================
--- ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java (original)
+++ ofbiz/trunk/framework/appserver/src/org/ofbiz/appservers/GenerateContainer.java Fri May 30 08:24:39 2008
@@ -26,22 +26,16 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.StringWriter;
 import java.io.Writer;
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
@@ -49,7 +43,6 @@
 import javolution.util.FastMap;
 
 import org.ofbiz.base.component.ComponentConfig;
-import org.ofbiz.base.component.ComponentConfig.WebappInfo;
 import org.ofbiz.base.container.Container;
 import org.ofbiz.base.container.ContainerException;
 import org.ofbiz.base.start.Classpath;
@@ -58,11 +51,7 @@
 import org.ofbiz.base.util.UtilProperties;
 import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.base.util.template.FreeMarkerWorker;
-import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
 
 /**
  * GenerateContainer - Generates Configuration Files For Application Servers
@@ -400,9 +389,12 @@
         return parentDir.listFiles();
     }
 
-    private Map<String, Object> buildDataMap() {
+    private Map<String, Object> buildDataMap() throws ContainerException {
         Map<String, Object> dataMap = FastMap.newInstance();
         List c[] = getClasspath();
+        dataMap.put("targetDirectory", getTargetDirectory());
+        dataMap.put("pathSeparatorChar", File.pathSeparatorChar);
+        dataMap.put("classpath", System.getProperty("java.class.path"));
         dataMap.put("classpathJars", c[0]);
         dataMap.put("classpathDirs", c[1]);
         dataMap.put("env", System.getProperties());
@@ -431,15 +423,7 @@
         return lists;
     }
 
-    private void parseTemplate(File templateFile, Map<String, Object> dataMap) throws ContainerException {
-        Debug.log("Parsing template : " + templateFile.getAbsolutePath(), module);
-        Reader reader = null;
-        try {
-            reader = new InputStreamReader(new FileInputStream(templateFile));
-        } catch (FileNotFoundException e) {
-            throw new ContainerException(e);
-        }
-
+    private String getTargetDirectory() throws ContainerException {
         // create the target file/directory
         String targetDirectoryName = args.length > 1 ? args[1] : null;
         if (targetDirectoryName == null) {
@@ -463,6 +447,21 @@
             targetDirectory = targetDirectory + "/";
         }
 
+        return targetDirectory;
+    }
+
+    private void parseTemplate(File templateFile, Map<String, Object> dataMap) throws ContainerException {
+        Debug.log("Parsing template : " + templateFile.getAbsolutePath(), module);
+        Reader reader = null;
+        try {
+            reader = new InputStreamReader(new FileInputStream(templateFile));
+        } catch (FileNotFoundException e) {
+            throw new ContainerException(e);
+        }
+
+        // create the target file/directory
+        String targetDirectory = getTargetDirectory();
+
         // write the template to the target directory
         Writer writer = null;
         try {