You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2009/10/13 17:37:42 UTC
svn commit: r824809 - /incubator/pivot/trunk/demos/www/
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" />
Re: svn commit: r824809
Posted by Greg Brown <gk...@mac.com>.
> Again, I would recommend that you keep it simple and keep changes to
> a minimum. This file is intentionally fairly simple, and I would
> prefer to keep it that way. Simple "JNLP" links wrapped in
> parentheses next to the existing links are sufficient, as far as I
> am concerned.
I just realized that I used the word "simple" about three times too
many in that sentence. However, maybe that will help to emphasize the
message I am trying to get across. :-)
Re: svn commit: r824809
Posted by Sandro Martini <sa...@gmail.com>.
Hi Greg,
Ok, sorry for not having run it before.
I've just run it on my local trunk, but I don't see any file changed
(commit tell me that there is nothing to update), is it right ?
In the page description "This page contains a collection of Pivot
demos. All demos require Java 6 or greater." could be useful to write
that some Web Start applications runs the signed version because they
needs full permissions to access remote sites or local storage, ok ?
The right version in English for this is certainly not written by me,
so be free to change it ...
> Again, I would recommend that you keep it simple and keep changes to a minimum. This file is intentionally fairly simple, and I would prefer to keep it that way. Simple "JNLP" links wrapped in parentheses next to the existing links are sufficient, as far as I am concerned.
Ok, ok ... but instead of "simple", why not also "clear" and if
possible "looks good", keeping all as simple as possible ?
For example, I'd add an horizontal divider (HR tag) between demos, to
separated them a little.
And another idea, many users don't like Applets, so why not write that
the default link run the demo as an Applet (link tooltip) ? And why
not remove the link from demo title, and create a "Detail" or "More
Info" link under the demo description (and at its left other
link/buttons) ?
And maybe add the same link also to the image (when present) ?
Only for the "Kitchen Sink" I'm thinking to add 3 links for Web Start
execution (or buttons ? many sites executing Web Start applications
use the standard button image to do this), so at least should be
better to explain (a little) what does any link (or could be the
tooltip of the link/button), or for example why we have to run the
signed version and require the all-permission on the client.
For others, I think to add only 1 Web Start link/button, the default
version ... but some of them probably needs the signed version, so at
least I think it's better to write in the link (or in its tooltip).
Then, at right to images (when present) there is a lot of free
(unused) space, so what do you think on put there the other
links/buttons ?
Last, some demos can run only as Applets (DOM or Javascript
interaction) ... but since Java 6 Update 10 Applets can run also with
a Web Start extension, enabling them to some features (JavaFX uses
this approach by default for Applets if i remember well). So here i
could try to add this, what do you think ?
Comments (from Greg and from others) ?
Excuse me for all this points to discuss, but I've very little time,
and doing the same thing many times is a sin.
Bye,
Sandro
Re: svn commit: r824809
Posted by Greg Brown <gk...@mac.com>.
Hi Sandro,
Your last two checkins included extraneous whitespace characters. Can
you please make sure you run the trim-whitespace build target before
you check anything else in?
Thanks,
Greg
On Oct 13, 2009, at 12:00 PM, Greg Brown wrote:
>>> The indentation is still off in these files (there shouldn't be
>>> any).
>> You means the indentation in jnlp_common.jsp ? In this I'm fixing it.
>
> I saw that - thanks.
>
>> But in other files I think it's better to keep, they are more
>> readable this way.
>> For example, in jnlp_properties.jsp the indentation is done to make
>> the lines merged in the right position (also as indent) in
>> destination
>> files.
>> If you have suggestion for these, tell me.
>
> Maybe this is a good reason to eliminate jnlp_properties.jsp and
> just put that content inline in each JNLP file. :-)
>
>> Tomorrow it's the time of the index.html page ... and here I expect
>> many suggestions :-) ...
>
> Again, I would recommend that you keep it simple and keep changes to
> a minimum. This file is intentionally fairly simple, and I would
> prefer to keep it that way. Simple "JNLP" links wrapped in
> parentheses next to the existing links are sufficient, as far as I
> am concerned.
>
Re: svn commit: r824809
Posted by Greg Brown <gk...@mac.com>.
>> The indentation is still off in these files (there shouldn't be any).
> You means the indentation in jnlp_common.jsp ? In this I'm fixing it.
I saw that - thanks.
> But in other files I think it's better to keep, they are more
> readable this way.
> For example, in jnlp_properties.jsp the indentation is done to make
> the lines merged in the right position (also as indent) in destination
> files.
> If you have suggestion for these, tell me.
Maybe this is a good reason to eliminate jnlp_properties.jsp and just
put that content inline in each JNLP file. :-)
> Tomorrow it's the time of the index.html page ... and here I expect
> many suggestions :-) ...
Again, I would recommend that you keep it simple and keep changes to a
minimum. This file is intentionally fairly simple, and I would prefer
to keep it that way. Simple "JNLP" links wrapped in parentheses next
to the existing links are sufficient, as far as I am concerned.
Re: svn commit: r824809
Posted by Sandro Martini <sa...@gmail.com>.
Hi Greg,
> The indentation is still off in these files (there shouldn't be any).
You means the indentation in jnlp_common.jsp ? In this I'm fixing it.
But in other files I think it's better to keep, they are more readable this way.
For example, in jnlp_properties.jsp the indentation is done to make
the lines merged in the right position (also as indent) in destination
files.
If you have suggestion for these, tell me.
> Otherwise, looks good.
Thanks ... after many revision we are here ;-) ...
Tomorrow it's the time of the index.html page ... and here I expect
many suggestions :-) ...
Bye
Re: svn commit: r824809
Posted by Greg Brown <gk...@mac.com>.
The indentation is still off in these files (there shouldn't be any).
Otherwise, looks good.
On Oct 13, 2009, at 11:37 AM, smartini@apache.org wrote:
> 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
> " />
>
>
>