Merge pull request #151 from testmycode/nb11

Nb11

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,26 @@
-currentVersion=Netbeans with TMC {0}
+SPLASH_WIDTH=480
+SPLASH_HEIGHT=300
+
+SplashShowProgressBar=true
+
+SplashRunningTextBounds=16, 278, 448, 12
+SplashProgressBarBounds=16, 275, 448, 2
+SplashRunningTextFontSize=10
+SplashRunningTextColor=0x000000
+SplashProgressBarColor=0x000000
+SplashProgressBarEdgeColor=0x000000
+SplashProgressBarCornerColor=0x000000
+AboutTextBounds=78, 60, 362, 20
+AboutTextColor=0x000000
+
+SplashVersionTextBounds=16, 257, 448, 16
+SplashVersionTextFontSize=13
+SplashVersionTextFontType=Dialog
+SplashVersionTextColor=0x000000
+SplashVersionTextHorizontalAlignment=right
+
+currentVersion=Netbeans with TMC 1.3.0
 LBL_splash_window_title=Starting Netbeans with TMC
-SplashProgressBarBounds=0,249,473,3
-SplashProgressBarColor=0xE000
-SplashRunningTextBounds=10,235,450,12
+
+MSG_warning=NetBeans with TMC IDE - Warning
+MSG_info=NetBeans with TMC IDE - Information

build.xml

@@ -10,7 +10,7 @@
 
     <target name="-check-mavenmodules">
         <uptodate property="mavenmodules.uptodate"
-                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.30.nbm"
+                  srcfile="maven-wrapper/target/nbm/maven-wrapper-1.31.nbm"
                   targetfile="mavenmodules"/>
     </target>
 

desktop/tmcbeans.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=TMCBeans
+Comment=Integrated Development Environment
+Exec=tmcbeans/bin/tmcbeans
+Icon=tmcbeans/nb/tmcbeans.png
+Categories=Development;IDE;Java;
+Terminal=false
+Type=Application
+Keywords=development;Java;IDE;platform;javafx;javase;
+StartupWMClass=NetBeans IDE 11.1

maven-wrapper/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>fi.helsinki.cs.tmc</groupId>
     <artifactId>maven-wrapper</artifactId>
-    <version>1.30</version>
+    <version>1.31</version>
     <packaging>nbm</packaging>
 
     <name>TMC Maven Wrapper</name>

nbproject/genfiles.properties

@@ -5,7 +5,7 @@ [email protected]
 # 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=b49f54e7
 nbproject/build-impl.xml.script.CRC32=416371d0
-nbproject/build-impl.xml.stylesheet.CRC32=0f381476@2.50.1
+nbproject/build-impl.xml.stylesheet.CRC32=473dc988@2.76.1
 nbproject/platform.xml.data.CRC32=b49f54e7
 nbproject/platform.xml.script.CRC32=6dcbd131
-nbproject/platform.xml.stylesheet.CRC32=45ddf0e0@2.72.1
+nbproject/platform.xml.stylesheet.CRC32=ae64f0b6@2.76.1

nbproject/platform.properties

@@ -7,17 +7,73 @@ cluster.path=\
     ${nbplatform.active.dir}/javafx:\
     ${nbplatform.active.dir}/nb:\
     ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/webcommon:\
     ${nbplatform.active.dir}/websvccommon:\
     mavenmodules
 disabled.modules=\
+    org.netbeans.api.knockout,\
+    org.netbeans.lib.v8debug,\
+    org.netbeans.libs.graaljs,\
+    org.netbeans.libs.jstestdriver,\
+    org.netbeans.libs.nashorn,\
+    org.netbeans.libs.plist,\
     org.netbeans.modules.autoupdate.pluginimporter,\
     org.netbeans.modules.bugzilla.exceptionreporter,\
+    org.netbeans.modules.cordova,\
+    org.netbeans.modules.cordova.platforms,\
+    org.netbeans.modules.cordova.platforms.android,\
+    org.netbeans.modules.extbrowser.chrome,\
+    org.netbeans.modules.html.angular,\
+    org.netbeans.modules.html.knockout,\
+    org.netbeans.modules.html.ojet,\
     org.netbeans.modules.ide.branding,\
     org.netbeans.modules.ide.branding.kit,\
+    org.netbeans.modules.javascript.bower,\
+    org.netbeans.modules.javascript.cdnjs,\
+    org.netbeans.modules.javascript.grunt,\
+    org.netbeans.modules.javascript.gulp,\
+    org.netbeans.modules.javascript.jstestdriver,\
+    org.netbeans.modules.javascript.karma,\
+    org.netbeans.modules.javascript.nodejs,\
+    org.netbeans.modules.javascript.v8debug,\
+    org.netbeans.modules.javascript.v8debug.ui,\
+    org.netbeans.modules.javascript2.doc,\
+    org.netbeans.modules.javascript2.editor,\
+    org.netbeans.modules.javascript2.extdoc,\
+    org.netbeans.modules.javascript2.extjs,\
+    org.netbeans.modules.javascript2.jade,\
+    org.netbeans.modules.javascript2.jquery,\
+    org.netbeans.modules.javascript2.jsdoc,\
+    org.netbeans.modules.javascript2.json,\
+    org.netbeans.modules.javascript2.kit,\
+    org.netbeans.modules.javascript2.knockout,\
+    org.netbeans.modules.javascript2.lexer,\
+    org.netbeans.modules.javascript2.model,\
+    org.netbeans.modules.javascript2.nodejs,\
+    org.netbeans.modules.javascript2.prototypejs,\
+    org.netbeans.modules.javascript2.react,\
+    org.netbeans.modules.javascript2.requirejs,\
+    org.netbeans.modules.javascript2.sdoc,\
+    org.netbeans.modules.javascript2.source.query,\
+    org.netbeans.modules.javascript2.types,\
+    org.netbeans.modules.languages.apacheconf,\
+    org.netbeans.modules.languages.ini,\
+    org.netbeans.modules.netserver,\
+    org.netbeans.modules.selenium2.webclient,\
+    org.netbeans.modules.selenium2.webclient.mocha,\
+    org.netbeans.modules.selenium2.webclient.protractor,\
     org.netbeans.modules.uihandler.exceptionreporter,\
+    org.netbeans.modules.web.client.kit,\
+    org.netbeans.modules.web.client.samples,\
+    org.netbeans.modules.web.clientproject,\
+    org.netbeans.modules.web.clientproject.api,\
+    org.netbeans.modules.web.inspect,\
+    org.netbeans.modules.web.javascript.debugger,\
+    org.netbeans.modules.web.webkit.tooling,\
     org.netbeans.modules.welcome
 extcluster.mavenmodules.javadoc=
 extcluster.mavenmodules.sources=
+nbjdk.active=default
 #Default disabled modules for NB RCP app:
 #disabled.modules=\
 #    org.jdesktop.layout,\
@@ -33,4 +89,4 @@ extcluster.mavenmodules.sources=
 #    org.openide.execution,\
 #    org.openide.options,\
 #    org.openide.util.enumerations
-nbplatform.active=nb82
+nbplatform.active=Apache_NetBeans_IDE_11.1

nbproject/project.properties

@@ -1,7 +1,7 @@
 app.icon=branding/core/core.jar/org/netbeans/core/startup/frame48.gif
 app.name=${branding.token}
 app.title=Netbeans with TMC
-auxiliary.org-netbeans-modules-apisupport-installer.license-type=gpl.v2
+auxiliary.org-netbeans-modules-apisupport-installer.license-type=no
 auxiliary.org-netbeans-modules-apisupport-installer.os-linux=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-macosx=true
 auxiliary.org-netbeans-modules-apisupport-installer.os-solaris=false
@@ -16,4 +16,4 @@ project.fi.helsinki.cs.tmc.application=tmc-application
 run.args=-J-client -J-Xss2m -J-Xms32m -J-XX:PermSize=256m -J-Dapple.laf.useScreenMenuBar=true -J-Dapple.awt.graphics.UseQuartz=true -J-Dsun.java2d.noddraw=true -J-Dsun.zip.disableMemoryMapping=true
 run.jvmargs= -J-XX:PermSize=1024m -J-XX:MaxPermSize=2048m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled
 # NB version
-app.version=8.2.0
+app.version=11.1

snap/snapcraft.yaml

@@ -0,0 +1,38 @@
+name: tmcbeans # you probably want to 'snapcraft register <name>'
+base: core18 # the base snap is the execution environment for this snap
+version: '1.3.0' # just for humans, typically '1.2+git' or '1.3.2'
+summary: IDE for students using Test My Code # 79 char long summary
+description: |
+  TMCBeans is a customized version of the NetBeans IDE intended to be used with the Test My Code -system.
+  The Test My Code -system provides automatic assignment evaluation for MOOC-courses found at mooc.fi.
+  The system and most of the courses are created by the University of Helsinki.
+
+  TMCBeans is not affiliated with the Apache Software Foundation.
+
+grade: stable # must be 'stable' to release into candidate/stable channels
+confinement: classic # use 'strict' once you have the right plugs and slots
+
+parts:
+  tmcbeans:
+    plugin: dump
+    source: dist/tmcbeans.zip
+    override-build: |
+      chmod +x tmcbeans/java/maven/bin/mvn
+      find . -type d -name '*SunOS*' | xargs rm -rf
+      find . -type d -name 'i386' | xargs rm -rf
+      find . -type d -name 'Linux-sparc_64' | xargs rm -rf
+      find . -type d -name 'Linux-x86' | xargs rm -rf
+      snapcraftctl build
+  shortcut:
+    plugin: dump
+    source: desktop/
+
+apps:
+  tmcbeans:
+    command: tmcbeans/bin/tmcbeans
+    desktop: tmcbeans.desktop
+    plugs:
+      - desktop
+      - desktop-legacy
+      - wayland
+      - unity7

tmc-application/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=d86d3efa
 build.xml.script.CRC32=d075bdf4
-build.xml.stylesheet.CRC32=a56c6a5b@2.71.1
+build.xml.stylesheet.CRC32=15ca8a54@2.76.1
 # 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=d86d3efa
 nbproject/build-impl.xml.script.CRC32=ba1a70e4
-nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.71.1
+nbproject/build-impl.xml.stylesheet.CRC32=49aa68b0@2.76.1

tmc-application/nbproject/project.properties

@@ -1,3 +1,3 @@
 is.eager=true
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial