Rollback JVMClassPath changes.

git-svn-id: https://svn.java.net/svn/appbundler~svn@9 07572b26-92e5-4d45-f66a-c18421440a21

Author: gk_brown

appbundler/native/main.m

@@ -32,7 +32,6 @@
 
 #define JVM_RUNTIME_KEY "JVMRuntime"
 #define JVM_MAIN_CLASS_NAME_KEY "JVMMainClassName"
-#define JVM_CLASS_PATH_KEY "JVMClassPath"
 #define JVM_OPTIONS_KEY "JVMOptions"
 #define JVM_ARGUMENTS_KEY "JVMArguments"
 
@@ -120,23 +119,21 @@ int launch(char *commandName) {
     }
 
     // Set the class path
-    NSMutableString *classPath = [NSMutableString stringWithString:@"-Djava.class.path="];
-    NSArray *classPathEntries = [infoDictionary objectForKey:@JVM_CLASS_PATH_KEY];
-    if (classPathEntries == nil || [classPathEntries count] == 0) {
-        [NSException raise:@JAVA_LAUNCH_ERROR format:@"%@ is required.", @JVM_CLASS_PATH_KEY];
+    NSString *javaPath = [mainBundlePath stringByAppendingString:@"/Contents/Java"];
+    NSMutableString *classPath = [NSMutableString stringWithFormat:@"-Djava.class.path=%@/Classes", javaPath];
+
+    NSFileManager *defaultFileManager = [NSFileManager defaultManager];
+    NSArray *javaDirectoryContents = [defaultFileManager contentsOfDirectoryAtPath:javaPath error:nil];
+    if (javaDirectoryContents == nil) {
+        [NSException raise:@JAVA_LAUNCH_ERROR format:@"Could not enumerate Java directory contents."];
     }
 
-    for (int i = 0, n = [classPathEntries count]; i < n; i++) {
-        NSString *classPathEntry = [classPathEntries objectAtIndex:i];
-        if (i > 0) {
-            [classPath appendString:@":"];
+    for (NSString *file in javaDirectoryContents) {
+        if ([file hasSuffix:@".jar"]) {
+            [classPath appendFormat:@":%@/%@", javaPath, file];
         }
-
-        [classPath appendFormat:@"%@/%@", mainBundlePath, classPathEntry];
     }
 
-    NSLog(@"classPath = %@", classPath);
-
     // Set the library path
     NSString *libraryPath = [NSString stringWithFormat:@"-Djava.library.path=%@/Contents/MacOS", mainBundlePath];
 

appbundler/src/com/oracle/appbundler/AppBundlerTask.java

@@ -139,12 +139,7 @@ public void addConfiguredClassPath(FileSet classPath) {
         String[] includedFiles = directoryScanner.getIncludedFiles();
 
         for (int i = 0; i < includedFiles.length; i++) {
-            File entry = new File(parent, includedFiles[i]);
-            if (entry.isDirectory()) {
-                throw new BuildException("Class path entry cannot be a directory.");
-            }
-
-            this.classPath.add(entry);
+            this.classPath.add(new File(parent, includedFiles[i]));
         }
     }
 
@@ -264,12 +259,25 @@ public void execute() throws BuildException {
             File javaDirectory = new File(contentsDirectory, "Java");
             javaDirectory.mkdir();
 
+            File classesDirectory = new File(javaDirectory, "Classes");
+            classesDirectory.mkdir();
+
             File plugInsDirectory = new File(contentsDirectory, "PlugIns");
             plugInsDirectory.mkdir();
 
             File resourcesDirectory = new File(contentsDirectory, "Resources");
             resourcesDirectory.mkdir();
 
+            // Generate Info.plist
+            File infoPlistFile = new File(contentsDirectory, "Info.plist");
+            infoPlistFile.createNewFile();
+            writeInfoPlist(infoPlistFile);
+
+            // Generate PkgInfo
+            File pkgInfoFile = new File(contentsDirectory, "PkgInfo");
+            pkgInfoFile.createNewFile();
+            writePkgInfo(pkgInfoFile);
+
             // Copy executable to MacOS folder
             File executableFile = new File(macOSDirectory, EXECUTABLE_NAME);
             copy(getClass().getResource(EXECUTABLE_NAME), executableFile);
@@ -283,25 +291,20 @@ public void execute() throws BuildException {
 
             // Copy class path entries to Java folder
             for (File entry : classPath) {
-                // TODO Don't copy if in JRE
-                copy(entry, new File(javaDirectory, entry.getName()));
+                String name = entry.getName();
+
+                if (entry.isDirectory() || name.endsWith(CLASS_EXTENSION)) {
+                    copy(entry, new File(classesDirectory, name));
+                } else {
+                    copy(entry, new File(javaDirectory, name));
+                }
             }
 
-            // Copy native libraries to MacOS folder
+            // Copy native libraries to Java folder
             for (File nativeLibrary : nativeLibraries) {
                 copy(nativeLibrary, new File(macOSDirectory, nativeLibrary.getName()));
             }
 
-            // Generate Info.plist
-            File infoPlistFile = new File(contentsDirectory, "Info.plist");
-            infoPlistFile.createNewFile();
-            writeInfoPlist(infoPlistFile);
-
-            // Generate PkgInfo
-            File pkgInfoFile = new File(contentsDirectory, "PkgInfo");
-            pkgInfoFile.createNewFile();
-            writePkgInfo(pkgInfoFile);
-
             // Copy icon to Resources folder
             if (icon == null) {
                 copy(getClass().getResource(DEFAULT_ICON_NAME), new File(resourcesDirectory,
@@ -360,20 +363,6 @@ private void writeInfoPlist(File file) throws IOException {
             // Write main class name
             writeProperty(xout, "JVMMainClassName", mainClassName);
 
-            // Write class path
-            writeKey(xout, "JVMClassPath");
-
-            xout.writeStartElement(ARRAY_TAG);
-            xout.writeCharacters("\n");
-
-            for (File entry : classPath) {
-                // TODO Write appropriate path based on location
-                writeString(xout, "Contents/Java/" + entry.getName());
-            }
-
-            xout.writeEndElement();
-            xout.writeCharacters("\n");
-
             // Write options
             writeKey(xout, "JVMOptions");