remove webstart support

Oracle disabled self-signed applications by default. There's no point in
keeping WebStart support around.

Author: kparal

build.xml

@@ -77,46 +77,7 @@
         <property name="libs.MacUI.classpath" value=""/>
         <echo message="Building without Mac OS support as requested."/>
     </target>
-
-    <!-- overwrite 'jar' target not to create jnlp automatically -->
-    <target name="jar" depends="init,compile,-pre-jar,-do-jar,-post-jar"
-        description="Build JAR."/>
-    
-    <!-- overwrite 'jws-run' to depend on 'javaws' target -->
-    <target name="jws-run" depends="jar,-verify-jnlp-enabled,-verify-codebase,javaws" description="Start javaws execution">
-        <exec executable="${java.home}/bin/javaws">
-            <arg file="${jnlp.dest.dir}/${launch.jnlp.file}"/>
-        </exec>
-    </target>
-    
-    <!-- build java webstart files -->
-    <target name="javaws" depends="jar" description="Build Java WebStart files.">
-        <!-- create gateways.jar file -->
-        <copy todir="dist/tmp/esmska/gateways/scripts">
-            <fileset dir="dist/gateways"/>
-        </copy>
-        <jar destfile="dist/lib/gateways.jar" basedir="dist/tmp"/>
-        <delete dir="dist/tmp"/>
-        <!-- add "gateways.jar" to the Class-Path in jar manifest -->
-        <jar destfile="${dist.jar}" update="true">
-            <manifest>
-                <attribute name="Class-Path" value="${jar.classpath} gateways.jar"/>
-            </manifest>
-        </jar>
-        <!-- add esmska.ico -->
-        <move file="dist/icons/esmska.ico" todir="dist"/>
-        <!-- delete unneeded stuff -->
-        <delete includeemptydirs="true">
-            <fileset dir="dist" includes="**/*">
-                <exclude name="lib/**"/>
-                <exclude name="*.jar"/>
-                <exclude name="esmska.ico"/>
-            </fileset>
-        </delete>
-        <!-- call 'jnlp' target -->
-        <antcall target="jnlp"/>
-    </target>
-    
+   
     <!-- called after jar building -->
     <target name="-post-jar">
         <!-- delete unneeded stuff -->

master.jnlp

@@ -1,5 +1,6 @@
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 application.desc=Program for sending SMS over the Internet
 application.homepage=http://esmska.googlecode.com
@@ -29,7 +30,9 @@ excludes=
 file.reference.esmska-lib=lib
 file.reference.javaws.jar=lib/javaws.jar
 includes=**
+jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
+jar.index=${jnlp.enabled}
 javac.classpath=\
     ${libs.JGoodies-Looks.classpath}:\
     ${libs.JavaCSV.classpath}:\
@@ -75,15 +78,24 @@ jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
 jnlp.codebase.type=user
 jnlp.codebase.url=file:/home/ripper/devel/esmska/trunk/esmska/dist/
 jnlp.codebase.user=http://ripper.profitux.cz/esmska/webstart/
+jnlp.descriptor=application
 jnlp.enabled=false
 jnlp.icon=src/esmska/resources/esmska.png
+jnlp.mixed.code=default
 jnlp.offline-allowed=true
 jnlp.signed=true
+jnlp.signing=generated
+jnlp.signing.alias=esmska
+jnlp.signing.keystore=
 # Comment jnlp.signjar.* properties to disable custom keystore and use one-time generated cerificates.
 # Add jnlp.signjar.storepass property to private/project.properties to set keystore password.
 jnlp.signjar.keystore=esmska.keystore
 jnlp.signjar.alias=esmska
 main.class=esmska.Main
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
+manifest.custom.codebase=
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
+manifest.custom.permissions=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false

nbproject/project.properties

@@ -63,16 +63,6 @@ public static void main(String[] args) {
                     + "The tested Java versions are: Oracle Java 6 and 7, OpenJDK 6 and 7, Apple Java 6 and 7.");
         }
 
-        // halt for Webstart on OpenJDK, it currently doesn't work
-        // see http://code.google.com/p/esmska/issues/detail?id=335
-        // see http://code.google.com/p/esmska/issues/detail?id=357
-        // see http://code.google.com/p/esmska/issues/detail?id=358
-        if (RuntimeUtils.isOpenJDK() && RuntimeUtils.isRunAsWebStart()) {
-            logger.severe("Running as Java WebStart on OpenJDK, that's currently unsupported! Quitting.");
-            JOptionPane.showMessageDialog(null, l10n.getString("Main.brokenWebstart"), "Esmska", JOptionPane.ERROR_MESSAGE);
-            System.exit(99);
-        }
-
         //parse commandline arguments
         CommandLineParser clp = new CommandLineParser();
         if (! clp.parseArgs(args)) {

src/esmska/Main.java

@@ -62,8 +62,6 @@ public class PersistenceManager {
     private static final String LOCK_FILENAME = "running.lock";
     private static final String LOG_FILENAME = "console.log";
     private static final String DEPRECATED_GWS_FILENAME = "deprecated.xml";
-    private static final String GATEWAY_RESOURCE = "/esmska/gateways/scripts";
-    private static final String DEPRECATED_GWS_RESOURCE = GATEWAY_RESOURCE + "/" + DEPRECATED_GWS_FILENAME;
     private static final String GATEWAY_PROPS_FILENAME = "gateways.json";
 
     private static File configDir =
@@ -371,28 +369,22 @@ public void loadGateways() throws IOException, IntrospectionException, SAXExcept
         TreeSet<Gateway> localGateways = new TreeSet<Gateway>();
         HashSet<DeprecatedGateway> deprecatedGateways = new HashSet<DeprecatedGateway>();
         //global gateways
-        if (!RuntimeUtils.isRunAsWebStart() && globalGatewayDir.exists()) {
+        if (globalGatewayDir.exists()) {
             globalGateways = new ArrayList<Gateway>(ImportManager.importGateways(globalGatewayDir, false));
-        } else if (RuntimeUtils.isRunAsWebStart()) {
-            globalGateways = new ArrayList<Gateway>(ImportManager.importGateways(GATEWAY_RESOURCE));
         } else {
             throw new IOException("Could not find gateways directory '" +
-                    globalGatewayDir.getAbsolutePath() + "' nor jar gateways resource '" +
-                    GATEWAY_RESOURCE + "'");
+                    globalGatewayDir.getAbsolutePath() + "'");
         }
         //local gateways
         if (localGatewayDir.exists()) {
             localGateways = ImportManager.importGateways(localGatewayDir, true);
         }
         //deprecated gateways
-        if (!RuntimeUtils.isRunAsWebStart() && deprecatedGWsFile.canRead()) {
+        if (deprecatedGWsFile.canRead()) {
             deprecatedGateways = ImportManager.importDeprecatedGateways(deprecatedGWsFile);
-        } else if (RuntimeUtils.isRunAsWebStart()) {
-            deprecatedGateways = ImportManager.importDeprecatedGateways(DEPRECATED_GWS_RESOURCE);
         } else {
             logger.warning("Could not find deprecated gateways file: '" +
-                    deprecatedGWsFile.getAbsolutePath() + "' nor jar resource '" +
-                    DEPRECATED_GWS_RESOURCE + "'");
+                    deprecatedGWsFile.getAbsolutePath() + "'");
         }
         //filter out deprecated gateways
         for (DeprecatedGateway deprecated : deprecatedGateways) {
@@ -497,8 +489,8 @@ public void saveGateway(String scriptName, String scriptContents, byte[] icon) t
         //move script file to correct location
         File scriptFileGlobal = new File(globalGatewayDir, scriptName + ".gateway");
         File scriptFileLocal = new File(localGatewayDir, scriptName + ".gateway");
-        if (!RuntimeUtils.isRunAsWebStart() && canWrite(globalGatewayDir)
-                && (!scriptFileGlobal.exists() || canWrite(scriptFileGlobal))) {
+        if (canWrite(globalGatewayDir) && 
+                (!scriptFileGlobal.exists() || canWrite(scriptFileGlobal))) {
             //first try global dir
             moveFileSafely(temp, scriptFileGlobal);
             //set readable for everyone
@@ -519,8 +511,8 @@ public void saveGateway(String scriptName, String scriptContents, byte[] icon) t
         if (icon != null) {
             File iconFileGlobal = new File(globalGatewayDir, scriptName + ".png");
             File iconFileLocal = new File(localGatewayDir, scriptName + ".png");
-            if (!RuntimeUtils.isRunAsWebStart() && canWrite(globalGatewayDir)
-                    && (!iconFileGlobal.exists() || canWrite(iconFileGlobal))) {
+            if (canWrite(globalGatewayDir) && 
+                    (!iconFileGlobal.exists() || canWrite(iconFileGlobal))) {
                 //first try global dir
                 moveFileSafely(iconTemp, iconFileGlobal);
                 logger.finer("Saved gateway icon into file: " + iconFileGlobal.getAbsolutePath());

src/esmska/persistence/PersistenceManager.java

@@ -454,7 +454,6 @@ ConfigFrame.senderNumberLabel.text=&Number:
 ConfigFrame.senderNameLabel.text=N&ame:
 Signature.confirmRemove=Do you want to remove selected signature?
 SignatureComboBox.tooltip=The signature to append to the message (sender number and name).
-Main.brokenWebstart=You're currently running Esmska using OpenJDK and Java WebStart.\nUnfortunatelly this combination is currently broken and doesn't work.\nEither install Sun Java and use Java WebStart, or download Esmska to your computer\nand run it the common way.\n\nEsmska will now quit.
 #If you want to use single quotes (') in this translation, you must write them doubled ('')!
 GatewayProblem.WRONG_SIGNATURE=You have entered a wrong sender signature (a number or a name).<br>\nYour sender number: {0}<br>\nYour sender name: {1}
 #If you want to use single quotes (') in this translation, you must write them doubled ('')!

src/esmska/resources/l10n.properties

@@ -58,7 +58,6 @@ public static JSONObject collectUsageInfo() {
         info.put("uuid", config.getUUID());
         info.put("version", Config.getLatestVersion());
         info.put("stable", Config.isStableVersion());
-        info.put("webstart", RuntimeUtils.isRunAsWebStart());
 
         // system info
         info.put("os", WordUtils.capitalizeFully(RuntimeUtils.detectOS().name()));

src/esmska/update/Statistics.java

@@ -124,12 +124,6 @@ public static boolean isSupportedJava() {
         return isOracleJava() || isOpenJDK() || isAppleJava();
     }
 
-    /** Whether the program is run as Java WebStart or not */
-    public static boolean isRunAsWebStart() {
-        //property esmska.isWebstart is set in JNLP file
-        return System.getProperty("esmska.isWebstart") != null;
-    }
-
     /** Get basic information about current system. Useful for debugging
      * print-outs.
      */