diff --git a/pom.xml b/pom.xml index 74decaf93f..9d085af88f 100644 --- a/pom.xml +++ b/pom.xml @@ -290,22 +290,6 @@ - - maven-source-plugin - 2.1.1 - - - attach-source - package - - jar - - - true - - - - maven-antrun-plugin 1.3 @@ -401,6 +385,22 @@ + + maven-source-plugin + 2.1.1 + + + attach-source + package + + jar + + + true + + + + maven-javadoc-plugin 2.6.1 diff --git a/src/javadoc/resources/bkg_blkheader.png b/src/javadoc/resources/bkg_blkheader.png new file mode 100644 index 0000000000..6bf1478636 Binary files /dev/null and b/src/javadoc/resources/bkg_blkheader.png differ diff --git a/src/javadoc/resources/bkg_gradient.gif b/src/javadoc/resources/bkg_gradient.gif new file mode 100644 index 0000000000..e67f720dc6 Binary files /dev/null and b/src/javadoc/resources/bkg_gradient.gif differ diff --git a/src/javadoc/resources/bkgheader.png b/src/javadoc/resources/bkgheader.png new file mode 100644 index 0000000000..87ddf82196 Binary files /dev/null and b/src/javadoc/resources/bkgheader.png differ diff --git a/src/javadoc/resources/h1_hdr.png b/src/javadoc/resources/h1_hdr.png new file mode 100644 index 0000000000..483b8d0f7c Binary files /dev/null and b/src/javadoc/resources/h1_hdr.png differ diff --git a/src/javadoc/stylesheet.css b/src/javadoc/stylesheet.css index 8d6958fb9f..ee636e0b73 100644 --- a/src/javadoc/stylesheet.css +++ b/src/javadoc/stylesheet.css @@ -1,122 +1,100 @@ -/* - * Copyright 2009 Red Hat, Inc. - * - * Red Hat 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. - */ - -* { - font-family: "Liberation Sans", "DejaVu Sans", "Lucida Grande", Geneva, Verdana, Helvetica, Arial, sans-serif; -} - -body { - background-color: #FFFFFF; - color:#000000; - font-size: 11pt; -} - -a:link {color:#0033cc;} -a:visited {color:#0044cc;} - -tt, tt *, pre, pre *, code, code * { - font-family: "Liberation Mono", "DejaVu Sans Mono", Consolas, Monaco, "Lucida Console", "Courier New", monospace; -} - -/* Headings */ -h1, h2, h3, h4, h5, h6 { - color:#4a5d75; - line-height:130%; - margin-top:0em; - font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; - background-color:transparent; -} - -h1 { - font-size:2em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; -} - -h2 { - font-size:1.6em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; -} - -h3 { - font-size:1.3em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; -} - -h4 { - font-size:1.1em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; -} - -h5 { - font-size:1em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; -} - -/* Tables */ -table { - border-collapse: collapse; - border-color: black; -} - -th { - text-align: left; - background: #CCCCFF; - color:#000000; - padding: 3px 6px; - border-color: black; -} - -td { - vertical-align: top; - padding: 3px 6px; - border-color: black; -} - -/* Table colors */ -.TableHeadingColor { - background: #CCCCFF; /* Dark mauve */ - color:#000000; -} -.TableHeadingColor TH * { - font-size: 1.2em !important; -} -.TableSubHeadingColor { - background: #EEEEFF; /* Light mauve */ - color:#000000 -} -.TableRowColor { - background: #FFFFFF; /* White */ - color:#000000 -} - -/* Font used in left-hand frame lists */ -.FrameTitleFont { font-size: 100%; color:#000000 } -.FrameHeadingFont { font-size: 90%; color:#000000 } -.FrameItemFont { font-size: 90%; color:#000000 } - -/* Navigation bar fonts and colors */ -.NavBarCell1 { background-color:#EEEEFF; color:#000000} /* Light mauve */ -.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */ -.NavBarFont1 { color:#000000;color:#000000;} -.NavBarFont1Rev { color:#FFFFFF;color:#FFFFFF;} - -.NavBarCell2 { background-color:#FFFFFF; color:#000000} -.NavBarCell3 { background-color:#FFFFFF; color:#000000} +/* Javadoc style sheet */ + +/* Define colors, fonts and other style attributes here to override the defaults */ + +/* Page background color */ +body { + background-color: #FFFFFF; + background-image:url(resources/bkg_gradient.gif); + background-repeat: repeat-x; + margin:0 auto; + font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; + font-size:12px; + padding:0em 2em; + color:#333; + + } + +/* Common elements */ + +font { + font-family: inherit; + font-size: inherit; + color: inherit; + font-weight: inherit; } + +hr { display: none; } + +a:link { color:#0066cc; } +a:visited { color:#8b5caf; } +a:hover { color:#6699cc; } + + +/* Headings */ +h1 { + font-size: 145%; + background-image:url(resources/h1_hdr.png); + background-repeat:no-repeat; + border-top:1px dotted #CCCCCC; + line-height:1.2em; + color:#182737; + font-size:2em; + padding:1.5em; + margin-top: 0px; + text-align:left; +} + + +/* Default Table elements and colors */ + +th, table { border-collapse:collapse;border-color: #E6E7E8; } + + +.TableHeadingColor { + background:#000000 url(resources/bkg_blkheader.png) repeat-x scroll left top; + color:#FFFFFF; + font-size:12px; + font-weight:bold; + height:31px; + text-align:left; + padding:1.5em; +} + +.TableHeadingColor th { + padding-left: 10px; +} + + +.TableSubHeadingColor { background: #EEEEFF } /* Light mauve */ +.TableRowColor { background: #FFFFFF; border-color: #E6E7E8;} +.TableRowColor td { line-height: 175%; padding-left: 10px;} + +/* Font used in left-hand frame lists */ +.FrameTitleFont { font-size: 125%; font-family: Helvetica, Arial, sans-serif; font-weight: bold; margin-top: 1em; display: block; } +.FrameHeadingFont { font-size: 125%; font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; font-weight: bold; margin-top: 1em; display: block; } +.FrameItemFont { font-size: 100%; font-family: Helvetica, Arial, sans-serif } + +/* Navigation bar fonts and colors */ + +.NavBarCell1 { background-color: #ffffff; + background-image:url(resources/bkgheader.png); + background-repeat: repeat-x scroll left top; + line-height:2em; + padding-left:6px; + padding-right:6px; +} + +.NavBarFont1 { + color: white; +} +.NavBarCell1 a { + color: white; +} + +.NavBarCell1Rev { background-color:#FFFFFF; padding-left:6px; padding-right:6px;} +.NavBarFont1 { color:#FFFFFF;} +.NavBarFont1Rev { color:#243446;} + +.NavBarCell2 { background-color:#FFFFFF;} +.NavBarCell3 { background-color:#FFFFFF;} + diff --git a/src/xref/stylesheet.css b/src/xref/stylesheet.css index c7987b74e7..0cbcf2b662 100644 --- a/src/xref/stylesheet.css +++ b/src/xref/stylesheet.css @@ -1,155 +1,148 @@ -/* - * Copyright 2009 Red Hat, Inc. - * - * Red Hat 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. - */ - -* { - font-family: "Lucida Grande", Geneva, Verdana, "Liberation Sans", Helvetica, Arial, sans-serif; -} - +/* Page background color */ body { - background-color: #FFFFFF; - color:#000000; - font-size: 10pt; -} + background-color: #FFFFFF; + background-image:url(../api/resources/bkg_gradient.gif); + background-repeat: repeat-x; + margin:0 auto; + font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; + font-size:12px; + padding:0em 2em; + color:#333; -a:link {color:#0033cc;} -a:visited {color:#0044cc;} + } + +/* Common elements */ + +font { + font-family: inherit; + font-size: inherit; + color: inherit; + font-weight: inherit; } + +hr { display: none; } + +a:link { color:#0066cc; } +a:visited { color:#8b5caf; } +a:hover { color:#6699cc; } -tt, tt *, pre, pre *, code, code * { - font-family: "Liberation Mono", "DejaVu Sans Mono", Consolas, Monaco, "Lucida Console", "Courier New", monospace; -} /* Headings */ -h1, h2, h3, h4, h5, h6 { - color:#4a5d75; - line-height:130%; - margin-top:0em; - font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; - background-color:transparent; +h1, h2 { + font-size: 145%; + background-image:url(../api/resources/h1_hdr.png); + background-repeat:no-repeat; + border-top:1px dotted #CCCCCC; + line-height:1.2em; + color:#182737; + font-size:2em; + padding:1.5em; + margin-top: 0px; + text-align:left; } -h1 { - font-size:2em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; + +/* Default Table elements and colors */ + +th, td, table { border-collapse:collapse; border-color: #E6E7E8; } + +.summary { + margin-bottom: 1em; + width: 100%; } -h2 { - font-size:1.6em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; +.summary, .summary th, .summary td { + border: solid #E6E7E8 1px; + font-weight: bold; } -h3 { - font-size:1.3em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; +.summary th { + background:#000000 url(../api/resources/bkg_blkheader.png) repeat-x scroll left top; + color:#FFFFFF; + font-size:12px; + font-weight:bold; + height:31px; + text-align:left; + padding: 0 10px 0 10px; } -h4 { - font-size:1.1em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; +.summary td { background: #FFFFFF; line-height: 175%; padding-left: 10px; } + +/* Navigation bar fonts and colors */ + +.overview { + background-color: #ffffff; + background-image:url(../api/resources/bkgheader.png); + background-repeat: repeat-x scroll left top; + line-height:2em; + padding-left:6px; + padding-right:6px; } -h5 { - font-size:1em; - padding: 0em; - margin: 0.8em 0em 0.35em 0em; +.overview ul { + margin-bottom: 0; } -ul, li { - list-style-type:none; - margin:0; - padding:0; +.overview li { + display: inline; + list-style-type: none; + padding-right: 20px; + color: white; +} +.overview li a { + color: white; + font-weight: bold; } -table td { - padding: 3px; - border: 1px solid #000; +.framenoframe { + background-color: #ffffff; + line-height:2em; + padding-left:6px; + padding-right:6px; } -table { - width:100%; - border: 1px solid #000; - border-collapse: collapse; +.framenoframe ul { + margin:0; } -div.overview { - background-color:#ddd; - padding: 4px 4px 4px 0; +.framenoframe li { + display: inline; + list-style-type: none; + padding-right: 10px; } -div.overview li, div.framenoframe li { - display: inline; -} -div.framenoframe { - text-align: center; - font-size: x-small; -} -div.framenoframe li { - margin: 0 3px 0 3px; -} -div.overview li { - margin:3px 3px 0 3px; - padding: 4px; -} -li.selected { - background-color:#888; - color: #fff; - font-weight: bold; +.framenoframe li a { + font-weight: bold; } -table.summary { - margin-bottom: 20px; +/* Class/package list on the left frame */ +body ul { + padding: 0; + margin-top: 0; } -table.summary td, table.summary th { - font-weight: bold; - text-align: left; - padding: 3px; + +body li { + list-style-type: none; + font-family: Helvetica, Arial, sans-serif; } -table.summary th { - background-color:#CCCCFF; - color: #000; -} -table.summary td { - background-color:#fff; - border: 1px solid black; + +div#footer { + text-align:center; } +/* Syntax highlighting */ + em { color: rgb(63, 63, 191); font-style: normal; } + em.comment { color: rgb(63, 127, 95); font-style: normal; } + .string { color: rgb(42, 0, 255); } -div#footer { - text-align:center; -} -#overview { - padding:2px; -} - -hr { - height: 1px; - color: #000; -} .jxr_comment { color: rgb(63, 127, 95); @@ -169,3 +162,4 @@ hr { color: rgb(127, 0, 85); font-weight: bold; } +