You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/12/05 05:09:26 UTC
svn commit: r887493 - in /incubator/pivot/site/trunk: ./ www/lib/ xsl/
Author: tvolkert
Date: Sat Dec 5 04:09:24 2009
New Revision: 887493
URL: http://svn.apache.org/viewvc?rev=887493&view=rev
Log:
Minor site updates in response to recent trunk updates
Added:
incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-core-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-core-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-web-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-web-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.signed.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.jar (with props)
incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.signed.jar (with props)
incubator/pivot/site/trunk/xsl/tutorial-index.xsl
Removed:
incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.terra.jar
incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.terra.signed.jar
Modified:
incubator/pivot/site/trunk/build.xml
incubator/pivot/site/trunk/xsl/demo.xsl
Modified: incubator/pivot/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/build.xml?rev=887493&r1=887492&r2=887493&view=diff
==============================================================================
--- incubator/pivot/site/trunk/build.xml (original)
+++ incubator/pivot/site/trunk/build.xml Sat Dec 5 04:09:24 2009
@@ -74,6 +74,18 @@
<param name="root" expression=""/>
</xslt>
+ <!-- Transform the tutorials index -->
+ <xslt basedir="${folder.trunk}/tutorials/www"
+ includes="index.xml"
+ destdir="${folder.bin}/tutorials"
+ extension=".html"
+ style="xsl/tutorial-index.xsl">
+ <param name="release" expression="${version}"/>
+ <param name="demos" expression="${folder.trunk}/demos/www"/>
+ <param name="tutorials" expression="${folder.trunk}/tutorials/www"/>
+ <param name="base" expression="../"/>
+ </xslt>
+
<!-- Copy static resource files -->
<copy todir="${folder.bin}">
<fileset dir="www" excludes="**/*.xml"/>
@@ -84,16 +96,17 @@
author="true" version="true" use="true"
classpath="${java.class.path}">
<classpath>
- <fileset dir="${folder.trunk}/charts/lib" includes="**/*.jar"/>
- <fileset dir="${folder.trunk}/web/lib" includes="**/*.jar"/>
+ <fileset dir="${folder.trunk}/web-server/lib" includes="**/*.jar"/>
<path refid="classpath.javalib"/>
</classpath>
<packageset dir="${folder.trunk}/charts/src" includes="**/*"/>
<packageset dir="${folder.trunk}/core/src" includes="**/*"/>
+ <packageset dir="${folder.trunk}/tools/src" includes="**/*"/>
<packageset dir="${folder.trunk}/web/src" includes="**/*"/>
+ <packageset dir="${folder.trunk}/web-server/src" includes="**/*"/>
<packageset dir="${folder.trunk}/wtk/src" includes="**/*"/>
- <packageset dir="${folder.trunk}/tools/src" includes="**/*"/>
+ <packageset dir="${folder.trunk}/wtk-terra/src" includes="**/*"/>
<link href="http://java.sun.com/javase/6/docs/api"/>
<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
Added: incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-charts-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-core-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-core-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-core-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-core-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-core-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-core-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-demos-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-tools-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-tutorials-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-web-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-web-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-web-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-web-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-web-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-web-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-wtk-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.signed.jar
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.signed.jar?rev=887493&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/pivot/site/trunk/www/lib/pivot-wtk-terra-1.4.signed.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/pivot/site/trunk/xsl/demo.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/xsl/demo.xsl?rev=887493&r1=887492&r2=887493&view=diff
==============================================================================
--- incubator/pivot/site/trunk/xsl/demo.xsl (original)
+++ incubator/pivot/site/trunk/xsl/demo.xsl Sat Dec 5 04:09:24 2009
@@ -69,28 +69,44 @@
<xsl:template match="application">
<script type="text/javascript" src="http://java.com/js/deployJava.js"></script>
<script type="text/javascript">
+ <!-- Base attributes -->
var attributes = {
code:"org.apache.pivot.wtk.BrowserApplicationContext$HostApplet",
width:"<xsl:value-of select="@width"/>",
height:"<xsl:value-of select="@height"/>"
};
+ <!-- Additional attributes -->
<xsl:for-each select="attributes/*">
attributes.<xsl:value-of select="name(.)"/> = '<xsl:value-of select="."/>';
</xsl:for-each>
+ <!-- Archive attribute -->
var libraries = [];
- <xsl:apply-templates select="libraries/library">
- <xsl:with-param name="signed" select="@signed"/>
- </xsl:apply-templates>
+ <xsl:variable name="signed" select="@signed"/>
+ <xsl:for-each select="libraries/library">
+ <xsl:text><![CDATA[libraries.push("]]></xsl:text>
+ <xsl:value-of select="'lib/pivot-'"/>
+ <xsl:value-of select="."/>
+ <xsl:value-of select="'-'"/>
+ <xsl:value-of select="$release"/>
+ <xsl:if test="$signed">
+ <xsl:value-of select="'.signed'"/>
+ </xsl:if>
+ <xsl:value-of select="'.jar'"/>
+ <xsl:text><![CDATA[");
+ ]]></xsl:text>
+ </xsl:for-each>
attributes.archive = libraries.join(",");
+ <!-- Base parameters -->
var parameters = {
codebase_lookup:false,
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true",
application_class_name:"<xsl:value-of select="@class"/>"
};
+ <!-- Startup properties -->
<xsl:if test="startup-properties">
var startupProperties = [];
<xsl:for-each select="startup-properties/*">
@@ -102,46 +118,4 @@
deployJava.runApplet(attributes, parameters, "1.6");
</script>
</xsl:template>
-
- <!-- <library> translates to Javascript that adds necessary jars to a Javascript array -->
- <xsl:template match="library">
- <xsl:param name="signed"/>
-
- <xsl:choose>
- <xsl:when test=".='wtk'">
- <xsl:variable name="jar">
- <xsl:value-of select="'../lib/pivot-wtk-'"/>
- <xsl:value-of select="$release"/>
- <xsl:if test="$signed='true'">
- <xsl:value-of select="'.signed'"/>
- </xsl:if>
- <xsl:value-of select="'.jar'"/>
- </xsl:variable>
- libraries.push('<xsl:value-of select="$jar"/>');
- <xsl:variable name="jar-terra">
- <xsl:value-of select="'../lib/pivot-wtk-'"/>
- <xsl:value-of select="$release"/>
- <xsl:value-of select="'.terra'"/>
- <xsl:if test="$signed='true'">
- <xsl:value-of select="'.signed'"/>
- </xsl:if>
- <xsl:value-of select="'.jar'"/>
- </xsl:variable>
- libraries.push('<xsl:value-of select="$jar-terra"/>');
- </xsl:when>
- <xsl:otherwise>
- <xsl:variable name="jar">
- <xsl:value-of select="'../lib/pivot-'"/>
- <xsl:value-of select="."/>
- <xsl:value-of select="'-'"/>
- <xsl:value-of select="$release"/>
- <xsl:if test="$signed='true'">
- <xsl:value-of select="'.signed'"/>
- </xsl:if>
- <xsl:value-of select="'.jar'"/>
- </xsl:variable>
- libraries.push('<xsl:value-of select="$jar"/>');
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
</xsl:stylesheet>
Added: incubator/pivot/site/trunk/xsl/tutorial-index.xsl
URL: http://svn.apache.org/viewvc/incubator/pivot/site/trunk/xsl/tutorial-index.xsl?rev=887493&view=auto
==============================================================================
--- incubator/pivot/site/trunk/xsl/tutorial-index.xsl (added)
+++ incubator/pivot/site/trunk/xsl/tutorial-index.xsl Sat Dec 5 04:09:24 2009
@@ -0,0 +1,51 @@
+<?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.
+-->
+
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:import href="auxilliary.xsl"/>
+
+ <xsl:param name="tutorials"/>
+
+ <!-- Override content area to show demos index -->
+ <xsl:template name="content">
+ <xsl:apply-templates/>
+ </xsl:template>
+
+ <!-- <item-group> gets translated to a properly indented list -->
+ <xsl:template match="item-group">
+ <h3><xsl:value-of select="@name"/></h3>
+ <ul style="padding-left: 0px;">
+ <xsl:apply-templates/>
+ </ul>
+ </xsl:template>
+
+ <!-- <document-item> gets translated to a list item with a hyperlink -->
+ <xsl:template match="document-item">
+ <xsl:variable name="tutorial" select="document(concat($tutorials, '/', @id, '.xml'))/document"/>
+ <li>
+ <a href="{@id}.html">
+ <xsl:value-of select="$tutorial/properties/title"/>
+ </a>
+ <xsl:if test="*">
+ <xsl:element name="ul">
+ <xsl:apply-templates/>
+ </xsl:element>
+ </xsl:if>
+ </li>
+ </xsl:template>
+</xsl:stylesheet>