From 145003155c05e915b900989a27cef1271398164b Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 26 Aug 2009 17:31:32 +0000
Subject: MOCCA TLS Server CA cert installation servlet removed help.jsp (and
 jsp dependencies in jetty) moved html pages to src/main/webapp (encoding
 problem?) switch to BASIC download protocol in BKUWebStart (no
 jnlpDownloadServlet required, see template.xml)

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@474 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKUWebStart/src/main/jnlp/resources/version.xml | 35 -------------------------
 BKUWebStart/src/main/jnlp/template.xml          | 22 +++++++---------
 2 files changed, 10 insertions(+), 47 deletions(-)

(limited to 'BKUWebStart/src/main/jnlp')

diff --git a/BKUWebStart/src/main/jnlp/resources/version.xml b/BKUWebStart/src/main/jnlp/resources/version.xml
index 451fe038..5e504b68 100644
--- a/BKUWebStart/src/main/jnlp/resources/version.xml
+++ b/BKUWebStart/src/main/jnlp/resources/version.xml
@@ -89,41 +89,6 @@
     </pattern>
     <file>servlet-api-2.5-20081211.jar</file>
   </resource>
-  <resource>
-    <pattern>
-      <name>jsp-2.1-jetty-6.1.19.jar</name>
-      <version-id>6.1.19</version-id>
-    </pattern>
-    <file>jsp-2.1-jetty-6.1.19.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>jsp-2.1-glassfish-9.1.1.B60.25.p0.jar</name>
-      <version-id>9.1.1.B60.25.p0</version-id>
-    </pattern>
-    <file>jsp-2.1-glassfish-9.1.1.B60.25.p0.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>jsp-api-2.1-glassfish-9.1.1.B60.25.p0.jar</name>
-      <version-id>9.1.1.B60.25.p0</version-id>
-    </pattern>
-    <file>jsp-api-2.1-glassfish-9.1.1.B60.25.p0.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>ant-1.6.5.jar</name>
-      <version-id>1.6.5</version-id>
-    </pattern>
-    <file>ant-1.6.5.jar</file>
-  </resource>
-  <resource>
-    <pattern>
-      <name>core-3.1.1.jar</name>
-      <version-id>3.1.1</version-id>
-    </pattern>
-    <file>core-3.1.1.jar</file>
-  </resource>
   <resource>
     <pattern>
       <name>slf4j-api-1.5.8.jar</name>
diff --git a/BKUWebStart/src/main/jnlp/template.xml b/BKUWebStart/src/main/jnlp/template.xml
index a8ee0341..8181bc31 100644
--- a/BKUWebStart/src/main/jnlp/template.xml
+++ b/BKUWebStart/src/main/jnlp/template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="$jnlpspec" codebase="$$codebase" context="$$context" href="$$name">
+<jnlp spec="$jnlpspec" codebase="http://localhost:8080/webstart/" context="http://localhost:8080" href="mocca.jnlp">
 
   <information>
     <!--title>$project.Name</title-->
@@ -9,15 +9,15 @@
     <homepage href="$project.Url"/>
     <description>$project.Description (BKU) MOCCA Web Start</description>
     <description kind="short">$project.Description</description>
-    <icon kind="shortcut" href="img/chip16.png" width="16" height="16" version="2.0"/>
-    <icon kind="shortcut" href="img/chip24.png" width="24" height="24" version="2.0"/>
-    <icon kind="shortcut" href="img/chip32.png" width="32" height="32" version="2.0"/>
-    <icon kind="shortcut" href="img/chip48.png" width="48" height="48" version="2.0"/>
-    <icon kind="default" href="img/chip16.png" width="16" height="16" version="2.0"/>
-    <icon kind="default" href="img/chip24.png" width="24" height="24" version="2.0"/>
-    <icon kind="default" href="img/chip32.png" width="32" height="32" version="2.0"/>
-    <icon kind="default" href="img/chip48.png" width="48" height="48" version="2.0"/>
-    <icon kind="splash" href="img/splash.png" version="2.0"/>
+    <icon kind="shortcut" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="shortcut" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="shortcut" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="shortcut" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="default" href="img/chip16.png" width="16" height="16"/>
+    <icon kind="default" href="img/chip24.png" width="24" height="24"/>
+    <icon kind="default" href="img/chip32.png" width="32" height="32"/>
+    <icon kind="default" href="img/chip48.png" width="48" height="48"/>
+    <icon kind="splash" href="img/splash.png"/>
     <shortcut online="false">
       <desktop/>
       <menu submenu="e-Government"/>
@@ -39,13 +39,11 @@
 
   <resources os="Mac OS X">
     <java version="$j2seVersion" java-vm-args="-d32"/>
-    <property name="jnlp.versionEnabled" value="true"/>
      $dependencies
   </resources>
 
   <resources>
     <java version="$j2seVersion"/>
-    <property name="jnlp.versionEnabled" value="true"/>
      $dependencies
   </resources>
 
-- 
cgit v1.2.3