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 2015/09/21 09:03:18 UTC
svn commit: r1704223 - in /pivot: site/trunk/xsl/ trunk/ trunk/demos/www/
trunk/demos/xsl/ trunk/eclipse/META-INF/
trunk/examples/src/org/apache/pivot/examples/deployment/
trunk/tests/src/org/apache/pivot/tests/issues/pivot859/
trunk/tutorials/www/ tru...
Author: smartini
Date: Mon Sep 21 07:03:11 2015
New Revision: 1704223
URL: http://svn.apache.org/viewvc?rev=1704223&view=rev
Log:
PIVOT-915, update release from 1.6 to 1.7 in source files for generated pages/deploy files in web site
Modified:
pivot/site/trunk/xsl/html.xsl
pivot/site/trunk/xsl/project.xml
pivot/trunk/demos/www/swing-demo.template.html
pivot/trunk/demos/xsl/demo.html.xsl
pivot/trunk/demos/xsl/demo.jnlp.xsl
pivot/trunk/deployment-example.xml
pivot/trunk/eclipse/META-INF/MANIFEST.MF
pivot/trunk/examples/src/org/apache/pivot/examples/deployment/index.html
pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/pivot859.html
pivot/trunk/tutorials/www/scripting.xml
pivot/trunk/tutorials/xsl/tutorial.xsl
Modified: pivot/site/trunk/xsl/html.xsl
URL: http://svn.apache.org/viewvc/pivot/site/trunk/xsl/html.xsl?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/site/trunk/xsl/html.xsl (original)
+++ pivot/site/trunk/xsl/html.xsl Mon Sep 21 07:03:11 2015
@@ -56,8 +56,8 @@ limitations under the License.
var pageTracker = _gat._getTracker("UA-7977275-3");
pageTracker._trackPageview();
} catch(err) {
- }
- </script>
+ }
+ </script>
</head>
<body>
@@ -85,11 +85,11 @@ limitations under the License.
</a>
</xsl:element>
<!-- ASF Logo -->
- <div xmlns="" class="logoASF">
- <a href="http://www.apache.org/">
- <img src="/images/asf_logo_wide_transp.png" alt="Apache" title="Apache Homepage"/>
- </a>
- </div>
+ <div xmlns="" class="logoASF">
+ <a href="http://www.apache.org/">
+ <img src="/images/asf_logo_wide_transp.png" alt="Apache" title="Apache Homepage"/>
+ </a>
+ </div>
<!-- Tagline -->
<div class="tagline">
@@ -193,7 +193,7 @@ limitations under the License.
<!-- Trademark on name -->
<div class="footerLinks">
- Apache Pivot, Pivot, Apache, and the Apache Pivot project logo are trademarks of The Apache Software Foundation.
+ Apache Pivot, Pivot, Apache, and the Apache Pivot project logo are trademarks of The Apache Software Foundation.
</div>
</div>
</div>
@@ -289,7 +289,7 @@ limitations under the License.
parameters.system_properties = systemProperties.join("&");
</xsl:if>
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
</script>
</xsl:template>
</xsl:stylesheet>
Modified: pivot/site/trunk/xsl/project.xml
URL: http://svn.apache.org/viewvc/pivot/site/trunk/xsl/project.xml?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/site/trunk/xsl/project.xml (original)
+++ pivot/site/trunk/xsl/project.xml Mon Sep 21 07:03:11 2015
@@ -20,7 +20,7 @@ limitations under the License.
<title>Apache Pivot</title>
<tagline>Rich Internet Applications in Java</tagline>
<copyright>
- <message>Copyright (c) 1999-2014</message>
+ <message>Copyright (c) 1999-2015</message>
<message>The Apache Software Foundation.</message>
</copyright>
Modified: pivot/trunk/demos/www/swing-demo.template.html
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/www/swing-demo.template.html?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/demos/www/swing-demo.template.html (original)
+++ pivot/trunk/demos/www/swing-demo.template.html Mon Sep 21 07:03:11 2015
@@ -51,7 +51,7 @@ limitations under the License.
java_arguments:"-Dsun.awt.noerasebackground=true -Dsun.awt.erasebackgroundonresize=true"
};
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
</script>
</body>
</html>
Modified: pivot/trunk/demos/xsl/demo.html.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/xsl/demo.html.xsl?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/demos/xsl/demo.html.xsl (original)
+++ pivot/trunk/demos/xsl/demo.html.xsl Mon Sep 21 07:03:11 2015
@@ -156,7 +156,7 @@ limitations under the License.
parameters.system_properties = systemProperties.join("&");
</xsl:if>
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
</script>
</xsl:template>
</xsl:stylesheet>
Modified: pivot/trunk/demos/xsl/demo.jnlp.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/xsl/demo.jnlp.xsl?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/demos/xsl/demo.jnlp.xsl (original)
+++ pivot/trunk/demos/xsl/demo.jnlp.xsl Mon Sep 21 07:03:11 2015
@@ -64,7 +64,7 @@ limitations under the License.
}
%>
- <jnlp spec="1.6+" codebase="<%= codebase %>" href="<%= href %>">
+ <jnlp spec="1.7+" codebase="<%= codebase %>" href="<%= href %>">
]]>
</xsl:text>
@@ -92,12 +92,12 @@ limitations under the License.
<xsl:choose>
<xsl:when test="/document/properties/java_memory_options_huge">
- <java version="1.6+" href="http://java.sun.com/products/autodl/j2se"
+ <java version="1.7+" href="http://java.sun.com/products/autodl/j2se"
initial-heap-size="256M" max-heap-size="1024M"
/>
</xsl:when>
<xsl:otherwise>
- <java version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
+ <java version="1.7+" href="http://java.sun.com/products/autodl/j2se"/>
</xsl:otherwise>
</xsl:choose>
Modified: pivot/trunk/deployment-example.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/deployment-example.xml?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/deployment-example.xml (original)
+++ pivot/trunk/deployment-example.xml Mon Sep 21 07:03:11 2015
@@ -72,7 +72,7 @@ JarBundler requires Mac OS X. See the pr
includeantruntime="true"
deprecation="true"
debug="true"
- target="1.6"
+ target="1.7"
encoding="UTF-8"
failonerror="true">
<include name="${example.path}/**"/>
@@ -160,7 +160,7 @@ JarBundler requires Mac OS X. See the pr
outfile="${example.exe}">
<classPath mainClass="org.apache.pivot.wtk.DesktopApplicationContext"
cp="${folder.lib}/pivot-core-${version}.jar;${folder.lib}/pivot-wtk-${version}.jar;${folder.lib}/pivot-wtk-terra-${version}.jar"/>
- <jre minVersion="1.6.0">
+ <jre minVersion="1.7.0">
<opt>-Dorg.apache.pivot.wtk.skin.terra.location=TerraTheme_winxp1.json</opt>
</jre>
</config>
Modified: pivot/trunk/eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/pivot/trunk/eclipse/META-INF/MANIFEST.MF?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/eclipse/META-INF/MANIFEST.MF (original)
+++ pivot/trunk/eclipse/META-INF/MANIFEST.MF Mon Sep 21 07:03:11 2015
@@ -4,7 +4,7 @@ Bundle-Name: Eclipse Plug-in for Apache
Bundle-SymbolicName: org.apache.pivot.eclipse;singleton:=true
Bundle-Version: 2.0
Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.ui;bundle-version="3.5.2",
org.eclipse.swt;bundle-version="3.5.2",
Modified: pivot/trunk/examples/src/org/apache/pivot/examples/deployment/index.html
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/deployment/index.html?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/deployment/index.html (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/deployment/index.html Mon Sep 21 07:03:11 2015
@@ -41,7 +41,7 @@ var attributes = {code:"org.apache.pivot
var parameters = {application_class_name:"org.apache.pivot.examples.deployment.DeploymentExample",
codebase_lookup:false
};
-var version = "1.6";
+var version = "1.7";
deployJava.runApplet(attributes, parameters, version);
</script>
</body>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/pivot859.html
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/pivot859.html?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/pivot859.html (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/issues/pivot859/pivot859.html Mon Sep 21 07:03:11 2015
@@ -81,7 +81,7 @@ limitations under the License.
parameters.startup_properties = startupProperties.join("&");
// run the applet
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
// call Applet methods from JavaScript
var applet1 = document.getElementById("applet1");
@@ -109,7 +109,7 @@ limitations under the License.
parameters.startup_properties = startupProperties.join("&");
// run the applet
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
// call Applet methods from JavaScript
var applet2 = document.getElementById("applet2");
Modified: pivot/trunk/tutorials/www/scripting.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/scripting.xml?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/scripting.xml (original)
+++ pivot/trunk/tutorials/www/scripting.xml Mon Sep 21 07:03:11 2015
@@ -23,7 +23,7 @@ limitations under the License.
<body>
<p>
- Because Pivot requires a minimum of Java 6 update 10, Pivot applications can take
+ Pivot applications can take
advantage of the JVM scripting support provided by the <tt>javax.script</tt> package
included with JDK versions 1.6 and later. While these APIs can be used on their own to
script Pivot applications, Pivot includes platform support for easily embedding script
Modified: pivot/trunk/tutorials/xsl/tutorial.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/xsl/tutorial.xsl?rev=1704223&r1=1704222&r2=1704223&view=diff
==============================================================================
--- pivot/trunk/tutorials/xsl/tutorial.xsl (original)
+++ pivot/trunk/tutorials/xsl/tutorial.xsl Mon Sep 21 07:03:11 2015
@@ -165,7 +165,7 @@ limitations under the License.
parameters.system_properties = systemProperties.join("&");
</xsl:if>
- deployJava.runApplet(attributes, parameters, "1.6");
+ deployJava.runApplet(attributes, parameters, "1.7");
</script>
</xsl:template>