[infinispan-commits] Infinispan SVN: r555 - in trunk: bin and 4 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Jul 13 06:36:06 EDT 2009
Author: manik.surtani at jboss.com
Date: 2009-07-13 06:36:05 -0400 (Mon, 13 Jul 2009)
New Revision: 555
Added:
trunk/tools/src/main/resources/
trunk/tools/src/main/resources/stylesheet2.css
Modified:
trunk/bin/release.py
trunk/pom.xml
trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
Log:
Updated CSS for generated docs
Modified: trunk/bin/release.py
===================================================================
--- trunk/bin/release.py 2009-07-13 09:37:27 UTC (rev 554)
+++ trunk/bin/release.py 2009-07-13 10:36:05 UTC (rev 555)
@@ -211,6 +211,8 @@
def buildAndTest(workingDir):
os.chdir(workingDir)
+ subprocess.check_call(["mvn", "install", "-Pjmxdoc", "-Dmaven.test.skip.exec=true"])
+ subprocess.check_call(["mvn", "install", "-Pconfigdoc", "-Dmaven.test.skip.exec=true"])
subprocess.check_call(["mvn", "deploy", "-Pdistribution", "-Dmaven.test.skip.exec=true"])
def getModuleName(pomFile):
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-07-13 09:37:27 UTC (rev 554)
+++ trunk/pom.xml 2009-07-13 10:36:05 UTC (rev 555)
@@ -248,6 +248,25 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>copy_css</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java 2009-07-13 09:37:27 UTC (rev 554)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java 2009-07-13 10:36:05 UTC (rev 555)
@@ -29,7 +29,7 @@
"Infinispan configuration options", Arrays.asList("Configuration", "Infinispan",
"Data Grids", "Documentation", "Reference", "MBeans"), cp);
- generator.generateHtml(outputDirectory + File.separator + "config.html");
+ generator.generateHtml(outputDirectory + File.separator + "config.html", "stylesheet2.css");
System.out.println("FINISHING CONFIG DOCLET");
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java 2009-07-13 09:37:27 UTC (rev 554)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java 2009-07-13 10:36:05 UTC (rev 555)
@@ -27,6 +27,10 @@
}
public void generateHtml(String fileName) throws IOException {
+ generateHtml(fileName, "stylesheet.css");
+ }
+
+ public void generateHtml(String fileName, String styleSheetName) throws IOException {
FileOutputStream fos = new FileOutputStream(fileName);
OutputStreamWriter osw = isValid(encoding) ? new OutputStreamWriter(fos, encoding) : new OutputStreamWriter(fos);
PrintWriter writer = new PrintWriter(osw);
@@ -46,7 +50,7 @@
writer.println("<TITLE>");
writer.println(title);
writer.println("</TITLE>");
- writer.println("<LINK REL=\"stylesheet\" HREF=\"stylesheet.css\" TYPE=\"text/css\"/>");
+ writer.println("<LINK REL=\"stylesheet\" HREF=\"" + styleSheetName + "\" TYPE=\"text/css\"/>");
writer.println("</HEAD>");
writer.println("<BODY>");
Added: trunk/tools/src/main/resources/stylesheet2.css
===================================================================
--- trunk/tools/src/main/resources/stylesheet2.css (rev 0)
+++ trunk/tools/src/main/resources/stylesheet2.css 2009-07-13 10:36:05 UTC (rev 555)
@@ -0,0 +1,420 @@
+/*
+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.
+*/
+body {
+ background-color: #fff;
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ margin-left: auto;
+ margin-right: auto;
+ background-repeat: repeat-y;
+ font-size: 13px;
+ padding: 0px;
+}
+
+td, select, input, li {
+ font-family: Verdana, Helvetica, Arial, sans-serif;
+ font-size: 12px;
+ color: #333333;
+}
+
+code {
+ font-size: 12px;
+}
+
+a {
+ text-decoration: none;
+}
+
+a:link {
+ color: #47a;
+}
+
+a:visited {
+ color: #68a;
+}
+
+a:active, a:hover {
+ color: #990000;
+}
+
+#legend li.externalLink {
+ background: url(../images/external.png) left top no-repeat;
+ padding-left: 18px;
+}
+
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+ background: url(../images/external.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+#legend li.newWindow {
+ background: url(../images/newwindow.png) left top no-repeat;
+ padding-left: 18px;
+}
+
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+ background: url(../images/newwindow.png) right center no-repeat;
+ padding-right: 18px;
+}
+
+h2 {
+ font-size: 17px;
+ color: #333333;
+}
+
+h3 {
+ padding: 4px 4px 4px 24px;
+ color: #666;
+ background-color: #ccc;
+ font-weight: bold;
+ font-size: 14px;
+ background-image: url(../images/h3.jpg);
+ background-repeat: no-repeat;
+ background-position: left bottom;
+}
+
+p {
+ line-height: 1.3em;
+ font-size: 12px;
+ color: #000;
+}
+
+#breadcrumbs {
+ height: 13px;
+ background-image: url(../images/breadcrumbs.jpg);
+ padding: 5px 10px 14px 20px;
+}
+
+* html #breadcrumbs {
+ padding-bottom: 8px;
+}
+
+#leftColumn {
+ margin: 10px 0 10px 0;
+ border-top-color: #ccc;
+ border-top-style: solid;
+ border-top-width: 1px;
+ border-right-color: #ccc;
+ border-right-style: solid;
+ border-right-width: 1px;
+ border-bottom-color: #ccc;
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
+ padding-right: 5px;
+ padding-left: 5px;
+}
+
+#navcolumn h5 {
+ font-size: smaller;
+ border-bottom: 1px solid #aaaaaa;
+ padding-top: 2px;
+ padding-left: 9px;
+ color: #49635a;
+ background-image: url(../images/h5.jpg);
+ background-repeat: no-repeat;
+ background-position: left bottom;
+}
+
+table.bodyTable th {
+ color: white;
+ background-color: #bbb;
+ text-align: left;
+ font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+ font-size: 11px;
+}
+
+table.bodyTable tr.a {
+ background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+ background-color: #eee;
+}
+
+.source {
+ border: 1px solid #999;
+ overflow: auto
+}
+
+dt {
+ padding: 4px 4px 4px 24px;
+ color: #333333;
+ background-color: #ccc;
+ font-weight: bold;
+ font-size: 14px;
+ background-image: url(../images/h3.jpg);
+ background-repeat: no-repeat;
+ background-position: left bottom;
+}
+
+.subsectionTitle {
+ font-size: 13px;
+ font-weight: bold;
+ color: #666;
+
+}
+
+table {
+ font-size: 10px;
+}
+
+.xright a:link, .xright a:visited, .xright a:active {
+ color: #666;
+}
+
+.xright a:hover {
+ color: #003300;
+}
+
+#banner {
+ height: 93px;
+ background: url(../images/banner.jpg);
+}
+
+#navcolumn ul {
+ margin: 5px 0 15px -0em;
+}
+
+#navcolumn ul a {
+ color: #333333;
+}
+
+#navcolumn ul a:hover {
+ color: red;
+}
+
+#intro {
+ border: solid #ccc 1px;
+ margin: 6px 0px 0px 0px;
+ padding: 10px 40px 10px 40px;
+}
+
+.subsection {
+ margin-left: 3px;
+ color: #333333;
+}
+
+.subsection p {
+ font-size: 12px;
+}
+
+#footer {
+ padding: 10px;
+ margin: 20px 0px 20px 0px;
+ border-top: solid #ccc 1px;
+ color: #333333;
+}
+
+.errormark, .warningmark, .donemark, .infomark {
+ background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+ background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+ background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+ background-image: url(../images/icon_info_sml.gif);
+}
+
+body {
+ margin: 0px;
+ padding: 0px;
+}
+
+img {
+ border: none;
+}
+
+table {
+ padding: 0px;
+ width: 100%;
+ margin-left: -2px;
+ margin-right: -2px;
+}
+
+acronym {
+ cursor: help;
+ border-bottom: 1px dotted #feb;
+}
+
+table.bodyTable th, table.bodyTable td {
+ padding: 2px 4px 2px 4px;
+ vertical-align: top;
+}
+
+div.clear {
+ clear: both;
+ visibility: hidden;
+}
+
+div.clear hr {
+ display: none;
+}
+
+#bannerLeft, #bannerRight {
+ font-size: xx-large;
+ font-weight: bold;
+}
+
+#bannerLeft img, #bannerRight img {
+ margin: 0px;
+}
+
+.xleft, #bannerLeft img {
+ float: left;
+}
+
+.xright, #bannerRight {
+ float: right;
+}
+
+#banner {
+ padding: 0px;
+}
+
+#banner img {
+ border: none;
+}
+
+#breadcrumbs {
+ padding: 3px 10px 3px 10px;
+}
+
+#leftColumn {
+ width: 170px;
+ float: left;
+ overflow: auto;
+}
+
+#bodyColumn {
+ margin-right: 1.5em;
+ margin-left: 197px;
+}
+
+#legend {
+ padding: 8px 0 8px 0;
+}
+
+#navcolumn {
+ padding: 8px 4px 0 8px;
+}
+
+#navcolumn h5 {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+
+#navcolumn ul {
+ margin: 0;
+ padding: 0;
+ font-size: small;
+}
+
+#navcolumn li {
+ list-style-type: none;
+ background-image: none;
+ background-repeat: no-repeat;
+ background-position: 0 0.4em;
+ padding-left: 16px;
+ list-style-position: outside;
+ line-height: 1.2em;
+ font-size: smaller;
+}
+
+#navcolumn li.expanded {
+ background-image: url(../images/expanded.gif);
+}
+
+#navcolumn li.collapsed {
+ background-image: url(../images/collapsed.gif);
+}
+
+#poweredBy {
+ text-align: center;
+}
+
+#navcolumn img {
+ margin-top: 10px;
+ margin-bottom: 3px;
+}
+
+#poweredBy img {
+ display: block;
+ margin: 20px 0 20px 17px;
+}
+
+#search img {
+ margin: 0px;
+ display: block;
+}
+
+#search #q, #search #btnG {
+ border: 1px solid #999;
+ margin-bottom: 10px;
+}
+
+#search form {
+ margin: 0px;
+}
+
+#lastPublished {
+ font-size: x-small;
+}
+
+.navSection {
+ margin-bottom: 2px;
+ padding: 8px;
+}
+
+.navSectionHead {
+ font-weight: bold;
+ font-size: x-small;
+}
+
+.section {
+ padding: 4px;
+}
+
+#footer {
+ padding: 3px 10px 3px 10px;
+ font-size: x-small;
+}
+
+#breadcrumbs {
+ font-size: x-small;
+ margin: 0pt;
+}
+
+.source {
+ padding: 12px;
+ margin: 1em 7px 1em 7px;
+}
+
+.source pre {
+ margin: 0px;
+ padding: 0px;
+}
More information about the infinispan-commits
mailing list