Browse Source

SDK:
- update core public api
- remove manual netbeans update center entries
- add default netbeans update center set

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

nor..67 12 years ago
parent
commit
f69c9b913d

+ 1 - 1
build.xml

@@ -49,7 +49,7 @@
     <target name="-create-netbeans-config">
     <target name="-create-netbeans-config">
         <!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
         <!--replaces default values in jmonkeyplatform.conf file with run.args.extra from project.properties-->
         <mkdir dir="build/launcher/etc"/>
         <mkdir dir="build/launcher/etc"/>
-        <copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf">
+        <copy file="${harness.dir}/etc/app.conf" tofile="build/launcher/etc/${app.name}.conf" overwrite="true">
             <filterchain>
             <filterchain>
                 <replacestring from="$${branding.token}" to="${branding.token}"/>
                 <replacestring from="$${branding.token}" to="${branding.token}"/>
                 <replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>
                 <replacestring from="$${APPNAME}/dev" to="$${APPNAME}/${app.version}"/>

+ 0 - 8
jme3-core-updatecenters/src/com/jme3/gde/core/updatecenters/layer.xml

@@ -3,14 +3,6 @@
 <filesystem>
 <filesystem>
     <folder name="Services">
     <folder name="Services">
         <folder name="AutoupdateType">
         <folder name="AutoupdateType">
-            <file name="org_netbeans_update_center.instance">
-                <attr name="displayName" bundlevalue="com.jme3.gde.core.updatecenters.Bundle#Services/AutoupdateType/org_netbeans_update_center.instance"/>
-                <attr name="enabled" boolvalue="true"/>
-                <attr name="instanceCreate" methodvalue="org.netbeans.modules.autoupdate.updateprovider.AutoupdateCatalogFactory.createUpdateProvider"/>
-                <attr name="instanceOf" stringvalue="org.netbeans.spi.autoupdate.UpdateProvider"/>
-                <attr name="url" bundlevalue="com.jme3.gde.core.updatecenters.Bundle#org_netbeans_update_center"/>
-                <attr name="category" stringvalue="STANDARD"/>
-            </file>
             <file name="com_jme3_gde_core_update_center.instance">
             <file name="com_jme3_gde_core_update_center.instance">
                 <attr name="displayName" bundlevalue="com.jme3.gde.core.updatecenters.Bundle#Services/AutoupdateType/com_jme3_gde_core_update_center_nightly.instance"/>
                 <attr name="displayName" bundlevalue="com.jme3.gde.core.updatecenters.Bundle#Services/AutoupdateType/com_jme3_gde_core_update_center_nightly.instance"/>
                 <attr name="enabled" boolvalue="false"/>
                 <attr name="enabled" boolvalue="false"/>

+ 2 - 0
jme3-core/nbproject/project.xml

@@ -337,6 +337,7 @@
                 <package>com.jme3.gde.core.filters.actions</package>
                 <package>com.jme3.gde.core.filters.actions</package>
                 <package>com.jme3.gde.core.filters.impl</package>
                 <package>com.jme3.gde.core.filters.impl</package>
                 <package>com.jme3.gde.core.filters.impl.bloom</package>
                 <package>com.jme3.gde.core.filters.impl.bloom</package>
+                <package>com.jme3.gde.core.icons</package>
                 <package>com.jme3.gde.core.importantfiles</package>
                 <package>com.jme3.gde.core.importantfiles</package>
                 <package>com.jme3.gde.core.j2seproject</package>
                 <package>com.jme3.gde.core.j2seproject</package>
                 <package>com.jme3.gde.core.options</package>
                 <package>com.jme3.gde.core.options</package>
@@ -352,6 +353,7 @@
                 <package>com.jme3.gde.core.sceneexplorer.nodes.actions.impl</package>
                 <package>com.jme3.gde.core.sceneexplorer.nodes.actions.impl</package>
                 <package>com.jme3.gde.core.sceneviewer</package>
                 <package>com.jme3.gde.core.sceneviewer</package>
                 <package>com.jme3.gde.core.sceneviewer.actions</package>
                 <package>com.jme3.gde.core.sceneviewer.actions</package>
+                <package>com.jme3.gde.core.texture</package>
                 <package>com.jme3.gde.core.undoredo</package>
                 <package>com.jme3.gde.core.undoredo</package>
                 <package>com.jme3.gde.core.util</package>
                 <package>com.jme3.gde.core.util</package>
             </public-packages>
             </public-packages>

+ 10 - 0
nbproject/platform.properties

@@ -3,6 +3,7 @@ cluster.path=\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/harness:\
     ${nbplatform.active.dir}/ide:\
     ${nbplatform.active.dir}/ide:\
     ${nbplatform.active.dir}/java:\
     ${nbplatform.active.dir}/java:\
+    ${nbplatform.active.dir}/nb:\
     ${nbplatform.active.dir}/platform
     ${nbplatform.active.dir}/platform
 disabled.modules=\
 disabled.modules=\
     org.apache.commons.codec,\
     org.apache.commons.codec,\
@@ -25,6 +26,7 @@ disabled.modules=\
     org.eclipse.mylyn.commons.net,\
     org.eclipse.mylyn.commons.net,\
     org.eclipse.mylyn.commons.xmlrpc,\
     org.eclipse.mylyn.commons.xmlrpc,\
     org.eclipse.mylyn.tasks.core,\
     org.eclipse.mylyn.tasks.core,\
+    org.netbeans.lib.uihandler,\
     org.netbeans.libs.commons_net,\
     org.netbeans.libs.commons_net,\
     org.netbeans.libs.jsr223,\
     org.netbeans.libs.jsr223,\
     org.netbeans.libs.nbi.ant,\
     org.netbeans.libs.nbi.ant,\
@@ -32,9 +34,11 @@ disabled.modules=\
     org.netbeans.libs.smack,\
     org.netbeans.libs.smack,\
     org.netbeans.libs.springframework,\
     org.netbeans.libs.springframework,\
     org.netbeans.libs.swingx,\
     org.netbeans.libs.swingx,\
+    org.netbeans.modules.autoupdate.pluginimporter,\
     org.netbeans.modules.bugtracking,\
     org.netbeans.modules.bugtracking,\
     org.netbeans.modules.bugtracking.bridge,\
     org.netbeans.modules.bugtracking.bridge,\
     org.netbeans.modules.bugzilla,\
     org.netbeans.modules.bugzilla,\
+    org.netbeans.modules.bugzilla.exceptionreporter,\
     org.netbeans.modules.db,\
     org.netbeans.modules.db,\
     org.netbeans.modules.db.core,\
     org.netbeans.modules.db.core,\
     org.netbeans.modules.db.dataview,\
     org.netbeans.modules.db.dataview,\
@@ -61,6 +65,8 @@ disabled.modules=\
     org.netbeans.modules.hudson.subversion,\
     org.netbeans.modules.hudson.subversion,\
     org.netbeans.modules.hudson.tasklist,\
     org.netbeans.modules.hudson.tasklist,\
     org.netbeans.modules.i18n.form,\
     org.netbeans.modules.i18n.form,\
+    org.netbeans.modules.ide.branding,\
+    org.netbeans.modules.ide.branding.kit,\
     org.netbeans.modules.j2ee.core.utilities,\
     org.netbeans.modules.j2ee.core.utilities,\
     org.netbeans.modules.j2ee.eclipselink,\
     org.netbeans.modules.j2ee.eclipselink,\
     org.netbeans.modules.j2ee.eclipselinkmodelgen,\
     org.netbeans.modules.j2ee.eclipselinkmodelgen,\
@@ -99,8 +105,12 @@ disabled.modules=\
     org.netbeans.modules.spring.beans,\
     org.netbeans.modules.spring.beans,\
     org.netbeans.modules.swing.validation,\
     org.netbeans.modules.swing.validation,\
     org.netbeans.modules.testng.maven,\
     org.netbeans.modules.testng.maven,\
+    org.netbeans.modules.uihandler,\
+    org.netbeans.modules.uihandler.exceptionreporter,\
     org.netbeans.modules.websvc.saas.codegen.java,\
     org.netbeans.modules.websvc.saas.codegen.java,\
+    org.netbeans.modules.welcome,\
     org.netbeans.modules.xml.wsdl.model,\
     org.netbeans.modules.xml.wsdl.model,\
+    org.netbeans.upgrader,\
     org.openide.compat,\
     org.openide.compat,\
     org.openide.options,\
     org.openide.options,\
     org.openide.util.enumerations
     org.openide.util.enumerations