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 2010/10/29 01:40:00 UTC
svn commit: r1028545 - in /pivot/trunk: build.xml demos/www/swing-demo.html
demos/www/swing-demo.template.html
Author: gbrown
Date: Thu Oct 28 23:39:59 2010
New Revision: 1028545
URL: http://svn.apache.org/viewvc?rev=1028545&view=rev
Log:
Minor demo updates.
Added:
pivot/trunk/demos/www/swing-demo.template.html
- copied, changed from r1023844, pivot/trunk/demos/www/swing-demo.html
Removed:
pivot/trunk/demos/www/swing-demo.html
Modified:
pivot/trunk/build.xml
Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1028545&r1=1028544&r2=1028545&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Thu Oct 28 23:39:59 2010
@@ -576,7 +576,20 @@ limitations under the License.
<!-- Copy static demo files to deploy folder -->
<copy todir="demos/${folder.deploy}">
- <fileset dir="demos/www" excludes="**/*.xml"/>
+ <fileset dir="demos/www">
+ <exclude name="**/*.xml"/>
+ <exclude name="**/*.template.html"/>
+ </fileset>
+ </copy>
+
+ <copy todir="demos/${folder.deploy}">
+ <fileset dir="demos/www">
+ <include name="*.template.html"/>
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="${version}"/>
+ </filterset>
+ <globmapper from="*.template.html" to="*.html"/>
</copy>
<!-- Generate demos WAR -->
@@ -626,7 +639,20 @@ limitations under the License.
<!-- Copy static tutorial files to deploy folder -->
<copy todir="tutorials/${folder.deploy}">
- <fileset dir="tutorials/www" excludes="**/*.xml"/>
+ <fileset dir="tutorials/www">
+ <exclude name="**/*.xml"/>
+ <exclude name="**/*.template.html"/>
+ </fileset>
+ </copy>
+
+ <copy todir="tutorials/${folder.deploy}">
+ <fileset dir="tutorials/www">
+ <include name="*.template.html"/>
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="${version}"/>
+ </filterset>
+ <globmapper from="*.template.html" to="*.html"/>
</copy>
<!-- Generate tutorials WAR -->
Copied: pivot/trunk/demos/www/swing-demo.template.html (from r1023844, pivot/trunk/demos/www/swing-demo.html)
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/www/swing-demo.template.html?p2=pivot/trunk/demos/www/swing-demo.template.html&p1=pivot/trunk/demos/www/swing-demo.html&r1=1023844&r2=1028545&rev=1028545&view=diff
==============================================================================
--- pivot/trunk/demos/www/swing-demo.html (original)
+++ pivot/trunk/demos/www/swing-demo.template.html Thu Oct 28 23:39:59 2010
@@ -3,10 +3,10 @@ Licensed to the Apache Software Foundati
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
+Version @VERSION@ (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
+ http://www.apache.org/licenses/LICENSE-@VERSION@
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -40,10 +40,10 @@ limitations under the License.
};
var libraries = [];
- libraries.push("lib/pivot-core-2.0.jar");
- libraries.push("lib/pivot-wtk-2.0.jar");
- libraries.push("lib/pivot-wtk-terra-2.0.jar");
- libraries.push("lib/pivot-demos-2.0.jar");
+ libraries.push("lib/pivot-core-@VERSION@.jar");
+ libraries.push("lib/pivot-wtk-@VERSION@.jar");
+ libraries.push("lib/pivot-wtk-terra-@VERSION@.jar");
+ libraries.push("lib/pivot-demos-@VERSION@.jar");
attributes.archive = libraries.join(",");
var parameters = {