You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(37) |
Oct
(12) |
Nov
|
Dec
(47) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(9) |
Feb
(6) |
Mar
(1) |
Apr
(85) |
May
(9) |
Jun
|
Jul
(6) |
Aug
(85) |
Sep
(42) |
Oct
(27) |
Nov
(15) |
Dec
(27) |
2004 |
Jan
(39) |
Feb
(52) |
Mar
(43) |
Apr
(32) |
May
(18) |
Jun
(5) |
Jul
(63) |
Aug
(69) |
Sep
(12) |
Oct
(80) |
Nov
(55) |
Dec
(30) |
2005 |
Jan
(27) |
Feb
(6) |
Mar
(43) |
Apr
(5) |
May
(48) |
Jun
(48) |
Jul
(100) |
Aug
(16) |
Sep
(43) |
Oct
(25) |
Nov
(249) |
Dec
(2) |
2006 |
Jan
(9) |
Feb
(2) |
Mar
|
Apr
(26) |
May
(21) |
Jun
(8) |
Jul
(14) |
Aug
(104) |
Sep
|
Oct
|
Nov
|
Dec
|
2007 |
Jan
(32) |
Feb
|
Mar
(2) |
Apr
|
May
(38) |
Jun
(2) |
Jul
(9) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
2008 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Gandin M. <mg...@us...> - 2005-11-07 16:10:23
|
mgandin 05/11/07 08:10:17 maven-plugins/maven-dashboard-history/maven-dashboard-history-plugin/src/plugin-test - New directory |
From: Gandin M. <mg...@us...> - 2005-11-07 16:09:34
|
mgandin 05/11/07 08:09:25 maven-plugins/maven-dashboard-history/maven-dashboard-history-plugin - New directory |
From: Gandin M. <mg...@us...> - 2005-11-07 16:07:57
|
mgandin 05/11/07 08:07:51 Modified: maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph/impl PNGGraphImage.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/engine AbstractHistoryGraphEngine.java Log: Add some correction to close stream properly Revision Changes Path 1.3 +1 -0 maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph/impl/PNGGraphImage.java Index: PNGGraphImage.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph/impl/PNGGraphImage.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PNGGraphImage.java 7 Nov 2005 13:47:41 -0000 1.2 +++ PNGGraphImage.java 7 Nov 2005 16:07:51 -0000 1.3 @@ -248,6 +248,7 @@ PngEncoder tPngEncoder = new PngEncoder(mImage, PngEncoder.NO_ALPHA, PngEncoder.FILTER_NONE, 9); byte[] tPngImage = tPngEncoder.pngEncode(); theOutputStream.write(tPngImage); + theOutputStream.close(); } catch (IOException e) { 1.3 +1 -0 maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/engine/AbstractHistoryGraphEngine.java Index: AbstractHistoryGraphEngine.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/engine/AbstractHistoryGraphEngine.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractHistoryGraphEngine.java 7 Nov 2005 13:47:42 -0000 1.2 +++ AbstractHistoryGraphEngine.java 7 Nov 2005 16:07:51 -0000 1.3 @@ -323,4 +323,5 @@ */ public abstract void process() throws HistoryException; +// public abstract void closeStream() throws HistoryException; } \ No newline at end of file |
From: Gandin M. <mg...@us...> - 2005-11-07 13:49:01
|
mgandin 05/11/07 05:48:49 Modified: maven-dashboard-history/MainProject/maven project.xml project.properties maven-dashboard-history/MainProject/xdocs properties.xml maven-dashboard-history/MainProject project.properties maven.xml project.xml Added: maven-dashboard-history/MainProject buildAndDeploy.cmd octo_pmd.xml octo_checks.xml octo_format.xml Log: Support of NaN of dashboard files Some more tests Some refactoring Revision Changes Path 1.2 +11 -5 maven-plugins/maven-dashboard-history/MainProject/maven/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/maven/project.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.xml 12 Jul 2005 14:40:54 -0000 1.1 +++ project.xml 7 Nov 2005 13:48:49 -0000 1.2 @@ -8,10 +8,16 @@ --> <project> - <extend>${octo.basedir}/Common/maven/Component/project.xml</extend> + <pomVersion>3</pomVersion> + + <!-- (facultatif) identifiant de groupe --> + <groupId>maven-dashboard-history</groupId> + + <!-- version en cours de développement --> + <currentVersion>${dashboard.history.version}</currentVersion> - <!-- version en cours de développement --> - <currentVersion>${dashboardhistorical.version}</currentVersion> + <!-- racine du package (syntaxe java) --> + <package>com.octo.dashboard.history</package> <!-- développeurs du projet --> @@ -47,9 +53,9 @@ </developers> - <repository> + <!--repository> <connection>scm:cvs:ssh:PARIS\UsineDeDev@octonet:/cvs/cvsrepo:USINE_DE_DEV/ProjetSample/${pom.artifactId}</connection> - </repository> + </repository--> </project> 1.2 +10 -1 maven-plugins/maven-dashboard-history/MainProject/maven/project.properties Index: project.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/maven/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.properties 12 Jul 2005 14:40:54 -0000 1.1 +++ project.properties 7 Nov 2005 13:48:49 -0000 1.2 @@ -1,2 +1,11 @@ #num de version du projet qui est utiliséar tous les composants du projet -dashboardhistorical.version=1.1 +dashboard.history.version=1.2SNAPSHOT + +maven.clover.report.xml=true + +maven.xdoc.date=left +maven.xdoc.date.format=dd MMMM yyyy HH:mm + +maven.dashboard.aggregators = cserrors,cswarnings,pmdviolations,clovertpc,cloverloc,simiantdl,junittests,junitpassrate,fbfiles,fbviolations,tasklist + +maven.checkstyle.properties=../MainProject/octo_checks.xml 1.2 +39 -7 maven-plugins/maven-dashboard-history/MainProject/xdocs/properties.xml Index: properties.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/xdocs/properties.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- properties.xml 12 Jul 2005 14:40:53 -0000 1.1 +++ properties.xml 7 Nov 2005 13:48:49 -0000 1.2 @@ -18,13 +18,45 @@ # This properties has to be set in each project.properties of you MainProject (eg multiproject). # It defines the exact folder where to find your artifacts history for this project. # Exemple for the project "ProjectSample" -maven.historical.projectresultpath=${maven.dashboard.history.artifacts}/ProjectSample -# -# Extension of all the image file name. -maven.historical.image.extension=png -# Image generator to use for image file encoding. This properties has to be adapted -# with the file extension of the images. -maven.historical.image.graphclass=com.octo.dashboard.historical.graph.impl.PNGGraphImage +maven.project.name=ProjectSample + +#Authorize the generation of the images +# This properties may be true on server and false on developers +# computers to generate site more quickly +maven.dashboard.history.report=true + +#List of the aggregators use for the history, by default this plugin use the same +# aggregators than the dashboard plugin +maven.dashboard.history.aggregators=${maven.dashboard.aggregators} + +#Size of the thumbnail of all the graphics +maven.dashboard.history.thumbnail.width=100 +maven.dashboard.history.thumbnail.height=75 +#Size of the Image +maven.dashboard.history.image.width=800 +maven.dashboard.history.image.height=600 + +#Parameter for the image generation. This plugin support PNG and JPEG +# for using Jpeg generation use: +#maven.dashboard.history.image.extension=jpeg +#maven.dashboard.history.image.graphclass=com.octo.dashboard.history.graph.impl.JPEGGraphImage +maven.dashboard.history.image.extension=png +maven.dashboard.history.image.graphclass=com.octo.dashboard.history.graph.impl.PNGGraphImage + +# Name of the internal ressources +maven.dashboard.history.report.xdoc=dashboard-history-report +maven.dashboard.history.source.report.xml=dashboard-data.xml + +maven.dashboard.history.destination=${maven.build.dir}/dashboard-history.xml +maven.dashboard.history.dashboardfilename=dashboard-data.xml +maven.dashboard.history.filetype=xml +maven.dashboard.history.filename=${maven.build.dir}/dashboard-history.xml + + +maven.dashboard.history.projectresultpath=${maven.dashboard.history.artifacts}/${maven.project.name} + +# Version use by the ANT Task for the classpath generation +dashboard.history.version=1.2SNAPSHOT ]]></source> </section> </body> 1.2 +20 -11 maven-plugins/maven-dashboard-history/MainProject/project.properties Index: project.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/project.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- project.properties 12 Jul 2005 14:40:55 -0000 1.1 +++ project.properties 7 Nov 2005 13:48:49 -0000 1.2 @@ -1,21 +1,30 @@ -maven.ear.appxml.generate=true -maven.ear.displayname=true +#num de version du projet qui est utiliséar tous les composants du projet +dashboard.history.version=1.2SNAPSHOT maven.multiproject.basedir = .. maven.multiproject.excludes = MainProject/project.xml -# Tells the dashboard plugin not to run its own reactor. -# We'll use the one run by the multiproject. -maven.dashboard.runreactor = false - -# Tells the multiproject plugin to execute the dashboard:report-single -# goal on each project when you run it through multiproject:site. -maven.multiproject.site.goals=site,dashboard:report-single -maven.dashboard.basedir=.. +maven.project.name=maven-dashboard-history maven.clover.report.xml=true maven.xdoc.date=left maven.xdoc.date.format=dd MMMM yyyy HH:mm -maven.historical.projectresultpath=${maven.dashboard.history.artifacts}/MavenHistoricDashboard \ No newline at end of file +maven.project.name=DashboardHistory + +############################################ +### DASHBOARD +############################################ +# Tells the multiproject plugin to execute the dashboard:report-single +# goal on each project when you run it through multiproject:site. +maven.multiproject.site.goals=site,dashboard:report-single +maven.dashboard.basedir=.. +maven.dashboard.includes=*/project.xml +maven.dashboard.excludes=MainProject/project.xml +maven.dashboard.ignoreFailures=false +# Tells the dashboard plugin not to run its own reactor. +# We'll use the one run by the multiproject. +maven.dashboard.runreactor = false + +maven.dashboard.aggregators = cserrors,cswarnings,pmdviolations,clovertpc,cloverloc,simiantdl,junittests,junitpassrate,fbfiles,fbviolations,tasklist \ No newline at end of file 1.3 +1 -1 maven-plugins/maven-dashboard-history/MainProject/maven.xml Index: maven.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/maven.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- maven.xml 29 Jul 2005 15:19:29 -0000 1.2 +++ maven.xml 7 Nov 2005 13:48:49 -0000 1.3 @@ -25,7 +25,7 @@ target="fullcheckout" /--> <j:set var="_exception1" value="${null}"/> - <j:catch var="_exception1"> + <j:catch var="_exception1"> <echo>***** Try to clean project</echo> <attainGoal name="clean"/> </j:catch> 1.3 +11 -44 maven-plugins/maven-dashboard-history/MainProject/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/MainProject/project.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.xml 29 Jul 2005 15:19:29 -0000 1.2 +++ project.xml 7 Nov 2005 13:48:49 -0000 1.3 @@ -9,17 +9,14 @@ <project> <pomVersion>3</pomVersion> - <!-- libellé du projet --> - <name>Maven dashboard history</name> - <!-- identifiant du projet --> - <id>main_maven_historic_dashboard</id> - - <!-- (facultatif) identifiant de groupe --> - <groupId>maven_history_dashboard</groupId> - - <!-- version en cours de développement --> - <currentVersion>${dashboardhistorical.version}</currentVersion> + <!-- version en cours de développement --> + <currentVersion>${dashboard.history.version}</currentVersion> + + <!-- libellé du projet --> + <name>Main Maven dashboard history</name> + <!-- identifiant du projet --> + <id>main-maven-dashboard-history</id> <organization> <name>OCTO Technology</name> @@ -35,40 +32,10 @@ <siteDirectory>${octo.basedir}/projets/${pom.artifactId}/${pom.currentVersion}</siteDirectory--> - <description> - - </description> - <developers> - <developer> - <name>Mathieu Gandin</name> - <id>MGA</id> - <email>mg...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Christian Blavier</name> - <id>CBL</id> - <email>cbl...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Philippe Kernevez</name> - <id>paris\pke</id> - <email>pke...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - </developers> - <reports> - <!--report>maven-dashboard-plugin</report--> + <description>Head project of the maven-dashboard-history project</description> + + <reports> + <report>maven-dashboard-plugin</report> <report>maven-dashboard-history-plugin</report> <!--report>maven-linkcheck-plugin</report--> <report>maven-multiproject-plugin</report> 1.1 maven-plugins/maven-dashboard-history/MainProject/buildAndDeploy.cmd Index: buildAndDeploy.cmd =================================================================== rm -d -f -r C:\DOCUME~1\pke\.maven\cache\maven-dashboard-history-plugin-1.2SNAPSHOT\ call maven clean multiproject:clean multiproject:install cd ..\maven-dashboard-history-plugin call maven plugin:install cd ..\MainProject 1.1 maven-plugins/maven-dashboard-history/MainProject/octo_pmd.xml Index: octo_pmd.xml =================================================================== <?xml version="1.0"?> <ruleset name="octoruleset"> <description> This ruleset checks the respect of octo coding standards </description> <!-- Use of basic ruleset --> <!-- see http://pmd.sourceforge.net/rules/basic.html --> <!-- RA-018 --> <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/> <!-- Naming rule --> <!-- RN-011--> <rule ref="rulesets/naming.xml/ShortVariable"/> <!-- Unused code rules --> <!-- RA-019 (trois lignes suivantes) --> <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/> <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/> <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/> <!-- Design rules --> <!-- RA-020 --> <rule ref="rulesets/coupling.xml/LooseCoupling"/> <!-- RA-021 --> <rule ref="rulesets/design.xml/AvoidReassigningParameters"/> <!-- RA-022 --> <rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/> <!-- RA-023 --> <rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/> <!-- Strings rules --> <!-- RA-024 --> <rule ref="rulesets/strings.xml/StringInstantiation"/> </ruleset> 1.1 maven-plugins/maven-dashboard-history/MainProject/octo_checks.xml Index: octo_checks.xml =================================================================== <?xml version="1.0"?> <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_1.dtd"> <!-- Checkstyle configuration that checks the Octo coding conventions --> <module name="Checker"> <property name="severity" value="warning"/> <!-- RD-001 --> <!-- Checks that a package.html file exists for each package. --> <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml --> <module name="PackageHtml"/> <!-- RF-001 --> <!-- Checks whether files end with a new line. --> <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile --> <module name="NewlineAtEndOfFile"/> <module name="TreeWalker"> <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> <!-- RD-002 --> <module name="JavadocMethod"/> <!-- RD-003 --> <module name="JavadocType"/> <!-- RD-004 --> <module name="JavadocVariable"/> <!-- Checks for Naming Conventions. --> <!-- See http://checkstyle.sf.net/config_naming.html --> <!-- RN-001 --> <module name="ConstantName"/> <!-- RN-002 --> <module name="LocalFinalVariableName"/> <!-- RN-003 --> <module name="LocalVariableName"/> <!-- RN-004 --> <module name="MemberName"/> <!-- RN-005 --> <module name="MethodName"/> <!-- RN-006 --> <module name="PackageName"/> <!-- RN-007 --> <module name="ParameterName"> <property name="format" value="^the[A-Z][a-zA-Z0-9]*$"/> </module> <!-- RN-008 --> <module name="StaticVariableName"/> <!-- RN-009 --> <module name="TypeName"/> <!-- Checks for imports --> <!-- See http://checkstyle.sf.net/config_import.html --> <!-- RA-001 --> <module name="AvoidStarImport"/> <!-- RA-002 --> <module name="RedundantImport"/> <!-- RA-003 --> <module name="IllegalImport"/> <!-- defaults to sun.* packages --> <!-- RA-004 --> <module name="UnusedImports"/> <!-- Checks for Size Violations. --> <!-- See http://checkstyle.sf.net/config_sizes.html --> <!-- Checks for Size Violations. --> <!-- See http://checkstyle.sf.net/config_sizes.html --> <!-- RF-002 --> <module name="FileLength"> <property name="max" value="2000"/> </module> <!-- RF-003 --> <module name="LineLength"> <property name="max" value="120"/> </module> <!-- RF-004 --> <module name="MethodLength"> <property name="max" value="150"/> </module> <!-- RA-005 --> <module name="ParameterNumber"/> <!-- Checks for whitespace --> <!-- See http://checkstyle.sf.net/config_whitespace.html --> <!-- RF-005 --> <module name="NoWhitespaceAfter"> <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT"/> </module> <!-- RF-006 --> <module name="NoWhitespaceBefore"/> <!-- RF-007 --> <module name="OperatorWrap"/> <!-- RF-008 --> <module name="ParenPad"/> <!-- RF-009 --> <module name="TabCharacter"/> <!-- RF-010 --> <module name="WhitespaceAfter"/> <!-- RF-011 --> <module name="WhitespaceAround"/> <!-- Modifier Checks --> <!-- See http://checkstyle.sf.net/config_modifiers.html --> <!-- RF-016 --> <module name="ModifierOrder"/> <!-- RF-017 --> <module name="RedundantModifier"/> <!-- Checks for blocks. You know, those {}'s --> <!-- See http://checkstyle.sf.net/config_blocks.html --> <!-- RF-018 --> <module name="AvoidNestedBlocks"/> <!-- RF-019 --> <module name="EmptyBlock"> <property name="option" value="text"/> </module> <!-- RF-012 --> <module name="LeftCurly"> <property name="option" value="nl"/> </module> <!-- RF-013 --> <module name="NeedBraces"/> <!-- RF-014 --> <module name="RightCurly"> <property name="option" value="alone"/> </module> <!-- Checks for common coding problems --> <!-- See http://checkstyle.sf.net/config_coding.html --> <!-- RF-020 --> <module name="AvoidInlineConditionals"/> <!-- RF-022 --> <module name="DoubleCheckedLocking"/> <!-- RA-006 --> <module name="EmptyStatement"/> <!-- RA-007 --> <module name="EqualsHashCode"/> <!-- RN-010 --> <module name="HiddenField"/> <module name="IllegalInstantiation"/> <!-- RA-008 --> <module name="InnerAssignment"/> <!-- RA-009 --> <module name="MagicNumber"/> <!-- RA-010 --> <module name="MissingSwitchDefault"/> <!-- RA-011 --> <module name="RedundantThrows"/> <!-- RA-012 --> <module name="SimplifyBooleanExpression"/> <!-- Checks for class design --> <!-- See http://checkstyle.sf.net/config_design.html --> <!-- RA-013 --> <module name="FinalClass"/> <!-- RA-014 --> <module name="HideUtilityClassConstructor"/> <!-- RA-015 --> <module name="InterfaceIsType"/> <!-- RA-016 --> <module name="VisibilityModifier"/> <!-- Miscellaneous other checks. --> <!-- See http://checkstyle.sf.net/config_misc.html --> <!-- RF-021 --> <module name="ArrayTypeStyle"/> <!-- RA-017 --> <module name="GenericIllegalRegexp"> <!-- . matches any character, so we need to escape it and use \. to match dots. --> <property name="format" value="System\.out\.println"/> <property name="message" value="Don't log directly to Sytem.out."/> </module> </module> </module> 1.1 maven-plugins/maven-dashboard-history/MainProject/octo_format.xml Index: octo_format.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <profiles version="6"> <profile name="Octo" version="6"> <setting id="comment_clear_blank_lines" value="false"/> <setting id="comment_format_comments" value="true"/> <setting id="comment_format_header" value="false"/> <setting id="comment_format_html" value="true"/> <setting id="comment_format_source_code" value="true"/> <setting id="comment_indent_parameter_description" value="false"/> <setting id="comment_indent_root_tags" value="true"/> <setting id="comment_line_length" value="120"/> <setting id="comment_new_line_for_parameter" value="false"/> <setting id="comment_separate_root_tags" value="true"/> <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/> <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="4"/> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="4"/> <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/> </profile> </profiles> |
From: Gandin M. <mg...@us...> - 2005-11-07 13:48:07
|
mgandin 05/11/07 05:47:56 Modified: maven-dashboard-history/history-dashboard project.xml project.properties .cvsignore Log: Support of NaN of dashboard files Some more tests Some refactoring Revision Changes Path 1.5 +54 -91 maven-plugins/maven-dashboard-history/history-dashboard/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/project.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- project.xml 19 Oct 2005 22:37:36 -0000 1.4 +++ project.xml 7 Nov 2005 13:47:56 -0000 1.5 @@ -6,47 +6,20 @@ ************************************************************************ --> <project> - <pomVersion>3</pomVersion> - <extend>${basedir}/../../plugin-project.xml</extend> - <artifactId>history-dashboard</artifactId> + + <!-- (facultatif) identifiant de groupe --> + <extend>../MainProject/maven/project.xml</extend> + + <artifactId>dashboard-history</artifactId> + <!-- libellé du projet --> - <organization /> <name>Maven History Dashboard components</name> <!-- racine du package (syntaxe java) --> <package>com.octo.dashboard.history</package> <description>Maven History Dashboard components.</description> - <!-- mailing lists --> + <!-- version en cours de développement --> - <currentVersion>1.1-SNAPSHOT</currentVersion> - <developers> - <developer> - <name>Mathieu Gandin</name> - <id>MGA</id> - <email>mg...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Christian Blavier</name> - <id>CBL</id> - <email>cbl...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Philippe Kernevez</name> - <id>paris\pke</id> - <email>pke...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - </developers> + <!-- dépendances --> <dependencies> <dependency> @@ -71,73 +44,63 @@ <version>2.5.1</version> </dependency> <dependency> + <groupId>mockrunner</groupId> + <artifactId>mockrunner</artifactId> + <version>0.3.1</version> + </dependency> + <dependency> <groupId>servletapi</groupId> <artifactId>servletapi</artifactId> <version>2.3</version> </dependency> - <dependency> - <groupId>com.mockrunner</groupId> - <artifactId>mockrunner</artifactId> - <version>0.3.1</version> - </dependency> </dependencies> <!-- informations sur le "build" --> - <build> - <sourceDirectory>${basedir}/src/java</sourceDirectory> - <unitTestSourceDirectory>${basedir}/src/unit-test</unitTestSourceDirectory> - - <unitTest> - <includes> - <include>**/Test*.java</include> - <include>**/*Test.java</include> - </includes> - <resources> - <resource> - <directory>${basedir}/conf/unit-test</directory> - <includes> - <include>**/*.*</include> - </includes> - </resource> - <resource> - <directory>${basedir}/conf/integration-test</directory> - <includes> - <include>**/*.*</include> - </includes> - </resource> - <resource> - <directory>${basedir}/src/integration-test</directory> - <includes> - <include>**/*.java</include> - <include>**/*.jsp</include> - <include>**/*.xml</include> - </includes> - </resource> - </resources> - </unitTest> - - <resources> - <resource> - <directory>${basedir}/conf/java</directory> - <includes> - <include>**/*.*</include> - </includes> - </resource> - <resource> - <directory>${basedir}/src/java</directory> - <includes> - <include>**/*.xml</include> - <include>**/*.properties</include> - </includes> - </resource> + <build> + <sourceDirectory>${basedir}/src/java</sourceDirectory> + <unitTestSourceDirectory>${basedir}/src/unit-test</unitTestSourceDirectory> + + <unitTest> + <includes> + <include>**/Test*.java</include> + <include>**/*Test.java</include> + </includes> + <resources> + <resource> + <directory>${basedir}/src/conf</directory> + <includes> + <include>**/*.*</include> + </includes> + </resource> + </resources> + </unitTest> + + <resources> <resource> - <directory>${basedir}/src/conf/</directory> + <directory>${basedir}/src/java</directory> <includes> - <include>servlet.properties</include> + <include>**/*.xml</include> + <include>**/*.properties</include> </includes> - <filtering>false</filtering> </resource> </resources> - </build> + </build> + <reports> + <!--report>maven-changes-plugin</report--> + <!--report>maven-changelog-plugin</report--> + <!--report>maven-file-activity-plugin</report--> + <!--report>maven-developer-activity-plugin</report--> + <report>maven-checkstyle-plugin</report> + <report>maven-javadoc-plugin</report> + <report>maven-jdepend-plugin</report> + <report>maven-junit-report-plugin</report> + <report>maven-jxr-plugin</report> + <report>maven-license-plugin</report> + <report>maven-tasklist-plugin</report> + <report>maven-clover-plugin</report> + <report>maven-simian-plugin</report> + <report>maven-findbugs-plugin</report> + <report>maven-linkcheck-plugin</report> + </reports> </project> 1.3 +1 -21 maven-plugins/maven-dashboard-history/history-dashboard/project.properties Index: project.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/project.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.properties 19 Oct 2005 22:37:36 -0000 1.2 +++ project.properties 7 Nov 2005 13:47:56 -0000 1.3 @@ -1,21 +1 @@ -maven.ear.appxml.generate=true -maven.ear.displayname=true - -maven.multiproject.basedir = .. -maven.multiproject.excludes = MainProject/project.xml - -# Tells the dashboard plugin not to run its own reactor. -# We'll use the one run by the multiproject. -maven.dashboard.runreactor = false - -# Tells the multiproject plugin to execute the dashboard:report-single -# goal on each project when you run it through multiproject:site. -maven.multiproject.site.goals=site,dashboard:report-single -maven.dashboard.basedir=.. - -maven.clover.report.xml=true - -maven.xdoc.date=left -maven.xdoc.date.format=dd MMMM yyyy HH:mm - -maven.historical.projectresultpath=${maven.dashboard.history.artifacts}/MavenHistoricDashboard +maven.multiproject.type=jar 1.2 +5 -0 maven-plugins/maven-dashboard-history/history-dashboard/.cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Oct 2005 22:25:48 -0000 1.1 +++ .cvsignore 7 Nov 2005 13:47:56 -0000 1.2 @@ -1 +1,6 @@ +bin target +.cvsignore +.classpath +.project +velocity.log |
From: Gandin M. <mg...@us...> - 2005-11-07 13:47:56
|
mgandin 05/11/07 05:47:43 Modified: maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder IHistoryBuilder.java AbstractHistoryBuilder.java HistoryBuilderFactory.java maven-dashboard-history/history-dashboard/src/unit-test/com/octo/dashboard/history/util TestDirectoryScanner.java TestXpathUtils.java TestXmlHelper.java TestStringHelper.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/engine/impl HistoryEngine.java AppendHistoryEngine.java HistoryException.java HistoryGraphEngine.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph/impl XmlGraphData.java JfGraphBuilder.java PngEncoder.java PNGGraphImage.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/engine AbstractHistoryGraphEngine.java IEngine.java AbstractHistoryEngine.java maven-dashboard-history/history-dashboard/src/unit-test/com/octo/dashboard/history/engine/impl TestHistoryEngine.java TestHistoryGraphEngine.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/util FileDateHelper.java XPathUtils.java DirectoryScanner.java StringHelper.java FileHelper.java XMLHelper.java maven-dashboard-history/history-dashboard/src/unit-test/com/octo/dashboard/history TestAppendHistory.java TestHistory.java TestAppendHistoryEngine.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph GraphBuilderFactory.java AbstractGraphBuilder.java IGraphBuilder.java IGraphImage.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/impl XmlHistoryBuilder.java AppendXmlHistoryBuilder.java maven-dashboard-history/history-dashboard/src/unit-test/com/octo/dashboard/history/graph/impl TestGraphData.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/dashboard/impl XmlDashBoard.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/dashboard DashBoardFactory.java IDashBoard.java maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/servlet CruiseControlHistoryDashboardServlet.java maven-dashboard-history/history-dashboard/src/unit-test/com/octo/dashboard/history/graph TestGraph.java Added: maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/graph/impl JPEGGraphImage.java Log: Support of NaN of dashboard files Some more tests Some refactoring Revision Changes Path 1.2 +202 -202 maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/IHistoryBuilder.java Index: IHistoryBuilder.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/IHistoryBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- IHistoryBuilder.java 12 Jul 2005 14:30:47 -0000 1.1 +++ IHistoryBuilder.java 7 Nov 2005 13:47:40 -0000 1.2 @@ -1,206 +1,206 @@ /* -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all -other entities that control, are controlled by, or are under common -control with that entity. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the -direction or management of such entity, whether by contract or -otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work -(an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the purposes -of this License, Derivative Works shall not include works that remain -separable from, or merely link (or bind by name) to the interfaces of, -the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including -the original version of the Work and any modifications or additions -to that Work or Derivative Works thereof, that is intentionally -submitted to Licensor for inclusion in the Work by the copyright owner -or by an individual or Legal Entity authorized to submit on behalf of -the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, -and issue tracking systems that are managed by, or on behalf of, the -Licensor for the purpose of discussing and improving the Work, but -excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work, -where such license applies only to those patent claims licensable -by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) -with the Work to which such Contribution(s) was submitted. If You -institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work -or a Contribution incorporated within the Work constitutes direct -or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate -as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof in any medium, with or without -modifications, and in Source or Object form, provided that You -meet the following conditions: - -(a) You must give any other recipients of the Work or -Derivative Works a copy of this License; and - -(b) You must cause any modified files to carry prominent notices -stating that You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works -that You distribute, all copyright, patent, trademark, and -attribution notices from the Source form of the Work, -excluding those notices that do not pertain to any part of -the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its -distribution, then any Derivative Works that You distribute must -include a readable copy of the attribution notices contained -within such NOTICE file, excluding those notices that do not -pertain to any part of the Derivative Works, in at least one -of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, -within a display generated by the Derivative Works, if and -wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and -do not modify the License. You may add Your own attribution -notices within Derivative Works that You distribute, alongside -or as an addendum to the NOTICE text from the Work, provided -that such additional attribution notices cannot be construed -as modifying the License. - -You may add Your own copyright statement to Your modifications and -may provide additional or different license terms and conditions -for use, reproduction, or distribution of Your modifications, or -for any such Derivative Works as a whole, provided Your use, -reproduction, and distribution of the Work otherwise complies with -the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright 2004 Maven - -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. -*/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2004 Maven + + 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 com.octo.dashboard.history.builder; 1.2 +202 -202 maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/AbstractHistoryBuilder.java Index: AbstractHistoryBuilder.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/AbstractHistoryBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AbstractHistoryBuilder.java 12 Jul 2005 14:30:47 -0000 1.1 +++ AbstractHistoryBuilder.java 7 Nov 2005 13:47:40 -0000 1.2 @@ -1,206 +1,206 @@ /* -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all -other entities that control, are controlled by, or are under common -control with that entity. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the -direction or management of such entity, whether by contract or -otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work -(an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the purposes -of this License, Derivative Works shall not include works that remain -separable from, or merely link (or bind by name) to the interfaces of, -the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including -the original version of the Work and any modifications or additions -to that Work or Derivative Works thereof, that is intentionally -submitted to Licensor for inclusion in the Work by the copyright owner -or by an individual or Legal Entity authorized to submit on behalf of -the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, -and issue tracking systems that are managed by, or on behalf of, the -Licensor for the purpose of discussing and improving the Work, but -excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work, -where such license applies only to those patent claims licensable -by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) -with the Work to which such Contribution(s) was submitted. If You -institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work -or a Contribution incorporated within the Work constitutes direct -or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate -as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof in any medium, with or without -modifications, and in Source or Object form, provided that You -meet the following conditions: - -(a) You must give any other recipients of the Work or -Derivative Works a copy of this License; and - -(b) You must cause any modified files to carry prominent notices -stating that You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works -that You distribute, all copyright, patent, trademark, and -attribution notices from the Source form of the Work, -excluding those notices that do not pertain to any part of -the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its -distribution, then any Derivative Works that You distribute must -include a readable copy of the attribution notices contained -within such NOTICE file, excluding those notices that do not -pertain to any part of the Derivative Works, in at least one -of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, -within a display generated by the Derivative Works, if and -wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and -do not modify the License. You may add Your own attribution -notices within Derivative Works that You distribute, alongside -or as an addendum to the NOTICE text from the Work, provided -that such additional attribution notices cannot be construed -as modifying the License. - -You may add Your own copyright statement to Your modifications and -may provide additional or different license terms and conditions -for use, reproduction, or distribution of Your modifications, or -for any such Derivative Works as a whole, provided Your use, -reproduction, and distribution of the Work otherwise complies with -the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright 2004 Maven - -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. -*/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2004 Maven + + 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 com.octo.dashboard.history.builder; 1.2 +204 -203 maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/HistoryBuilderFactory.java Index: HistoryBuilderFactory.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/history-dashboard/src/java/com/octo/dashboard/history/builder/HistoryBuilderFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HistoryBuilderFactory.java 12 Jul 2005 14:30:47 -0000 1.1 +++ HistoryBuilderFactory.java 7 Nov 2005 13:47:40 -0000 1.2 @@ -1,206 +1,206 @@ /* -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all -other entities that control, are controlled by, or are under common -control with that entity. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the -direction or management of such entity, whether by contract or -otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work -(an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the purposes -of this License, Derivative Works shall not include works that remain -separable from, or merely link (or bind by name) to the interfaces of, -the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including -the original version of the Work and any modifications or additions -to that Work or Derivative Works thereof, that is intentionally -submitted to Licensor for inclusion in the Work by the copyright owner -or by an individual or Legal Entity authorized to submit on behalf of -the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, -and issue tracking systems that are managed by, or on behalf of, the -Licensor for the purpose of discussing and improving the Work, but -excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work, -where such license applies only to those patent claims licensable -by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) -with the Work to which such Contribution(s) was submitted. If You -institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work -or a Contribution incorporated within the Work constitutes direct -or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate -as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof in any medium, with or without -modifications, and in Source or Object form, provided that You -meet the following conditions: - -(a) You must give any other recipients of the Work or -Derivative Works a copy of this License; and - -(b) You must cause any modified files to carry prominent notices -stating that You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works -that You distribute, all copyright, patent, trademark, and -attribution notices from the Source form of the Work, -excluding those notices that do not pertain to any part of -the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its -distribution, then any Derivative Works that You distribute must -include a readable copy of the attribution notices contained -within such NOTICE file, excluding those notices that do not -pertain to any part of the Derivative Works, in at least one -of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, -within a display generated by the Derivative Works, if and -wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and -do not modify the License. You may add Your own attribution -notices within Derivative Works that You distribute, alongside -or as an addendum to the NOTICE text from the Work, provided -that such additional attribution notices cannot be construed -as modifying the License. - -You may add Your own copyright statement to Your modifications and -may provide additional or different license terms and conditions -for use, reproduction, or distribution of Your modifications, or -for any such Derivative Works as a whole, provided Your use, -reproduction, and distribution of the Work otherwise complies with -the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright 2004 Maven - -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. -*/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract... [truncated message content] |
From: Gandin M. <mg...@us...> - 2005-11-07 13:45:51
|
mgandin 05/11/07 05:45:38 Modified: maven-dashboard-history/ant-history-dashboard project.properties .cvsignore project.xml Log: Support of NaN of dashboard files Some more tests Some refactoring Revision Changes Path 1.3 +1 -20 maven-plugins/maven-dashboard-history/ant-history-dashboard/project.properties Index: project.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/ant-history-dashboard/project.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- project.properties 19 Oct 2005 22:37:37 -0000 1.2 +++ project.properties 7 Nov 2005 13:45:38 -0000 1.3 @@ -1,21 +1,2 @@ -maven.ear.appxml.generate=true -maven.ear.displayname=true +maven.multiproject.type=jar -maven.multiproject.basedir = .. -maven.multiproject.excludes = MainProject/project.xml - -# Tells the dashboard plugin not to run its own reactor. -# We'll use the one run by the multiproject. -maven.dashboard.runreactor = false - -# Tells the multiproject plugin to execute the dashboard:report-single -# goal on each project when you run it through multiproject:site. -maven.multiproject.site.goals=site,dashboard:report-single -maven.dashboard.basedir=.. - -maven.clover.report.xml=true - -maven.xdoc.date=left -maven.xdoc.date.format=dd MMMM yyyy HH:mm - -maven.historical.projectresultpath=${maven.dashboard.history.artifacts}/MavenHistoricDashboard 1.2 +6 -0 maven-plugins/maven-dashboard-history/ant-history-dashboard/.cvsignore Index: .cvsignore =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/ant-history-dashboard/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Oct 2005 22:25:48 -0000 1.1 +++ .cvsignore 7 Nov 2005 13:45:38 -0000 1.2 @@ -1 +1,7 @@ +.settings +bin target +.cvsignore +.classpath +.project +velocity.log 1.4 +17 -46 maven-plugins/maven-dashboard-history/ant-history-dashboard/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/ant-history-dashboard/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 19 Oct 2005 22:37:37 -0000 1.3 +++ project.xml 7 Nov 2005 13:45:38 -0000 1.4 @@ -6,53 +6,24 @@ ************************************************************************ --> <project> - <pomVersion>3</pomVersion> - <extend>${basedir}/../../plugin-project.xml</extend> - <artifactId>ant-history-dashboard</artifactId> + <extend>../MainProject/maven/project.xml</extend> + + <!-- (facultatif) identifiant de groupe --> + <artifactId>ant-dashboard-history</artifactId> + <!-- libellé du projet --> - <organization /> + <name>Ant tasks for Maven History Dashboard plugin</name> - <!-- racine du package (syntaxe java) --> - <package>com.octo.dashboard.history</package> + <description>Ant tasks for Maven History Dashboard plugin</description> - <!-- mailing lists --> - <!-- version en cours de développement --> - <currentVersion>1.1-SNAPSHOT</currentVersion> - <developers> - <developer> - <name>Mathieu Gandin</name> - <id>MGA</id> - <email>mg...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Christian Blavier</name> - <id>CBL</id> - <email>cbl...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - <developer> - <name>Philippe Kernevez</name> - <id>paris\pke</id> - <email>pke...@oc...</email> - <organization>OCTO Technology</organization> - <roles> - <role>Developer</role> - </roles> - </developer> - </developers> + + <!-- dépendances --> <dependencies> <dependency> - <groupId>maven-plugins</groupId> - <artifactId>history-dashboard</artifactId> - <version>1.1-SNAPSHOT</version> + <groupId>maven-dashboard-history</groupId> + <artifactId>dashboard-history</artifactId> + <version>${dashboard.history.version}</version> </dependency> <dependency> @@ -87,7 +58,7 @@ <version>1.6.3</version> </dependency> <dependency> - <groupId>com.mockrunner</groupId> + <groupId>mockrunner</groupId> <artifactId>mockrunner</artifactId> <version>0.3.1</version> </dependency> @@ -151,10 +122,10 @@ </resources> </build> <reports> - <report>maven-changes-plugin</report> - <report>maven-changelog-plugin</report> - <report>maven-file-activity-plugin</report> - <report>maven-developer-activity-plugin</report> + <!--report>maven-changes-plugin</report--> + <!--report>maven-changelog-plugin</report--> + <!--report>maven-file-activity-plugin</report--> + <!--report>maven-developer-activity-plugin</report--> <report>maven-checkstyle-plugin</report> <report>maven-javadoc-plugin</report> <report>maven-jdepend-plugin</report> |
From: Gandin M. <mg...@us...> - 2005-11-07 13:45:22
|
mgandin 05/11/07 05:45:14 Modified: maven-dashboard-history/ant-history-dashboard/src/java/com/octo/dashboard/history/task HistoryTask.java HistoryGraphTask.java Log: Support of NaN of dashboard files Some more tests Some refactoring Revision Changes Path 1.2 +214 -221 maven-plugins/maven-dashboard-history/ant-history-dashboard/src/java/com/octo/dashboard/history/task/HistoryTask.java Index: HistoryTask.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/ant-history-dashboard/src/java/com/octo/dashboard/history/task/HistoryTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HistoryTask.java 12 Jul 2005 14:34:34 -0000 1.1 +++ HistoryTask.java 7 Nov 2005 13:45:14 -0000 1.2 @@ -1,206 +1,206 @@ /* -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all -other entities that control, are controlled by, or are under common -control with that entity. For the purposes of this definition, -"control" means (i) the power, direct or indirect, to cause the -direction or management of such entity, whether by contract or -otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or -Object form, made available under the License, as indicated by a -copyright notice that is included in or attached to the work -(an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the purposes -of this License, Derivative Works shall not include works that remain -separable from, or merely link (or bind by name) to the interfaces of, -the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including -the original version of the Work and any modifications or additions -to that Work or Derivative Works thereof, that is intentionally -submitted to Licensor for inclusion in the Work by the copyright owner -or by an individual or Legal Entity authorized to submit on behalf of -the copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, -and issue tracking systems that are managed by, or on behalf of, the -Licensor for the purpose of discussing and improving the Work, but -excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work, -where such license applies only to those patent claims licensable -by such Contributor that are necessarily infringed by their -Contribution(s) alone or by combination of their Contribution(s) -with the Work to which such Contribution(s) was submitted. If You -institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work -or a Contribution incorporated within the Work constitutes direct -or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate -as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof in any medium, with or without -modifications, and in Source or Object form, provided that You -meet the following conditions: - -(a) You must give any other recipients of the Work or -Derivative Works a copy of this License; and - -(b) You must cause any modified files to carry prominent notices -stating that You changed the files; and - -(c) You must retain, in the Source form of any Derivative Works -that You distribute, all copyright, patent, trademark, and -attribution notices from the Source form of the Work, -excluding those notices that do not pertain to any part of -the Derivative Works; and - -(d) If the Work includes a "NOTICE" text file as part of its -distribution, then any Derivative Works that You distribute must -include a readable copy of the attribution notices contained -within such NOTICE file, excluding those notices that do not -pertain to any part of the Derivative Works, in at least one -of the following places: within a NOTICE text file distributed -as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, -within a display generated by the Derivative Works, if and -wherever such third-party notices normally appear. The contents -of the NOTICE file are for informational purposes only and -do not modify the License. You may add Your own attribution -notices within Derivative Works that You distribute, alongside -or as an addendum to the NOTICE text from the Work, provided -that such additional attribution notices cannot be construed -as modifying the License. - -You may add Your own copyright statement to Your modifications and -may provide additional or different license terms and conditions -for use, reproduction, or distribution of Your modifications, or -for any such Derivative Works as a whole, provided Your use, -reproduction, and distribution of the Work otherwise complies with -the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - -Copyright 2004 Maven - -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. -*/ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2004 Maven + + 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 com.octo.dashboard.history.task; @@ -236,16 +236,14 @@ private String fileType; /** - * This field contains the path and the file name where the history XML file - * will be written. + * This field contains the path and the file name where the history XML file will be written. */ private String destination; /** - * This field contains the directory name where we find the old history XML - * file + * This field contains the directory name where we find the old history XML file */ - private String historicalFileName; + private String historyFileName; /** * Ant task @@ -255,8 +253,8 @@ try { HistoryEngine engine = new HistoryEngine(this.dashBoardFileName, this.destination, - this.projectResultPath, this.fileType); - engine.process(); + this.projectResultPath, this.fileType); + engine.process(); this.log("Historic has been written into file: " + this.destination); } catch (HistoryException e) @@ -270,8 +268,7 @@ /** * - * @param theProjectResultPath This field contains the directory name where - * we find dashboards. + * @param theProjectResultPath This field contains the directory name where we find dashboards. */ public void setProjectResultPath(String theProjectResultPath) { @@ -280,8 +277,7 @@ /** * - * @param theDashBoardFileName This field contains the name of the dashboard - * file name. + * @param theDashBoardFileName This field contains the name of the dashboard file name. */ public void setDashBoardFileName(String theDashBoardFileName) { @@ -290,8 +286,7 @@ /** * - * @param thefileType This field contains the type of builder we use. For - * now it is 'XML'. + * @param thefileType This field contains the type of builder we use. For now it is 'XML'. */ public void setFileType(String thefileType) { @@ -299,8 +294,7 @@ } /** - * @param destination This field contains the path and the file name where - * the history XML file will be written. + * @param destination This field contains the path and the file name where the history XML file will be written. */ public void setDestination(String thedestination) { @@ -308,11 +302,10 @@ } /** - * @param historicalFileName This field contains the directory name where we - * find the old history XML file + * @param historyFileName This field contains the directory name where we find the old history XML file */ - public void setHistoricalFileName(String thehistoricalFileName) + public void setHistoryFileName(String thehistoricalFileName) { - this.historicalFileName = thehistoricalFileName; + this.historyFileName = thehistoricalFileName; } } \ No newline at end of file 1.2 +212 -213 maven-plugins/maven-dashboard-history/ant-history-dashboard/src/java/com/octo/dashboard/history/task/HistoryGraphTask.java Index: HistoryGraphTask.java =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/maven-dashboard-history/ant-history-dashboard/src/java/com/octo/dashboard/history/task/HistoryGraphTask.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- HistoryGraphTask.java 12 Jul 2005 14:34:34 -0000 1.1 +++ HistoryGraphTask.java 7 Nov 2005 13:45:14 -0000 1.2 @@ -1,205 +1,205 @@ /* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2004 Maven - - 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. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2004 Maven + + 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 com.octo.dashboard.history.task; @@ -214,7 +214,6 @@ * This task draw a graph from the historic file. * * @todo aggregating curve ! - * @todo add the size of image as properties ! * @author gandin */ public class HistoryGraphTask extends Task @@ -232,7 +231,7 @@ /** * This field contains the name of the history file name. */ - protected String historicFileName; + protected String historyFileName; /** * This field contains the name of the indicator to draw. @@ -266,8 +265,9 @@ { try { - HistoryGraphEngine engine = new HistoryGraphEngine(this.historicFileName, this.indicatorName, - this.projectName, this.graphType, this.graphName, this.imageGenerationClassName, mWidth, mHeight); + HistoryGraphEngine engine = new HistoryGraphEngine(this.historyFileName, this.indicatorName, + this.projectName, this.graphType, this.graphName, this.imageGenerationClassName, + mWidth, mHeight); engine.process(); this.log("Graph has been written into file:" + this.graphName); } catch (HistoryException e) @@ -277,17 +277,15 @@ } /** - * @param historicFileName This field contains the name of the history file - * name. + * @param historyFileName This field contains the name of the history file name. */ - public void setHistoricFileName(String historicFileName) + public void setHistoryFileName(String historicFileName) { - this.historicFileName = historicFileName; + this.historyFileName = historicFileName; } /** - * @param indicatorName This field contains the name of the indicator to - * draw. + * @param indicatorName This field contains the name of the indicator to draw. */ public void setIndicatorName(String indicatorName) { @@ -323,7 +321,7 @@ */ public void setWidth(String pWidth) { - this.mWidth = Integer.parseInt( pWidth ); + this.mWidth = Integer.parseInt(pWidth); } /** @@ -331,8 +329,9 @@ */ public void setHeight(String pHeight) { - this.mHeight = Integer.parseInt( pHeight ); + this.mHeight = Integer.parseInt(pHeight); } + /** * @param imageGenerationClassName The imageGenerationClassName to set. */ |
From: dion g. <dio...@us...> - 2005-11-07 02:19:29
|
diongillard 05/11/06 18:19:23 Modified: was5 project.xml was5/xdocs changes.xml Log: Open up 2.0.3 Revision Changes Path 1.21 +1 -1 maven-plugins/was5/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- project.xml 6 Nov 2005 22:58:33 -0000 1.20 +++ project.xml 7 Nov 2005 02:19:23 -0000 1.21 @@ -6,7 +6,7 @@ <id>maven-was5-plugin</id> <name>WebSphere 5 (5.0/5.1) Plugin</name> <!-- groupId is in parent --> - <currentVersion>2.0.2</currentVersion> + <currentVersion>2.0.3-SNAPSHOT</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> 1.21 +2 -0 maven-plugins/was5/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- changes.xml 6 Nov 2005 22:58:34 -0000 1.20 +++ changes.xml 7 Nov 2005 02:19:23 -0000 1.21 @@ -6,6 +6,8 @@ <author email="dio...@us...">dIon Gillard</author> </properties> <body> + <release version="2.0.3-SNAPSHOT" date="in CVS"> + </release> <release version="2.0.2" date="2005-11-07"> <action dev="diongillard" type="fix" due-to="Jason Dillon">Check for ws_ant and use it if found when running the build files.</action> </release> |
From: dion g. <dio...@us...> - 2005-11-06 22:58:43
|
diongillard 05/11/06 14:58:34 Modified: was5 project.xml was5/xdocs changes.xml Log: [maven-scm-plugin] prepare release 2.0.2 Revision Changes Path 1.20 +6 -3 maven-plugins/was5/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- project.xml 4 Nov 2005 02:36:33 -0000 1.19 +++ project.xml 6 Nov 2005 22:58:33 -0000 1.20 @@ -6,7 +6,7 @@ <id>maven-was5-plugin</id> <name>WebSphere 5 (5.0/5.1) Plugin</name> <!-- groupId is in parent --> - <currentVersion>2.0.2-SNAPSHOT</currentVersion> + <currentVersion>2.0.2</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> @@ -46,6 +46,11 @@ <name>2.0.1</name> <tag>WAS5PLUGIN-2_0_1</tag> </version> + <version> + <id>2.0.2</id> + <name>2.0.2</name> + <tag>WAS5PLUGIN-2_0_2</tag> + </version> </versions> <!-- mailingLists are in parent --> <developers> @@ -60,7 +65,6 @@ <email>dio...@us...</email> </developer> </developers> - <!-- no contributors --> <!-- licenses section not done yet --> <dependencies> @@ -71,7 +75,6 @@ <url>http://jakarta.apache.org/commons/jelly/libs/util/</url> </dependency> </dependencies> - <!-- build is in the parent --> <!-- reports is in the parent --> </project> 1.20 +1 -1 maven-plugins/was5/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- changes.xml 4 Nov 2005 02:36:34 -0000 1.19 +++ changes.xml 6 Nov 2005 22:58:34 -0000 1.20 @@ -6,7 +6,7 @@ <author email="dio...@us...">dIon Gillard</author> </properties> <body> - <release version="2.0.2-SNAPSHOT" date="in CVS"> + <release version="2.0.2" date="2005-11-07"> <action dev="diongillard" type="fix" due-to="Jason Dillon">Check for ws_ant and use it if found when running the build files.</action> </release> <release version="2.0.1" date="2005-11-03"> |
From: dion g. <dio...@us...> - 2005-11-04 02:36:39
|
diongillard 05/11/03 18:36:34 Modified: was5 plugin.jelly project.xml was5/xdocs changes.xml Log: Start on 2.0.2 - use ws_ant if found, else use ws_ant.sh or .bat Revision Changes Path 1.17 +6 -3 maven-plugins/was5/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/plugin.jelly,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plugin.jelly 24 Jun 2005 03:24:24 -0000 1.16 +++ plugin.jelly 4 Nov 2005 02:36:33 -0000 1.17 @@ -18,14 +18,17 @@ <!-- find .bat or .sh based on os --> <j:choose> <j:when test="${systemScope['os.name'].startsWith('Windows')}"> - <j:set var="extension" value="bat"/> + <j:set var="extension" value=".bat"/> </j:when> <j:otherwise> - <j:set var="extension" value="sh"/> + <j:set var="extension" value=".sh"/> + <u:available file="${maven.was5.home}/bin/ws_ant"> + <j:set var="extension" value=""/> + </u:available> </j:otherwise> </j:choose> - <exec executable="${maven.was5.home}/bin/ws_ant.${extension}"> + <exec executable="${maven.was5.home}/bin/ws_ant${extension}"> <arg value="-f"/> <arg value="${maven.build.dir}/was5/build.xml"/> <arg value="${target}"/> 1.19 +11 -1 maven-plugins/was5/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- project.xml 3 Nov 2005 01:02:16 -0000 1.18 +++ project.xml 4 Nov 2005 02:36:33 -0000 1.19 @@ -6,7 +6,7 @@ <id>maven-was5-plugin</id> <name>WebSphere 5 (5.0/5.1) Plugin</name> <!-- groupId is in parent --> - <currentVersion>2.0.1</currentVersion> + <currentVersion>2.0.2-SNAPSHOT</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> @@ -60,8 +60,18 @@ <email>dio...@us...</email> </developer> </developers> + <!-- no contributors --> <!-- licenses section not done yet --> + <dependencies> + <dependency> + <groupId>commons-jelly</groupId> + <artifactId>commons-jelly-tags-util</artifactId> + <version>1.1.1</version> + <url>http://jakarta.apache.org/commons/jelly/libs/util/</url> + </dependency> + </dependencies> + <!-- build is in the parent --> <!-- reports is in the parent --> </project> 1.19 +3 -0 maven-plugins/was5/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- changes.xml 3 Nov 2005 01:02:16 -0000 1.18 +++ changes.xml 4 Nov 2005 02:36:34 -0000 1.19 @@ -6,6 +6,9 @@ <author email="dio...@us...">dIon Gillard</author> </properties> <body> + <release version="2.0.2-SNAPSHOT" date="in CVS"> + <action dev="diongillard" type="fix" due-to="Jason Dillon">Check for ws_ant and use it if found when running the build files.</action> + </release> <release version="2.0.1" date="2005-11-03"> <action dev="diongillard" type="fix">host is not a valid option for the ant task to stop a server.</action> </release> |
From: dion g. <dio...@us...> - 2005-11-03 01:02:22
|
diongillard 05/11/02 17:02:16 Modified: was5 project.xml was5/xdocs changes.xml Log: [maven-scm-plugin] prepare release 2.0.1 Revision Changes Path 1.18 +6 -1 maven-plugins/was5/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- project.xml 3 Nov 2005 00:48:33 -0000 1.17 +++ project.xml 3 Nov 2005 01:02:16 -0000 1.18 @@ -6,7 +6,7 @@ <id>maven-was5-plugin</id> <name>WebSphere 5 (5.0/5.1) Plugin</name> <!-- groupId is in parent --> - <currentVersion>2.0.1-SNAPSHOT</currentVersion> + <currentVersion>2.0.1</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> @@ -41,6 +41,11 @@ <name>2.0</name> <tag>WAS5PLUGIN-2_0</tag> </version> + <version> + <id>2.0.1</id> + <name>2.0.1</name> + <tag>WAS5PLUGIN-2_0_1</tag> + </version> </versions> <!-- mailingLists are in parent --> <developers> 1.18 +1 -1 maven-plugins/was5/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- changes.xml 3 Nov 2005 00:48:06 -0000 1.17 +++ changes.xml 3 Nov 2005 01:02:16 -0000 1.18 @@ -6,7 +6,7 @@ <author email="dio...@us...">dIon Gillard</author> </properties> <body> - <release version="2.0.1-SNAPSHOT" date="in CVS"> + <release version="2.0.1" date="2005-11-03"> <action dev="diongillard" type="fix">host is not a valid option for the ant task to stop a server.</action> </release> <release version="2.0" date="2005-11-02"> |
From: dion g. <dio...@us...> - 2005-11-03 00:48:40
|
diongillard 05/11/02 16:48:33 Modified: was5 project.xml Log: Use 2.0.1 snapshot Revision Changes Path 1.17 +1 -1 maven-plugins/was5/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/project.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- project.xml 2 Nov 2005 10:15:17 -0000 1.16 +++ project.xml 3 Nov 2005 00:48:33 -0000 1.17 @@ -6,7 +6,7 @@ <id>maven-was5-plugin</id> <name>WebSphere 5 (5.0/5.1) Plugin</name> <!-- groupId is in parent --> - <currentVersion>2.1-SNAPSHOT</currentVersion> + <currentVersion>2.0.1-SNAPSHOT</currentVersion> <!-- organization is in parent --> <inceptionYear>2004</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> |
From: dion g. <dio...@us...> - 2005-11-03 00:48:15
|
diongillard 05/11/02 16:48:06 Modified: was5/xdocs changes.xml Log: Host is not valid for stopServer. If you are stopping a server remotely, you must use wsadmin -host HostName -c "$AdminControl stopServer serverName". Maybe we should replace this goal with the wsadmin script exec only? Revision Changes Path 1.17 +3 -0 maven-plugins/was5/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/xdocs/changes.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- changes.xml 1 Nov 2005 19:54:15 -0000 1.16 +++ changes.xml 3 Nov 2005 00:48:06 -0000 1.17 @@ -6,6 +6,9 @@ <author email="dio...@us...">dIon Gillard</author> </properties> <body> + <release version="2.0.1-SNAPSHOT" date="in CVS"> + <action dev="diongillard" type="fix">host is not a valid option for the ant task to stop a server.</action> + </release> <release version="2.0" date="2005-11-02"> <action dev="diongillard" type="update">Deprecate was5:run-script, replacing it with was5:runScript</action> <action dev="diongillard" type="fix">Use ws_ant to invoke tasks, instead of using a taskdef inside Maven, as this is not supported by IBM</action> |
From: dion g. <dio...@us...> - 2005-11-03 00:29:49
|
diongillard 05/11/02 16:29:37 Modified: was5/src/plugin-resources build.xml.jelly Log: Host is not valid for stopServer. If you are stopping a server remotely, you must use wsadmin -host HostName -c "$AdminControl stopServer serverName". Maybe we should replace this goal with the wsadmin script exec only? Revision Changes Path 1.4 +0 -1 maven-plugins/was5/src/plugin-resources/build.xml.jelly Index: build.xml.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/was5/src/plugin-resources/build.xml.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.xml.jelly 24 Jun 2005 02:09:28 -0000 1.3 +++ build.xml.jelly 3 Nov 2005 00:29:37 -0000 1.4 @@ -49,7 +49,6 @@ <target name="wasStopServer"> <wasStopServer server="${maven.was5.stopServer.server}" conntype="${maven.was5.stopServer.conntype}" - host="${maven.was5.stopServer.host}" port="${maven.was5.stopServer.port}" timeout="${maven.was5.stopServer.timeout}" username="${maven.was5.stopServer.username}" |
From: dion g. <dio...@us...> - 2005-11-03 00:20:33
|
diongillard 05/11/02 16:20:25 Removed: . .project Log: removed |
From: dion g. <dio...@us...> - 2005-11-03 00:19:20
|
diongillard 05/11/02 16:19:15 Removed: . .classpath Log: |
From: dion g. <dio...@us...> - 2005-11-03 00:17:42
|
diongillard 05/11/02 16:17:35 Removed: . project.properties project.xml plugin.jelly .cvsignore plugin.properties Log: |
From: dion g. <dio...@us...> - 2005-11-03 00:16:14
|
diongillard 05/11/02 16:16:09 Removed: xdocs provider.txt properties.xml navigation.xml authdata.txt mqtopic.txt listenerport.txt mqqueue.txt mqtcf.txt mqqcf.txt datasource.txt goals.xml namespacebinding.txt index.xml examples.xml src/java/org/apache/maven/was5/jaas JAASAuthDataHandler.java src/java/org/apache/maven/was5/mq QueueHandler.java TopicHandler.java QCFHandler.java TCFHandler.java src/java/org/apache/maven/was5/jdbc JDBCProviderHandler.java JDBCDatasourceHandler.java src/java/org/apache/maven/was5/listenerport ListenerportHandler.java src/java/org/apache/maven/was5/namespace NameSpaceBindingHandler.java Log: Moved |
From: dion g. <dio...@us...> - 2005-11-03 00:15:23
|
diongillard 05/11/02 16:15:17 Removed: src/java/org/apache/maven/was5 ScriptFileBuilder.java MissingArgumentException.java StringUtil.java ScriptFileHandler.java plugin-resources nodesync.jacl Log: Moved |
From: dion g. <dio...@us...> - 2005-11-03 00:14:54
|
diongillard 05/11/02 16:14:48 Removed: javadoc javadoc.css Log: Moved |
diongillard 05/11/02 15:26:23 Added: was5config/xdocs authdata.txt datasource.txt examples.xml goals.xml index.xml listenerport.txt mqqcf.txt mqqueue.txt mqtcf.txt mqtopic.txt namespacebinding.txt navigation.xml properties.xml provider.txt Log: Added from previous ocation Revision Changes Path 1.1 maven-plugins/was5config/xdocs/authdata.txt Index: authdata.txt =================================================================== <setup> <authdata> <alias name="alias1" /> <userId name="userid1" /> <password name="password1" /> <description name="This is my first alias" /> </authdata> <authdata> <alias name="alias2" /> <userId name="userid2" /> <password name="password2" /> <description name="This is my second alias" /> </authdata> </setup> 1.1 maven-plugins/was5config/xdocs/datasource.txt Index: datasource.txt =================================================================== <setup> <!-- Globals: This will be applied to all datasources if not overrided --> <node name="mynode" /> <server name="server1" /> <providerName name="Provider 1" /> <property name="serverName" type="java.lang.String" value="123.234.345.456" /> <property name="portNumber" type="java.lang.String" value="1234" /> <datasource> <name name="Datasource 1" /> <jndiName name="jdbc/ds/ds1" /> <authDataAlias name="alias1" /> <datasourceHelperClassname name="com.foo.Helper1" /> <property name="databaseName" type="java.lang.String" value="DB1" /> </datasource> <datasource> <providerName name="Provider 2" /> <name name="Datasource 2" /> <jndiName name="jdbc/ds/ds2" /> <authDataAlias name="alias2" /> <datasourceHelperClassname name="com.foo.Helper2" /> <server name="" /> <property name="databaseName" type="java.lang.String" value="DB2" /> <property name="serverName" type="java.lang.String" value="234.345.456.567" /> <property name="portNumber" type="java.lang.String" value="2345" /> </datasource> </setup> 1.1 maven-plugins/was5config/xdocs/examples.xml Index: examples.xml =================================================================== <?xml version="1.0"?> <document> <body> <section name="Examples"> <p> <b>In general</b>: All was5config:xx goals (except the nodesync goal) requires a xml file with input. Have a look at the <a href="properties.html">Properties</a> section to see default path to xml files. A good approach will be to create a working folder with all xml files you need to match the goals you're calling, together with a project.properties file with properties set for washome, host, port, conntype, username and password (as an example). You then run all your goals from this working folder. <p/> For those of you that are familiar with jacl/jython scripting towards WAS, will recognize the xlm element names. They are all equal to the attribute names of the corresponding MBeans in wsadmin. <b>NOTE</b>: the content of the xml file is case-sensitive when it comes to elements and attributes! <p/> Below you will find all the goals with descriptions on target xml file structure and with an example. You'll see a column named "Global" in all tables. This states whether the element can be global or not. The global elements are very convenient to avoid duplications in the xml files (you can set global elements that are used for all sub-elements and override them where neccessary). <p/> <b>NOTE: Scripts does not check for already existing config, so you might get duplicates if they already exist!!</b> </p> <subsection name="was5config:jaasauthdata"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><authdata></b> elements. </p> <table> <tr> <th><authdata> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>alias</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>userId</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>password</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="authdata.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:jdbc-provider"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><provider></b> elements. </p> <table> <tr> <th><provider> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>implementationClassName</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td>classpath</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td>nativepath</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="provider.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:jdbc-datasource"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><datasource></b> elements. </p> <table> <tr> <th><datasource> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>providerName</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>datasourceHelperClassname</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>authDataAlias</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>mappingConfigAlias</td> <td>"name"</td> <td>-</td> <td>X</td> <td>DefaultPrincipalMapping</td> </tr> <tr> <td>authMechanismPreference</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>category</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>statementCacheSize</td> <td>"name"</td> <td>-</td> <td>X</td> <td>10</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td>property</td> <td>"name", "type", "value" (all required if property are used)</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="datasource.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:mq-qcf"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><qcf></b> elements. </p> <table> <tr> <th><qcf> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>transportType</td> <td>"name"</td> <td>X</td> <td>X</td> <td>CLIENT</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>CCSID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>XAEnabled</td> <td>"name"</td> <td>-</td> <td>X</td> <td>true</td> </tr> <tr> <td>authDataAlias</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>authMechanismPreference</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>category</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>channel</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>clientID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>host</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>mappingConfigAlias</td> <td>"name"</td> <td>-</td> <td>X</td> <td>DefaultPrincipalMapping</td> </tr> <tr> <td>msgRetention</td> <td>"name"</td> <td>-</td> <td>X</td> <td>true</td> </tr> <tr> <td>port</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>queueManager</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>tempModel</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="mqqcf.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:mq-queue"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><queue></b> elements. </p> <table> <tr> <th><queue> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>baseQueueName</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>CCSID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>baseQueueManagerName</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>category</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>decimalEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>Normal</td> </tr> <tr> <td>expiry</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>floatingPointEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>IEEENormal</td> </tr> <tr> <td>integerEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>Normal</td> </tr> <tr> <td>password</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>persistence</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>priority</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>queueManagerHost</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>queueManagerPort</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>serverConnectionChannelName</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>specifiedExpiry</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>specifiedPriority</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>targetClient</td> <td>"name"</td> <td>-</td> <td>X</td> <td>JMS</td> </tr> <tr> <td>useNativeEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>false</td> </tr> <tr> <td>userName</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="mqqueue.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:mq-tcf"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><tcf></b> elements. </p> <table> <tr> <th><tcf> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>transportType</td> <td>"name"</td> <td>X</td> <td>X</td> <td>BINDINGS</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>CCSID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>XAEnabled</td> <td>"name"</td> <td>-</td> <td>X</td> <td>true</td> </tr> <tr> <td>authDataAlias</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>authMechanismPreference</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerCCSubQ</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerControlQueue</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerPubQueue</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerQueueManager</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerSubQueue</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerVersion</td> <td>"name"</td> <td>-</td> <td>X</td> <td>MA0C</td> </tr> <tr> <td>category</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>channel</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>clientID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>cloneSupport</td> <td>"name"</td> <td>-</td> <td>X</td> <td>false</td> </tr> <tr> <td>host</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>mapping</td> <td>"name"</td> <td>-</td> <td>X</td> <td>DefaultPrincipalMapping</td> </tr> <tr> <td>port</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>queueManager</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>tempModel</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="mqtcf.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:mq-topic"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><topic></b> elements. </p> <table> <tr> <th><topic> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>baseTopicName</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerDurSubQueue</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>brokerCCDurSubQueue</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>CCSID</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>category</td> <td>"name"</td> <td>-</td> <td>X</td> <td>-</td> </tr> <tr> <td>decimalEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>Normal</td> </tr> <tr> <td>expiry</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>floatingPointEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>IEEENormal</td> </tr> <tr> <td>integerEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>Normal</td> </tr> <tr> <td>persistence</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>priority</td> <td>"name"</td> <td>-</td> <td>X</td> <td>APPLICATION_DEFINED</td> </tr> <tr> <td>specifiedExpiry</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>specifiedPriority</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>targetClient</td> <td>"name"</td> <td>-</td> <td>X</td> <td>JMS</td> </tr> <tr> <td>useNativeEncoding</td> <td>"name"</td> <td>-</td> <td>X</td> <td>false</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="mqtopic.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:listenerport"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><listenerport></b> elements. </p> <table> <tr> <th><listenerport> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>connectionFactoryJNDIName</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>destinationJNDIName</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>initialState</td> <td>"name"</td> <td>X</td> <td>X</td> <td>START</td> </tr> <tr> <td>maxSessions</td> <td>"name"</td> <td>-</td> <td>X</td> <td>1</td> </tr> <tr> <td>maxRetries</td> <td>"name"</td> <td>-</td> <td>X</td> <td>0</td> </tr> <tr> <td>maxMessages</td> <td>"name"</td> <td>-</td> <td>X</td> <td>1</td> </tr> <tr> <td>description</td> <td>"name"</td> <td>-</td> <td>-</td> <td>-</td> </tr> <tr> <td colspan="5"><a href="listenerport.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> <subsection name="was5config:namespacebinding"> <p> Xml file should have <b><setup></b> root-element and can then have one or more <b><namespacebinding></b> elements. </p> <table> <tr> <th><namespacebinding> child elements</th> <th>Element attribute(s)</th> <th>Required</th> <th>Global</th> <th>Default value</th> </tr> <tr> <td>name</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>node</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>server</td> <td>"name"</td> <td>X</td> <td>X</td> <td>-</td> </tr> <tr> <td>nameInNameSpace</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>type</td> <td>"name"</td> <td>X</td> <td>-</td> <td>-</td> </tr> <tr> <td>jndiName</td> <td>"name"</td> <td>For type Indirect</td> <td>-</td> <td>-</td> </tr> <tr> <td>providerURL</td> <td>"name"</td> <td>For type Indirect</td> <td>-</td> <td>-</td> </tr> <tr> <td>applicationNodeName</td> <td>"name"</td> <td>For type Ejb</td> <td>-</td> <td>-</td> </tr> <tr> <td>applicationServerName</td> <td>"name"</td> <td>For type Ejb</td> <td>-</td> <td>-</td> </tr> <tr> <td>bindingLocation</td> <td>"name"</td> <td>For type Ejb</td> <td>-</td> <td>SINGLESERVER</td> </tr> <tr> <td>ejbJndiName</td> <td>"name"</td> <td>For type Ejb</td> <td>-</td> <td>-</td> </tr> <tr> <td>corbanameUrl</td> <td>"name"</td> <td>For type Corba</td> <td>-</td> <td>-</td> </tr> <tr> <td>federatedContext</td> <td>"name"</td> <td>For type Corba</td> <td>-</td> <td>false</td> </tr> <tr> <td colspan="5"><a href="namespacebinding.txt" target="_blank">Example file</a></td> </tr> </table> </subsection> </section> </body> </document> 1.1 maven-plugins/was5config/xdocs/goals.xml Index: goals.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <document> <properties> <title>Maven WAS5 Setup plugin Goals</title> </properties> <body> <goals> <goal> <name>was5config:was5config</name> <description> Default goal. Runs the other goals in sequence. </description> </goal> <goal> <name>was5config:jaasauthdata</name> <description> Setup J2C Authentication Data Entries. Goal uses xml file from property maven.was5.jaasauthdata.xml </description> </goal> <goal> <name>was5config:jdbc-provider</name> <description> Setup JDBC Providers. Goal uses xml file from property maven.was5.jdbc.provider.xml </description> </goal> <goal> <name>was5config:jdbc-datasource</name> <description> Setup JDBC Datasources. Goal uses xml file from property maven.was5.jdbc.datasource.xml </description> </goal> <goal> <name>was5config:listenerport</name> <description> Setup Listenerports. Goal uses xml file from property maven.was5.listenport.xml </description> </goal> <goal> <name>was5config:namespacebinding</name> <description> Setup Name Space Bindings. Goal uses xml file from property maven.was5.namespacebinding.xml </description> </goal> <goal> <name>was5config:mq-qcf</name> <description> Setup WebSphere MQ Queue Connection Factories. Goal uses xml file from property maven.was5.mq.qcf.xml </description> </goal> <goal> <name>was5config:mq-queue</name> <description> Setup WebSphere MQ Queue Destinations. Goal uses xml file from property maven.was5.mq.queue.xml </description> </goal> <goal> <name>was5config:mq-tcf</name> <description> Setup WebSphere MQ Topic Connection Factories. Goal uses xml file from property maven.was5.mq.tcf.xml </description> </goal> <goal> <name>was5config:mq-topic</name> <description> Setup WebSphere MQ Topic Destinations. Goal uses xml file from property maven.was5.mq.topic.xml </description> </goal> <goal> <name>was5config:nodesync</name> <description>Performs NodeSync on nodes.</description> </goal> </goals> </body> </document> 1.1 maven-plugins/was5config/xdocs/index.xml Index: index.xml =================================================================== <?xml version="1.0"?> <document> <body> <section name="Maven WAS5 Config Plugin"> <p> This plugin provides functionality for configurating parts of your WebSphere application server. The plugin generates jacl scripts on the fly based on xml files, so you do not need know anything about scripting. <p/> The plugin currently supports the setup of: <br/> <li>JDBC Providers</li> <li>Datasources</li> <li>J2C Authentication Data Entries</li> <li>Listenerports</li> <li>Name Space Bindings</li> <li>WebSphere MQ Queue Connection Factories </li> <li>WebSphere MQ Queue Destinations </li> <li>WebSphere MQ Topic Connection Factories </li> <li>WebSphere MQ Topic Destinations </li> <p/> The plugin supports both BASE and ND deployment setup It assumes only one cell. Examples on how to use plugin can be found <a href="examples.html">here</a>. <p/> For more information on the functionality provided by this plugin, please see the <a href="goals.html">Goals</a> document. <p /> For more information on how to customise the functionality provided by this plugin, please see the <a href="properties.html">Properties</a> document. </p> </section> </body> </document> 1.1 maven-plugins/was5config/xdocs/listenerport.txt Index: listenerport.txt =================================================================== <setup> <node name="mynode" /> <server name="server1" /> <listenerport> <name name="listenerport1" /> <connectionFactoryJNDIName name="jms/qcf/qcf1" /> <destinationJNDIName name="jms/queue/queue1" /> <description name="Listenerport One" /> </listenerport> <listenerport> <name name="listenerport2" /> <connectionFactoryJNDIName name="jms/qcf/qcf2" /> <destinationJNDIName name="jms/queue/queue2" /> <description name="Listenerport Two" /> </listenerport> </setup> 1.1 maven-plugins/was5config/xdocs/mqqcf.txt Index: mqqcf.txt =================================================================== <setup> <node name="mynode" /> <queueManager name="MQMANAGER" /> <host name="123.234.345.456" /> <port name="1234" /> <qcf> <name name="QCF 1" /> <jndiName name="jms/qcf/qcf1" /> <description name="My First QCF" /> </qcf> <qcf> <name name="QCF 2" /> <jndiName name="jms/qcf/qcf2" /> <description name="My Second QCF" /> <queueManager name="MQMANAGER2" /> <host name="234.345.456.567" /> <port name="2345" /> <server name="server1" /> </qcf> </setup> 1.1 maven-plugins/was5config/xdocs/mqqueue.txt Index: mqqueue.txt =================================================================== <setup> <node name="mynode" /> <CCSID name="850" /> <queue> <name name="Queue 1" /> <jndiName name="jms/queue/queue1" /> <baseQueueName name="SOME_QUEUE_1" /> <description name="My First Queue" /> </queue> <queue> <name name="Queue 2" /> <jndiName name="jms/queue/queue2" /> <baseQueueName name="SOME_QUEUE_2" /> <description name="My Second Queue" /> </queue> </setup> 1.1 maven-plugins/was5config/xdocs/mqtcf.txt Index: mqtcf.txt =================================================================== <setup> <node name="mynode" /> <queueManager name="MQMANAGER" /> <host name="123.45.67.89" /> <port name="1414" /> <!-- Add more connectionfactories as needed --> <tcf> <name name="SomeTCF" /> <jndiName name="jms/tcf/SomeTCF" /> <description name="Some connection factory" /> </tcf> </setup> 1.1 maven-plugins/was5config/xdocs/mqtopic.txt Index: mqtopic.txt =================================================================== <setup> <node name="mynode" /> <CCSID name="819" /> <category name="category" /> <brokerDurSubQueue name="brokerDurSubQueue" /> <brokerCCDurSubQueue name="brokerCCDurSubQueue" /> <!-- Add more queues as needed --> <topic> <name name="QA.TEST_SYNCH" /> <jndiName name="mq/topic/QA.TEST_SYNCH" /> <baseTopicName name="QA.TEST_SYNCH" /> <description name="Topic for synchronous requests" /> </topic> </setup> 1.1 maven-plugins/was5config/xdocs/namespacebinding.txt Index: namespacebinding.txt =================================================================== <setup> <node name="mynode" /> <!-- Add more namespacebindings as needed --> <namespacebinding> <!-- Indirect, Ejb, Corba --> <type name="Indirect" /> <name name="Binding1" /> <nameInNameSpace name="binding/test1" /> <jndiName name="ejb/TestEJB1" /> <providerURL name="iiop://localhost:2809" /> </namespacebinding> <namespacebinding> <!-- Indirect, Ejb, Corba --> <type name="Ejb" /> <name name="Binding2" /> <nameInNameSpace name="binding/test2" /> <applicationNodeName name="someothernode" /> <applicationServerName name="someserver" /> <bindingLocation name="SINGLESERVER" /> <!-- SINGLESERVER or SERVERCLUSTER --> <ejbJndiName name="ejb/TestEJB2" /> </namespacebinding> <namespacebinding> <!-- Indirect, Ejb, Corba --> <type name="Corba" /> <name name="Binding3" /> <nameInNameSpace name="binding/test3" /> <corbanameUrl name="corbaname:iiop:localhost:2809#ejb/TestEJB3" /> <federatedContext name="false" /> </namespacebinding> </setup> 1.1 maven-plugins/was5config/xdocs/navigation.xml Index: navigation.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <project name="Maven WAS5 Config plugin"> <title>Maven WAS5 Config plugin</title> <body> <links> <item href="http://maven.apache.org/" name="Maven"> </item> </links> <menu name="Overview"> <item href="/goals.html" name="Goals"> </item> <item href="/properties.html" name="Properties"> </item> <item href="/examples.html" name="Examples"> </item> </menu> </body> </project> 1.1 maven-plugins/was5config/xdocs/properties.xml Index: properties.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <document> <properties> <title>Maven WAS5 Config plugin Properties</title> </properties> <body> <section name="Maven WAS5 Config plugin Settings"> <table> <tr> <th>Property</th> <th>Optional?</th> <th>Description</th> </tr> <tr> <td>maven.was5.home</td> <td>No</td> <td> <p> Path to WAS install root. Default value is blank. </p> </td> </tr> <tr> <td>maven.was5.host</td> <td>Yes</td> <td> <p> Name of host to which to add config to. Default value is <code>localhost</code> . </p> </td> </tr> <tr> <td>maven.was5.port</td> <td>Yes</td> <td> <p> Value of port "matching" the "host" and "conntype". Default value is <code>8880</code> . </p> </td> </tr> <tr> <td>maven.was5.conntype</td> <td>Yes</td> <td> <p> What kind of connection to use when calling server. Valid values are: SOAP, RMI and NONE. Default value is <code>SOAP</code> . </p> </td> </tr> <tr> <td>maven.was5.username</td> <td>Yes</td> <td> <p>Username to use if the server uses security. Default value is blank</p> </td> </tr> <tr> <td>maven.was5.password</td> <td>Yes</td> <td> <p>Password to use if the server uses security. Default value is blank</p> </td> </tr> <tr> <td>maven.was5.mq.topic.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-mq-topic.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.mq.tcf.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-mq-tcf.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.mq.queue.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-mq-queue.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.mq.qcf.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-mq-qcf.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.jdbc.datasource.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-jdbc-datasource.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.jaasauthdata.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-jaasauthdata.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.listenerport.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-listenerport.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.namespacebinding.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-namespacebinding.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.jdbc.provider.xml</td> <td>Yes</td> <td> <p> Path to where plugin expects to find xml file with config content. Default value is <code>${basedir}/setup-jdbc-provider.xml</code> . </p> </td> </tr> <tr> <td>maven.was5.nodesync.nodes</td> <td>Yes</td> <td> <p> Property to be set with values of nodes to synch when calling <b>was5config:nodesync</b> goal. <b>NOTE: This only works in a ND setting!</b> . Default value is blank </p> </td> </tr> </table> </section> </body> </document> 1.1 maven-plugins/was5config/xdocs/provider.txt Index: provider.txt =================================================================== <setup> <!-- Globals: This will be applied to all providers if not overrided --> <node name="mynode" /> <server name="server1" /> <!-- This provider will be setup at mynode and server1 --> <provider> <name name="Provider 1" /> <description name="My First Provider" /> <classpath name="/my/path/driver.jar" /> <implementationClassName name="com.foo.SomeClass" /> </provider> <!-- This provider will be setup at mynode --> <provider> <name name="Provider 2" /> <description name="My Second Provider" /> <classpath name="/my/path/driver2.jar" /> <implementationClassName name="com.foo.SomeClass2" /> <server name="" /> </provider> <!-- This provider will be setup at cell level --> <provider> <name name="Provider 3" /> <description name="My Third Provider" /> <classpath name="/my/path/driver3.jar" /> <implementationClassName name="com.foo.SomeClass3" /> <node name="" /> <server name="" /> </provider> </setup> |
From: dion g. <dio...@us...> - 2005-11-02 23:25:58
|
diongillard 05/11/02 15:25:52 maven-plugins/was5config/xdocs - New directory |
From: dion g. <dio...@us...> - 2005-11-02 23:25:13
|
diongillard 05/11/02 15:25:07 Added: was5config/src/java/org/apache/maven/was5 MissingArgumentException.java ScriptFileBuilder.java ScriptFileHandler.java StringUtil.java was5config/src/java/org/apache/maven/was5/jaas JAASAuthDataHandler.java was5config/src/java/org/apache/maven/was5/jdbc JDBCDatasourceHandler.java JDBCProviderHandler.java was5config/src/java/org/apache/maven/was5/listenerport ListenerportHandler.java was5config/src/java/org/apache/maven/was5/mq QCFHandler.java QueueHandler.java TCFHandler.java TopicHandler.java was5config/src/java/org/apache/maven/was5/namespace NameSpaceBindingHandler.java Log: Added from previous ocation Revision Changes Path 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/MissingArgumentException.java Index: MissingArgumentException.java =================================================================== package org.apache.maven.was5; /** * * @author Morten Kristiansen */ public class MissingArgumentException extends Exception { public MissingArgumentException(String arg) { super("Required argument \"" + arg + "\" missing"); } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/ScriptFileBuilder.java Index: ScriptFileBuilder.java =================================================================== package org.apache.maven.was5; import java.io.File; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; /** * * @author Morten Kristiansen */ public final class ScriptFileBuilder { public String build(String myScriptArgsHandlerClass, String myXml) { try { ScriptFileHandler handler = (ScriptFileHandler) Class.forName(myScriptArgsHandlerClass).newInstance(); SAXParserFactory factory = SAXParserFactory.newInstance(); SAXParser saxParser = factory.newSAXParser(); saxParser.parse(new File(myXml), handler); return handler.generateFile(); } catch (Throwable t) { return t.getMessage(); } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/ScriptFileHandler.java Index: ScriptFileHandler.java =================================================================== package org.apache.maven.was5; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import org.xml.sax.helpers.DefaultHandler; /** * * @author Morten Kristiansen */ public abstract class ScriptFileHandler extends DefaultHandler { private List myWsAdminScriptArgs = new ArrayList(); private Map myGlobals = new HashMap(); protected void addArgs(Object args) { myWsAdminScriptArgs.add(args); } protected void addGlobal(String key, String value) { myGlobals.put(key, value); } protected List getArgs() { return myWsAdminScriptArgs; } protected String getGlobal(String key) { return myGlobals.containsKey(key) ? (String) myGlobals.get(key) : null; } protected void addDefaultHeader(PrintWriter printwriter) { printwriter.println("global AdminConfig"); printwriter.println("global AdminControl"); printwriter.println("set cell [$AdminControl getCell]"); } protected void required(String arg, String desc) throws MissingArgumentException { if(arg == null || arg.trim().equals("")) { throw new MissingArgumentException(desc); } } protected abstract String generateFile(); } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/StringUtil.java Index: StringUtil.java =================================================================== package org.apache.maven.was5; /** * * @author Morten Kristiansen */ public final class StringUtil { public static final String wrap(String s) { return "\"" + s + "\""; } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/jaas/JAASAuthDataHandler.java Index: JAASAuthDataHandler.java =================================================================== package org.apache.maven.was5.jaas; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class JAASAuthDataHandler extends ScriptFileHandler { class Args { String alias = ""; String description = ""; String password = ""; String userId = ""; } private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("authdata".equals(qName)) { myCurrent = new Args(); addArgs(myCurrent); } else if ("alias".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.alias = name; } else if ("userId".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.userId = name; } else if ("password".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.password = name; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = name; } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); printwriter.println("set security [$AdminConfig getid /Cell:$cell/Security:/]"); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.alias, "alias"); required(args.userId, "userId"); required(args.password, "password"); printwriter.println("puts \"Creating JAASAuthData " + args.alias + "\""); String attrs = "{alias " + StringUtil.wrap(args.alias) + "} {userId " + StringUtil.wrap(args.userId) + "} {password " + StringUtil.wrap(args.password) + "}"; if(!args.description.equals("")) { attrs = attrs + " {description " + StringUtil.wrap(args.description) + "}"; } printwriter.println("set attrs [list " + attrs + "]"); printwriter.println("$AdminConfig create JAASAuthData $security $attrs"); printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("authdata".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/jdbc/JDBCDatasourceHandler.java Index: JDBCDatasourceHandler.java =================================================================== package org.apache.maven.was5.jdbc; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class JDBCDatasourceHandler extends ScriptFileHandler { class Args { String providerName = ""; String node = ""; String server = ""; String name = ""; String jndiName = ""; String description = ""; String datasourceHelperClassname = ""; String authDataAlias = ""; String mappingConfigAlias = "DefaultPrincipalMapping"; String authMechanismPreference = ""; String category = ""; String statementCacheSize = "10"; List properties = new ArrayList(); } class Property { String name = ""; String type = ""; String value = ""; public boolean equals(Object obj) { return (obj instanceof Property) && ((Property) obj).name.equals(this.name); } } private Map myGlobalProperties = new HashMap(); private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("datasource".equals(qName)) { myCurrent = new Args(); myCurrent.providerName = getGlobal("providerName") != null ? getGlobal("providerName") : myCurrent.providerName; myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; myCurrent.datasourceHelperClassname = getGlobal("datasourceHelperClassname") != null ? getGlobal("datasourceHelperClassname") : myCurrent.datasourceHelperClassname; myCurrent.authDataAlias = getGlobal("authDataAlias") != null ? getGlobal("authDataAlias") : myCurrent.authDataAlias; myCurrent.mappingConfigAlias = getGlobal("mappingConfigAlias") != null ? getGlobal("mappingConfigAlias") : myCurrent.mappingConfigAlias; myCurrent.authMechanismPreference = getGlobal("authMechanismPreference") != null ? getGlobal("authMechanismPreference") : myCurrent.authMechanismPreference; myCurrent.category = getGlobal("category") != null ? getGlobal("category") : myCurrent.category; myCurrent.statementCacheSize = getGlobal("statementCacheSize") != null ? getGlobal("statementCacheSize") : myCurrent.statementCacheSize; addGlobalProperties(myCurrent); addArgs(myCurrent); } else if ("property".equals(qName)) { String type = attrs.getValue("type"); String value = attrs.getValue("value"); Property prop = new Property(); prop.name = name; prop.type = type; prop.value = value; if (myCurrent == null) { addGlobalProperty(name, prop); } else { int index = myCurrent.properties.indexOf(prop); if (index > -1) { myCurrent.properties.remove(index); } myCurrent.properties.add(prop); } } else if ("providerName".equals(qName)) { if (myCurrent == null) { addGlobal("providerName", name); } else { myCurrent.providerName = name; } } else if ("node".equals(qName)) { if (myCurrent == null) { addGlobal("node", name); } else { myCurrent.node = name; } } else if ("server".equals(qName)) { if (myCurrent == null) { addGlobal("server", name); } else { myCurrent.server = name; } } else if ("datasourceHelperClassname".equals(qName)) { if (myCurrent == null) { addGlobal("datasourceHelperClassname", name); } else { myCurrent.datasourceHelperClassname = name; } } else if ("authDataAlias".equals(qName)) { if (myCurrent == null) { addGlobal("authDataAlias", name); } else { myCurrent.authDataAlias = name; } } else if ("mappingConfigAlias".equals(qName)) { if (myCurrent == null) { addGlobal("mappingConfigAlias", name); } else { myCurrent.mappingConfigAlias = name; } } else if ("authMechanismPreference".equals(qName)) { if (myCurrent == null) { addGlobal("authMechanismPreference", name); } else { myCurrent.authMechanismPreference = name; } } else if ("category".equals(qName)) { if (myCurrent == null) { addGlobal("category", name); } else { myCurrent.category = name; } } else if ("statementCacheSize".equals(qName)) { if (myCurrent == null) { addGlobal("statementCacheSize", name); } else { myCurrent.statementCacheSize = name; } } else if ("name".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.name = name; } else if ("jndiName".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.jndiName = name; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = name; } } private void addGlobalProperty(String key, Property value) { myGlobalProperties.put(key, value); } private void addGlobalProperties(Args ds) { for (Iterator iter = myGlobalProperties.values().iterator(); iter.hasNext();) { Property prop = (Property) iter.next(); ds.properties.add(prop); } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.providerName, "providerName"); required(args.name, "name"); String path = "/Cell:$cell"; if (args.node != null && !args.node.trim().equals("")) { path = path + "/Node:" + args.node; } if (args.server != null && !args.server.trim().equals("")) { path = path + "/Server:" + args.server; } path = path + "/JDBCProvider:" + args.providerName + "/"; printwriter.println("if { [llength [$AdminConfig getid \"" + path + "\"]] == 0 } then {"); printwriter.println(" puts \"ProviderName " + args.providerName + " not found on " + path + "\""); printwriter.println(" return"); printwriter.println("}"); printwriter.println("set prov [$AdminConfig getid \"" + path + "\"]"); printwriter.println("puts \"Creating JDBC Datasource " + args.name + "\""); String attrs = "{name " + StringUtil.wrap(args.name) + "}"; if(!args.jndiName.equals("")) { attrs = attrs + " {jndiName " + StringUtil.wrap(args.jndiName) + "}"; } if(!args.description.equals("")) { attrs = attrs + " {description " + StringUtil.wrap(args.description) + "}"; } if(!args.datasourceHelperClassname.equals("")) { attrs = attrs + " {datasourceHelperClassname " + StringUtil.wrap(args.datasourceHelperClassname) + "}"; } if(!args.category.equals("")) { attrs = attrs + " {category " + StringUtil.wrap(args.category) + "}"; } if(!args.statementCacheSize.equals("")) { attrs = attrs + " {statementCacheSize " + StringUtil.wrap(args.statementCacheSize) + "}"; } if(!args.authMechanismPreference.equals("")) { attrs = attrs + " {authMechanismPreference " + StringUtil.wrap(args.authMechanismPreference) + "}"; } printwriter.println("set attrs [list " + attrs + "]"); printwriter.println("set ds [$AdminConfig create DataSource $prov $attrs]"); if (args.properties.size() > 0) { printwriter.println("set customProps [$AdminConfig create J2EEResourcePropertySet $ds {}]"); int index = 0; for (Iterator iterator = args.properties.iterator(); iterator.hasNext();) { Property prop = (Property) iterator.next(); printwriter.println("set props_attr" + index + " [subst {{name " + prop.name + "} {type " + prop.type + "} {value " + StringUtil.wrap(prop.value) + "}}]"); printwriter.println("$AdminConfig create J2EEResourceProperty $customProps $props_attr" + index); index++; } } String mappings = ""; if (!args.authDataAlias.equals("")) { mappings = "{authDataAlias " + StringUtil.wrap(args.authDataAlias) + "}"; } if (!args.mappingConfigAlias.equals("")) { mappings = mappings + " {mappingConfigAlias " + StringUtil.wrap(args.mappingConfigAlias) + "}"; } if (!mappings.equals("")) { printwriter.println("set mappedAlias [$AdminConfig create MappingModule $ds [subst {" + mappings + "}] mapping]"); } printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("datasource".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/jdbc/JDBCProviderHandler.java Index: JDBCProviderHandler.java =================================================================== package org.apache.maven.was5.jdbc; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class JDBCProviderHandler extends ScriptFileHandler { class Args { String node = ""; String server = ""; String name = ""; String description = ""; String classpath = ""; String nativepath = ""; String implementationClassName = ""; } private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("provider".equals(qName)) { myCurrent = new Args(); myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; addArgs(myCurrent); } else if ("node".equals(qName)) { if (myCurrent == null) { addGlobal("node", name); } else { myCurrent.node = name; } } else if ("server".equals(qName)) { if (myCurrent == null) { addGlobal("server", name); } else { myCurrent.server = name; } } else if ("name".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.name = name; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = name; } else if ("classpath".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.classpath = name; } else if ("implementationClassName".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.implementationClassName = name; } else if ("nativepath".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.nativepath = name; } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.name, "name"); required(args.implementationClassName, "implementationClassName"); String path = "/Cell:$cell"; if (args.node != null && !args.node.trim().equals("")) { path = path + "/Node:" + args.node; } if (args.server != null && !args.server.trim().equals("")) { path = path + "/Server:" + args.server; } printwriter.println("set path [$AdminConfig getid " + path + "/]"); printwriter.println("puts \"Creating JDBC Provider " + args.name + "\""); String attrs = "{name " + StringUtil.wrap(args.name) + "} {implementationClassName " + StringUtil.wrap(args.implementationClassName) + "}"; if(!args.description.equals("")) { attrs = attrs + " {description " + StringUtil.wrap(args.description) + "}"; } if(!args.classpath.equals("")) { attrs = attrs + " {classpath " + StringUtil.wrap(args.classpath) + "}"; } if(!args.nativepath.equals("")) { attrs = attrs + " {nativepath " + StringUtil.wrap(args.nativepath) + "}"; } printwriter.println("set attrs [list " + attrs + "]"); printwriter.println("$AdminConfig create JDBCProvider $path $attrs"); printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("provider".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/listenerport/ListenerportHandler.java Index: ListenerportHandler.java =================================================================== package org.apache.maven.was5.listenerport; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class ListenerportHandler extends ScriptFileHandler { class Args { String node = ""; String server = ""; String name = ""; String description = ""; String connectionFactoryJNDIName = ""; String destinationJNDIName = ""; String maxSessions = "1"; String maxRetries = "0"; String maxMessages = "1"; String initialState = "START"; } private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String value = attrs.getValue("name"); if ("listenerport".equals(qName)) { myCurrent = new Args(); myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; myCurrent.connectionFactoryJNDIName = getGlobal("connectionFactoryJNDIName") != null ? getGlobal("connectionFactoryJNDIName") : myCurrent.connectionFactoryJNDIName; myCurrent.destinationJNDIName = getGlobal("destinationJNDIName") != null ? getGlobal("destinationJNDIName") : myCurrent.destinationJNDIName; myCurrent.maxSessions = getGlobal("maxSessions") != null ? getGlobal("maxSessions") : myCurrent.maxSessions; myCurrent.maxRetries = getGlobal("maxRetries") != null ? getGlobal("maxRetries") : myCurrent.maxRetries; myCurrent.maxMessages = getGlobal("maxMessages") != null ? getGlobal("maxMessages") : myCurrent.maxMessages; myCurrent.initialState = getGlobal("initialState") != null ? getGlobal("initialState") : myCurrent.initialState; addArgs(myCurrent); } else if ("node".equals(qName)) { if (myCurrent == null) { addGlobal("node", value); } else { myCurrent.node = value; } } else if ("server".equals(qName)) { if (myCurrent == null) { addGlobal("server", value); } else { myCurrent.server = value; } } else if ("connectionFactoryJNDIName".equals(qName)) { if (myCurrent == null) { addGlobal("connectionFactoryJNDIName", value); } else { myCurrent.connectionFactoryJNDIName = value; } } else if ("destinationJNDIName".equals(qName)) { if (myCurrent == null) { addGlobal("destinationJNDIName", value); } else { myCurrent.destinationJNDIName = value; } } else if ("maxSessions".equals(qName)) { if (myCurrent == null) { addGlobal("maxSessions", value); } else { myCurrent.maxSessions = value; } } else if ("maxRetries".equals(qName)) { if (myCurrent == null) { addGlobal("maxRetries", value); } else { myCurrent.maxRetries = value; } } else if ("maxMessages".equals(qName)) { if (myCurrent == null) { addGlobal("maxMessages", value); } else { myCurrent.maxMessages = value; } } else if ("initialState".equals(qName)) { if (myCurrent == null) { addGlobal("initialState", value); } else { myCurrent.initialState = value; } } else if ("name".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.name = value; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = value; } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.node, "node"); required(args.server, "server"); required(args.name, "name"); required(args.initialState, "initialState"); required(args.connectionFactoryJNDIName, "connectionFactoryJNDIName"); required(args.destinationJNDIName, "destinationJNDIName"); printwriter.println("set theServer [$AdminConfig getid /Cell:$cell/Node:" + args.node + "/Server:" + args.server + "/]"); printwriter.println("if {[llength $theServer] ==0 } {"); printwriter.println(" puts \"Did not find server " + args.server + " on node " + args.node + " and cell $cell\""); printwriter.println(" return"); printwriter.println("}"); printwriter.println("set mls [$AdminConfig list MessageListenerService $theServer]"); printwriter.println("puts \"Creating Listenerport " + args.name + "\""); printwriter.println("set attr1 [list name " + StringUtil.wrap(args.name) + "]"); printwriter.println("set attr2 [list description " + StringUtil.wrap(args.description) + "]"); printwriter.println("set attr3 [list connectionFactoryJNDIName " + StringUtil.wrap(args.connectionFactoryJNDIName) + "]"); printwriter.println("set attr4 [list destinationJNDIName " + StringUtil.wrap(args.destinationJNDIName) + "]"); printwriter.println("set attr5 [list maxSessions " + StringUtil.wrap(args.maxSessions) + "]"); printwriter.println("set attr6 [list maxRetries " + StringUtil.wrap(args.maxRetries) + "]"); printwriter.println("set attr7 [list maxMessages " + StringUtil.wrap(args.maxMessages) + "]"); printwriter.println("set attr8 [list initialState " + StringUtil.wrap(args.initialState) + "]"); printwriter.println("set attr9 [list $attr8]"); printwriter.println("set attr10 [list stateManagement $attr9]"); printwriter.println("set attr [list $attr1 $attr2 $attr3 $attr4 $attr5 $attr6 $attr7 $attr10]"); printwriter.println("set newLP [$AdminConfig create ListenerPort $mls $attr]"); printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("listenerport".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/mq/QCFHandler.java Index: QCFHandler.java =================================================================== package org.apache.maven.was5.mq; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class QCFHandler extends ScriptFileHandler { class Args { String node = ""; String server = ""; String name = ""; String jndiName = ""; String description = ""; String CCSID = ""; String XAEnabled = "true"; String authDataAlias = ""; String authMechanismPreference = ""; String category = ""; String channel = ""; String clientID = ""; String host = ""; String mappingConfigAlias = "DefaultPrincipalMapping"; String msgRetention = "true"; String port = ""; String queueManager = ""; String tempModel = ""; String transportType = "CLIENT"; } private String myJmsProvider = "WebSphere MQ JMS Provider"; private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("qcf".equals(qName)) { myCurrent = new Args(); myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; myCurrent.CCSID = getGlobal("CCSID") != null ? getGlobal("CCSID") : myCurrent.CCSID; myCurrent.XAEnabled = getGlobal("XAEnabled") != null ? getGlobal("XAEnabled") : myCurrent.XAEnabled; myCurrent.authDataAlias = getGlobal("authDataAlias") != null ? getGlobal("authDataAlias") : myCurrent.authDataAlias; myCurrent.authMechanismPreference = getGlobal("authMechanismPreference") != null ? getGlobal("authMechanismPreference") : myCurrent.authMechanismPreference; myCurrent.category = getGlobal("category") != null ? getGlobal("category") : myCurrent.category; myCurrent.channel = getGlobal("channel") != null ? getGlobal("channel") : myCurrent.channel; myCurrent.clientID = getGlobal("clientID") != null ? getGlobal("clientID") : myCurrent.clientID; myCurrent.host = getGlobal("host") != null ? getGlobal("host") : myCurrent.host; myCurrent.mappingConfigAlias = getGlobal("mappingConfigAlias") != null ? getGlobal("mappingConfigAlias") : myCurrent.mappingConfigAlias; myCurrent.msgRetention = getGlobal("msgRetention") != null ? getGlobal("msgRetention") : myCurrent.msgRetention; myCurrent.port = getGlobal("port") != null ? getGlobal("port") : myCurrent.port; myCurrent.queueManager = getGlobal("queueManager") != null ? getGlobal("queueManager") : myCurrent.queueManager; myCurrent.tempModel = getGlobal("tempModel") != null ? getGlobal("tempModel") : myCurrent.tempModel; myCurrent.transportType = getGlobal("transportType") != null ? getGlobal("transportType") : myCurrent.transportType; addArgs(myCurrent); } else if ("node".equals(qName)) { if (myCurrent == null) { addGlobal("node", name); } else { myCurrent.node = name; } } else if ("server".equals(qName)) { if (myCurrent == null) { addGlobal("server", name); } else { myCurrent.server = name; } } else if ("CCSID".equals(qName)) { if (myCurrent == null) { addGlobal("CCSID", name); } else { myCurrent.CCSID = name; } } else if ("XAEnabled".equals(qName)) { if (myCurrent == null) { addGlobal("XAEnabled", name); } else { myCurrent.XAEnabled = name; } } else if ("authDataAlias".equals(qName)) { if (myCurrent == null) { addGlobal("authDataAlias", name); } else { myCurrent.authDataAlias = name; } } else if ("authMechanismPreference".equals(qName)) { if (myCurrent == null) { addGlobal("authMechanismPreference", name); } else { myCurrent.authMechanismPreference = name; } } else if ("category".equals(qName)) { if (myCurrent == null) { addGlobal("category", name); } else { myCurrent.category = name; } } else if ("channel".equals(qName)) { if (myCurrent == null) { addGlobal("channel", name); } else { myCurrent.channel = name; } } else if ("clientID".equals(qName)) { if (myCurrent == null) { addGlobal("clientID", name); } else { myCurrent.clientID = name; } } else if ("host".equals(qName)) { if (myCurrent == null) { addGlobal("host", name); } else { myCurrent.host = name; } } else if ("mappingConfigAlias".equals(qName)) { if (myCurrent == null) { addGlobal("mappingConfigAlias", name); } else { myCurrent.mappingConfigAlias = name; } } else if ("msgRetention".equals(qName)) { if (myCurrent == null) { addGlobal("msgRetention", name); } else { myCurrent.msgRetention = name; } } else if ("port".equals(qName)) { if (myCurrent == null) { addGlobal("port", name); } else { myCurrent.port = name; } } else if ("queueManager".equals(qName)) { if (myCurrent == null) { addGlobal("queueManager", name); } else { myCurrent.queueManager = name; } } else if ("tempModel".equals(qName)) { if (myCurrent == null) { addGlobal("tempModel", name); } else { myCurrent.tempModel = name; } } else if ("transportType".equals(qName)) { if (myCurrent == null) { addGlobal("transportType", name); } else { myCurrent.transportType = name; } } else if ("name".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.name = name; } else if ("jndiName".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.jndiName = name; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = name; } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.name, "name"); required(args.jndiName, "jndiName"); required(args.transportType, "transportType"); String path = "/Cell:$cell"; if (args.node != null && !args.node.trim().equals("")) { path = path + "/Node:" + args.node; } if (args.server != null && !args.server.trim().equals("")) { path = path + "/Server:" + args.server; } path = path + "/JMSProvider:" + myJmsProvider + "/"; printwriter.println("set jmsp [$AdminConfig getid \"" + path + "\"]"); printwriter.println("puts \"Creating MQ QCF " + args.name + "\""); String attrs = "{name " + StringUtil.wrap(args.name) + "} {jndiName " + StringUtil.wrap(args.jndiName) + "} {transportType " + StringUtil.wrap(args.transportType) + "}"; if(!args.description.equals("")) { attrs = attrs + " {description " + StringUtil.wrap(args.description) + "}"; } if(!args.CCSID.equals("")) { attrs = attrs + " {CCSID " + StringUtil.wrap(args.CCSID) + "}"; } if(!args.XAEnabled.equals("")) { attrs = attrs + " {XAEnabled " + StringUtil.wrap(args.XAEnabled) + "}"; } if(!args.category.equals("")) { attrs = attrs + " {category " + StringUtil.wrap(args.category) + "}"; } if(!args.channel.equals("")) { attrs = attrs + " {channel " + StringUtil.wrap(args.channel) + "}"; } if(!args.clientID.equals("")) { attrs = attrs + " {clientID " + StringUtil.wrap(args.clientID) + "}"; } if(!args.host.equals("")) { attrs = attrs + " {host " + StringUtil.wrap(args.host) + "}"; } if(!args.msgRetention.equals("")) { attrs = attrs + " {msgRetention " + StringUtil.wrap(args.msgRetention) + "}"; } if(!args.port.equals("")) { attrs = attrs + " {port " + StringUtil.wrap(args.port) + "}"; } if(!args.queueManager.equals("")) { attrs = attrs + " {queueManager " + StringUtil.wrap(args.queueManager) + "}"; } if(!args.tempModel.equals("")) { attrs = attrs + " {tempModel " + StringUtil.wrap(args.tempModel) + "}"; } if(!args.authMechanismPreference.equals("")) { attrs = attrs + " {authMechanismPreference " + StringUtil.wrap(args.authMechanismPreference) + "}"; } printwriter.println("set attrs [list " + attrs + "]"); printwriter.println("set qcf [$AdminConfig create MQQueueConnectionFactory $jmsp $attrs]"); String mappings = ""; if (!args.authDataAlias.equals("")) { mappings = "{authDataAlias " + StringUtil.wrap(args.authDataAlias) + "}"; } if (!args.mappingConfigAlias.equals("")) { mappings = mappings + " {mappingConfigAlias " + StringUtil.wrap(args.mappingConfigAlias) + "}"; } if (!mappings.equals("")) { printwriter.println("set mappedAlias [$AdminConfig create MappingModule $qcf [subst {" + mappings + "}] mapping]"); } printwriter.println("$AdminConfig create ConnectionPool $qcf {} connectionPool"); printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("qcf".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/mq/QueueHandler.java Index: QueueHandler.java =================================================================== package org.apache.maven.was5.mq; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Morten Kristiansen */ public class QueueHandler extends ScriptFileHandler { class Args { String node = ""; String server = ""; String name = ""; String jndiName = ""; String description = ""; String CCSID = ""; String baseQueueManagerName = ""; String baseQueueName = ""; String category = ""; String decimalEncoding = "Normal"; String expiry = "APPLICATION_DEFINED"; String floatingPointEncoding = "IEEENormal"; String integerEncoding = "Normal"; String password = ""; String persistence = "APPLICATION_DEFINED"; String priority = "APPLICATION_DEFINED"; String queueManagerHost = ""; String queueManagerPort = "0"; String serverConnectionChannelName = ""; String specifiedExpiry = "0"; String specifiedPriority = "0"; String targetClient = "JMS"; String useNativeEncoding = "false"; String userName = ""; } private String myJmsProvider = "WebSphere MQ JMS Provider"; private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param qName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String qName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("queue".equals(qName)) { myCurrent = new Args(); myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; myCurrent.CCSID = getGlobal("CCSID") != null ? getGlobal("CCSID") : myCurrent.CCSID; myCurrent.baseQueueManagerName = getGlobal("baseQueueManagerName") != null ? getGlobal("baseQueueManagerName") : myCurrent.baseQueueManagerName; myCurrent.baseQueueName = getGlobal("baseQueueName") != null ? getGlobal("baseQueueName") : myCurrent.baseQueueName; myCurrent.category = getGlobal("category") != null ? getGlobal("category") : myCurrent.category; myCurrent.decimalEncoding = getGlobal("decimalEncoding") != null ? getGlobal("decimalEncoding") : myCurrent.decimalEncoding; myCurrent.expiry = getGlobal("expiry") != null ? getGlobal("expiry") : myCurrent.expiry; myCurrent.floatingPointEncoding = getGlobal("floatingPointEncoding") != null ? getGlobal("floatingPointEncoding") : myCurrent.floatingPointEncoding; myCurrent.integerEncoding = getGlobal("integerEncoding") != null ? getGlobal("integerEncoding") : myCurrent.integerEncoding; myCurrent.password = getGlobal("password") != null ? getGlobal("password") : myCurrent.password; myCurrent.persistence = getGlobal("persistence") != null ? getGlobal("persistence") : myCurrent.persistence; myCurrent.priority = getGlobal("priority") != null ? getGlobal("priority") : myCurrent.priority; myCurrent.queueManagerHost = getGlobal("queueManagerHost") != null ? getGlobal("queueManagerHost") : myCurrent.queueManagerHost; myCurrent.queueManagerPort = getGlobal("queueManagerPort") != null ? getGlobal("queueManagerPort") : myCurrent.queueManagerPort; myCurrent.serverConnectionChannelName = getGlobal("serverConnectionChannelName") != null ? getGlobal("serverConnectionChannelName") : myCurrent.serverConnectionChannelName; myCurrent.specifiedExpiry = getGlobal("specifiedExpiry") != null ? getGlobal("specifiedExpiry") : myCurrent.specifiedExpiry; myCurrent.specifiedPriority = getGlobal("specifiedPriority") != null ? getGlobal("specifiedPriority") : myCurrent.specifiedPriority; myCurrent.targetClient = getGlobal("targetClient") != null ? getGlobal("targetClient") : myCurrent.targetClient; myCurrent.useNativeEncoding = getGlobal("useNativeEncoding") != null ? getGlobal("useNativeEncoding") : myCurrent.useNativeEncoding; myCurrent.userName = getGlobal("userName") != null ? getGlobal("userName") : myCurrent.userName; addArgs(myCurrent); } else if ("node".equals(qName)) { if (myCurrent == null) { addGlobal("node", name); } else { myCurrent.node = name; } } else if ("server".equals(qName)) { if (myCurrent == null) { addGlobal("server", name); } else { myCurrent.server = name; } } else if ("CCSID".equals(qName)) { if (myCurrent == null) { addGlobal("CCSID", name); } else { myCurrent.CCSID = name; } } else if ("baseQueueManagerName".equals(qName)) { if (myCurrent == null) { addGlobal("baseQueueManagerName", name); } else { myCurrent.baseQueueManagerName = name; } } else if ("baseQueueName".equals(qName)) { if (myCurrent == null) { addGlobal("baseQueueName", name); } else { myCurrent.baseQueueName = name; } } else if ("category".equals(qName)) { if (myCurrent == null) { addGlobal("category", name); } else { myCurrent.category = name; } } else if ("decimalEncoding".equals(qName)) { if (myCurrent == null) { addGlobal("decimalEncoding", name); } else { myCurrent.decimalEncoding = name; } } else if ("expiry".equals(qName)) { if (myCurrent == null) { addGlobal("expiry", name); } else { myCurrent.expiry = name; } } else if ("floatingPointEncoding".equals(qName)) { if (myCurrent == null) { addGlobal("floatingPointEncoding", name); } else { myCurrent.floatingPointEncoding = name; } } else if ("integerEncoding".equals(qName)) { if (myCurrent == null) { addGlobal("integerEncoding", name); } else { myCurrent.integerEncoding = name; } } else if ("password".equals(qName)) { if (myCurrent == null) { addGlobal("password", name); } else { myCurrent.password = name; } } else if ("persistence".equals(qName)) { if (myCurrent == null) { addGlobal("persistence", name); } else { myCurrent.persistence = name; } } else if ("priority".equals(qName)) { if (myCurrent == null) { addGlobal("priority", name); } else { myCurrent.priority = name; } } else if ("queueManagerHost".equals(qName)) { if (myCurrent == null) { addGlobal("queueManagerHost", name); } else { myCurrent.queueManagerHost = name; } } else if ("queueManagerPort".equals(qName)) { if (myCurrent == null) { addGlobal("queueManagerPort", name); } else { myCurrent.queueManagerPort = name; } } else if ("serverConnectionChannelName".equals(qName)) { if (myCurrent == null) { addGlobal("serverConnectionChannelName", name); } else { myCurrent.serverConnectionChannelName = name; } } else if ("specifiedExpiry".equals(qName)) { if (myCurrent == null) { addGlobal("specifiedExpiry", name); } else { myCurrent.specifiedExpiry = name; } } else if ("specifiedPriority".equals(qName)) { if (myCurrent == null) { addGlobal("specifiedPriority", name); } else { myCurrent.specifiedPriority = name; } } else if ("targetClient".equals(qName)) { if (myCurrent == null) { addGlobal("targetClient", name); } else { myCurrent.targetClient = name; } } else if ("useNativeEncoding".equals(qName)) { if (myCurrent == null) { addGlobal("useNativeEncoding", name); } else { myCurrent.useNativeEncoding = name; } } else if ("userName".equals(qName)) { if (myCurrent == null) { addGlobal("userName", name); } else { myCurrent.userName = name; } } else if ("name".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.name = name; } else if ("jndiName".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.jndiName = name; } else if ("description".equals(qName)) { if(myCurrent == null) { throw new SAXException("Invalid global found"); } myCurrent.description = name; } } protected String generateFile() { try { File file = File.createTempFile("wsant", "jacl"); PrintWriter printwriter = new PrintWriter(new FileWriter(file)); addDefaultHeader(printwriter); for (Iterator iter = getArgs().iterator(); iter.hasNext();) { Args args = (Args) iter.next(); required(args.name, "name"); required(args.jndiName, "jndiName"); required(args.baseQueueName, "baseQueueName"); String path = "/Cell:$cell"; if (args.node != null && !args.node.trim().equals("")) { path = path + "/Node:" + args.node; } if (args.server != null && !args.server.trim().equals("")) { path = path + "/Server:" + args.server; } path = path + "/JMSProvider:" + myJmsProvider + "/"; printwriter.println("set jmsp [$AdminConfig getid \"" + path + "\"]"); printwriter.println("puts \"Creating MQ QUEUE " + args.name + "\""); String attrs = "{name " + StringUtil.wrap(args.name) + "} {jndiName " + StringUtil.wrap(args.jndiName) + "} {baseQueueName " + StringUtil.wrap(args.baseQueueName) + "}"; if(!args.description.equals("")) { attrs = attrs + " {description " + StringUtil.wrap(args.description) + "}"; } if(!args.CCSID.equals("")) { attrs = attrs + " {CCSID " + StringUtil.wrap(args.CCSID) + "}"; } if(!args.baseQueueManagerName.equals("")) { attrs = attrs + " {baseQueueManagerName " + StringUtil.wrap(args.baseQueueManagerName) + "}"; } if(!args.category.equals("")) { attrs = attrs + " {category " + StringUtil.wrap(args.category) + "}"; } if(!args.decimalEncoding.equals("")) { attrs = attrs + " {decimalEncoding " + StringUtil.wrap(args.decimalEncoding) + "}"; } if(!args.expiry.equals("")) { attrs = attrs + " {expiry " + StringUtil.wrap(args.expiry) + "}"; } if(!args.floatingPointEncoding.equals("")) { attrs = attrs + " {floatingPointEncoding " + StringUtil.wrap(args.floatingPointEncoding) + "}"; } if(!args.integerEncoding.equals("")) { attrs = attrs + " {integerEncoding " + StringUtil.wrap(args.integerEncoding) + "}"; } if(!args.password.equals("")) { attrs = attrs + " {password " + StringUtil.wrap(args.password) + "}"; } if(!args.persistence.equals("")) { attrs = attrs + " {persistence " + StringUtil.wrap(args.persistence) + "}"; } if(!args.priority.equals("")) { attrs = attrs + " {priority " + StringUtil.wrap(args.priority) + "}"; } if(!args.queueManagerHost.equals("")) { attrs = attrs + " {queueManagerHost " + StringUtil.wrap(args.queueManagerHost) + "}"; } if(!args.queueManagerPort.equals("")) { attrs = attrs + " {queueManagerPort " + StringUtil.wrap(args.queueManagerPort) + "}"; } if(!args.serverConnectionChannelName.equals("")) { attrs = attrs + " {serverConnectionChannelName " + StringUtil.wrap(args.serverConnectionChannelName) + "}"; } if(!args.specifiedExpiry.equals("")) { attrs = attrs + " {specifiedExpiry " + StringUtil.wrap(args.specifiedExpiry) + "}"; } if(!args.specifiedPriority.equals("")) { attrs = attrs + " {specifiedPriority " + StringUtil.wrap(args.specifiedPriority) + "}"; } if(!args.targetClient.equals("")) { attrs = attrs + " {targetClient " + StringUtil.wrap(args.targetClient) + "}"; } if(!args.useNativeEncoding.equals("")) { attrs = attrs + " {useNativeEncoding " + StringUtil.wrap(args.useNativeEncoding) + "}"; } if(!args.userName.equals("")) { attrs = attrs + " {userName " + StringUtil.wrap(args.userName) + "}"; } printwriter.println("set attrs [list " + attrs + "]"); printwriter.println("$AdminConfig create MQQueue $jmsp $attrs"); printwriter.println("$AdminConfig save"); } printwriter.println("puts \"Created " + getArgs().size() + "\""); printwriter.flush(); printwriter.close(); return file.getAbsolutePath(); } catch (Throwable t) { return t.getMessage(); } } public void endElement(String uri, String localName, String qName) throws SAXException { if ("queue".equals(qName)) { myCurrent = null; } } } 1.1 maven-plugins/was5config/src/java/org/apache/maven/was5/mq/TCFHandler.java Index: TCFHandler.java =================================================================== package org.apache.maven.was5.mq; import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; import java.util.Iterator; import org.apache.maven.was5.ScriptFileHandler; import org.apache.maven.was5.StringUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; /** * * @author Bjorn Hilstad */ public class TCFHandler extends ScriptFileHandler { class Args { String node = ""; String server = ""; String name = ""; String jndiName = ""; String description = ""; String CCSID = ""; String XAEnabled = "true"; String authDataAlias = ""; String authMechanismPreference = ""; String brokerCCSubQ = ""; String brokerControlQueue = ""; String brokerPubQueue = ""; String brokerQueueManager = ""; String brokerSubQueue = ""; String brokerVersion = "MA0C"; String category = ""; String channel = ""; String clientID = ""; String cloneSupport = "false"; String host = ""; String port = ""; String mapping = "DefaultPrincipalMapping"; String queueManager = ""; String tempModel = ""; String transportType = "BINDINGS"; } private String myJmsProvider = "WebSphere MQ JMS Provider"; private Args myCurrent = null; /** * @param namespaceURI - * @param sName - * @param tName - * @param attrs - * * @throws SAXException - */ public void startElement(String namespaceURI, String sName, String tName, Attributes attrs) throws SAXException { String name = attrs.getValue("name"); if ("tcf".equals(tName)) { myCurrent = new Args(); myCurrent.node = getGlobal("node") != null ? getGlobal("node") : myCurrent.node; myCurrent.server = getGlobal("server") != null ? getGlobal("server") : myCurrent.server; myCurrent.CCSID = getGlobal("CCSID") != null ? getGlobal("CCSID") : myCurrent.CCSID; myCurrent.XAEnabled = getGlobal("XAEnabled") != null ? getGlobal("XAEnabled") : myCurrent.XAEnabled; myCurrent.authDataAlias = getGlobal("authDataAlias") != null ? getGlobal("authDataAlias") : myCurrent.authDataAlias; myCurrent.authMechanismPreference = getGlobal("authMechanismPreference") != null ? getGlobal("authMechanismPreference") : myCurrent.authMechanismPreference; myCurrent.brokerCCSubQ = getGlobal("brokerCCSubQ") != null ? getGlobal("brokerCCSubQ") : myCurrent.brokerCCSubQ; myCurrent.brokerControlQueue = getGlobal("brokerControlQueue") != null ? getGlobal("brokerControlQueue") : myCurrent.brokerControlQueue; myCurrent.brokerPubQueue = getGlobal("brokerPubQueue") != null ? getGlobal("brokerPubQueue") : myCurrent.brokerPubQueue; myCurrent.brokerQueueManager = getGlobal("brokerQueueManager") != null ? getGlobal("brokerQueueManager") : myCurrent.brokerQueueManager; myCurrent.brokerSubQueue = getGlobal("brokerSubQueue") != null ? getGlobal("brokerSubQueue") : myCurrent.brokerSubQueue; myCurrent.brokerVersion = getGlobal("brokerVersion") != null ? getGlobal("brokerVersion") : myCurrent.brokerVersion; myCurrent.category = getGlobal("category") != null ? getGlobal("category") : myCurrent.category; myCurrent.channel = getGlobal("channel") != null ? getGlobal("channel") : myCurrent.channel; myCurrent.clientID = getGlobal("clientID") != null ? getGlobal("clientID") : myCurrent.clientID; myCurrent.cloneSupport = getGlobal("cloneSupport") != null ? getGlobal("cloneSupport") : myCurrent.cloneSupport; myCurrent.host = getGlobal("host") != null ? getGlobal("host") : myCurrent.host; myCurrent.port = getGlobal("port") != null ? getGlobal("port") : myCurrent.port; myCurrent.mapping = getGlobal("mapping") != null ? getGlobal("mapping") : myCurrent.mapping; myCurrent.queueManager = getGlobal("queueManager") != null ? getGlobal("queueManager") : myCurrent.queueManager; myCurrent.tempModel = getGlobal("tempModel") != null ? getGlobal("tempModel") : myCurrent.tempModel; myCurrent.transportType = getGlobal("transportType") != null ? getGlobal("transportType") : myCurrent.transportType; addArgs(myCurrent); } else if ("node".equals(tName)) { if (myCurrent == null) { addGlobal("node", name); } else { myCurrent.node = name; } } else if ("server".equals(tName)) { if (myCurrent == null) { addGlobal("server", name); } else { myCurrent.server = name; } } else if ("CCSID".equals(tName)) { if (myCurrent == null) { addGlobal("CCSID", name); } else { myCurrent.CCSID = name; } } else if ("XAEnabled".equals(tName)) { if (myCurrent == null) { addGlobal("XAEnabled", name); } else { myCurrent.XAEnabled = name; } } else if ("authDataAlias".equals(tName)) { if (myCurrent == null) { addGlobal("authDataAlias", name); } else { myCurrent.authDataAlias = name; } } else if ("authMechanismPreference".equals(tName)) { if (myCurrent == null) { addGlobal("authMechanismPreference", name); } else { myCurrent.authMechanismPreference = name; } } else if ("brokerCCSubQ".equals(tName)) { if (myCurrent == null) { addGlobal("brokerCCSubQ", name); } else { myCurrent.brokerCCSubQ = name; } } else if ("brokerControlQueue".equals(tName)) { if (myCurrent == null) { addGlobal("brokerControlQueue", name); } else { myCurrent.brokerControlQueue = name; } } else if ("brokerPubQueue".equals(tName)) { if (myCurrent == null) { addGlobal("brokerPubQueue", name); } else { myCurrent.brokerPubQueue = name; } } else if ("brokerQueueManager".equals(tName)) { if (myCurrent == null) { addGlobal("brokerQueueManager", name); } else { myCurrent.brokerQueueManager = name; } } else if ("brokerSubQueue".equals(tName)) { if (myCurrent == null) { addGlobal("brokerSubQueue", name); } else { myCurrent.brokerSubQueue = name; } } else if ("brokerVersion".equals(tName)) { if (myCurrent == null) { addGlobal("brokerVersion", name); } else { myCurrent.brokerVersion = name; } } else if ("category".equals(tName)) { if (myCurrent == null) { addGlobal("category", name); } else { myCurrent.category = name; } } else if ("channel".equals(tName)) { if (myCurrent == null) { addGlobal("channel", name); } else { myCurrent.channel = name; } } else if ("clientID".equals(tName)) { if (myCurrent == null) { addGlobal("clientID", name); } el... [truncated message content] |
From: dion g. <dio...@us...> - 2005-11-02 23:23:08
|
diongillard 05/11/02 15:23:02 maven-plugins/was5config/src/java/org/apache/maven/was5/namespace - New directory |