Refactored extras/net/sourceforge/jnlp to extras/net/sourceforge/javaws/ as first step to get rid of all-permitions tag in abouyt.jnlp, boot.java is now reading about.jnlp from insttall directory. About.jnlp codebase redirected to local directory by dot.

10 files changed, 31 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index eaa7da3..7d86305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-03-02  Jiri Vanek  <[email protected]>
+
+	* netx/net/sourceforge/jnlp/runtime/Boot.java: getAboutFile changed to 
+	return path to local about.jnlp instead to  inner-from-jar
+	* extras/net/sourceforge/jnlp/: refactored to 
+	extras/net/sourceforge/javaws/, as /net/sourceforge/jnlp/ package 
+	must be run with all-permissions.
+	* netx/net/sourceforge/jnlp/resources/about.jnlp: codebase changed 
+	to "."
+
+
 2011-03-15  Denis Lila  <[email protected]>
 
 	* netx/net/sourceforge/jnlp/Launcher.java
diff --git a/Makefile.am b/Makefile.am
index fe98a32..4d259ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@
 NETX_DIR = $(abs_top_builddir)/netx.build
 NETX_SRCDIR = $(abs_top_srcdir)/netx
 NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
-NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources
+NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
+NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
 
 # Build directories
 
@@ -305,7 +306,7 @@ stamps/extra-class-files.stamp: extra-source-files.txt stamps/netx.stamp
 	 for files in $$(find . -type f); \
 	 do \
 	   ${INSTALL_DATA} -D $${files} \
-	   ${abs_top_builddir}/extra-lib/net/sourceforge/jnlp/about/resources/$${files}; \
+	   $(NETX_EXTRA_DIST_DIR)/$${files}; \
 	 done)
 	mkdir -p stamps
 	touch $@
diff --git a/extra/net/sourceforge/jnlp/about/HTMLPanel.java b/extra/net/sourceforge/javaws/about/HTMLPanel.java
index bac5d1e..e544e32 100644
--- a/extra/net/sourceforge/jnlp/about/HTMLPanel.java
+++ b/extra/net/sourceforge/javaws/about/HTMLPanel.java
@@ -35,7 +35,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
 */
 
-package net.sourceforge.jnlp.about;
+package net.sourceforge.javaws.about;
 
 import java.awt.BorderLayout;
 import java.io.IOException;
diff --git a/extra/net/sourceforge/jnlp/about/Main.java b/extra/net/sourceforge/javaws/about/Main.java
index f24a13d..e0cc589 100644
--- a/extra/net/sourceforge/jnlp/about/Main.java
+++ b/extra/net/sourceforge/javaws/about/Main.java
@@ -35,7 +35,7 @@ obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version.
 */
 
-package net.sourceforge.jnlp.about;
+package net.sourceforge.javaws.about;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
diff --git a/extra/net/sourceforge/jnlp/about/resources/about.html b/extra/net/sourceforge/javaws/about/resources/about.html
index ab2e0fd..ab2e0fd 100644
--- a/extra/net/sourceforge/jnlp/about/resources/about.html
+++ b/extra/net/sourceforge/javaws/about/resources/about.html
diff --git a/extra/net/sourceforge/jnlp/about/resources/applications.html b/extra/net/sourceforge/javaws/about/resources/applications.html
index e9210d6..e9210d6 100644
--- a/extra/net/sourceforge/jnlp/about/resources/applications.html
+++ b/extra/net/sourceforge/javaws/about/resources/applications.html
diff --git a/extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg b/extra/net/sourceforge/javaws/about/resources/jamIcon.jpg
index 6a827c7..6a827c7 100644
--- a/extra/net/sourceforge/jnlp/about/resources/jamIcon.jpg
+++ b/extra/net/sourceforge/javaws/about/resources/jamIcon.jpg
diff --git a/extra/net/sourceforge/jnlp/about/resources/notes.html b/extra/net/sourceforge/javaws/about/resources/notes.html
index c43418c..c43418c 100644
--- a/extra/net/sourceforge/jnlp/about/resources/notes.html
+++ b/extra/net/sourceforge/javaws/about/resources/notes.html
diff --git a/netx/net/sourceforge/jnlp/resources/about.jnlp b/netx/net/sourceforge/jnlp/resources/about.jnlp
index e5bf1e1..44763b6 100644
--- a/netx/net/sourceforge/jnlp/resources/about.jnlp
+++ b/netx/net/sourceforge/jnlp/resources/about.jnlp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<jnlp spec="1.0" href="about.jnlp" codebase="http://icedtea.classpath.org/netx/">

+<jnlp spec="1.0" href="about.jnlp" codebase=".">

   <information>

     <title>About window for NetX</title>

     <vendor>NetX</vendor>

@@ -11,10 +11,7 @@
     <j2se version="1.4+"/>

     <jar href="about.jar"/>

   </resources>

-  <security>

-    <all-permissions/>

-  </security>

-  <application-desc main-class="net.sourceforge.jnlp.about.Main">

+  <application-desc main-class="net.sourceforge.javaws.about.Main">

   </application-desc>

 </jnlp>

 

diff --git a/netx/net/sourceforge/jnlp/runtime/Boot.java b/netx/net/sourceforge/jnlp/runtime/Boot.java
index edf8f8c..1db5296 100644
--- a/netx/net/sourceforge/jnlp/runtime/Boot.java
+++ b/netx/net/sourceforge/jnlp/runtime/Boot.java
@@ -218,8 +218,19 @@ public final class Boot implements PrivilegedAction<Void> {
             cl = ClassLoader.getSystemClassLoader();
         }
         try {
-            return cl.getResource("net/sourceforge/jnlp/resources/about.jnlp").toString();
-        } catch (Exception e) {
+                    //extracts full path to about.jnlp
+            String s = cl.getResource("net/sourceforge/jnlp/runtime/Boot.class").toString();
+            s=s.substring(0,s.indexOf("!"));
+            s=s.substring(s.indexOf(":")+1);
+            s=s.substring(s.indexOf(":")+1);
+            s="file://"+s.replace("netx.jar","about.jnlp");
+            if (JNLPRuntime.isDebug()){
+                System.out.println("Using " + s + " as about.jnlp URL");
+            }
+
+            return s;
+         } catch (Exception e) {
+            e.printStackTrace();
             return null;
         }
     }