Changeset 2422

Timestamp:

11/06/09 17:32:16 (2 years ago)

Author:

mswertz

Message:

Probleem met resource kopieren!

File:

• molgenis/3.3/src/org/molgenis/generators/server/MolgenisResourceCopyGen.java (modified) (4 diffs)

molgenis/3.3/src/org/molgenis/generators/server/MolgenisResourceCopyGen.java

@@ -1 +1 @@
 package org.molgenis.generators.server;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 
+import java.io.StringReader;
+import java.net.URL;
+import java.nio.channels.Channel;
+import java.nio.channels.FileChannel;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Enumeration;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
 import org.molgenis.Molgenis;
 import org.molgenis.MolgenisOptions;
@@ -16 +29 @@
 public class MolgenisResourceCopyGen extends Generator
 {
+    public static final String RESOURCE_FOLDER = "org/molgenis/framework/ui/res/";
         @Override
         public String getDescription()
@@ -25 +39 @@
         public void generate(Model model, MolgenisOptions options) throws Exception
         {
-                // copy the images/scripts/css
-                File source = new File(MolgenisOriginalStyle.class.getResource("res").getFile());
-                File target = new File(this.getWebserverPath(options) + "/generated-res");
+            String jarPath = getClass().getResource("").getFile();
+            jarPath = jarPath.split("!")[0].split("file:")[1];
+            
+            // copy the images/scripts/css
+            File source = new File(jarPath);
+            File target = new File(this.getWebserverPath(options) + "/generated-res");
 
-                // deledeleteDirectory(target);
-                copyDirectory(source, target);
-                logger.info("generated " + target);
+            URL url = MolgenisOriginalStyle.class.getResource("");
+            url.toString();
 
-                // copy the libs etc
-                // source = new File(new
-                // File(MolgenisFactory.class.getResource("").getFile()).getParentFile().getParentFile()
-                // .getParentFile()
-                // + "/lib");
-                // // check folder lib
-                // if (source.exists())
-                // {
-                // target = new File(this.getWebserverPath(options) + "/WEB-INF/lib/");
-                // copyDirectory(source, target);
-                // }
+            //check if the target exists otherwise it's created
+            if(!target.exists()) {
+                boolean succes = target.mkdirs();
+                if(!succes)
+                    throw new Exception("can't create /generated-res directory!");
+            }
 
-                logger.info("generated " + target);
+            JarFile jar = new JarFile(jarPath);
+            Enumeration entries = jar.entries();
+            while(entries.hasMoreElements()) {
+                JarEntry file = (JarEntry) entries.nextElement();
+                if(file.getName().contains(RESOURCE_FOLDER)) {
+                    if(!file.isDirectory()) {
+                        ZipEntry zipEntry = jar.getEntry(file.getName());
+                        InputStream is = jar.getInputStream(zipEntry);
+                        String outFilePath = file.getName().replace(RESOURCE_FOLDER, target.getPath() + File.separator);
+                        System.out.println(outFilePath);
+
+                        File dst = new File(outFilePath);
+                        dst.mkdirs();
+                        if(dst.exists()) {
+                            dst.delete();
+                        }
+                        dst.createNewFile();
+                        copyFile(outFilePath, is, dst);
+                    }
+                }
+            }
+            logger.info("generated " + target);
+        }
+
+        public void copyFile(String srcPath, InputStream in, File dst) throws IOException {
+                OutputStream out = new FileOutputStream(dst);
+
+                // Transfer bytes from in to out
+                byte[] buf = new byte[1024];
+                int len;
+                while ((len = in.read(buf)) > 0)
+                {
+                        out.write(buf, 0, len);
+                }
+                in.close();
+                out.close();
+                logger.debug("copied " + srcPath + " to " + dst);
         }
 
@@ -89 +136 @@
         public void copyFile(File src, File dst) throws IOException
         {
+
+
                 if (!src.getAbsolutePath().contains(".svn") && !dst.exists())
                 {