SDK:

- fix library references for SDK
- add blender, terrain and plugins library
- remove video library
- fix android build
- fix jme3 library svn auto-versioning

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8840 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/build.xml

@@ -18,76 +18,11 @@
         </exec>
     </target>
     
-    <!-- overrides javadoc generation to only include relevant classes -->
-    <!--target depends="init" if="have.sources" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.core.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.terrain.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.networking.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.desktop-fx.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.niftygui.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.tools.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${src.xml.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-        <copy todir="${dist.javadoc.dir}">
-            <fileset dir="${src.core.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.terrain.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.networking.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.desktop-fx.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.jbullet.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.niftygui.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.tools.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${src.xml.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
-            <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
-                <include name="**/doc-files/**"/>
-            </fileset>
-        </copy>
-    </target-->
-
     <!--Override compile section to compile in different folders-->
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <mkdir dir="${build.dir}/core"/>
         <mkdir dir="${build.dir}/plugins"/>
+        <mkdir dir="${build.dir}/jogg"/>
         <mkdir dir="${build.dir}/blender"/>
         <mkdir dir="${build.dir}/desktop"/>
         <mkdir dir="${build.dir}/terrain"/>
@@ -109,24 +44,27 @@
             <fileset dir="${src.core-plugins.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.tools.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/core"/>
-        </copy-->
         
-        <!--compile non-core plugins (jogg, ogre, xml)-->
+        <!--compile non-core plugins (ogre, xml)-->
         <j2seproject3:javac 
             destdir="${build.dir}/plugins"
-            srcdir="${src.jogg.dir}:${src.ogre.dir}:${src.xml.dir}"
+            srcdir="${src.ogre.dir}:${src.xml.dir}"
             classpath="${javac.classpath}:${build.dir}/core"
             gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.dir}/plugins">
-            <fileset dir="${src.jogg.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.ogre.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.xml.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/plugins"/>
-        </copy-->
+        
+        <!--compile jogg-->
+        <j2seproject3:javac 
+            destdir="${build.dir}/jogg"
+            srcdir="${src.jogg.dir}"
+            classpath="${javac.classpath}:${build.dir}/core"
+            gensrcdir="${build.generated.sources.dir}"/>
+        <copy todir="${build.dir}/jogg">
+            <fileset dir="${src.jogg.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+        </copy>
         
         <!--compile desktop-->
         <j2seproject3:javac 
@@ -138,9 +76,6 @@
             <fileset dir="${src.desktop.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.desktop-fx.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/desktop"/>
-        </copy-->
         
         <!--compile blender loader-->
         <j2seproject3:javac 
@@ -151,9 +86,6 @@
         <copy todir="${build.dir}/blender">
             <fileset dir="${src.blender.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/blender"/>
-        </copy-->
         
         <!--compile terrain-->
         <j2seproject3:javac 
@@ -164,9 +96,6 @@
         <copy todir="${build.dir}/terrain">
             <fileset dir="${src.terrain.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/terrain"/>
-        </copy-->
         
         <!--compile jbullet-->
         <j2seproject3:javac 
@@ -178,9 +107,6 @@
             <fileset dir="${src.jbullet.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.bullet-common.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/jbullet"/>
-        </copy-->
         
         <!--compile bullet-->
         <j2seproject3:javac 
@@ -192,9 +118,6 @@
             <fileset dir="${src.bullet.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.bullet-common.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/bullet"/>
-        </copy-->
         
         <!--compile nifty-->
         <j2seproject3:javac 
@@ -205,9 +128,6 @@
         <copy todir="${build.dir}/niftygui">
             <fileset dir="${src.niftygui.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/niftygui"/>
-        </copy-->
         
         <!--compile lwjgl-->
         <j2seproject3:javac 
@@ -218,28 +138,24 @@
         <copy todir="${build.dir}/lwjgl">
             <fileset dir="${src.lwjgl.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/lwjgl"/>
-        </copy-->
 
         <!--compile android-->
         <j2seproject3:javac 
             destdir="${build.dir}/android"
             srcdir="${src.android.dir}"
             classpath="${javac.classpath}:${build.dir}/core:${build.dir}/plugins"
-            gensrcdir="${build.generated.sources.dir}"/>
+            gensrcdir="${build.generated.sources.dir}"
+            excludes="${excludes},**/jme3test/**"
+            />
         <copy todir="${build.dir}/android">
-            <fileset dir="${src.android.dir}" excludes="${build.classes.excludes},${excludes},**/OGLESRenderer.java,**/TestsActivity.java,**/AboutActivity.java,nbproject/**" includes="${includes}"/>
+            <fileset dir="${src.android.dir}" excludes="${build.classes.excludes},${excludes},**/jme3test/**" includes="${includes}"/>
         </copy>
-        <!--copy todir="${build.classes.dir}">
-            <fileset dir="${build.dir}/android"/>
-        </copy-->
         
         <!--compile tests-->
         <j2seproject3:javac 
             destdir="${build.dir}/test"
             srcdir="${src.test.dir}"
-            classpath="${javac.classpath}:${build.dir}/core:${build.dir}/plugins:${build.dir}/desktop:${build.dir}/blender:${build.dir}/terrain:${build.dir}/jbullet:${build.dir}/niftygui"
+            classpath="${javac.classpath}:${build.dir}/core:${build.dir}/plugins:${build.dir}/jogg:${build.dir}/desktop:${build.dir}/blender:${build.dir}/terrain:${build.dir}/jbullet:${build.dir}/niftygui"
             gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.dir}/test">
             <fileset dir="${src.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -252,6 +168,7 @@
     <target name="-pre-jar">
         <jar jarfile="build/jME3-core.jar" basedir="${build.dir}/core" compress="true"/>
         <jar jarfile="build/jME3-plugins.jar" basedir="${build.dir}/plugins" compress="true"/>
+        <jar jarfile="build/jME3-jogg.jar" basedir="${build.dir}/jogg" compress="true"/>
         <jar jarfile="build/jME3-desktop.jar" basedir="${build.dir}/desktop" compress="true"/>
         <jar jarfile="build/jME3-blender.jar" basedir="${build.dir}/blender" compress="true"/>
         <jar jarfile="build/jME3-terrain.jar" basedir="${build.dir}/terrain" compress="true"/>
@@ -272,6 +189,7 @@
         
         <property location="${build.dir}/core" name="build.core.dir.resolved"/>
         <property location="${build.dir}/plugins" name="build.plugins.dir.resolved"/>
+        <property location="${build.dir}/jogg" name="build.jogg.dir.resolved"/>
         <property location="${build.dir}/desktop" name="build.desktop.dir.resolved"/>
         <property location="${build.dir}/blender" name="build.blender.dir.resolved"/>
         <property location="${build.dir}/terrain" name="build.terrain.dir.resolved"/>
@@ -287,6 +205,7 @@
             
             <map from="${build.core.dir.resolved}" to=""/>
             <map from="${build.plugins.dir.resolved}" to=""/>
+            <map from="${build.jogg.dir.resolved}" to=""/>
             <map from="${build.desktop.dir.resolved}" to=""/>
             <map from="${build.blender.dir.resolved}" to=""/>
             <map from="${build.terrain.dir.resolved}" to=""/>
@@ -298,6 +217,7 @@
             
             <path path="build/jME3-core.jar"/>
             <path path="build/jME3-plugins.jar"/>
+            <path path="build/jME3-jogg.jar"/>
             <path path="build/jME3-desktop.jar"/>
             <path path="build/jME3-blender.jar"/>
             <path path="build/jME3-terrain.jar"/>
@@ -317,7 +237,7 @@
         <mkdir dir="dist/opt"/>
         <!--native bullet-->
         <mkdir dir="dist/opt/native-bullet"/>
-        <!--ant antfile="src/bullet/native/build.xml" target="bullet-api-diff"/-->
+        <!--ant antfile="nbproject/build-bullet-natives.xml" target="bullet-api-diff"/-->
         <!--move file="bullet-api-diff.html" todir="dist/opt/native-bullet" overwrite="true"/-->
         <move file="dist/lib/jME3-bullet.jar" todir="dist/opt/native-bullet" overwrite="true"/>
         <move file="dist/lib/jME3-bullet-natives.jar" todir="dist/opt/native-bullet" overwrite="true"/>
@@ -325,7 +245,7 @@
 
         <!--android-->
         <mkdir dir="dist/opt/android"/>
-        <move file="build/jME3-android.jar" todir="dist/opt/android" overwrite="true"/>
+        <copy file="build/jME3-android.jar" todir="dist/opt/android" overwrite="true"/>
     </target>
     <!--
        ****************************************************************
@@ -339,15 +259,34 @@
             <param name="jmp_dir" value="../sdk/"/>
         </antcall>
     </target>
-
+    
     <target name="-do-update-sdk">
-        <fileset id="jme3-jars" dir="dist/">
-            <include name="**/jME3-jbullet.jar"/>
-            <include name="**/jME3-bullet.jar"/>
-            <include name="**/jME3-bullet-natives.jar"/>
-            <include name="**/jME3-bullet-natives-android.jar"/>
+        <fileset id="jme3-jars" dir="build">
+            <include name="**/jME3**.jar"/>
+            <exclude name="**/jME3-testdata.jar"/>
+            <exclude name="**/jME3-bullet-natives.jar"/>
+            <exclude name="**/jME3-bullet-natives-android.jar"/>
+        </fileset>
+        <fileset id="jme3-sdk-jars" dir="build">
+            <include name="**/jME3**.jar"/>
+            <exclude name="**/jME3-android.jar"/>
+            <exclude name="**/jME3-testdata.jar"/>
+            <exclude name="**/jME3-bullet.jar"/>
+            <exclude name="**/jME3-bullet-natives.jar"/>
+            <exclude name="**/jME3-bullet-natives-android.jar"/>
+        </fileset>
+        <fileset id="jme3-bullet-native-jars" dir="dist/opt/native-bullet">
+            <include name="**/jME3-bullet-native**.jar"/>
+        </fileset>
+        <fileset id="jme3-testdata-jars" dir="build">
+            <include name="**/jME3-testdata.jar"/>
+        </fileset>
+        <fileset id="jme3-lwjgl-native-jars" dir="dist/lib">
+            <include name="**/jME3-lwjgl-natives.jar"/>
+        </fileset>
+        <fileset id="jme3-external-libraries" dir="dist/lib/">
+            <exclude name="jME3-**"/>
         </fileset>
-
         <!--clear old files-->
         <delete dir="${jmp_dir}/JME3TestsTemplate/src/"/>
         <delete dir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/"/>
@@ -357,71 +296,51 @@
         <delete dir="${jmp_dir}/jme3-project-testdata/release/libs/"/>
 
         <!--jMonkeyPlatform jME3 libs-->
-        <copy file="${dist.jar}" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
         <copy toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false" flatten="true">
-            <fileset refid="jme3-jars"/>
+            <fileset refid="jme3-sdk-jars"/>
+            <!--natives need to be in jme3 package for jme to work in jMP-->
+            <fileset refid="jme3-lwjgl-native-jars"/>
         </copy>
-        <!--natives need to be in jme3 package for jme to work in jMP-->
-        <copy file="dist/lib/jME3-lwjgl-natives.jar" toDir="${jmp_dir}/jme3-core-baselibs/release/modules/ext/" overwrite="true" failonerror="true" verbose="false"/>
 
-        <!--jMonkeyPlatform Android libs-->
-        <copy file="dist/opt/android/jMonkeyEngine3.jar" toFile="${jmp_dir}/jme3-project-baselibs/release/libs/jMonkeyEngine3-android.jar" overwrite="true" failonerror="true" verbose="false"/>
+        <!--jMonkeyPlatform external libraries-->
+        <copy todir="${jmp_dir}/jme3-core-libraries/release/modules/ext/" overwrite="true" failonerror="true" verbose="false" flatten="true">
+            <fileset refid="jme3-external-libraries"/>
+        </copy>
         
         <!--Project jME3 libs-->
-        <copy file="${dist.jar}" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
         <copy toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false" flatten="true">
             <fileset refid="jme3-jars"/>
         </copy>
 
-        <!--jMonkeyPlatform external libraries-->
-        <copy todir="${jmp_dir}/jme3-core-libraries/release/modules/ext/" overwrite="true" failonerror="true" verbose="false" flatten="true">
-            <!--exclude jme3 test data from core-->
-            <fileset dir="dist/lib/">
-                <exclude name="jME3-**"/>
-            </fileset>
-        </copy>
-        
         <!--Project external libraries-->
         <copy todir="${jmp_dir}/jme3-project-libraries/release/libs/" overwrite="true" failonerror="true" verbose="false" flatten="true">
-            <!--exclude jme3 test data from libs-->
-            <fileset dir="dist/lib/">
-                <exclude name="jME3-**"/>
-            </fileset>
-            <!--lwjgl is an external library but has the "jME3-" prefix-->
-            <fileset dir="dist/lib/">
-                <include name="jME3-lwjgl-natives.jar"/>
-            </fileset>
-            <fileset dir="lib/niftygui/">
-                <include name="nifty-javadoc.jar"/>
-                <include name="nifty-default-controls-javadoc.jar"/>
-            </fileset>
+            <fileset refid="jme3-external-libraries"/>
+            <fileset refid="jme3-lwjgl-native-jars"/>
+            <fileset refid="jme3-bullet-native-jars"/>
         </copy>
 
-        <!--test data-->
-        <copy file="dist/lib/jME3-testdata.jar" toDir="${jmp_dir}/jme3-project-testdata/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
+        <!--Test Project Data-->
+        <copy toDir="${jmp_dir}/jme3-project-testdata/release/libs/" overwrite="true" failonerror="true" verbose="false">
+            <fileset refid="jme3-testdata-jars"/>
+        </copy>
 
-        <!--javadoc-->
+        <!-- javadoc -->
         <zip destfile="dist/jMonkeyEngine3-javadoc.zip">
             <zipfileset dir="dist/javadoc/"/>
         </zip>
         <copy file="dist/jMonkeyEngine3-javadoc.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
 
-        <!--sources-->
         <zip destfile="dist/jMonkeyEngine3-sources.zip">
             <zipfileset dir="${src.core.dir}"/>
             <zipfileset dir="${src.core-data.dir}"/>
             <zipfileset dir="${src.core-plugins.dir}"/>
             <zipfileset dir="${src.desktop.dir}"/>
             <zipfileset dir="${src.desktop-fx.dir}"/>
-            <zipfileset dir="${src.games.dir}"/>
             <zipfileset dir="${src.jbullet.dir}"/>
             <zipfileset dir="${src.niftygui.dir}"/>
             <zipfileset dir="${src.jogg.dir}"/>
-            <zipfileset dir="${src.lwjgl-oal.dir}"/>
-            <zipfileset dir="${src.lwjgl-ogl.dir}"/>
+            <zipfileset dir="${src.lwjgl.dir}"/>
             <zipfileset dir="${src.ogre.dir}"/>
-            <zipfileset dir="${src.pack.dir}"/>
-            <zipfileset dir="${src.jheora.dir}"/>
             <zipfileset dir="${src.test.dir}"/>
             <zipfileset dir="${src.tools.dir}"/>
             <zipfileset dir="${src.xml.dir}"/>
@@ -430,6 +349,16 @@
         </zip>
         <copy file="dist/jMonkeyEngine3-sources.zip" toDir="${jmp_dir}/jme3-project-baselibs/release/libs/" overwrite="true" failonerror="true" verbose="false"/>
         
+        <copy todir="${jmp_dir}/jme3-project-libraries/release/libs/" overwrite="true" failonerror="true" verbose="false" flatten="true">
+            <fileset refid="jme3-external-libraries"/>
+            <fileset refid="jme3-lwjgl-native-jars"/>
+            <fileset refid="jme3-bullet-native-jars"/>
+            <fileset dir="lib/niftygui/">
+                <include name="nifty-javadoc.jar"/>
+                <include name="nifty-default-controls-javadoc.jar"/>
+            </fileset>
+        </copy>
+        
         <!--examples-->
         <copy todir="${jmp_dir}/JME3TestsTemplate/src/" overwrite="true" failonerror="true" verbose="false">
             <fileset dir="src/test/">

engine/nbproject/project.properties

@@ -87,6 +87,7 @@ run.classpath=\
     ${javac.classpath}:\
     ${build.dir}/core:\
     ${build.dir}/plugins:\
+    ${build.dir}/jogg:\
     ${build.dir}/desktop:\
     ${build.dir}/blender:\
     ${build.dir}/terrain:\

sdk/build.xml

@@ -272,12 +272,12 @@
     <target name="-create-jme3-svn-properties">
         <mkdir dir="build"/>
         <!--jme3 svn properties-->
-        <exec executable="svn" dir="${jme3_dir}" output="build/jme3-svn.properties">
+        <exec executable="svn" dir="${jme3_dir}/src/" output="build/jme3-svn.properties">
             <arg value="info" />
         </exec>
         <replace file="build/jme3-svn.properties" token=" " value=""/>
         <!--jme3 test data svn properties-->
-        <exec executable="svn" dir="${jme3_dir}/src/test-data/" output="build/jme3-testdata-svn.properties">
+        <exec executable="svn" dir="${jme3_dir}/test-data/" output="build/jme3-testdata-svn.properties">
             <arg value="info" />
         </exec>
         <replace file="build/jme3-testdata-svn.properties" token=" " value=""/>

sdk/jme3-android/src/com/jme3/gde/android/MobileCompositeProvider.java

@@ -57,7 +57,7 @@ public class MobileCompositeProvider implements ProjectCustomizer.CompositeCateg
     private class SavePropsListener implements ActionListener {
 
         private String extensionName = "mobile";
-        private String extensionVersion = "v0.15";
+        private String extensionVersion = "v0.16";
         private String[] extensionDependencies = new String[]{"jar", "-mobile-deployment"};
         private ProjectExtensionManager manager = new ProjectExtensionManager(extensionName, extensionVersion, extensionDependencies);
         private ProjectExtensionProperties properties;

sdk/jme3-android/src/com/jme3/gde/android/mobile-targets.xml

@@ -29,7 +29,9 @@
         <mkdir dir="mobile/libs"/>
         <copy todir="mobile/libs" verbose="false" flatten="true">
             <fileset dir="dist/lib/">
-                <exclude name="jMonkeyEngine3.jar"/>
+                <exclude name="jME3-desktop.jar"/>
+                <exclude name="jME3-blender.jar"/>
+                <exclude name="jME3-lwjgl.jar"/>
                 <exclude name="jME3-lwjgl-natives.jar"/>
                 <exclude name="jME3-bullet-natives.jar"/>
                 <exclude name="jME3-jbullet.jar"/>
@@ -42,7 +44,7 @@
             </fileset>
         </copy>
 
-        <echo>Adding jMonkeyEngine3.jar for android.</echo>
+        <echo>Adding libraries for android.</echo>
         <copy todir="mobile/libs" flatten="true">
             <path>
                 <pathelement path="${libs.jme3-android.classpath}"/>

sdk/jme3-core-baselibs/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=97a53057
+build.xml.data.CRC32=05d5b002
 build.xml.script.CRC32=cdae6a36
 [email protected]
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=97a53057
+nbproject/build-impl.xml.data.CRC32=05d5b002
 nbproject/build-impl.xml.script.CRC32=246f9b81
 nbproject/[email protected]

sdk/jme3-core-baselibs/nbproject/project.properties

@@ -1,7 +1,3 @@
-#Thu, 25 Aug 2011 20:26:48 +0200
-file.reference.jME3-jbullet.jar=release/modules/ext/jME3-jbullet.jar
-file.reference.jME3-lwjgl-natives.jar=release/modules/ext/jME3-lwjgl-natives.jar
-file.reference.jMonkeyEngine3.jar=release/modules/ext/jMonkeyEngine3.jar
 javac.source=1.5
 javac.compilerargs=-Xlint -Xlint\:-serial
 license.file=../license-jme.txt

sdk/jme3-core-baselibs/nbproject/project.xml

@@ -22,7 +22,6 @@
                 <package>com.jme3.app</package>
                 <package>com.jme3.app.state</package>
                 <package>com.jme3.asset</package>
-                <package>com.jme3.asset.pack</package>
                 <package>com.jme3.asset.plugins</package>
                 <package>com.jme3.audio</package>
                 <package>com.jme3.audio.lwjgl</package>
@@ -75,7 +74,6 @@
                 <package>com.jme3.post.filters</package>
                 <package>com.jme3.post.ssao</package>
                 <package>com.jme3.renderer</package>
-                <package>com.jme3.renderer.layer</package>
                 <package>com.jme3.renderer.lwjgl</package>
                 <package>com.jme3.renderer.queue</package>
                 <package>com.jme3.scene</package>
@@ -108,6 +106,7 @@
                 <package>com.jme3.system.lwjgl</package>
                 <package>com.jme3.terrain</package>
                 <package>com.jme3.terrain.geomipmap</package>
+                <package>com.jme3.terrain.geomipmap.grid</package>
                 <package>com.jme3.terrain.geomipmap.lodcalc</package>
                 <package>com.jme3.terrain.geomipmap.lodcalc.util</package>
                 <package>com.jme3.terrain.geomipmap.picking</package>
@@ -118,8 +117,6 @@
                 <package>com.jme3.util</package>
                 <package>com.jme3.util.blockparser</package>
                 <package>com.jme3.util.xml</package>
-                <package>com.jme3.video</package>
-                <package>com.jme3.video.plugins.jheora</package>
                 <package>com.jme3.water</package>
                 <package>jme3tools.converters</package>
                 <package>jme3tools.converters.model</package>
@@ -127,19 +124,48 @@
                 <package>jme3tools.navigation</package>
                 <package>jme3tools.nvtex</package>
                 <package>jme3tools.optimize</package>
+                <package>jme3tools.savegame</package>
             </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-niftygui.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-niftygui.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-blender.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-blender.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-desktop.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-desktop.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-lwjgl.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-lwjgl.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-terrain.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-terrain.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jME3-jbullet.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jME3-jbullet.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jMonkeyEngine3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jMonkeyEngine3.jar</binary-origin>
+                <runtime-relative-path>ext/jME3-plugins.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-plugins.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-core.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-core.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jME3-lwjgl-natives.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jME3-lwjgl-natives.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/jME3-jogg.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jME3-jogg.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

sdk/jme3-core-libraries/nbproject/project.properties

@@ -1,14 +1,6 @@
 #Thu, 25 Aug 2011 20:26:48 +0200
 file.reference.eventbus-1.4.jar=release/modules/ext/eventbus-1.4.jar
-file.reference.j-ogg-oggd.jar=release/modules/ext/j-ogg-oggd.jar
-file.reference.j-ogg-vorbisd.jar=release/modules/ext/j-ogg-vorbisd.jar
-file.reference.jbullet.jar=release/modules/ext/jbullet.jar
-file.reference.jinput.jar=release/modules/ext/jinput.jar
-file.reference.lwjgl.jar=release/modules/ext/lwjgl.jar
 file.reference.nifty-1.2-SNAPSHOT.jar=release/modules/ext/nifty-1.1.jar
-file.reference.noise-0.0.1-SNAPSHOT.jar=release/modules/ext/noise-0.0.1-SNAPSHOT.jar
-file.reference.stack-alloc.jar=release/modules/ext/stack-alloc.jar
-file.reference.vecmath.jar=release/modules/ext/vecmath.jar
 file.reference.xmlpull-xpp3-1.1.4c.jar=release/modules/ext/xmlpull-xpp3-1.1.4c.jar
 javac.source=1.5
 javac.compilerargs=-Xlint -Xlint\:-serial

sdk/jme3-core-libraries/nbproject/project.xml

@@ -21,6 +21,7 @@
                 <package>com.bulletphysics.linearmath</package>
                 <package>com.bulletphysics.linearmath.convexhull</package>
                 <package>com.bulletphysics.util</package>
+                <package>com.jme3.gde.core.libraries</package>
                 <package>cz.advel.stack</package>
                 <package>cz.advel.stack.instrument</package>
                 <package>de.jarnbjo.ogg</package>
@@ -72,6 +73,43 @@
                 <package>de.lessvoid.nifty.elements.events</package>
                 <package>de.lessvoid.nifty.elements.render</package>
                 <package>de.lessvoid.nifty.elements.tools</package>
+                <package>de.lessvoid.nifty.examples</package>
+                <package>de.lessvoid.nifty.examples.all</package>
+                <package>de.lessvoid.nifty.examples.allcontrols</package>
+                <package>de.lessvoid.nifty.examples.console</package>
+                <package>de.lessvoid.nifty.examples.controls</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.chatcontrol</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.common</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.dragndrop</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.dropdown</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.listbox</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.scrollpanel</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.sliderandscrollbar</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.tabs</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrols.textfield</package>
+                <package>de.lessvoid.nifty.examples.defaultcontrolsxml</package>
+                <package>de.lessvoid.nifty.examples.dragndrop</package>
+                <package>de.lessvoid.nifty.examples.falloff</package>
+                <package>de.lessvoid.nifty.examples.helloniftybuilder</package>
+                <package>de.lessvoid.nifty.examples.helloworld</package>
+                <package>de.lessvoid.nifty.examples.hint</package>
+                <package>de.lessvoid.nifty.examples.localize</package>
+                <package>de.lessvoid.nifty.examples.menu</package>
+                <package>de.lessvoid.nifty.examples.mouse</package>
+                <package>de.lessvoid.nifty.examples.multiplayer</package>
+                <package>de.lessvoid.nifty.examples.progressbar</package>
+                <package>de.lessvoid.nifty.examples.reload</package>
+                <package>de.lessvoid.nifty.examples.resolution</package>
+                <package>de.lessvoid.nifty.examples.scroll</package>
+                <package>de.lessvoid.nifty.examples.style.dynamic</package>
+                <package>de.lessvoid.nifty.examples.style.label</package>
+                <package>de.lessvoid.nifty.examples.table</package>
+                <package>de.lessvoid.nifty.examples.test</package>
+                <package>de.lessvoid.nifty.examples.textalign</package>
+                <package>de.lessvoid.nifty.examples.textfield</package>
+                <package>de.lessvoid.nifty.examples.tutorial</package>
+                <package>de.lessvoid.nifty.examples.tutorial.screen</package>
                 <package>de.lessvoid.nifty.input</package>
                 <package>de.lessvoid.nifty.input.keyboard</package>
                 <package>de.lessvoid.nifty.input.mapping</package>
@@ -153,8 +191,8 @@
                 <binary-origin>release/modules/ext/jinput.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/nifty-default-controls.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty-default-controls.jar</binary-origin>
+                <runtime-relative-path>ext/nifty.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/stack-alloc.jar</runtime-relative-path>
@@ -165,33 +203,37 @@
                 <binary-origin>release/modules/ext/noise-0.0.1-SNAPSHOT.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/nifty-style-black.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty-style-black.jar</binary-origin>
-            </class-path-extension>
-            <class-path-extension>
-                <runtime-relative-path>ext/nifty.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/nifty.jar</binary-origin>
+                <runtime-relative-path>ext/nifty-default-controls.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-default-controls.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/xmlpull-xpp3.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/xmlpull-xpp3.jar</binary-origin>
+                <runtime-relative-path>ext/vecmath.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/vecmath.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/eventbus.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/eventbus.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/vecmath.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/vecmath.jar</binary-origin>
+                <runtime-relative-path>ext/xmlpull-xpp3.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/xmlpull-xpp3.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jbullet.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/jbullet.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/nifty-examples.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-examples.jar</binary-origin>
+            </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/lwjgl.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/lwjgl.jar</binary-origin>
             </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/nifty-style-black.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/nifty-style-black.jar</binary-origin>
+            </class-path-extension>
         </data>
     </configuration>
 </project>

sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-android.xml

@@ -10,9 +10,9 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.android.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-android.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives-android.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-android.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-bullet-natives-android.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3.xml

@@ -10,7 +10,7 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.baselibs.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-core.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-video.xml → sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-blender.xml

@@ -5,18 +5,19 @@ and open the template in the editor.
 -->
 <!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
 <library version="1.0">
-    <name>jme3-libraries-video</name>
+    <name>jme3-libraries-blender</name>
     <type>j2se</type>
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-blender.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-gui.xml

@@ -10,9 +10,10 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-niftygui.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xmlpull-xpp3.jar!/</resource>
     </volume>
     <volume>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-lwjgl-minimum.xml

@@ -10,17 +10,18 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-desktop.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-lwjgl.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jinput.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/lwjgl.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-oggvorbis.xml

@@ -10,15 +10,16 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jogg.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
     </volume>
     <volume>
         <type>javadoc</type>
-
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
     </volume>
 </library>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-physics-native.xml

@@ -11,7 +11,7 @@ and open the template in the editor.
     <volume>
         <type>classpath</type>
         <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-bullet-natives.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-bullet-natives.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-plugins.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-libraries-plugins</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-plugins.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
+    </volume>
+</library>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries-terrain.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+To change this template, choose Tools | Templates
+and open the template in the editor.
+-->
+<!DOCTYPE library PUBLIC "-//NetBeans//DTD Library Declaration 1.0//EN" "http://www.netbeans.org/dtds/library-declaration-1_0.dtd">
+<library version="1.0">
+    <name>jme3-libraries-terrain</name>
+    <type>j2se</type>
+    <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
+    <volume>
+        <type>classpath</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-terrain.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
+    </volume>
+    <volume>
+        <type>src</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-sources.zip!/</resource>
+    </volume>
+    <volume>
+        <type>javadoc</type>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jMonkeyEngine3-javadoc.zip!/</resource>
+    </volume>
+</library>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/jme3-libraries.xml

@@ -10,21 +10,32 @@ and open the template in the editor.
     <localizing-bundle>com.jme3.gde.project.libraries.Bundle</localizing-bundle>
     <volume>
         <type>classpath</type>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-desktop.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-plugins.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jogg.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-oggd.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/j-ogg-vorbisd.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-terrain.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
+
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-lwjgl.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jME3-lwjgl-natives.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jinput.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/lwjgl.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
+        
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jbullet.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
+        
+        <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jME3-niftygui.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/stack-alloc.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/vecmath.jar!/</resource>
+        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus.jar!/</resource>
         <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xmlpull-xpp3.jar!/</resource>
-        <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/noise-0.0.1-SNAPSHOT.jar!/</resource>
     </volume>
     <volume>
         <type>src</type>

sdk/jme3-project-libraries/src/com/jme3/gde/project/libraries/layer.xml

@@ -3,14 +3,16 @@
 <filesystem>
     <folder name="org-netbeans-api-project-libraries">
         <folder name="Libraries">
-            <file name="jme3-libraries.xml" url="jme3-libraries.xml"/>
-            <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
-            <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
+            <file name="jme3-libraries-blender.xml" url="jme3-libraries-blender.xml"/>
             <file name="jme3-libraries-gui-style-black.xml" url="jme3-libraries-gui-style-black.xml"/>
-            <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
-            <file name="jme3-libraries-physics-native.xml" url="jme3-libraries-physics-native.xml"/>
-            <file name="jme3-libraries-video.xml" url="jme3-libraries-video.xml"/>
+            <file name="jme3-libraries-gui.xml" url="jme3-libraries-gui.xml"/>
+            <file name="jme3-libraries-lwjgl-minimum.xml" url="jme3-libraries-lwjgl-minimum.xml"/>
             <file name="jme3-libraries-oggvorbis.xml" url="jme3-libraries-oggvorbis.xml"/>
+            <file name="jme3-libraries-physics-native.xml" url="jme3-libraries-physics-native.xml"/>
+            <file name="jme3-libraries-physics.xml" url="jme3-libraries-physics.xml"/>
+            <file name="jme3-libraries-plugins.xml" url="jme3-libraries-plugins.xml"/>
+            <file name="jme3-libraries-terrain.xml" url="jme3-libraries-terrain.xml"/>
+            <file name="jme3-libraries.xml" url="jme3-libraries.xml"/>
         </folder>
     </folder>
 </filesystem>