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/06/19 17:32:12 UTC
svn commit: r786546 - in /incubator/pivot/trunk: build.xml
demos/www/kitchen_sink.template.jnlp
Author: gbrown
Date: Fri Jun 19 15:32:11 2009
New Revision: 786546
URL: http://svn.apache.org/viewvc?rev=786546&view=rev
Log:
Add JNLP files to deploy target.
Added:
incubator/pivot/trunk/demos/www/kitchen_sink.template.jnlp
Modified:
incubator/pivot/trunk/build.xml
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=786546&r1=786545&r2=786546&view=diff
==============================================================================
--- incubator/pivot/trunk/build.xml (original)
+++ incubator/pivot/trunk/build.xml Fri Jun 19 15:32:11 2009
@@ -114,8 +114,10 @@
<delete>
<fileset dir="demos/www">
<include name="*.html"/>
- <exclude name="index.html"/>
<exclude name="*.template.html"/>
+ <include name="*.jnlp"/>
+ <exclude name="*.template.jnlp"/>
+ <exclude name="index.html"/>
</fileset>
</delete>
<delete file="${folder.lib}/${ant.project.name}_demos.war"/>
@@ -124,8 +126,10 @@
<delete>
<fileset dir="tutorials/www">
<include name="*.html"/>
- <exclude name="index.html"/>
<exclude name="*.template.html"/>
+ <include name="*.jnlp"/>
+ <exclude name="*.template.jnlp"/>
+ <exclude name="index.html"/>
</fileset>
</delete>
<delete file="${folder.lib}/${ant.project.name}_tutorials.war"/>
@@ -134,8 +138,10 @@
<delete>
<fileset dir="web/www">
<include name="*.html"/>
- <exclude name="index.html"/>
<exclude name="*.template.html"/>
+ <include name="*.jnlp"/>
+ <exclude name="*.template.jnlp"/>
+ <exclude name="index.html"/>
</fileset>
</delete>
<delete file="${folder.lib}/${ant.project.name}_web_test.war"/>
@@ -728,7 +734,7 @@
<filter token="project_name" value="${ant.project.name}"/>
<filter token="version" value="${version}"/>
- <!-- Create demos WAR -->
+ <!-- Deploy demos -->
<mkdir dir="demos/www/lib"/>
<copy todir="demos/www/lib">
<fileset dir="${folder.lib}">
@@ -761,7 +767,7 @@
<delete dir="demos/lib/signed"/>
- <!-- Generate demo HTML files -->
+ <!-- Generate demo HTML and JNLP files -->
<copy todir="demos/www" filtering="true">
<fileset dir="demos/www">
<include name="*.template.html"/>
@@ -769,13 +775,21 @@
<mapper type="glob" from="*.template.html" to="*.html"/>
</copy>
+ <copy todir="demos/www" filtering="true">
+ <fileset dir="demos/www">
+ <include name="*.template.jnlp"/>
+ </fileset>
+ <mapper type="glob" from="*.template.jnlp" to="*.jnlp"/>
+ </copy>
+
+ <!-- Generate demos WAR -->
<war destfile="${folder.lib}/${ant.project.name}_demos.war" webxml="demos/web.xml">
<fileset dir="demos/www">
<exclude name="*.template.html"/>
</fileset>
</war>
- <!-- Create tutorials WAR -->
+ <!-- Deploy tutorials -->
<mkdir dir="tutorials/www/lib"/>
<copy todir="tutorials/www/lib">
<fileset dir="${folder.lib}">
@@ -785,7 +799,7 @@
</fileset>
</copy>
- <!-- Generate tutorial HTML files -->
+ <!-- Generate tutorial HTML and JNLP files -->
<copy todir="tutorials/www" filtering="true">
<fileset dir="tutorials/www">
<include name="*.template.html"/>
@@ -793,13 +807,21 @@
<mapper type="glob" from="*.template.html" to="*.html"/>
</copy>
+ <copy todir="tutorials/www" filtering="true">
+ <fileset dir="tutorials/www">
+ <include name="*.template.jnlp"/>
+ </fileset>
+ <mapper type="glob" from="*.template.jnlp" to="*.jnlp"/>
+ </copy>
+
+ <!-- Generate tutorials WAR -->
<war destfile="${folder.lib}/${ant.project.name}_tutorials.war" webxml="tutorials/web.xml">
<fileset dir="tutorials/www">
<exclude name="*.template.html"/>
</fileset>
</war>
- <!-- Create web-test WAR -->
+ <!-- Deploy web test -->
<mkdir dir="web/www/lib"/>
<jar destfile="web/www/lib/${ant.project.name}-web-${version}.test.jar" index="${compiler.indexJars}">
@@ -823,7 +845,7 @@
</fileset>
</copy>
- <!-- Generate web test HTML files -->
+ <!-- Generate web test HTML and JNLP files -->
<copy todir="web/www" filtering="true">
<fileset dir="web/www">
<include name="*.template.html"/>
@@ -831,6 +853,14 @@
<mapper type="glob" from="*.template.html" to="*.html"/>
</copy>
+ <copy todir="web/www" filtering="true">
+ <fileset dir="web/www">
+ <include name="*.template.jnlp"/>
+ </fileset>
+ <mapper type="glob" from="*.template.jnlp" to="*.jnlp"/>
+ </copy>
+
+ <!-- Generate web test WAR -->
<war destfile="${folder.lib}/${ant.project.name}_web_test.war" webxml="web/web.xml">
<fileset dir="web/www">
<exclude name="*.template.html"/>
Added: incubator/pivot/trunk/demos/www/kitchen_sink.template.jnlp
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/www/kitchen_sink.template.jnlp?rev=786546&view=auto
==============================================================================
--- incubator/pivot/trunk/demos/www/kitchen_sink.template.jnlp (added)
+++ incubator/pivot/trunk/demos/www/kitchen_sink.template.jnlp Fri Jun 19 15:32:11 2009
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<jnlp spec="1.6+">
+ <information>
+ <title>Pivot "Kitchen Sink" Demo</title>
+ <vendor>Apache Pivot (Incubating)</vendor>
+ <homepage href="http://incubator.apache.org/pivot"/>
+ <description>Demonstrates a number of commonly used Pivot components.</description>
+ <offline-allowed/>
+ </information>
+ <resources>
+ <j2se version="1.6+" java-vm-args="-Xmx512M -ea"/>
+ <jar href="lib/@project_name@-core-@version@.jar"/>
+ <jar href="lib/@project_name@-wtk-@version@.jar"/>
+ <jar href="lib/@project_name@-wtk-@version@.terra.jar"/>
+ <jar href="lib/@project_name@-tutorials-@version@.jar"/>
+ </resources>
+ <application-desc main-class="org.apache.pivot.wtk.DesktopApplicationContext">
+ <argument>org.apache.pivot.tutorials.Demo</argument>
+ <argument>width:1024</argument>
+ <argument>height:768</argument>
+ <argument>center:true</argument>
+ </application-desc>
+</jnlp>
\ No newline at end of file