diff -r e61abb5095cb mobility.plugins.blackberry/manifest.mf
--- a/mobility.plugins.blackberry/manifest.mf	Sat Jul 19 05:56:16 2008 +0800
+++ b/mobility.plugins.blackberry/manifest.mf	Tue Jul 22 16:28:26 2008 +0800
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.mobility.plugins.blackberry
+OpenIDE-Module-Implementation-Version: 1
 OpenIDE-Module-Layer: org/netbeans/modules/mobility/plugins/blackberry/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mobility/plugins/blackberry/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.0
 
diff -r e61abb5095cb mobility.plugins.blackberry/nbproject/project.properties
--- a/mobility.plugins.blackberry/nbproject/project.properties	Sat Jul 19 05:56:16 2008 +0800
+++ b/mobility.plugins.blackberry/nbproject/project.properties	Tue Jul 22 16:28:26 2008 +0800
@@ -3,3 +3,4 @@
 license.file=../cddl.txt
 nbm.module.author=Sun Microsystems
 nbm.homepage=http://mobility.netbeans.org/
+spec.version.base=1.0
diff -r e61abb5095cb mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/BlackBerryPlatformConfigurator.java
--- a/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/BlackBerryPlatformConfigurator.java	Sat Jul 19 05:56:16 2008 +0800
+++ b/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/BlackBerryPlatformConfigurator.java	Tue Jul 22 16:28:26 2008 +0800
@@ -50,6 +50,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.jar.JarFile;
 import org.netbeans.spi.mobility.cldcplatform.CLDCPlatformDescriptor;
 import org.netbeans.spi.mobility.cldcplatform.CustomCLDCPlatformConfigurator;
 import org.openide.ErrorManager;
@@ -66,10 +67,9 @@
     }
 
     private static final String keyFiles[] = new String[] {
-        "simulator/handhelds.manifest.txt", "bin/rapc.exe", //NOI18N
+        "bin/rapc.exe", //NOI18N
         "bin/preverify.exe", "bin/JavaLoader.exe", "lib/net_rim_api.jar"}; //NOI18N
-    
-    private static final String BB_PLATFORM_NAME = "BlackBerry Device Simulator 2.3"; //NOI18N
+    //"simulator/handhelds.manifest.txt", 
     
     private static final String CLASSPATH= "${platform.home}/lib/net_rim_api.jar"; //NOI18N
     
@@ -88,10 +88,52 @@
         if (!isPossiblePlatform(f)) return null;
         f = FileUtil.normalizeFile(f);
         File docs = FileUtil.normalizeFile(new File(f, "docs/api")); //NOI18N
+        String platformName = "BlackBerry JDE"; //NOI18N
+            
         BufferedReader br = null;
         try {
-            br = new BufferedReader(new FileReader(new File(f, "simulator/handhelds.manifest.txt"))); //NOI18N
-            String devNames[] = br.readLine().split(" ");//NOI18N
+            File manifest = new File(f, "simulator/handhelds.manifest.txt"); //NOI18N
+            String devNames[] = null;
+            if (manifest.exists())
+            {
+                br = new BufferedReader(new FileReader(manifest));
+                devNames = br.readLine().split(" ");//NOI18N
+            }
+            else
+            {
+                devNames = new String[]{"BlackBerry Device"};//NOI18N
+                platformName = "BlackBerry JDE Component Package";
+            }
+
+        File rim = new File(f, "lib/net_rim_api.jar");
+        JarFile rimJar=null;
+        try {
+            rimJar = new JarFile(rim);
+            String version = rimJar.getManifest().getMainAttributes().getValue("MIDlet-Version");
+            if (version==null || version.length()==0)
+            {
+                if (f.getName().toLowerCase().contains(platformName.toLowerCase()))
+                        platformName = f.getName();
+                else
+                        platformName = platformName + " " + f.getName();
+            }
+            else
+            {
+                version = removeBuildVersion(version);
+                platformName = platformName + " " + version;
+            }
+        } catch (IOException ex) {
+            //Exceptions.printStackTrace(ex);
+        }
+        finally
+        {
+            if (rimJar!=null)
+                try {
+                rimJar.close();
+            } catch (IOException ex) {
+            }
+        }
+            
             ArrayList<CLDCPlatformDescriptor.Device> devices = new ArrayList<CLDCPlatformDescriptor.Device>();
             ArrayList<CLDCPlatformDescriptor.Profile> profiles = new ArrayList<CLDCPlatformDescriptor.Profile>();
             profiles.add(new CLDCPlatformDescriptor.Profile("CLDC", "1.1", "Connected Limited Device Configuration", CLDCPlatformDescriptor.ProfileType.Configuration, null, CLASSPATH, true)); //NOI18N
@@ -103,10 +145,27 @@
             for (int i=0; i<devNames.length; i++) {
                 devices.add(new CLDCPlatformDescriptor.Device(devNames[i], devNames[i], null, profiles, new CLDCPlatformDescriptor.Screen(240, devNames[i].charAt(1) == '1' ? 260 : 160, 16, true, false)));
             }
-            return new CLDCPlatformDescriptor(BB_PLATFORM_NAME, f.getAbsolutePath(), "CUSTOM", null, docs.getAbsolutePath(), 
-                    "\"{platformhome}{/}bin{/}preverify\" {classpath|-classpath \"{classpath}\"} -d \"{destdir}\" \"{srcdir}\"",  //NOI18N
-                    "cmd /C \"cd /D {platformhome}{/}simulator&{device}\"",  //NOI18N
-                    "cmd /C \"cd /D {platformhome}{/}bin&jdwp\"", devices); //NOI18N
+            
+            ///bin/sh wine "{platformhome}{/}bin{/}preverify.exe" {classpath|-classpath "`" + winepath + " -w  {classpath}`"} -d "`" + winepath + " -w {destdir}`" "`" + winepath + " -w {srcdir}`"
+            if (System.getProperty("os.name").toLowerCase().startsWith("windows"))
+            {
+                return new CLDCPlatformDescriptor(platformName, f.getAbsolutePath(), "CUSTOM", null, docs.getAbsolutePath(),
+                        "\"{platformhome}{/}bin{/}preverify\" {classpath|-classpath \"{classpath}\"} -d \"{destdir}\" \"{srcdir}\"", //NOI18N
+                        "cmd /C \"cd /D {platformhome}{/}simulator&{device}\"", //NOI18N
+                        "cmd /C \"cd /D {platformhome}{/}bin&jdwp\"", devices); //NOI18N
+            }
+            else
+            {
+                String sh = findFile("sh", "/bin", "/usr/bin", "/usr/local/bin", System.getProperty("user.home") + File.separator + "bin");
+                String wine = findFile("wine",  "/usr/bin","/bin", "/usr/local/bin", System.getProperty("user.home") + File.separator + "bin", System.getProperty("user.home") + File.separator + "wine" + File.separator + "bin", "/usr/local/wine/bin", "/opt/wine/bin", "/usr/sfw/bin", "/opt/sfw/bin");
+                String winepath = findFile("winepath", "/usr/bin","/bin", "/usr/local/bin", System.getProperty("user.home") + File.separator + "bin", System.getProperty("user.home") + File.separator + "wine" + File.separator + "bin", "/usr/local/wine/bin", "/opt/wine/bin", "/usr/sfw/bin", "/opt/sfw/bin");
+
+                return new CLDCPlatformDescriptor(platformName, f.getAbsolutePath(), "CUSTOM", null, docs.getAbsolutePath(),
+                        sh + " -c '" + wine + " \"{platformhome}{/}bin{/}preverify.exe\" {classpath|-classpath \"`" + winepath + " -w  \"{classpath}\"`\"} -d \"`" + winepath + " -w \"{destdir}\"`\" \"`" + winepath + " -w \"{srcdir}\"`\"'", //NOI18N
+                        sh + " -c 'cd   \"{platformhome}{/}simulator{/}\" && " + wine + " cmd /C \"{device}.bat\"'", //NOI18N
+                        sh + " -c 'cd   \"{platformhome}{/}bin{/}\" && " + wine + " cmd /C \"jdwp.bat\"'", devices); //NOI18N
+                            
+            }
         } catch (IOException ioe) {
             ErrorManager.getDefault().notify(ioe);
             return null;
@@ -114,5 +173,26 @@
             if (br != null) try {br.close();} catch (IOException ioe) {}
         }
     }
+
+    
+    private String findFile(String file, String ... paths) {
+        for(String path:paths)
+        {
+            File f = new File(path + File.separator + file);
+            if (f.exists() && f.canRead())
+            {
+                return f.getAbsolutePath();
+            }
+        }
+        return paths[0] + File.separator + file;
+    }
+
+    private String removeBuildVersion(String version) {
+        if (version.split("\\.").length>3)
+        {
+            return version.substring(0,version.lastIndexOf("."));
+        }
+        return version;
+    }
     
 }
diff -r e61abb5095cb mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/blackberry-init
--- a/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/blackberry-init	Sat Jul 19 05:56:16 2008 +0800
+++ b/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/blackberry-init	Tue Jul 22 16:28:26 2008 +0800
@@ -1,5 +1,5 @@
 <xsl:comment>blackberry-init</xsl:comment>
     <target name="blackberry-init">
-        <available file="${{platform.home}}/bin/rapc.exe" property="blackberry.trigger"/>
+        <available file="${{platform.home}}/bin/rapc.jar" property="blackberry.trigger"/>
         <available file="${{platform.home}}/bin/Settings.rc" property="blackberry.settings.trigger"/>
     </target>
diff -r e61abb5095cb mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/create-cod
--- a/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/create-cod	Sat Jul 19 05:56:16 2008 +0800
+++ b/mobility.plugins.blackberry/src/org/netbeans/modules/mobility/plugins/blackberry/create-cod	Tue Jul 22 16:28:26 2008 +0800
@@ -1,10 +1,40 @@
 <xsl:comment>create-cod</xsl:comment>
     <target name="create-cod" if="blackberry.trigger">
-        <exec dir="${{dist.dir}}" executable="${{platform.home}}/bin/rapc.exe" failonerror="true">
+        <exec dir="${{dist.dir}}" executable="java" failonerror="true">
+            <arg value="-cp"/>
+            <arg value="${{platform.home}}/bin/rapc.jar"/>
+            <arg value="net.rim.tools.compiler.Compiler"/>            
             <arg value="import=${{platform.bootclasspath}}"/>
             <arg value="codename=${{name}}"/>
             <arg value="-midlet"/>
             <arg value="jad=${{basedir}}/${{dist.dir}}/${{dist.jad}}"/>
             <arg value="${{basedir}}/${{dist.dir}}/${{dist.jar}}"/>
         </exec>
+        <property file="${{dist.dir}}/${{dist.jad}}"/>
+        <echo file="${{basedir}}/${{dist.dir}}/${{name}}.alx">
+&lt;loader version="1.0"&gt;
+    &lt;application id="${name}"&gt;
+        &lt;name&gt;
+            ${MIDlet-Name}
+        &lt;/name&gt;
+        &lt;description&gt;
+            ${MIDlet-Description}
+        &lt;/description&gt;
+        &lt;version&gt;
+            ${MIDlet-Version}
+        &lt;/version&gt;
+        &lt;vendor&gt;
+            ${MIDlet-Vendor}
+        &lt;/vendor&gt;
+        &lt;copyright&gt;
+            ${MIDlet-Copyright}
+        &lt;/copyright&gt;
+        &lt;fileset Java="1.0"&gt;
+            &lt;directory/&gt;
+            &lt;files&gt;${name}.cod&lt;/files&gt;
+        &lt;/fileset&gt;
+    &lt;/application&gt;
+&lt;/loader&gt;
+        </echo>
+
     </target>