dion 2003/08/07 10:00:55 Modified: src/plugins-build/uberjar Tag: MAVEN_RC1_STABLE plugin.jelly src/plugins-build/word2html Tag: MAVEN_RC1_STABLE plugin.jelly src/plugins-build/xdoc/src/plugin-resources/css Tag: MAVEN_RC1_STABLE tigris.css src/plugins-build/uberjar/xdocs Tag: MAVEN_RC1_STABLE changes.xml index.xml src/plugins-build/xdoc Tag: MAVEN_RC1_STABLE plugin.jelly src/plugins-build/war/xdocs Tag: MAVEN_RC1_STABLE properties.xml changes.xml src/plugins-build/torque Tag: MAVEN_RC1_STABLE plugin.jelly src/plugins-build/war Tag: MAVEN_RC1_STABLE plugin.jelly src/plugins-build/test Tag: MAVEN_RC1_STABLE project.xml plugin.jelly src/plugins-build/test/xdocs Tag: MAVEN_RC1_STABLE changes.xml src/plugins-build/xdoc/src/plugin-resources/templates Tag: MAVEN_RC1_STABLE cvs-usage.xml src/plugins-build/tasklist/src/plugin-resources/templates Tag: MAVEN_RC1_STABLE tasklist.vm Log: Update from back ported fixes Revision Changes Path No revision No revision 1.7.2.1 +1 -1 maven/src/plugins-build/uberjar/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/uberjar/plugin.jelly,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- plugin.jelly 4 Jul 2003 06:22:49 -0000 1.7 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.7.2.1 @@ -2,7 +2,7 @@ <project xmlns:j="jelly:core" - xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary" + xmlns:velocity="jelly:velocity" xmlns:artifact="artifact"> <!--==================================================================--> No revision No revision 1.5.4.1 +1 -1 maven/src/plugins-build/word2html/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/word2html/plugin.jelly,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -r1.5 -r1.5.4.1 --- plugin.jelly 9 Jul 2003 07:30:48 -0000 1.5 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.5.4.1 @@ -13,7 +13,7 @@ </goal> <goal name="word2html:generate" - prereqs="xdoc:init, word2html:prepare-filesystem" + prereqs="xdoc:init,word2html:prepare-filesystem" description="Generate HTML docs from Word via CScript"> <j:if test="${!wordSrcDir.equals('MAVEN_WORD2HTML_SRC_DIR_NOT_SET')}"> No revision No revision 1.1.1.1.4.1 +744 -389 maven/src/plugins-build/xdoc/src/plugin-resources/css/tigris.css Index: tigris.css =================================================================== RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/css/tigris.css,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1 -r1.1.1.1.4.1 --- tigris.css 24 Jan 2003 03:45:03 -0000 1.1.1.1 +++ tigris.css 7 Aug 2003 17:00:54 -0000 1.1.1.1.4.1 @@ -1,434 +1,789 @@ -/* contains rules unsuitable for Netscape 4.x; simpler rules are in ns4_only.css. see <http://style.tigris.org/> */ - -/* colors, backgrounds, borders, link indication */ +/* $Id$ + + This file defines basic default formatting for HTML conforming to Tigris application style. To extend or override these rules for your instance, edit inst.css instead of this file. */ +/* colors, backgrounds, borders, link indication */ body { - background: #fff; - color: #000; - } -.app h3, .app h4, .app th, .tabs td, .tabs th, .functnbar { - background-image: url(../images/nw_min.gif); - background-repeat: no-repeat; - } -#navcolumn div div, body.docs #toc li li { - background-image: url(../images/strich.gif); - background-repeat: no-repeat; - background-position: .5em .5em; - } -#navcolumn div div.heading { - background-image: none; - } + background: #fff; + color: #000; +} + +.app h3, .app h4, .tabs td, .tabs th, .functnbar { + background-image: url(../images/nw_maj_rond.gif); + background-repeat: no-repeat; +} + +.functnbar, .functnbar2 { + background-color: #aaa; +} + +.functnbar2, .functnbar3 { + background-color: #aaa; + background-image: url(../images/sw_maj_rond.gif); + background-repeat: no-repeat; + background-position: bottom left; +} + +.functnbar3 { + background-color: #ddd; + background-image: url(../images/sw_med_rond.gif); +} + +.functnbar, .functnbar2, .functnbar3 { + color: #000; +} + +.functnbar a, .functnbar2 a, .functnbar3 a { + color: #000; + text-decoration: underline; +} + +#navcolumn .body div, body.docs #toc li li { + background-image: url(../images/strich.gif); + background-repeat: no-repeat; + background-position: .5em .5em; +} + +#searchbox .body div, #navcolumn .body .heading { + background-image: none; +} + +a:link, #navcolumn a:visited, .app a:visited, .tasknav a:visited { + color: blue; +} + +a:link.selfref, a:visited.selfref { + color: #555 !important; + text-decoration: none; +} + +a:active, a:hover, #leftcol a:active, #leftcol a:hover { + color: #f30 !important; +} + +#leftcol a, #breadcrumbs a { + text-decoration: none; +} + .app h3, .app h4 { - color: #fff; - } + color: #fff; +} + .app h3 { - background-color: #036; - } -.app h4 { - background-color: #888; - } -.a td { - background: #ddd; - } -.b td { - background: #efefef; - } + background-color: #333; +} + +.app h3 a:link, .app h3 a:visited, .app h4 a:link, .app h4 a:visited { + color: #fff !important; + text-decoration: underline; +} + +.app h4 { + background-color: #888; +} + +.a td { + background: #ddd; +} + +.b td { + background: #efefef; +} + table, th, td { - border: none - } -.mtb { - border-top: solid 1px #ddd; - } + border: none; +} + div.colbar { - background: #bbb; - } -div#banner { - border-top: 1px solid #369; - border-bottom: 1px solid #003; - } -div#helptext th { - border-bottom: 1px solid #996; - border-right: 1px solid #996; - } -div#helptext td { - border-bottom: 1px solid #cc9; - border-right: 1px solid #cc9; - } -.tabs { - border-bottom: .75em #888 solid; - } -.tabs th, .tabs td { - border-right: 1px solid #333; - } -.tabs td { - border-bottom: 1px solid #ddd; - } -#navcolumn { - background: #eee; - border-right: 1px solid #aaa; - border-bottom: 1px solid #aaa; - } + background: #eee; + border-color: #999 #EEE #EEE #999; + border-width: 1px; + border-style: solid; +} + +.toolgroup { + background: #efefef; +} + +.toolgroup .label { + border-bottom: 1px solid #666; + border-right: 1px solid #666; + background: #ddd; + color: #555; +} + +.toolgroup .body { + border-right: 1px solid #aaa; + border-bottom: 1px solid #aaa; +} + #breadcrumbs { - border-bottom: 1px solid #aaa; - background-color: #ddd; - } -#navcolumn, #breadcrumbs { - border-top: 1px solid #fff; - } + border-top: 1px solid #fff; + background-color: #ccc; +} + +#main { + border-top: 1px solid #999; +} + #rightcol div.www, #rightcol div.help { - border: 1px solid #ddd; - } -div#navcolumn div.focus { - border-top: 1px solid #aaa; - border-left: 1px solid #aaa; - background-color: #fff; - } -body.docs div.docs { - background: #fff; - border-left: 1px solid #ddd; - border-top: 1px solid #ddd; - } -body.docs { - background: #eee url(../images/help_logo.gif) top right no-repeat !important; - } + border: 1px solid #ddd; +} + +body.docs div.docs { + background-color: #fff; + border-left: 1px solid #ddd; + border-top: 1px solid #ddd; +} + +#helptext .label { + background-image: url(../images/icon_help_sml.gif); + background-repeat: no-repeat; + background-position: 97%; +} + +body.docs { + background: #eee url(../images/help_logo.gif) top right no-repeat !important; +} + .docs h3, .docs h4 { - border-top: solid 1px #000; - } -#alerterrormessage { - background: url(../images/icon_alert.gif) top left no-repeat !important; - } -.functnbar { - background-color: #aaa; - } -.functnbar2, .functnbar3 { - background: #aaa url(../images/sw_min.gif) no-repeat bottom left; - } -.functnbar3 { - background-color: #ddd; - } -.functnbar, .functnbar2, .functnbar3 { - color: #000; - } -.functnbar a, .functnbar2 a, .functnbar3 a { - color: #000; - text-decoration: underline; - } -#topmodule { - background: #ddd; - border-top: 1px solid #fff; - border-bottom: 1px solid #aaa; - border-right: 1px solid #aaa; - } -#topmodule #issueid { - border-right: 1px solid #aaa; - } -a:link, #navcolumn a:visited, .app a:visited, .tasknav a:visited { - color: blue; - } -a:active, a:hover, #leftcol a:active, #leftcol a:hover { - color: #f30 !important; - } -#login a:link, #login a:visited { - color: white; - text-decoration: underline; - } -#banner a:active, #banner a:hover { - color: #f90 !important; - } -#leftcol a, #breadcrumbs a { - text-decoration: none; - } -a:link.selfref, a:visited.selfref { - color: #555 !important; - text-decoration: none; - } -h2 .lastchild { - color: #777 - } -.tabs td, .tabs th { - background-color: #ddd; - } + border-top: solid 1px #000; +} + +#apphead h2 em { + color: #777; +} + .app th { - background-color: #bbb; - } + background-color: #bbb; +} + .tabs th { - background-color: #888; - color: #fff; - } -.axial th { - background-color: #ddd; - color: black - } + border-right: 1px solid #333; + background-color: #ddd; + color: #fff; + border-left: 1px solid #fff; +} + .tabs td { - background-color: #ddd; - } -.alert { - color: #c00; - } + background-color: #999; + border-bottom: 1px solid #fff; + border-right: 1px solid #fff; + border-left: 1px solid #fff; +} + +.tabs { + border-bottom: 6px #ddd solid; +} + +.tabs th, .tabs th a:link, .tabs th a:visited { + color: #555; +} + +.tabs td, .tabs td a:link, .tabs td a:visited { + color: #fff; +} + +.tabs a { + text-decoration: none; +} + +.axial th { + background-color: #ddd; + color: black; +} + +.alert { + background-color: #ff9; +} + +.expandedwaste { + background: url(../images/icon_arrowwaste2_sml.gif) no-repeat; +} + +.collapsedwaste { + background: url(../images/icon_arrowwaste1_sml.gif) no-repeat; +} + +.filebrowse .expanded, .filebrowse-alt .expanded { + background-image: url(../images/icon_arrowfolderopen2_sml.gif); + background-repeat: no-repeat; +} + +.filebrowse .collapsed, .filebrowse-alt .collapsed { + background-image: url(../images/icon_arrowfolderclosed1_sml.gif); + background-repeat: no-repeat; +} + +.filebrowse .leafnode, .filebrowse-alt .leafnode { + background-image: url(../images/icon_folder_sml.gif); + background-repeat: no-repeat; +} + +.filebrowse .leaf, .filebrowse-alt .leaf { + background-image: url(../images/icon_doc_sml.gif); + background-repeat: no-repeat; +} + +.sortup { + background: url(../images/icon_sortup.gif) no-repeat; +} + +.sortdown { + background: url(../images/icon_sortdown.gif) no-repeat; +} + +.collapsedwaste { + background: url(../images/icon_arrowwaste1_sml.gif) no-repeat; +} + +body .grid td { + border-top: 1px solid #ccc; + border-left: 1px solid #ccc; + background-color: transparent; +} + .confirm { - color: green; - } + color: #090; +} + .info { - color: blue; - } -.selection { - background: #ffc; - } -#login { - color: #fff; - } -#helptext th { - background: #cc9; - } -#helptext td { - background: #ffc; - } -.tabs a { - text-decoration: none; - } -#navcolumn div strong { - color: #000; - } -#banner, #banner td { - background: #036; - color: #fff; - } -body #banner #login a { - color: #fff; - } + color: #069; +} + +.errormessage, .warningmessage, .donemessage, .infomessage { + border-top: 5px solid #900; + border-left: 1px solid #900; + background-image: url(../images/icon_error_lrg.gif); + background-repeat: no-repeat; + background-position: 5px 1.33em; +} + +.warningmessage { + background-image: url(../images/icon_warning_lrg.gif); + border-color: #c60; +} + +.donemessage { + background-image: url(../images/icon_success_lrg.gif); + border-color: #090; +} + +.infomessage { + background-image: url(../images/icon_info_lrg.gif); + border-color: #069; +} + +.docinfo { + background: url(../images/icon_doc_lrg.gif) no-repeat; +} + +.dirinfo { + background: url(../images/icon_folder_lrg.gif) no-repeat; +} + +.memberinfo { + background: url(../images/icon_members_lrg.gif) no-repeat; +} + +.usergroupinfo { + background: url(../images/icon_usergroups_lrg.gif) no-repeat; +} + +.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); +} + +.cvsdiff, .cvsblame { + background-color: #ccc; +} + +.cvsdiffadd { + background-color: #afa; +} + +.cvsdiffremove { + background-color: #faa; +} + +.cvsdiffchanges1 { + background-color: #ff7; +} + +.cvsdiffchanges2 { + background-color: #ff7; +} + +li.selection ul a { + background: #fff; +} + +.band1 { + color: #fff; + background-color: #663; +} + +.band2 { + color: #fff; + background-color: #66C; +} + +.band3 { + background-color: #C99; +} + +.band4 { + background-color: #CFF; +} + +.band5 { + color: #fff; + background-color: #336; +} + +.band6 { + color: #fff; + background-color: #966; +} + +.band7 { + background-color: #9CC; +} + +.band8 { + background-color: #FFC; +} + +.band9 { + color: #fff; + background-color: #633; +} +.band10 { + color: #fff; + background-color: #699; +} + +.band11 { + background-color: #CC9; +} + +.band12 { + background-color: #CCF; +} + +.band13 { + color: #fff; + background-color: #366; +} + +.band14 { + color: #fff; + background-color: #996; +} + +.band15 { + background-color: #99C; +} + +.band16 { + background-color: #FCC; +} + +.app .helplink, #helptext .helplink { + cursor: help; +} + +.legend th, .bars th { + background-color: #fff; +} /* font and text properties, exclusive of link indication, alignment, text-indent */ +body, th, td, input, select { + font-family: Verdana, Helvetica, Arial, sans-serif; +} -body, th, td, input, select, textarea, h2 small { - font-family: Verdana, Helvetica, Arial, sans-serif; - } code, pre { - font-family: 'Andale Mono', Courier, monospace; - } -html body, body th, body td, textarea, h2 small, .app h3, .app h4, #rightcol h3, #bodycol pre, #bodycol code { - font-size: x-small; - voice-family: "\"}\""; - voice-family: inherit; - font-size: small - } -html>body, html>body th, html>body td, html>body input, html>body select, html>body textarea, html>body h2 small, html>body .app h3, html>body .app h4, html>body #rightcol h3, html>body #bodycol pre, html>body #bodycol code { - font-size: small - } -small, div#footer td, div#login, div#helptext th, div#helptext td, div.tabs th, div.tabs td, input, select, .paginate, .functnbar, .functnbar2, .functnbar3, #breadcrumbs td, .courtesylinks, #rightcol div.help, .colbar, .tasknav, body.docs div#toc { - font-size: xx-small; - voice-family: "\"}\""; - voice-family: inherit; - font-size: x-small - } -html>body small, html>body div#footer td, html>body div#login, html>body div#helptext td, html>body div#helptext th, html>body div.tabs th, html>body div.tabs td, html>body input, html>body select, html>body .paginate, html>body .functnbar, html>body .functnbar2, html>body .functnbar3, html>body #breadcrumbs td, html>body .courtesylinks, html>body #rightcol div.help, html>body .colbar, html>body .tasknav, html>body.docs #toc { - font-size: x-small - } -#bodycol h2 { - font-family: Tahoma, Verdana, Helvetica, Arial, sans-serif; - font-size: 1.5em; - font-weight: normal; - } -h2 small { - font-weight: bold; - letter-spacing: .06em; - } -dt { - font-weight: bold - } -#login .username { - font-weight: bold; - } -h4 { - font-size: 1em; - } -#breadcrumbs td { - font-weight: bold; - } -.selection { - font-weight: bold - } + font-family: 'Andale Mono', Courier, monospace; +} +body, .app h3, .app h4, #rightcol h3, pre, code, #apphead h2 small, h4, th, td { + font-size: x-small; + voice-family: "\"}\""; + voice-family: inherit; + font-size: small; +} -/* box properties (exclusive of borders), positioning, alignments, list types, text-indent */ +small, div#footer, div#login, div.tabs th, div.tabs td, input, select, .paginate, .functnbar, .functnbar2, .functnbar3, #breadcrumbs, .courtesylinks, #rightcol div.help, .colbar, .tasknav, body.docs div#toc, #leftcol, .legend, .bars { + font-size: xx-small; + voice-family: "\"}\""; + voice-family: inherit; + font-size: x-small; +} + +.tabs td, .tabs th, dt, .tasknav .selfref, #login .username, .selection { + font-weight: bold; +} + +li.selection ul { + font-weight: normal; +} +#apphead h2 em { + font-style: normal; +} + +#banner h1 { + font-size: 1.25em; +} + +/* box properties (exclusive of borders), positioning, alignments, list types, text-indent */ #bodycol h2 { - margin-top: .3em; - margin-bottom: .5em; - } -p, ul, ol, dl { - margin-top: .67em; - margin-bottom: .67em; - } + margin-top: .3em; + margin-bottom: .5em; +} + +p, ul, ol, dl, .bars table { + margin-top: .67em; + margin-bottom: .67em; +} + h3, h4 { - margin-bottom: 0; - } + margin-bottom: 0; +} + form { - margin-top: 0; - margin-bottom: 0; - } + margin: 0; +} + #bodycol { - padding-left: 12px; - padding-right: 12px; - width: 100%; - voice-family: "\"}\""; - voice-family: inherit; - width: auto; - } + padding-left: 12px; + padding-right: 12px; + width: 100%; + voice-family: "\"}\""; + voice-family: inherit; + width: auto; +} + html>body #bodycol { - width: auto; - } + width: auto; +} + .docs { - line-height: 1.4; - } + line-height: 1.4; +} + +ol ol { + list-style-type: lower-alpha; +} + +ol ol ol { + list-style-type: lower-roman; +} + .app h3, .app h4 { - padding: 5px; - margin-right: 2px; - margin-left: 2px; - } + padding: 5px; + margin-right: 2px; + margin-left: 2px; +} + +.app td, .app th { + padding: 2px 3px; +} + .h3 p, .h4 p, .h3 dt, .h4 dt { - margin-right: 7px; - margin-left: 7px; - } + margin-right: 7px; + margin-left: 7px; +} + .tasknav { - margin-bottom: 1.33em - } + margin-bottom: 1.33em; +} + div.colbar { - padding: 4px; - margin: 2px 2px 0; - } -.tabs { - margin-top: .67em; - margin-right: 2px; - margin-left: 2px; - } -#leftcol { - padding-bottom: .5em; - } -#breadcrumbs td { - vertical-align: middle; - padding: 2px 8px; - } + padding: 3px; + margin: 2px 2px 0; +} + +.tabs { + margin-top: .67em; + margin-right: 2px; + margin-left: 2px; + padding-left: 8px; +} + +.tabs td, .tabs th { + padding: 3px 9px; +} + #rightcol div.www, #rightcol div.help { - padding: 0 .5em - } -#navcolumn { - margin: -8px -8px 0 -8px; - padding: 4px; - } -#navcolumn div { - padding-left: 5px - } -div#navcolumn div div { - margin-top: .3em; - margin-bottom: .3em; - } -div#navcolumn div.focus { - margin-top: -.1em; - padding: .2em 4px; - } -body.docs #toc { - position: absolute; - top: 15px; - left: 0px; - width: 120px; - padding: 0 20px 0 0 - } + padding: 0 .5em; +} + +body.docs #toc { + position: absolute; + top: 15px; + left: 0px; + width: 120px; + padding: 0 20px 0 0; +} + body.docs #toc ul, #toc ol { - margin-left: 0; - padding-left: 0; - } + margin-left: 0; + padding-left: 0; +} + body.docs #toc li { - margin-top: 7px; - padding-left: 10px; - list-style-type: none; - } -body.docs div.docs { - margin: 61px 0 0 150px; - padding: 1em 2em 1em 1em !important; - } + margin-top: 7px; + padding-left: 10px; + list-style-type: none; +} + +body.docs div.docs { + margin: 61px 0 0 150px; + padding: 1em 2em 1em 1em !important; +} + .docs p+p { - text-indent: 5%; - margin-top: -.67em - } + text-indent: 5%; + margin-top: -.67em; +} + .docs h3, .docs h4 { - margin-bottom: .1em; - padding-top: .3em; - } -#alerterrormessage { - padding-left: 100px; - } + margin-bottom: .1em; + padding-top: .3em; +} + .functnbar, .functnbar2, .functnbar3 { - padding: 5px; - margin: .67em 2px; - } -#topmodule td { - vertical-align: middle; - padding: 2px 8px - } + padding: 5px; + margin: .67em 2px; +} + +.functnbar3 { + margin-top: 0; +} + body { - padding: 1em; - } + padding: 1em; +} + body.composite, body.docs { - margin: 0; - padding: 0; - } + margin: 0; + padding: 0; +} + th, td { - text-align: left; - vertical-align: top - } + text-align: left; + vertical-align: top; +} + .right { - text-align: right !important; - } + text-align: right !important; +} + .center { - text-align: center !important; - } -.tabs td, .tabs th { - padding-left: 7px; - padding-right: 7px; - } -.axial th { - text-align: right; - } + text-align: center !important; +} + +.axial th, .axial th .strut { + text-align: right; +} + .app .axial td th { - text-align: left; - } -body td .stb { - margin-top: 1em; - text-indent: 0; - } -body td .mtb { - margin-top: 2em; - text-indent: 0; - } -dd { - margin-bottom: .67em; - } -#footer { - margin: 4px - } -#helptext { - margin-top: 1em - } -#helptext td div { - margin: .5em - } + text-align: left; +} + +body .stb { + margin-top: 1em; + text-indent: 0; +} + +body .mtb { + margin-top: 2em; + text-indent: 0; +} + .courtesylinks { - margin-top: 1em; - padding-top: 1em - } -#navcolumn div { - margin-bottom: .5em; - } -#navcolumn div div { - margin-top: .3em - } -#navcolumn div div { - padding-left: 1em; - } -#banner, #banner td { - vertical-align: middle; - } -body.docs, body.nonav { - margin: 1em - } + margin-top: 1em; + padding-top: 1em; +} + +dd { + margin-bottom: .67em; +} + +.toolgroup { + margin-bottom: 6px; +} + +.toolgroup .body { + padding: 4px 4px 4px 0; +} + +.toolgroup .label { + padding: 4px; +} + +.toolgroup .body div { + padding-bottom: .3em; + padding-left: 1em; +} + +.toolgroup .body div div { + margin-top: .3em; + padding-bottom: 0; +} + +.tier1 { + margin-left: 0; +} + +.tier2 { + margin-left: 1.5em; +} + +.tier3 { + margin-left: 3em; +} + +.tier4 { + margin-left: 4.5em; +} + +.tier5 { + margin-left: 6em; +} + +.tier6 { + margin-left: 7.5em; +} + +.tier7 { + margin-left: 9em; +} + +.tier8 { + margin-left: 10.5em; +} + +.tier9 { + margin-left: 12em; +} + +.tier10 { + margin-left: 13.5em; +} + +.filebrowse .expanded, .filebrowse .collapsed { + padding-left: 34px; +} + +.filebrowse .leafnode, .filebrowse .leaf { + padding-left: 20px; +} + +.messagechild { + padding-left: 34px; +} + +.filebrowse-alt .expanded, .filebrowse-alt .collapsed, .filebrowse-alt .leaf, .filebrowse-alt .leafnode, .expandedwaste, .collapsedwaste, .sortup, .sortdown { + /* hide from macie5\*/ + float: left; + /* resume */ + display: inline-block; + height: 15px; + width: 34px; + padding-left: 0 !important; +} + +.filebrowse-alt .leaf, .filebrowse-alt .leafnode, .sortup, .sortdown { + width: 20px; +} + +.filebrowse ul, .filebrowse-alt ul { + list-style-type: none; + padding-left: 0; + margin-left: 0; +} + +.filebrowse ul ul, .filebrowse-alt ul ul { + margin-left: 1.5em; + margin-top: 0; + padding-top: .67em; +} + +.filebrowse li, .filebrowse-alt li { + margin-bottom: .67em; +} + +td.filebrowse h3 { + margin-top: 0; +} + +.errormessage, .warningmessage, .donemessage, .infomessage, .docinfo, .dirinfo, .memberinfo, .usergroupinfo { + margin: .67em 0; + padding: .33em 0 .67em 42px; + min-height: 32px; +} + +.errormark, .warningmark, .donemark, .infomark { + padding-left: 20px; + min-height: 15px; +} + +.alt { + display: none; +} + +#banner h1 { + margin: 0; +} + +#leftcol { + width: 14em; +} + +.axial th, .axial th .strut, #leftcol .strut { + width: 12em; +} + +#breadcrumbs { + padding: 2px 8px; +} + +.app h3, .app h4, .bars { + clear: both; +} + +.legend { + float: right; +} + +.legend th, .bars th { + text-align: right; + padding-left: 1em; +} + +.bars table { + table-layout: fixed; +} + +.bars th { + width: 12em; +} + +#projectdocumentlist td.filebrowse-alt { + padding-right: .75em; +} No revision No revision 1.4.4.1 +3 -0 maven/src/plugins-build/uberjar/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/uberjar/xdocs/changes.xml,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -u -r1.4 -r1.4.4.1 --- changes.xml 25 Jul 2003 06:35:27 -0000 1.4 +++ changes.xml 7 Aug 2003 17:00:54 -0000 1.4.4.1 @@ -7,6 +7,9 @@ <body> <release version="1.1" date="in CVS"> + <action dev="evenisse" type="fix"> + Maven-655. Fix classworlds url. + </action> <action dev="dion" type="update"> update to velocity 1.4-dev </action> 1.1.1.1.4.1 +3 -3 maven/src/plugins-build/uberjar/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/uberjar/xdocs/index.xml,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.4.1 diff -u -r1.1.1.1 -r1.1.1.1.4.1 --- index.xml 24 Jan 2003 03:46:23 -0000 1.1.1.1 +++ index.xml 7 Aug 2003 17:00:54 -0000 1.1.1.1.4.1 @@ -19,7 +19,7 @@ this for you. </p> <p> - UberJar utilizes the <a href="http://classworlds.werken.com"> + UberJar utilizes the <a href="http://classworlds.codehaus.org"> Classworlds </a> package for the bootstrap code that loads your dependencies and executes your <tt>main</tt> method. It also enables your dependent JARs to be inserted into the classpath, @@ -27,14 +27,14 @@ within JARs are supported by the Classworlds class loaders. However, you do not need to know anything about Classworlds to build your UberJar. For those that want more information, see - the <a href="http://classworlds.werken.com/uberjar.html"> + the <a href="http://classworlds.codehaus.org/uberjar.html"> Classworlds uberjar page </a>. </p> <p> To create the UberJar, be sure to define the <tt>maven.uberjar.main</tt> property in your project's properties file. Alternatively, if you already have a custom <a - href="http://classworlds.werken.com">Classworlds</a> + href="http://classworlds.codehaus.org">Classworlds</a> configuration file, specify the <tt>maven.uberjar.classworlds.conf</tt> property instead. To create the UberJar, type: No revision No revision 1.38.2.1 +3 -3 maven/src/plugins-build/xdoc/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v retrieving revision 1.38 retrieving revision 1.38.2.1 diff -u -r1.38 -r1.38.2.1 --- plugin.jelly 25 Jul 2003 22:47:30 -0000 1.38 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.38.2.1 @@ -7,7 +7,7 @@ xmlns:pom="pom" xmlns:util="jelly:util" xmlns:x="jelly:xml" - xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary" + xmlns:velocity="jelly:velocity" xmlns:doc="doc"> <j:new var="reports" className="java.util.ArrayList"/> @@ -72,7 +72,7 @@ more of a global tool box. --> - <j:useBean var="formatter" class="org.apache.maven.DVSLFormatter"/> + <j:useBean var="formatter" class="org.apache.maven.util.DVSLFormatter"/> ${formatter.formatNumber(string,pattern)} </define:tag> @@ -605,7 +605,7 @@ <!-- path tool for relative processing --> - <j:useBean var="pathTool" class="org.apache.maven.DVSLPathTool"/> + <j:useBean var="pathTool" class="org.apache.maven.util.DVSLPathTool"/> <!-- tool for loading resources from the class loader --> <j:useBean class="org.apache.maven.util.ResourceBean" var="resourceTool"/> No revision No revision 1.3.2.1 +12 -0 maven/src/plugins-build/war/xdocs/properties.xml Index: properties.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/properties.xml,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- properties.xml 2 Jul 2003 10:34:48 -0000 1.3 +++ properties.xml 7 Aug 2003 17:00:54 -0000 1.3.2.1 @@ -47,6 +47,18 @@ </td> </tr> <tr> + <td>maven.war.final.name</td> + <td>Yes</td> + <td> + <p>Name of the war file that is built.</p> + <p>Defaults to <code>${pom.artifactId}.war</code></p> + <p> + Use <code>${pom.artifactId}-${pom.currentVersion}</code> + to mimic the files created using the jar and ear plugins + </p> + </td> + </tr> + <tr> <td>maven.war.build.dir</td> <td>Yes</td> <td> 1.8.4.1 +4 -1 maven/src/plugins-build/war/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/war/xdocs/changes.xml,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -r1.8 -r1.8.4.1 --- changes.xml 5 Jul 2003 17:10:45 -0000 1.8 +++ changes.xml 7 Aug 2003 17:00:54 -0000 1.8.4.1 @@ -8,6 +8,9 @@ <body> <release version="1.4" date="in CVS"> + <action dev="evenisse" type="fix"> + Allow webapp creation if project doesn't have sources. + </action> <action dev="michal" type="fix"> Added war:clean goal </action> @@ -19,7 +22,7 @@ and removes code duplication. </action> <action dev="michal" type="fix"> - Fi xes for MAVEN-481. + Fixes for MAVEN-481. Bundling of tlds in war is supported. </action> <action dev="michal" type="fix"> No revision No revision 1.7.4.1 +1 -0 maven/src/plugins-build/torque/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/torque/plugin.jelly,v retrieving revision 1.7 retrieving revision 1.7.4.1 diff -u -r1.7 -r1.7.4.1 --- plugin.jelly 9 Jul 2003 12:58:50 -0000 1.7 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.7.4.1 @@ -34,6 +34,7 @@ <pathelement path="${plugin.getDependencyPath('xmlParserAPIs')}"/> <pathelement path="${plugin.getDependencyPath('torque-gen')}"/> <pathelement path="${pom.getDependencyClasspath()}"/> + <path refid="maven.dependency.classpath"/> </path> <!-- The default.properties file will map old properties to the new ones along No revision No revision 1.24.4.1 +8 -6 maven/src/plugins-build/war/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/war/plugin.jelly,v retrieving revision 1.24 retrieving revision 1.24.4.1 diff -u -r1.24 -r1.24.4.1 --- plugin.jelly 5 Jul 2003 17:10:45 -0000 1.24 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.24.4.1 @@ -121,12 +121,14 @@ <!-- END OF TO BE REMOVED --> </j:forEach> - <ant:copy todir="${webapp.build.classes}"> - <ant:fileset dir="${maven.build.dest}"> - <ant:include name="${maven.war.classes.includes}" /> - <ant:exclude name="${maven.war.classes.excludes}" /> - </ant:fileset> - </ant:copy> + <j:if test="${sourcesPresent == 'true'}"> + <ant:copy todir="${webapp.build.classes}"> + <ant:fileset dir="${maven.build.dest}"> + <ant:include name="${maven.war.classes.includes}" /> + <ant:exclude name="${maven.war.classes.excludes}" /> + </ant:fileset> + </ant:copy> + </j:if> </goal> No revision No revision 1.11.2.1 +1 -1 maven/src/plugins-build/test/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/test/project.xml,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -u -r1.11 -r1.11.2.1 --- project.xml 24 Jul 2003 11:31:40 -0000 1.11 +++ project.xml 7 Aug 2003 17:00:54 -0000 1.11.2.1 @@ -5,7 +5,7 @@ <pomVersion>3</pomVersion> <id>maven-test-plugin</id> <name>Maven Test Plug-in</name> - <currentVersion>1.3</currentVersion> + <currentVersion>1.4-SNAPSHOT</currentVersion> <description/> <shortDescription>Java Project Management Tools</shortDescription> <url>http://maven.apache.org/reference/plugins/test/</url> 1.12.2.1 +38 -36 maven/src/plugins-build/test/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /home/cvs/maven/src/plugins-build/test/plugin.jelly,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- plugin.jelly 24 Jul 2003 06:37:01 -0000 1.12 +++ plugin.jelly 7 Aug 2003 17:00:54 -0000 1.12.2.1 @@ -1,6 +1,7 @@ <?xml version="1.0"?> -<project xmlns:j="jelly:core" +<project xmlns:j="jelly:core" + xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:resources="resources" xmlns:define="jelly:define"> @@ -111,7 +112,7 @@ <goal name="test:ui" description="Starts the Swing TestRunner front end" prereqs="test:compile"> - + <java classname="junit.swingui.TestRunner" fork="yes"> <sysproperty key="basedir" value="${basedir}"/> <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize> @@ -130,7 +131,7 @@ </classpath> <arg value="-noloading"/> </java> - + </goal> @@ -147,20 +148,20 @@ Example: maven -Dtestcase=MyTest test:single </echo> </j:when> - + <j:otherwise> - + <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> - <junit printSummary="yes" - haltonfailure="yes" - haltonerror="yes" + <junit printSummary="yes" + haltonfailure="yes" + haltonerror="yes" fork="${maven.junit.fork}" dir="${maven.junit.dir}"> - + <sysproperty key="basedir" value="${basedir}"/> <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize> <j:forEach var="someProperty" items="${listOfProperties}"> @@ -182,13 +183,13 @@ </classpath> <test name="${testcase}" todir="${maven.test.reportsDirectory}"/> - + </junit> - + </j:otherwise> </j:choose> </j:if> - + <j:if test="${!unitTestSourcesPresent}"> <echo>No tests to run.</echo> </j:if> @@ -209,20 +210,20 @@ Example: maven -Dtestmatch=*Foo* test:match </echo> </j:when> - + <j:otherwise> - + <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" /> - - <junit printSummary="yes" - haltonfailure="yes" - haltonerror="yes" + + <junit printSummary="yes" + haltonfailure="yes" + haltonerror="yes" fork="${maven.junit.fork}" dir="${maven.junit.dir}"> - + <sysproperty key="basedir" value="${basedir}"/> <u:tokenize var="listOfProperties" delim=" ">${maven.junit.sysproperties}</u:tokenize> <j:forEach var="someProperty" items="${listOfProperties}"> @@ -249,13 +250,13 @@ <include name="**/${testmatch}.java"/> </fileset> </batchtest> - + </junit> - + </j:otherwise> </j:choose> </j:if> - + <j:if test="${!unitTestSourcesPresent}"> <echo>No tests to run.</echo> </j:if> @@ -264,9 +265,9 @@ <goal name="test:single-test" description="[deprecated] please use the test:single goal instead"> - + <echo>[deprecated] please use the test:single goal instead</echo> - + <attainGoal name="test:single"/> </goal> @@ -274,33 +275,34 @@ description="[deprecated] please use the test:match goal instead"> <echo>[deprecated] please use the test:match goal instead</echo> - + <attainGoal name="test:match"/> </goal> - + <goal name="test:eclipse"> <echo>Used by eclipse to drag in test plugin context</echo> </goal> - + <!-- ================================================================== --> <!-- T E S T R E S O U R C E S --> <!-- ================================================================== --> <goal name="test:test-resources" description="Copy any resources that must be present for run tests" - prereqs="test:prepare-filesystem" - xmlns:resources="resources"> + prereqs="test:prepare-filesystem"> - <j:if test="${unitTestSourcesPresent == 'true'}"> - <j:if test="${!pom.build.unitTest.resources.isEmpty()}"> - <resources:copy - resources="${pom.build.unitTest.resources}" - todir="${maven.test.dest}" - /> + <j:if test="${unitTestSourcesPresent}"> + <j:if test="${pom.build.unitTest != null}"> + <j:if test="${!pom.build.unitTest.resources.isEmpty()}"> + <maven:copy-resources + resources="${pom.build.unitTest.resources}" + todir="${maven.test.dest}" + /> + </j:if> </j:if> </j:if> </goal> - + <define:taglib uri="test"> <define:tag name="dependency-handle"> <!-- XXX Use this tag to allow this plugin to be loaded into another --> No revision No revision 1.2.4.1 +6 -1 maven/src/plugins-build/test/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/test/xdocs/changes.xml,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -u -r1.2 -r1.2.4.1 --- changes.xml 26 Mar 2003 10:07:23 -0000 1.2 +++ changes.xml 7 Aug 2003 17:00:54 -0000 1.2.4.1 @@ -6,7 +6,12 @@ </properties> <body> - <release version="1.3" date="in CVS"> + <release version="1.4" date="in CVS"> + <action dev="evenisse" type="fix"> + Check if unitTest tag is present in pom before copy resources. + </action> + </release> + <release version="1.3" date="Unknown"> <action dev="evenisse" type="add"> Add jvmarg support for junit. Add properties documentation. No revision No revision 1.6.4.1 +65 -49 maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml Index: cvs-usage.xml =================================================================== RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -u -r1.6 -r1.6.4.1 --- cvs-usage.xml 10 Jul 2003 00:48:45 -0000 1.6 +++ cvs-usage.xml 7 Aug 2003 17:00:54 -0000 1.6.4.1 @@ -17,59 +17,75 @@ </section> #else - #set ($conn = $repository.cvsRoot) - #set ($module = $repository.cvsModule) - #set ($url = $escape.getText($project.repository.url)) + #set ($conn = $repository.getCvsRoot($repository.connection, '')) + #set ($module = $repository.getCvsModule($repository.connection)) + #set ($url = $escape.getText($repository.url)) - <section name="Web Access"> - <p> - <a href="$url">$url</a> - </p> - </section> + #if ($repository.url) + <section name="Web Access"> + <p> + <a href="$url">$url</a> + </p> + </section> + #end - <section name="Anonymous CVS Access"> - <p> - This project's CVS repository can be checked out through anonymous (pserver) - CVS with the following instruction set. - When prompted for a password for anonymous, simply press the Enter key. - </p> + #if ($repository.connection) + <section name="Anonymous CVS Access"> + <p> + This project's CVS repository can be checked out through anonymous (pserver) + CVS with the following instruction set. + When prompted for a password for anonymous, simply press the Enter key. + </p> - <p> - cvs -d $conn login - <br/> - cvs -z3 -d $conn co $module - </p> - - <p> - Updates from within the module's directory do not need the -d parameter. - </p> - </section> - - <section name="Developer CVS Access via SSH"> - - <p> - Only project developers can access the CVS tree via this method. - SSH1 must be installed on your client machine. Substitute - <b>name</b> with the proper value. Enter your site password when prompted. - </p> - - <p> - export CVS_RSH=ssh - <br/> - cvs -z3 -d $conn co $module - </p> - - </section> - - <section name="CVS Access behind a firewall"> - - <p> - For those developers who are stuck behind a corporate - firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a> - can use the viewcvs web interface to checkout the source code. - </p> + <p> + cvs -d $conn login + <br/> + cvs -z3 -d $conn co $module + </p> + + <p> + Updates from within the module's directory do not need the -d parameter. + </p> + </section> + #end + + #if ($repository.developerConnection) + #set ($conn = $repository.getCvsRoot($repository.developerConnection, 'username')) + #set ($module = $repository.getCvsModule($repository.developerConnection)) + #set ($server = $repository.getCvsServer($repository.developerConnection)) + + <section name="Developer CVS Access via SSH"> + + <p> + Only project developers can access the CVS tree via this method. + SSH1 must be installed on your client machine. Substitute + <b>name</b> with the proper value. Enter your site password when prompted. + </p> + + <p> + export CVS_RSH=ssh + <br/> + cvs -z3 -d $conn co $module + </p> + + <p> + Remember to replace 'username' with your actual username on $server. + </p> + + </section> + #end + + #if ($repository.url) + <section name="CVS Access behind a firewall"> + + <p> + For those developers who are stuck behind a corporate + firewall, <a href="http://cvsgrab.sourceforge.net/">CVSGrab</a> + can use the viewcvs web interface to checkout the source code. + </p> - </section> + </section> + #end #end </body> No revision No revision 1.5.4.1 +2 -2 maven/src/plugins-build/tasklist/src/plugin-resources/templates/tasklist.vm Index: tasklist.vm =================================================================== RCS file: /home/cvs/maven/src/plugins-build/tasklist/src/plugin-resources/templates/tasklist.vm,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -u -r1.5 -r1.5.4.1 --- tasklist.vm 30 Mar 2003 15:27:08 -0000 1.5 +++ tasklist.vm 7 Aug 2003 17:00:54 -0000 1.5.4.1 @@ -66,7 +66,7 @@ #foreach ($tag in $todoTags) <tr> <td> - $tag.value + <![CDATA[$tag.value]]> </td> </tr> #end @@ -81,7 +81,7 @@ #foreach ($tag in $methodTodoTags) <tr> <td> - ${m.name}(): $tag.value + <![CDATA[${m.name}(): $tag.value]]> </td> </tr> #end
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]