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/20 15:48:03 UTC

svn commit: r827445 - in /incubator/pivot/trunk/demos/www: kitchen_sink.custom_colors.jnlp kitchen_sink.jnlp kitchen_sink.signed.jnlp large_data.jnlp

Author: smartini
Date: Tue Oct 20 13:48:03 2009
New Revision: 827445

URL: http://svn.apache.org/viewvc?rev=827445&view=rev
Log:
fix startup properties for Kitchen Sink, and add jnlp for Large Data Set

Added:
    incubator/pivot/trunk/demos/www/large_data.jnlp
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

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=827445&r1=827444&r2=827445&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 20 13:48:03 2009
@@ -42,11 +42,6 @@
 
     <resources>
 <%@ include file="jnlp_properties.jsp" %>
-
-        <property name="width"  value="800" />
-        <property name="height" value="600" />
-        <property name="center" value="true" />
-
         <property name="org.apache.pivot.wtk.skin.terra.location" value="org/apache/pivot/tutorials/TerraTheme_dark.json" />
 
         <java version="1.6+" href="http://java.sun.com/products/autodl/j2se" />
@@ -58,6 +53,9 @@
 
     <application-desc main-class="org.apache.pivot.wtk.DesktopApplicationContext">
         <argument>org.apache.pivot.tutorials.KitchenSink</argument>
+        <argument>--width=800</argument>
+        <argument>--height=600</argument>
+        <argument>--center=true</argument>
     </application-desc>
     
     <update check="background" />

Modified: incubator/pivot/trunk/demos/www/kitchen_sink.jnlp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.jnlp?rev=827445&r1=827444&r2=827445&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.jnlp (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.jnlp Tue Oct 20 13:48:03 2009
@@ -30,7 +30,7 @@
         <vendor>Apache Pivot</vendor>
         <homepage href="http://incubator.apache.org/pivot/"/>
         <description>Similar to Sun's "Swing Set" demo, this application demonstrates a number of commonly used Pivot components.</description>
-        <icon kind="shortcut" href="<%= codebase %>logo.png" width="32" height="32" />
+        <icon kind="shortcut" href="logo.png" width="32" height="32" />
         <offline-allowed/>
         <shortcut online="true">
             <desktop/>
@@ -39,11 +39,6 @@
 
     <resources>
 <%@ include file="jnlp_properties.jsp" %>
-
-        <property name="width"  value="800" />
-        <property name="height" value="600" />
-        <property name="center" value="true" />
-
         <java version="1.6+" href="http://java.sun.com/products/autodl/j2se" />
 
         <extension name="pivot-runtime" href="<%= codebase %>pivot-runtime.jnlp" />
@@ -53,9 +48,9 @@
 
     <application-desc main-class="org.apache.pivot.wtk.DesktopApplicationContext">
         <argument>org.apache.pivot.tutorials.KitchenSink</argument>
-        <argument>--width:800</argument>
-        <argument>--height:600</argument>
-        <argument>--center:true</argument>
+        <argument>--width=800</argument>
+        <argument>--height=600</argument>
+        <argument>--center=true</argument>
     </application-desc>
     
     <update check="background" />

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=827445&r1=827444&r2=827445&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.signed.jnlp Tue Oct 20 13:48:03 2009
@@ -42,11 +42,6 @@
 
     <resources>
 <%@ include file="jnlp_properties.jsp" %>
-
-        <property name="width"  value="800" />
-        <property name="height" value="600" />
-        <property name="center" value="true" />
-
         <java version="1.6+" href="http://java.sun.com/products/autodl/j2se" />
 
         <extension name="pivot-runtime" href="<%= codebase %>pivot-runtime.signed.jnlp" />
@@ -56,6 +51,8 @@
 
     <application-desc main-class="org.apache.pivot.wtk.DesktopApplicationContext">
         <argument>org.apache.pivot.tutorials.KitchenSink</argument>
+        <argument>--width=800</argument>
+        <argument>--height=600</argument>
     </application-desc>
     
     <update check="background" />

Added: incubator/pivot/trunk/demos/www/large_data.jnlp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/large_data.jnlp?rev=827445&view=auto
==============================================================================
--- incubator/pivot/trunk/demos/www/large_data.jnlp (added)
+++ incubator/pivot/trunk/demos/www/large_data.jnlp Tue Oct 20 13:48:03 2009
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<%
+/*
+ * 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.
+ */
+%>
+
+<%@ page language="java" contentType="application/x-java-jnlp-file" pageEncoding="UTF-8" %>
+
+<%@ include file="version.jsp" %>
+<%@ include file="jnlp_common.jsp" %>
+
+<jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
+    <information>
+        <title>Pivot Large Data Sets Demo</title>
+        <vendor>Apache Pivot</vendor>
+        <homepage href="http://incubator.apache.org/pivot/"/>
+        <description>This application demonstrates Pivot's ability to handle large data sets. The application reads CSV files containing from 10 to 1,000,000 rows and reports the amount of time it takes to load each file. It loads the rows on a background thread using a streaming API such that rows can be presented to the user as they are read.</description>
+        <icon kind="shortcut" href="logo.png" />
+        <offline-allowed/>
+        <shortcut online="false">
+            <desktop/>
+        </shortcut>
+    </information>
+
+    <resources>
+<%@ include file="jnlp_properties.jsp" %>
+        <java version="1.6+" href="http://java.sun.com/products/autodl/j2se" />
+
+        <extension name="pivot-runtime" href="<%= codebase %>pivot-runtime.signed.jnlp" />
+
+        <jar href="lib/pivot-demos-<%= version %>.jar" main="true" />
+    </resources>
+
+    <application-desc main-class="org.apache.pivot.wtk.DesktopApplicationContext">
+        <argument>org.apache.pivot.demos.million.LargeData</argument>
+        <argument>--basePath=<%= request.getContextPath()%>/assets</argument>
+    </application-desc>
+    
+    <update check="background" />
+</jnlp>