You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/10/08 17:33:33 UTC
svn commit: r823207 - in /incubator/pivot/trunk: ./
demos/src/org/apache/pivot/demos/decorator/ demos/www/ tutorials/www/ web/
web/test/org/apache/pivot/web/test/
web/test/org/apache/pivot/web/test/server/ web/www/
Author: gbrown
Date: Thu Oct 8 15:33:32 2009
New Revision: 823207
URL: http://svn.apache.org/viewvc?rev=823207&view=rev
Log:
Add version.template.js and version.template.jsp; remove web query test client and servlet (since they were no longer being correctly packaged as a WAR file and have not been actively used in a while).
Added:
incubator/pivot/trunk/demos/www/animated_clock.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/animated_clock.template.html
incubator/pivot/trunk/demos/www/decorators.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/decorators.template.html
incubator/pivot/trunk/demos/www/dom_interaction.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/dom_interaction.template.html
incubator/pivot/trunk/demos/www/file_drag_drop.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/file_drag_drop.template.html
incubator/pivot/trunk/demos/www/fixed_column_table.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/fixed_column_table.template.html
incubator/pivot/trunk/demos/www/itunes_search.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/itunes_search.template.html
incubator/pivot/trunk/demos/www/json_viewer.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/json_viewer.template.html
incubator/pivot/trunk/demos/www/kitchen_sink.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/kitchen_sink.template.html
incubator/pivot/trunk/demos/www/large_data.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/large_data.template.html
incubator/pivot/trunk/demos/www/multiselect.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/multiselect.template.html
incubator/pivot/trunk/demos/www/rss_feed.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/rss_feed.template.html
incubator/pivot/trunk/demos/www/scripting.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/scripting.template.html
incubator/pivot/trunk/demos/www/stock_tracker.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/stock_tracker.template.html
incubator/pivot/trunk/demos/www/table_row_editor.html
- copied, changed from r823178, incubator/pivot/trunk/demos/www/table_row_editor.template.html
incubator/pivot/trunk/demos/www/version.template.js
incubator/pivot/trunk/demos/www/version.template.jsp
incubator/pivot/trunk/tutorials/www/version.template.js
incubator/pivot/trunk/tutorials/www/version.template.jsp
Removed:
incubator/pivot/trunk/demos/www/animated_clock.template.html
incubator/pivot/trunk/demos/www/decorators.template.html
incubator/pivot/trunk/demos/www/dom_interaction.template.html
incubator/pivot/trunk/demos/www/file_drag_drop.template.html
incubator/pivot/trunk/demos/www/fixed_column_table.template.html
incubator/pivot/trunk/demos/www/itunes_search.template.html
incubator/pivot/trunk/demos/www/json_viewer.template.html
incubator/pivot/trunk/demos/www/kitchen_sink.template.html
incubator/pivot/trunk/demos/www/large_data.template.html
incubator/pivot/trunk/demos/www/multiselect.template.html
incubator/pivot/trunk/demos/www/rss_feed.template.html
incubator/pivot/trunk/demos/www/scripting.template.html
incubator/pivot/trunk/demos/www/stock_tracker.template.html
incubator/pivot/trunk/demos/www/table_row_editor.template.html
incubator/pivot/trunk/web/test/org/apache/pivot/web/test/WebQueryTestClient.java
incubator/pivot/trunk/web/test/org/apache/pivot/web/test/server/
incubator/pivot/trunk/web/web.xml
incubator/pivot/trunk/web/www/
Modified:
incubator/pivot/trunk/build.xml
incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=823207&r1=823206&r2=823207&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java?rev=823207&r1=823206&r2=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java (original)
+++ incubator/pivot/trunk/demos/src/org/apache/pivot/demos/decorator/DecoratorDemo.java Thu Oct 8 15:33:32 2009
@@ -36,6 +36,8 @@
throws Exception {
WTKXSerializer wtkxSerializer = new WTKXSerializer();
reflectionWindow = (Window)wtkxSerializer.readObject(this, "reflection.wtkx");
+ wtkxSerializer.reset();
+
translucentFrame = (Frame)wtkxSerializer.readObject(this, "translucent.wtkx");
final FadeDecorator fadeDecorator = new FadeDecorator();
Copied: incubator/pivot/trunk/demos/www/animated_clock.html (from r823178, incubator/pivot/trunk/demos/www/animated_clock.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/animated_clock.html?p2=incubator/pivot/trunk/demos/www/animated_clock.html&p1=incubator/pivot/trunk/demos/www/animated_clock.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/animated_clock.template.html (original)
+++ incubator/pivot/trunk/demos/www/animated_clock.html Thu Oct 8 15:33:32 2009
@@ -24,10 +24,14 @@
<p>Demonstrates the use of the MovieView component, which is used to present an
animated clock. The clock is drawn using Pivot's drawing API.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:320,
height:320
};
@@ -35,8 +39,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/decorators.html (from r823178, incubator/pivot/trunk/demos/www/decorators.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/decorators.html?p2=incubator/pivot/trunk/demos/www/decorators.html&p1=incubator/pivot/trunk/demos/www/decorators.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/decorators.template.html (original)
+++ incubator/pivot/trunk/demos/www/decorators.html Thu Oct 8 15:33:32 2009
@@ -26,10 +26,14 @@
reflections, image effects, etc. This example shows a window with a reflection
decorator and a frame with a fade decorator.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:640,
height:640
};
@@ -37,8 +41,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/dom_interaction.html (from r823178, incubator/pivot/trunk/demos/www/dom_interaction.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/dom_interaction.html?p2=incubator/pivot/trunk/demos/www/dom_interaction.html&p1=incubator/pivot/trunk/demos/www/dom_interaction.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/dom_interaction.template.html (original)
+++ incubator/pivot/trunk/demos/www/dom_interaction.html Thu Oct 8 15:33:32 2009
@@ -42,10 +42,14 @@
<tr>
<td style="text-align:center; border:solid 1px #999999">
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:380,
height:240,
id:"domTestApplet"
@@ -54,8 +58,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</td>
</tr>
Copied: incubator/pivot/trunk/demos/www/file_drag_drop.html (from r823178, incubator/pivot/trunk/demos/www/file_drag_drop.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/file_drag_drop.html?p2=incubator/pivot/trunk/demos/www/file_drag_drop.html&p1=incubator/pivot/trunk/demos/www/file_drag_drop.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/file_drag_drop.template.html (original)
+++ incubator/pivot/trunk/demos/www/file_drag_drop.html Thu Oct 8 15:33:32 2009
@@ -25,18 +25,21 @@
drag files from the desktop or local file system into the applet for upload to
a web or other server.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.signed.jar,lib/@project_name@-wtk-@version@.signed.jar,lib/@project_name@-wtk-@version@.terra.signed.jar,lib/@project_name@-demos-@version@.signed.jar",
+ archive:"lib/pivot-core-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.terra.jar"
+ + ",lib/pivot-demos-" + version + ".signed.jar",
width:380,
height:260
};
var parameters = {application_class_name:"org.apache.pivot.demos.dnd.FileDropTargetDemo",
codebase_lookup:false
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
<p>Note that the application doesn't actually perform the upload - it merely
Copied: incubator/pivot/trunk/demos/www/fixed_column_table.html (from r823178, incubator/pivot/trunk/demos/www/fixed_column_table.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/fixed_column_table.html?p2=incubator/pivot/trunk/demos/www/fixed_column_table.html&p1=incubator/pivot/trunk/demos/www/fixed_column_table.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/fixed_column_table.template.html (original)
+++ incubator/pivot/trunk/demos/www/fixed_column_table.html Thu Oct 8 15:33:32 2009
@@ -24,10 +24,14 @@
<p>Demonstrates how to create a table with fixed columns in Pivot. Fixed
columns are handy when displaying tables with many columns.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:300,
height:170
};
@@ -35,8 +39,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/itunes_search.html (from r823178, incubator/pivot/trunk/demos/www/itunes_search.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/itunes_search.html?p2=incubator/pivot/trunk/demos/www/itunes_search.html&p1=incubator/pivot/trunk/demos/www/itunes_search.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/itunes_search.template.html (original)
+++ incubator/pivot/trunk/demos/www/itunes_search.html Thu Oct 8 15:33:32 2009
@@ -24,10 +24,14 @@
<p>Simple application that allows a user to run search queries against the
iTunes Music Store and presents the results in a table view.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.signed.jar,lib/@project_name@-web-@version@.signed.jar,lib/@project_name@-wtk-@version@.signed.jar,lib/@project_name@-wtk-@version@.terra.signed.jar,lib/@project_name@-demos-@version@.signed.jar",
+ archive:"lib/pivot-core-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.terra.jar"
+ + ",lib/pivot-demos-" + version + ".signed.jar",
width:640,
height:480
};
@@ -35,8 +39,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/json_viewer.html (from r823178, incubator/pivot/trunk/demos/www/json_viewer.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/json_viewer.html?p2=incubator/pivot/trunk/demos/www/json_viewer.html&p1=incubator/pivot/trunk/demos/www/json_viewer.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/json_viewer.template.html (original)
+++ incubator/pivot/trunk/demos/www/json_viewer.html Thu Oct 8 15:33:32 2009
@@ -23,10 +23,14 @@
<body>
<p>Allows users to visually browse a JSON structure using a TreeView component.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.signed.jar,lib/@project_name@-wtk-@version@.signed.jar,lib/@project_name@-wtk-@version@.terra.signed.jar,lib/@project_name@-tools-@version@.signed.jar",
+ archive:"lib/pivot-core-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.terra.jar"
+ + ",lib/pivot-tools-" + version + ".signed.jar",
width:360,
height:480,
styles:"border:solid 1px #999999"
@@ -34,8 +38,7 @@
var parameters = {application_class_name:"org.apache.pivot.tools.json.JSONViewer",
codebase_lookup:false
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/kitchen_sink.html (from r823178, incubator/pivot/trunk/demos/www/kitchen_sink.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.html?p2=incubator/pivot/trunk/demos/www/kitchen_sink.html&p1=incubator/pivot/trunk/demos/www/kitchen_sink.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.template.html (original)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.html Thu Oct 8 15:33:32 2009
@@ -23,19 +23,22 @@
<body>
<p>This application demonstrates a number of commonly used Pivot components:</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-tutorials-@version@.jar",
- width:720,
- height:480
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-tutorials-" + version + ".jar",
+ width:800,
+ height:600
};
var parameters = {application_class_name:"org.apache.pivot.tutorials.KitchenSink",
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/large_data.html (from r823178, incubator/pivot/trunk/demos/www/large_data.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/large_data.html?p2=incubator/pivot/trunk/demos/www/large_data.html&p1=incubator/pivot/trunk/demos/www/large_data.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/large_data.template.html (original)
+++ incubator/pivot/trunk/demos/www/large_data.html Thu Oct 8 15:33:32 2009
@@ -33,10 +33,14 @@
<p>Note that the 10e3.csv, 10e4.csv, and 10e5.csv files are not included in
this distribution due to their large size.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:600,
height:480
};
@@ -45,8 +49,7 @@
codebase_lookup:false,
java_arguments:"-Xms512M -Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/multiselect.html (from r823178, incubator/pivot/trunk/demos/www/multiselect.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/multiselect.html?p2=incubator/pivot/trunk/demos/www/multiselect.html&p1=incubator/pivot/trunk/demos/www/multiselect.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/multiselect.template.html (original)
+++ incubator/pivot/trunk/demos/www/multiselect.html Thu Oct 8 15:33:32 2009
@@ -23,10 +23,14 @@
<body>
<p>This application demonstrates Pivot's use of ranges to maintain selection state in a ListView component. This is more efficient than maintaining a list of individual selected indexes.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:480,
height:360
};
@@ -34,8 +38,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
<p>TableView also maintains selection in this manner.</p>
Copied: incubator/pivot/trunk/demos/www/rss_feed.html (from r823178, incubator/pivot/trunk/demos/www/rss_feed.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/rss_feed.html?p2=incubator/pivot/trunk/demos/www/rss_feed.html&p1=incubator/pivot/trunk/demos/www/rss_feed.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/rss_feed.template.html (original)
+++ incubator/pivot/trunk/demos/www/rss_feed.html Thu Oct 8 15:33:32 2009
@@ -29,10 +29,14 @@
the existence of a crossdomain.xml file on the server in order for an unsigned
applet to request the news feed.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:480,
height:360
};
@@ -40,8 +44,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/scripting.html (from r823178, incubator/pivot/trunk/demos/www/scripting.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/scripting.html?p2=incubator/pivot/trunk/demos/www/scripting.html&p1=incubator/pivot/trunk/demos/www/scripting.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/scripting.template.html (original)
+++ incubator/pivot/trunk/demos/www/scripting.html Thu Oct 8 15:33:32 2009
@@ -25,10 +25,14 @@
JavaScript to implement event handlers and populate a list view component with data. It also
demonstrates data sharing between script and Java code:</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-tutorials-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-tutorials-" + version + ".jar",
width:480,
height:360
};
@@ -36,8 +40,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
</body>
</html>
Copied: incubator/pivot/trunk/demos/www/stock_tracker.html (from r823178, incubator/pivot/trunk/demos/www/stock_tracker.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/stock_tracker.html?p2=incubator/pivot/trunk/demos/www/stock_tracker.html&p1=incubator/pivot/trunk/demos/www/stock_tracker.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/stock_tracker.template.html (original)
+++ incubator/pivot/trunk/demos/www/stock_tracker.html Thu Oct 8 15:33:32 2009
@@ -25,10 +25,14 @@
data from Yahoo! Finance as a CSV file and presents it in a table view component
(the applet is signed to allow it to communicate with the Yahoo web service):</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.signed.jar,lib/@project_name@-web-@version@.signed.jar,lib/@project_name@-wtk-@version@.signed.jar,lib/@project_name@-wtk-@version@.terra.signed.jar,lib/@project_name@-tutorials-@version@.signed.jar",
+ archive:"lib/pivot-core-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.jar"
+ + ",lib/pivot-wtk-" + version + ".signed.terra.jar"
+ + ",lib/pivot-tutorials-" + version + ".signed.jar",
width:480,
height:360
};
@@ -36,8 +40,7 @@
startup_properties:"language=en",
codebase_lookup:false
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
<p>Users can add or remove stock symbols using the text input and buttons at
Copied: incubator/pivot/trunk/demos/www/table_row_editor.html (from r823178, incubator/pivot/trunk/demos/www/table_row_editor.template.html)
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/table_row_editor.html?p2=incubator/pivot/trunk/demos/www/table_row_editor.html&p1=incubator/pivot/trunk/demos/www/table_row_editor.template.html&r1=823178&r2=823207&rev=823207&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/www/table_row_editor.template.html (original)
+++ incubator/pivot/trunk/demos/www/table_row_editor.html Thu Oct 8 15:33:32 2009
@@ -24,10 +24,14 @@
<p>This sample application demonstrates the use of a flip transition to bring
up a table view row editor.</p>
+<script src="version.js"></script>
<script src="http://java.com/js/deployJava.js"></script>
<script>
var attributes = {code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
- archive:"lib/@project_name@-core-@version@.jar,lib/@project_name@-wtk-@version@.jar,lib/@project_name@-wtk-@version@.terra.jar,lib/@project_name@-demos-@version@.jar",
+ archive:"lib/pivot-core-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".jar"
+ + ",lib/pivot-wtk-" + version + ".terra.jar"
+ + ",lib/pivot-demos-" + version + ".jar",
width:480,
height:360
};
@@ -35,8 +39,7 @@
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
-var version = "1.6";
-deployJava.runApplet(attributes, parameters, version);
+deployJava.runApplet(attributes, parameters, "1.6");
</script>
<p>Users can double click on any row to bring up the editor. Pressing the Enter
Added: incubator/pivot/trunk/demos/www/version.template.js
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/version.template.js?rev=823207&view=auto
==============================================================================
--- incubator/pivot/trunk/demos/www/version.template.js (added)
+++ incubator/pivot/trunk/demos/www/version.template.js Thu Oct 8 15:33:32 2009
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+var version = "@version@";
Added: incubator/pivot/trunk/demos/www/version.template.jsp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/version.template.jsp?rev=823207&view=auto
==============================================================================
--- incubator/pivot/trunk/demos/www/version.template.jsp (added)
+++ incubator/pivot/trunk/demos/www/version.template.jsp Thu Oct 8 15:33:32 2009
@@ -0,0 +1,20 @@
+<%
+/*
+ * 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.
+ */
+
+String version = "@version@";
+%>
\ No newline at end of file
Added: incubator/pivot/trunk/tutorials/www/version.template.js
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/version.template.js?rev=823207&view=auto
==============================================================================
--- incubator/pivot/trunk/tutorials/www/version.template.js (added)
+++ incubator/pivot/trunk/tutorials/www/version.template.js Thu Oct 8 15:33:32 2009
@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+var version = "@version@";
Added: incubator/pivot/trunk/tutorials/www/version.template.jsp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/www/version.template.jsp?rev=823207&view=auto
==============================================================================
--- incubator/pivot/trunk/tutorials/www/version.template.jsp (added)
+++ incubator/pivot/trunk/tutorials/www/version.template.jsp Thu Oct 8 15:33:32 2009
@@ -0,0 +1,20 @@
+<%
+/*
+ * 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.
+ */
+
+String version = "@version@";
+%>
\ No newline at end of file