You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ml...@apache.org on 2013/06/20 20:03:38 UTC
[1/3] git commit: fix typo and license header issues
Updated Branches:
refs/heads/master 09ca58266 -> c42c1c0d2
fix typo and license header issues
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/2a84cea8
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/2a84cea8
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/2a84cea8
Branch: refs/heads/master
Commit: 2a84cea8bb3bec46c3a762c922cac145b909dff1
Parents: 09ca582
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Jun 20 19:36:21 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Jun 20 19:36:21 2013 +0200
----------------------------------------------------------------------
.../apache/tapestry5/mongodb/MongoDBSource.java | 4 +++-
.../tapestry5/mongodb/modules/MongodbModule.java | 19 ++++++++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2a84cea8/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/MongoDBSource.java
----------------------------------------------------------------------
diff --git a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/MongoDBSource.java b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/MongoDBSource.java
index 887f7c7..70bc70c 100644
--- a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/MongoDBSource.java
+++ b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/MongoDBSource.java
@@ -10,7 +10,9 @@
// 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.package org.apache.tapestry5.mongodb;
+// limitations under the License.
+
+package org.apache.tapestry5.mongodb;
import com.mongodb.MongoClient;
import com.mongodb.ServerAddress;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/2a84cea8/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java
----------------------------------------------------------------------
diff --git a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java
index 73c14b9..a23b003 100644
--- a/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java
+++ b/tapestry-mongodb/src/main/java/org/apache/tapestry5/mongodb/modules/MongodbModule.java
@@ -1,5 +1,21 @@
+// Copyright 2013 The Apache Software Foundation
+//
+// Licensed 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.
+
package org.apache.tapestry5.mongodb.modules;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
import org.apache.tapestry5.internal.mongodb.MongoDBImpl;
import org.apache.tapestry5.internal.mongodb.MongoDBSourceImpl;
import org.apache.tapestry5.ioc.Configuration;
@@ -16,9 +32,6 @@ import org.apache.tapestry5.mongodb.MongoDBSource;
import org.apache.tapestry5.mongodb.MongoDBSymbols;
import org.slf4j.Logger;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-
/**
* Defines services which are responsible for MongoDB initializations and connections.
*/
[3/3] git commit: TAP5-2131 Adapt to choose between JDK6 and JDK7
stylesheets
Posted by ml...@apache.org.
TAP5-2131 Adapt to choose between JDK6 and JDK7 stylesheets
While here try to prevent accidental build based on a flawed
javadoc tool: VU#225657
http://www.kb.cert.org/vuls/id/225657
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c42c1c0d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c42c1c0d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c42c1c0d
Branch: refs/heads/master
Commit: c42c1c0d23ac37976f4280c99c51d1f2ca1b008c
Parents: 8400097
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Jun 20 19:47:20 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Jun 20 19:47:20 2013 +0200
----------------------------------------------------------------------
build.gradle | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c42c1c0d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 59c349c..4ba47fe 100755
--- a/build.gradle
+++ b/build.gradle
@@ -258,22 +258,27 @@ subprojects.each { project.evaluationDependsOn(it.name) }
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
-
task aggregateJavadoc(type: Javadoc) {
+ if ( !checkJDK() )
+ throw new StopActionException("Update your JDK to fix VU#225657")
+
dependsOn configurations.javadoc
group "Documentation"
description "Build the aggregated JavaDocs for all modules"
maxMemory "512m"
destinationDir file("$buildDir/documentation/javadocs")
+
+ def tapestryStylesheet = isJDK7() ? file("src/javadoc/stylesheet7.css") : file("src/javadoc/stylesheet.css");
+
configure(options) {
splitIndex true
linkSource true
- stylesheetFile file("src/javadoc/stylesheet.css")
+ stylesheetFile tapestryStylesheet
windowTitle "Tapestry API Documentation"
docTitle "Tapestry JavaDoc ($project.version)"
- bottom 'Copyright © 2003-2012 <a href="http://tapestry.apache.org">The Apache Software Foundation</a>.'
+ bottom 'Copyright © 2003-2013 <a href="http://tapestry.apache.org">The Apache Software Foundation</a>.'
use = true // 'use' seems to be a reserved word for the DSL
links "http://download.oracle.com/javase/6/docs/api/"
links "http://download.oracle.com/javaee/6/api/"
@@ -485,3 +490,22 @@ boolean isSnapshot() {
boolean isWindows() {
System.properties['os.name'].toLowerCase().contains('windows')
}
+
+boolean isJDK7() {
+ System.properties['java.version'].startsWith("1.7.")
+}
+
+// Check JDK version to prevent VU#225657 see:
+// http://www.oracle.com/technetwork/topics/security/javacpujun2013-1899847.html
+// http://www.kb.cert.org/vuls/id/225657
+boolean checkJDK() {
+ def jdkVersion = System.properties['java.version']
+ def minor = Integer.valueOf(jdkVersion.substring(jdkVersion.indexOf("_")+1))
+
+ if (jdkVersion.startsWith("1.7")) {
+ minor > 21
+ }
+ else { // JDK 6 and 5 require the same minor version
+ minor > 45
+ }
+}
\ No newline at end of file
[2/3] git commit: TAP5-2131 Add new resources for custom CSS based on
JDK7 javadoc stylesheet Anyone who would give more love to our css is welcome
Posted by ml...@apache.org.
TAP5-2131 Add new resources for custom CSS based on JDK7 javadoc stylesheet
Anyone who would give more love to our css is welcome
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8400097d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8400097d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8400097d
Branch: refs/heads/master
Commit: 8400097d1ab801fe07fb47a11d6731386096e267
Parents: 2a84cea
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Jun 20 19:45:50 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Jun 20 19:45:50 2013 +0200
----------------------------------------------------------------------
src/javadoc/images/background_green.gif | Bin 0 -> 1252 bytes
src/javadoc/images/tab_green.gif | Bin 0 -> 196 bytes
src/javadoc/images/tapestry-small.png | Bin 0 -> 6487 bytes
src/javadoc/images/titlebar_green.gif | Bin 0 -> 8245 bytes
src/javadoc/images/titlebar_green_end.gif | Bin 0 -> 547 bytes
src/javadoc/stylesheet7.css | 477 +++++++++++++++++++++++++
6 files changed, 477 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/background_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/background_green.gif b/src/javadoc/images/background_green.gif
new file mode 100644
index 0000000..ab6ac57
Binary files /dev/null and b/src/javadoc/images/background_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/tab_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/tab_green.gif b/src/javadoc/images/tab_green.gif
new file mode 100644
index 0000000..691218a
Binary files /dev/null and b/src/javadoc/images/tab_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/tapestry-small.png
----------------------------------------------------------------------
diff --git a/src/javadoc/images/tapestry-small.png b/src/javadoc/images/tapestry-small.png
new file mode 100644
index 0000000..e711d87
Binary files /dev/null and b/src/javadoc/images/tapestry-small.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/titlebar_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/titlebar_green.gif b/src/javadoc/images/titlebar_green.gif
new file mode 100644
index 0000000..e4371e6
Binary files /dev/null and b/src/javadoc/images/titlebar_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/titlebar_green_end.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/titlebar_green_end.gif b/src/javadoc/images/titlebar_green_end.gif
new file mode 100644
index 0000000..439fbe0
Binary files /dev/null and b/src/javadoc/images/titlebar_green_end.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/stylesheet7.css
----------------------------------------------------------------------
diff --git a/src/javadoc/stylesheet7.css b/src/javadoc/stylesheet7.css
new file mode 100644
index 0000000..0f3be7d
--- /dev/null
+++ b/src/javadoc/stylesheet7.css
@@ -0,0 +1,477 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+Adapted from original jdk7 doclet for Tapestry5
+*/
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:76%;
+ margin:0;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color: #569D2F;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color: #254B1D;
+}
+a:active {
+ text-decoration:none;
+ color: #569D2F;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+pre {
+ font-size:1.3em;
+}
+h1 {
+ font-size:1.8em;
+}
+h2 {
+ font-size:1.5em;
+}
+h3 {
+ font-size:1.4em;
+}
+h4 {
+ font-size:1.3em;
+}
+h5 {
+ font-size:1.2em;
+}
+h6 {
+ font-size:1.1em;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-size:1.2em;
+}
+dt code {
+ font-size:1.2em;
+}
+table tr td dt code {
+ font-size:1.2em;
+ vertical-align:top;
+}
+sup {
+ font-size:.6em;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:.8em;
+ z-index:200;
+ margin-top:-7px;
+}
+.legalCopy {
+ margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+ color:#bb7a2a;
+}
+.tab {
+ background-color:#0066FF;
+ background-image:url(titlebar_green.gif);
+ background-position:left top;
+ background-repeat:no-repeat;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:1em;
+ margin:0;
+}
+.topNav {
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ background-color: #71AA34;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.bottomNav {
+ margin-top:10px;
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.subNav {
+ background-color:#dee3e9;
+ border-bottom:1px solid #9eadc0;
+ float:left;
+ width:100%;
+ overflow:hidden;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding:3px 6px;
+}
+ul.subNavList li{
+ list-style:none;
+ float:left;
+ font-size:90%;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color: #8CE703;
+}
+.navBarCell1Rev {
+ background-image:url(tab_green.gif);
+ background-color: #26610F;
+ color:#FFFFFF;
+ margin: auto 5px;
+ border:1px solid #4CEC00;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexHeader {
+ margin:10px;
+ position:relative;
+}
+.indexHeader h1 {
+ font-size:1.3em;
+}
+.title {
+ margin:10px 0;
+ padding: 25px 0px 25px 80px;
+ background: url("tapestry-small.png") no-repeat;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 25px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:1.2em;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+ padding:0;
+ margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+ padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ clear:both;
+ padding:10px 20px;
+ position:relative;
+}
+.indexContainer {
+ margin:10px;
+ position:relative;
+ font-size:1.0em;
+}
+.indexContainer h2 {
+ font-size:1.1em;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:1.1em;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:10px 0 10px 20px;
+}
+.serializedFormContainer dl.nameValue dt {
+ margin-left:1px;
+ font-size:1.1em;
+ display:inline;
+ font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+ margin:0 0 0 1px;
+ font-size:1.1em;
+ display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+ display:inline;
+ font-size:0.9em;
+}
+ul.inheritance {
+ margin:0;
+ padding:0;
+}
+ul.inheritance li {
+ display:inline;
+ list-style:none;
+}
+ul.inheritance li ul.inheritance {
+ margin-left:15px;
+ padding-left:15px;
+ padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+ margin:10px 0 10px 0;
+ padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+ list-style:none;
+ margin-bottom:25px;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #9eadc0;
+ background-color:#f9f9f9;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+ padding:0 0 5px 8px;
+ background-color:#ffffff;
+ border:1px solid #9eadc0;
+ border-top:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+ border-bottom:1px solid #9eadc0;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+ list-style:none;
+ border-bottom:none;
+ padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+ margin-top:0;
+ margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.contentContainer table, .classUseContainer table, .constantValuesContainer table {
+ border-bottom:1px solid #9eadc0;
+ width:100%;
+}
+.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
+ width:100%;
+}
+.contentContainer .description table, .contentContainer .details table {
+ border-bottom:none;
+}
+.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
+ vertical-align:top;
+ padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
+.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
+.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
+ padding-right:3px;
+}
+.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#FFFFFF;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ margin:0px;
+}
+caption a:link, caption a:hover, caption a:active, caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
+ white-space:nowrap;
+ padding-top:8px;
+ padding-left:8px;
+ display:block;
+ float:left;
+ background-image:url(titlebar_green.gif);
+ height:18px;
+}
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
+ width:10px;
+ background-image:url(titlebar_green_end.gif);
+ background-repeat:no-repeat;
+ background-position:top right;
+ position:relative;
+ float:left;
+}
+ul.blockList ul.blockList li.blockList table {
+ margin:0 0 12px 0px;
+ width:100%;
+}
+.tableSubHeadingColor {
+ background-color: #EEEEFF;
+}
+.altColor {
+ background-color:#eeeeef;
+}
+.rowColor {
+ background-color:#ffffff;
+}
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
+ background:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+ font-weight:bold;
+}
+td.colFirst, th.colFirst {
+ border-left:1px solid #9eadc0;
+ white-space:nowrap;
+}
+td.colLast, th.colLast {
+ border-right:1px solid #9eadc0;
+}
+td.colOne, th.colOne {
+ border-right:1px solid #9eadc0;
+ border-left:1px solid #9eadc0;
+}
+table.overviewSummary {
+ padding:0px;
+ margin-left:0px;
+}
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+ width:25%;
+ vertical-align:middle;
+}
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+ width:25%;
+ vertical-align:middle;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:.9em;
+}
+.block {
+ display:block;
+ margin:3px 0 0 0;
+}
+.strong {
+ font-weight:bold;
+}
\ No newline at end of file
[2/3] git commit: TAP5-2131 Add new resources for custom CSS based on
JDK7 javadoc stylesheet Anyone who would give more love to our css is welcome
Posted by ml...@apache.org.
TAP5-2131 Add new resources for custom CSS based on JDK7 javadoc stylesheet
Anyone who would give more love to our css is welcome
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8400097d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8400097d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8400097d
Branch: refs/heads/master
Commit: 8400097d1ab801fe07fb47a11d6731386096e267
Parents: 2a84cea
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Jun 20 19:45:50 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Jun 20 19:45:50 2013 +0200
----------------------------------------------------------------------
src/javadoc/images/background_green.gif | Bin 0 -> 1252 bytes
src/javadoc/images/tab_green.gif | Bin 0 -> 196 bytes
src/javadoc/images/tapestry-small.png | Bin 0 -> 6487 bytes
src/javadoc/images/titlebar_green.gif | Bin 0 -> 8245 bytes
src/javadoc/images/titlebar_green_end.gif | Bin 0 -> 547 bytes
src/javadoc/stylesheet7.css | 477 +++++++++++++++++++++++++
6 files changed, 477 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/background_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/background_green.gif b/src/javadoc/images/background_green.gif
new file mode 100644
index 0000000..ab6ac57
Binary files /dev/null and b/src/javadoc/images/background_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/tab_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/tab_green.gif b/src/javadoc/images/tab_green.gif
new file mode 100644
index 0000000..691218a
Binary files /dev/null and b/src/javadoc/images/tab_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/tapestry-small.png
----------------------------------------------------------------------
diff --git a/src/javadoc/images/tapestry-small.png b/src/javadoc/images/tapestry-small.png
new file mode 100644
index 0000000..e711d87
Binary files /dev/null and b/src/javadoc/images/tapestry-small.png differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/titlebar_green.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/titlebar_green.gif b/src/javadoc/images/titlebar_green.gif
new file mode 100644
index 0000000..e4371e6
Binary files /dev/null and b/src/javadoc/images/titlebar_green.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/images/titlebar_green_end.gif
----------------------------------------------------------------------
diff --git a/src/javadoc/images/titlebar_green_end.gif b/src/javadoc/images/titlebar_green_end.gif
new file mode 100644
index 0000000..439fbe0
Binary files /dev/null and b/src/javadoc/images/titlebar_green_end.gif differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8400097d/src/javadoc/stylesheet7.css
----------------------------------------------------------------------
diff --git a/src/javadoc/stylesheet7.css b/src/javadoc/stylesheet7.css
new file mode 100644
index 0000000..0f3be7d
--- /dev/null
+++ b/src/javadoc/stylesheet7.css
@@ -0,0 +1,477 @@
+/* Javadoc style sheet */
+/*
+Overall document style
+Adapted from original jdk7 doclet for Tapestry5
+*/
+body {
+ background-color:#ffffff;
+ color:#353833;
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:76%;
+ margin:0;
+}
+a:link, a:visited {
+ text-decoration:none;
+ color: #569D2F;
+}
+a:hover, a:focus {
+ text-decoration:none;
+ color: #254B1D;
+}
+a:active {
+ text-decoration:none;
+ color: #569D2F;
+}
+a[name] {
+ color:#353833;
+}
+a[name]:hover {
+ text-decoration:none;
+ color:#353833;
+}
+pre {
+ font-size:1.3em;
+}
+h1 {
+ font-size:1.8em;
+}
+h2 {
+ font-size:1.5em;
+}
+h3 {
+ font-size:1.4em;
+}
+h4 {
+ font-size:1.3em;
+}
+h5 {
+ font-size:1.2em;
+}
+h6 {
+ font-size:1.1em;
+}
+ul {
+ list-style-type:disc;
+}
+code, tt {
+ font-size:1.2em;
+}
+dt code {
+ font-size:1.2em;
+}
+table tr td dt code {
+ font-size:1.2em;
+ vertical-align:top;
+}
+sup {
+ font-size:.6em;
+}
+/*
+Document title and Copyright styles
+*/
+.clear {
+ clear:both;
+ height:0px;
+ overflow:hidden;
+}
+.aboutLanguage {
+ float:right;
+ padding:0px 21px;
+ font-size:.8em;
+ z-index:200;
+ margin-top:-7px;
+}
+.legalCopy {
+ margin-left:.5em;
+}
+.bar a, .bar a:link, .bar a:visited, .bar a:active {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.bar a:hover, .bar a:focus {
+ color:#bb7a2a;
+}
+.tab {
+ background-color:#0066FF;
+ background-image:url(titlebar_green.gif);
+ background-position:left top;
+ background-repeat:no-repeat;
+ color:#ffffff;
+ padding:8px;
+ width:5em;
+ font-weight:bold;
+}
+/*
+Navigation bar styles
+*/
+.bar {
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ padding:.8em .5em .4em .8em;
+ height:auto;/*height:1.8em;*/
+ font-size:1em;
+ margin:0;
+}
+.topNav {
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ background-color: #71AA34;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.bottomNav {
+ margin-top:10px;
+ background-image:url(background_green.gif);
+ background-repeat:repeat-x;
+ color:#FFFFFF;
+ float:left;
+ padding:0;
+ width:100%;
+ clear:right;
+ height:2.8em;
+ padding-top:10px;
+ overflow:hidden;
+}
+.subNav {
+ background-color:#dee3e9;
+ border-bottom:1px solid #9eadc0;
+ float:left;
+ width:100%;
+ overflow:hidden;
+}
+.subNav div {
+ clear:left;
+ float:left;
+ padding:0 0 5px 6px;
+}
+ul.navList, ul.subNavList {
+ float:left;
+ margin:0 25px 0 0;
+ padding:0;
+}
+ul.navList li{
+ list-style:none;
+ float:left;
+ padding:3px 6px;
+}
+ul.subNavList li{
+ list-style:none;
+ float:left;
+ font-size:90%;
+}
+.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited {
+ color:#FFFFFF;
+ text-decoration:none;
+}
+.topNav a:hover, .bottomNav a:hover {
+ text-decoration:none;
+ color: #8CE703;
+}
+.navBarCell1Rev {
+ background-image:url(tab_green.gif);
+ background-color: #26610F;
+ color:#FFFFFF;
+ margin: auto 5px;
+ border:1px solid #4CEC00;
+}
+/*
+Page header and footer styles
+*/
+.header, .footer {
+ clear:both;
+ margin:0 20px;
+ padding:5px 0 0 0;
+}
+.indexHeader {
+ margin:10px;
+ position:relative;
+}
+.indexHeader h1 {
+ font-size:1.3em;
+}
+.title {
+ margin:10px 0;
+ padding: 25px 0px 25px 80px;
+ background: url("tapestry-small.png") no-repeat;
+}
+.subTitle {
+ margin:5px 0 0 0;
+}
+.header ul {
+ margin:0 0 25px 0;
+ padding:0;
+}
+.footer ul {
+ margin:20px 0 5px 0;
+}
+.header ul li, .footer ul li {
+ list-style:none;
+ font-size:1.2em;
+}
+/*
+Heading styles
+*/
+div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList ul.blockList li.blockList h3 {
+ background-color:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ margin:0 0 6px -8px;
+ padding:2px 5px;
+}
+ul.blockList ul.blockList li.blockList h3 {
+ padding:0;
+ margin:15px 0;
+}
+ul.blockList li.blockList h2 {
+ padding:0px 0 20px 0;
+}
+/*
+Page layout container styles
+*/
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ clear:both;
+ padding:10px 20px;
+ position:relative;
+}
+.indexContainer {
+ margin:10px;
+ position:relative;
+ font-size:1.0em;
+}
+.indexContainer h2 {
+ font-size:1.1em;
+ padding:0 0 3px 0;
+}
+.indexContainer ul {
+ margin:0;
+ padding:0;
+}
+.indexContainer ul li {
+ list-style:none;
+}
+.contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt {
+ font-size:1.1em;
+ font-weight:bold;
+ margin:10px 0 0 0;
+ color:#4E4E4E;
+}
+.contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
+ margin:10px 0 10px 20px;
+}
+.serializedFormContainer dl.nameValue dt {
+ margin-left:1px;
+ font-size:1.1em;
+ display:inline;
+ font-weight:bold;
+}
+.serializedFormContainer dl.nameValue dd {
+ margin:0 0 0 1px;
+ font-size:1.1em;
+ display:inline;
+}
+/*
+List styles
+*/
+ul.horizontal li {
+ display:inline;
+ font-size:0.9em;
+}
+ul.inheritance {
+ margin:0;
+ padding:0;
+}
+ul.inheritance li {
+ display:inline;
+ list-style:none;
+}
+ul.inheritance li ul.inheritance {
+ margin-left:15px;
+ padding-left:15px;
+ padding-top:1px;
+}
+ul.blockList, ul.blockListLast {
+ margin:10px 0 10px 0;
+ padding:0;
+}
+ul.blockList li.blockList, ul.blockListLast li.blockList {
+ list-style:none;
+ margin-bottom:25px;
+}
+ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList {
+ padding:0px 20px 5px 10px;
+ border:1px solid #9eadc0;
+ background-color:#f9f9f9;
+}
+ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList {
+ padding:0 0 5px 8px;
+ background-color:#ffffff;
+ border:1px solid #9eadc0;
+ border-top:none;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockList {
+ margin-left:0;
+ padding-left:0;
+ padding-bottom:15px;
+ border:none;
+ border-bottom:1px solid #9eadc0;
+}
+ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast {
+ list-style:none;
+ border-bottom:none;
+ padding-bottom:0;
+}
+table tr td dl, table tr td dl dt, table tr td dl dd {
+ margin-top:0;
+ margin-bottom:1px;
+}
+/*
+Table styles
+*/
+.contentContainer table, .classUseContainer table, .constantValuesContainer table {
+ border-bottom:1px solid #9eadc0;
+ width:100%;
+}
+.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table {
+ width:100%;
+}
+.contentContainer .description table, .contentContainer .details table {
+ border-bottom:none;
+}
+.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{
+ vertical-align:top;
+ padding-right:20px;
+}
+.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast,
+.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast,
+.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne,
+.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne {
+ padding-right:3px;
+}
+.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption {
+ position:relative;
+ text-align:left;
+ background-repeat:no-repeat;
+ color:#FFFFFF;
+ font-weight:bold;
+ clear:none;
+ overflow:hidden;
+ padding:0px;
+ margin:0px;
+}
+caption a:link, caption a:hover, caption a:active, caption a:visited {
+ color:#FFFFFF;
+}
+.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span {
+ white-space:nowrap;
+ padding-top:8px;
+ padding-left:8px;
+ display:block;
+ float:left;
+ background-image:url(titlebar_green.gif);
+ height:18px;
+}
+.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd {
+ width:10px;
+ background-image:url(titlebar_green_end.gif);
+ background-repeat:no-repeat;
+ background-position:top right;
+ position:relative;
+ float:left;
+}
+ul.blockList ul.blockList li.blockList table {
+ margin:0 0 12px 0px;
+ width:100%;
+}
+.tableSubHeadingColor {
+ background-color: #EEEEFF;
+}
+.altColor {
+ background-color:#eeeeef;
+}
+.rowColor {
+ background-color:#ffffff;
+}
+.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td {
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+th.colFirst, th.colLast, th.colOne, .constantValuesContainer th {
+ background:#dee3e9;
+ border-top:1px solid #9eadc0;
+ border-bottom:1px solid #9eadc0;
+ text-align:left;
+ padding:3px 3px 3px 7px;
+}
+td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+ font-weight:bold;
+}
+td.colFirst, th.colFirst {
+ border-left:1px solid #9eadc0;
+ white-space:nowrap;
+}
+td.colLast, th.colLast {
+ border-right:1px solid #9eadc0;
+}
+td.colOne, th.colOne {
+ border-right:1px solid #9eadc0;
+ border-left:1px solid #9eadc0;
+}
+table.overviewSummary {
+ padding:0px;
+ margin-left:0px;
+}
+table.overviewSummary td.colFirst, table.overviewSummary th.colFirst,
+table.overviewSummary td.colOne, table.overviewSummary th.colOne {
+ width:25%;
+ vertical-align:middle;
+}
+table.packageSummary td.colFirst, table.overviewSummary th.colFirst {
+ width:25%;
+ vertical-align:middle;
+}
+/*
+Content styles
+*/
+.description pre {
+ margin-top:0;
+}
+.deprecatedContent {
+ margin:0;
+ padding:10px 0;
+}
+.docSummary {
+ padding:0;
+}
+/*
+Formatting effect styles
+*/
+.sourceLineNo {
+ color:green;
+ padding:0 30px 0 0;
+}
+h1.hidden {
+ visibility:hidden;
+ overflow:hidden;
+ font-size:.9em;
+}
+.block {
+ display:block;
+ margin:3px 0 0 0;
+}
+.strong {
+ font-weight:bold;
+}
\ No newline at end of file
[3/3] git commit: TAP5-2131 Adapt to choose between JDK6 and JDK7
stylesheets
Posted by ml...@apache.org.
TAP5-2131 Adapt to choose between JDK6 and JDK7 stylesheets
While here try to prevent accidental build based on a flawed
javadoc tool: VU#225657
http://www.kb.cert.org/vuls/id/225657
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c42c1c0d
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c42c1c0d
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c42c1c0d
Branch: refs/heads/master
Commit: c42c1c0d23ac37976f4280c99c51d1f2ca1b008c
Parents: 8400097
Author: Massimo Lusetti <ml...@apache.org>
Authored: Thu Jun 20 19:47:20 2013 +0200
Committer: Massimo Lusetti <ml...@apache.org>
Committed: Thu Jun 20 19:47:20 2013 +0200
----------------------------------------------------------------------
build.gradle | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c42c1c0d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 59c349c..4ba47fe 100755
--- a/build.gradle
+++ b/build.gradle
@@ -258,22 +258,27 @@ subprojects.each { project.evaluationDependsOn(it.name) }
// Cribbed from https://github.com/hibernate/hibernate-core/blob/master/release/release.gradle#L19
-
task aggregateJavadoc(type: Javadoc) {
+ if ( !checkJDK() )
+ throw new StopActionException("Update your JDK to fix VU#225657")
+
dependsOn configurations.javadoc
group "Documentation"
description "Build the aggregated JavaDocs for all modules"
maxMemory "512m"
destinationDir file("$buildDir/documentation/javadocs")
+
+ def tapestryStylesheet = isJDK7() ? file("src/javadoc/stylesheet7.css") : file("src/javadoc/stylesheet.css");
+
configure(options) {
splitIndex true
linkSource true
- stylesheetFile file("src/javadoc/stylesheet.css")
+ stylesheetFile tapestryStylesheet
windowTitle "Tapestry API Documentation"
docTitle "Tapestry JavaDoc ($project.version)"
- bottom 'Copyright © 2003-2012 <a href="http://tapestry.apache.org">The Apache Software Foundation</a>.'
+ bottom 'Copyright © 2003-2013 <a href="http://tapestry.apache.org">The Apache Software Foundation</a>.'
use = true // 'use' seems to be a reserved word for the DSL
links "http://download.oracle.com/javase/6/docs/api/"
links "http://download.oracle.com/javaee/6/api/"
@@ -485,3 +490,22 @@ boolean isSnapshot() {
boolean isWindows() {
System.properties['os.name'].toLowerCase().contains('windows')
}
+
+boolean isJDK7() {
+ System.properties['java.version'].startsWith("1.7.")
+}
+
+// Check JDK version to prevent VU#225657 see:
+// http://www.oracle.com/technetwork/topics/security/javacpujun2013-1899847.html
+// http://www.kb.cert.org/vuls/id/225657
+boolean checkJDK() {
+ def jdkVersion = System.properties['java.version']
+ def minor = Integer.valueOf(jdkVersion.substring(jdkVersion.indexOf("_")+1))
+
+ if (jdkVersion.startsWith("1.7")) {
+ minor > 21
+ }
+ else { // JDK 6 and 5 require the same minor version
+ minor > 45
+ }
+}
\ No newline at end of file