Changeset 2430

Timestamp:

11/08/09 21:18:37 (2 years ago)

Author:

mswertz

Message:

bugfix: works now for eclipse (file) and netbeans/maven (jar)

File:

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

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

@@ -29 +29 @@
 public class MolgenisResourceCopyGen extends Generator
 {
-    public static final String RESOURCE_FOLDER = "org/molgenis/framework/ui/res/";
+        public static final String RESOURCE_FOLDER = "org/molgenis/framework/ui/res/";
+
         @Override
         public String getDescription()
@@ -39 +40 @@
         public void generate(Model model, MolgenisOptions options) throws Exception
         {
-            String jarPath = getClass().getResource("").getFile();
-            jarPath = jarPath.split("!")[0].split("file:")[1];
+                String jarPath = getClass().getResource("").getFile();
 
-            File target = new File(this.getWebserverPath(options) + "/generated-res");
+                // System.out.println(jarPath);
+                if (jarPath.contains("!"))
+                {
 
+                        jarPath = jarPath.split("!")[0].split("file:")[1];
 
-            //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!");
-            }
+                        File target = new File(this.getWebserverPath(options) + "/generated-res");
 
-            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);
+                        // 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!");
+                        }
 
-                        File dst = new File(outFilePath);
-                        dst.mkdirs();
-                        if(dst.exists()) {
-                            dst.delete();
+                        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);
+                                        }
+                                }
                         }
-                        dst.createNewFile();
-                        copyFile(outFilePath, is, dst);
-                    }
+
+                        logger.info("generated " + target);
                 }
-            }
-            logger.info("generated " + target);
+                else
+                {
+                        // copy the images/scripts/css
+                        File source = new File(MolgenisOriginalStyle.class.getResource("res").getFile());
+                        File target = new File(this.getWebserverPath(options) + "/generated-res");
+
+                        // deledeleteDirectory(target);
+                        copyDirectory(source, target);
+                        logger.info("generated " + target);
+                }
         }
 
-        public void copyFile(String srcPath, InputStream in, File dst) throws IOException {
+        public void copyFile(String srcPath, InputStream in, File dst) throws IOException
+        {
                 OutputStream out = new FileOutputStream(dst);
 
@@ -133 +155 @@
         {
 
-
                 if (!src.getAbsolutePath().contains(".svn") && !dst.exists())
                 {