Author: smartini
Date: Tue Oct 13 15:37:41 2009
New Revision: 824809
URL: http://svn.apache.org/viewvc?rev=824809&view=rev
Log:
some little changes to jnlp files, as suggested by Greg
Added:
incubator/pivot/trunk/demos/www/jnlp_common.jsp
incubator/pivot/trunk/demos/www/jnlp_properties.jsp
Removed:
incubator/pivot/trunk/demos/www/common_properties_for_jnlp.jsp
incubator/pivot/trunk/demos/www/url_utilities.jsp
Modified:
incubator/pivot/trunk/demos/www/kitchen_sink.custom_colors.jnlp
incubator/pivot/trunk/demos/www/kitchen_sink.jnlp
incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp
incubator/pivot/trunk/demos/www/pivot-runtime.jnlp
incubator/pivot/trunk/demos/www/pivot-runtime.signed.jnlp
Added: incubator/pivot/trunk/demos/www/jnlp_common.jsp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/jnlp_common.jsp?rev=824809&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/jnlp_common.jsp (added)
+++ incubator/pivot/trunk/demos/www/jnlp_common.jsp Tue Oct 13
15:37:41 2009
@@ -0,0 +1,47 @@
+<%
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
with
+ * this work for additional information regarding copyright
ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the
License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ * See the License for the specific language governing permissions
and
+ * limitations under the License.
+ */
+
+ // response.setHeader("Cache-Control", "no-cache");
+ // response.setHeader("Pragma", "no-cache");
+ // response.setDateHeader("Expires", 0);
+
+ String requestURL = request.getRequestURL().toString();
+ int lastSlash = requestURL.lastIndexOf('/');
+ String codebase = "";
+ String href = "";
+ if (requestURL != null) {
+ if (lastSlash < 0) {
+ lastSlash = 0;
+ }
+
+ codebase = requestURL.substring(0, lastSlash + 1);
+ if ((lastSlash + 1) < requestURL.length()) {
+ href = requestURL.substring(lastSlash + 1);
+ }
+
+ }
+
+ /*
+ String codebase = request.getScheme() + "://"
+ + request.getServerName() + ":"
+ + request.getServerPort() + request.getContextPath()
+ ;
+ String href = request.getServletPath();
+ */
+
+%>
Added: incubator/pivot/trunk/demos/www/jnlp_properties.jsp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/jnlp_properties.jsp?rev=824809&view=auto
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/jnlp_properties.jsp (added)
+++ incubator/pivot/trunk/demos/www/jnlp_properties.jsp Tue Oct 13
15:37:41 2009
@@ -0,0 +1,29 @@
+<%
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
with
+ * this work for additional information regarding copyright
ownership.
+ * The ASF licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the
License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ * See the License for the specific language governing permissions
and
+ * limitations under the License.
+ */
+
+%>
+
+ <property name="jnlp.packEnabled"
value="true" />
+ <%-- <property name="sun.java2d.noddraw" value="true" /> --%>
+ <property name="sun.awt.noerasebackground"
value="true" />
+ <property name="sun.awt.erasebackgroundonresize=true"
value="true" />
+
+<%--
+ <java version="1.6+" href="http://java.sun.com/products/autodl/j2se
" />
+//--%>
+
Modified: incubator/pivot/trunk/demos/www/
kitchen_sink.custom_colors.jnlp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.custom_colors.jnlp?rev=824809&r1=824808&r2=824809&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.custom_colors.jnlp
(original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.custom_colors.jnlp
Tue Oct 13 15:37:41 2009
@@ -18,11 +18,10 @@
*/
%>
-<%-- @ page language="java" contentType="application/xml;
charset=UTF-8" pageEncoding="UTF-8" --%> <%-- Enable this for Page
Debugging purposes --%>
<%@ page language="java" contentType="application/x-java-jnlp-file"
pageEncoding="UTF-8" %>
<%@ include file="version.jsp" %>
-<%@ include file="url_utilities.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
<information>
@@ -44,7 +43,7 @@
</security>
<resources>
-<%@ include file="common_properties_for_jnlp.jsp" %>
+<%@ include file="jnlp_properties.jsp" %>
<property name="org.apache.pivot.wtk.skin.terra.location"
value="org/apache/pivot/tutorials/TerraTheme_dark.json" />
Modified: incubator/pivot/trunk/demos/www/kitchen_sink.jnlp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.jnlp?rev=824809&r1=824808&r2=824809&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.jnlp (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.jnlp Tue Oct 13
15:37:41 2009
@@ -22,7 +22,7 @@
<%@ page language="java" contentType="application/x-java-jnlp-file"
pageEncoding="UTF-8" %>
<%@ include file="version.jsp" %>
-<%@ include file="url_utilities.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
<information>
@@ -39,7 +39,7 @@
</information>
<resources>
-<%@ include file="common_properties_for_jnlp.jsp" %>
+<%@ include file="jnlp_properties.jsp" %>
<java version="1.6+" href="http://java.sun.com/products/autodl/j2se
" />
Modified: incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp?rev=824809&r1=824808&r2=824809&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp
(original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp Tue Oct
13 15:37:41 2009
@@ -18,11 +18,10 @@
*/
%>
-<%-- @ page language="java" contentType="application/xml;
charset=UTF-8" pageEncoding="UTF-8" --%> <%-- Enable this for Page
Debugging purposes --%>
<%@ page language="java" contentType="application/x-java-jnlp-file"
pageEncoding="UTF-8" %>
<%@ include file="version.jsp" %>
-<%@ include file="url_utilities.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
<information>
@@ -44,7 +43,7 @@
</security>
<resources>
-<%@ include file="common_properties_for_jnlp.jsp" %>
+<%@ include file="jnlp_properties.jsp" %>
<java version="1.6+" href="http://java.sun.com/products/autodl/j2se
" />
Modified: incubator/pivot/trunk/demos/www/pivot-runtime.jnlp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/pivot-runtime.jnlp?rev=824809&r1=824808&r2=824809&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/pivot-runtime.jnlp (original)
+++ incubator/pivot/trunk/demos/www/pivot-runtime.jnlp Tue Oct 13
15:37:41 2009
@@ -22,7 +22,7 @@
<%@ page language="java" contentType="application/x-java-jnlp-file"
pageEncoding="UTF-8" %>
<%@ include file="version.jsp" %>
-<%@ include file="url_utilities.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
<information>
@@ -34,9 +34,7 @@
</information>
<resources>
- <property name="jnlp.packEnabled"
value="true" />
- <property name="sun.awt.noerasebackground"
value="true" />
- <property name="sun.awt.erasebackgroundonresize=true"
value="true" />
+<%@ include file="jnlp_properties.jsp" %>
<java version="1.6+" href="http://java.sun.com/products/autodl/j2se
" />
Modified: incubator/pivot/trunk/demos/www/pivot-runtime.signed.jnlp
URL:
http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/pivot-runtime.signed.jnlp?rev=824809&r1=824808&r2=824809&view=diff
=
=
=
=
=
=
=
=
======================================================================
--- incubator/pivot/trunk/demos/www/pivot-runtime.signed.jnlp
(original)
+++ incubator/pivot/trunk/demos/www/pivot-runtime.signed.jnlp Tue
Oct 13 15:37:41 2009
@@ -18,11 +18,10 @@
*/
%>
-<%-- @ page language="java" contentType="application/xml;
charset=UTF-8" pageEncoding="UTF-8" --%> <%-- Enable this for Page
Debugging purposes --%>
<%@ page language="java" contentType="application/x-java-jnlp-file"
pageEncoding="UTF-8" %>
<%@ include file="version.jsp" %>
-<%@ include file="url_utilities.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
<information>
@@ -38,9 +37,7 @@
</security>
<resources>
- <property name="jnlp.packEnabled"
value="true" />
- <property name="sun.awt.noerasebackground"
value="true" />
- <property name="sun.awt.erasebackgroundonresize=true"
value="true" />
+<%@ include file="jnlp_properties.jsp" %>
<java version="1.6+" href="http://java.sun.com/products/autodl/j2se
" />
