Author: bayard Date: Fri Mar 20 06:27:40 2009 New Revision: 756341 URL: http://svn.apache.org/viewvc?rev=756341&view=rev Log: Updating site to be CLI1 specific
Removed: commons/proper/cli/branches/cli-1.x/xdocs/examples/ commons/proper/cli/branches/cli-1.x/xdocs/manual/ Modified: commons/proper/cli/branches/cli-1.x/pom.xml commons/proper/cli/branches/cli-1.x/src/site/site.xml commons/proper/cli/branches/cli-1.x/xdocs/index.xml Modified: commons/proper/cli/branches/cli-1.x/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/pom.xml?rev=756341&r1=756340&r2=756341&view=diff ============================================================================== --- commons/proper/cli/branches/cli-1.x/pom.xml (original) +++ commons/proper/cli/branches/cli-1.x/pom.xml Fri Mar 20 06:27:40 2009 @@ -176,44 +176,71 @@ </build> <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>1.2</version> - <configuration> - <threshold>Normal</threshold> - <effort>Default</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>src/conf/checkstyle.xml</configLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.2</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>clirr-maven-plugin</artifactId> - <version>2.2.1</version> - <configuration> - <comparisonVersion>1.1</comparisonVersion> - </configuration> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <linksource>true</linksource> + <links> + <link>http://java.sun.com/javase/6/docs/api</link> + </links> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-changes-plugin</artifactId> + <version>2.0</version> + <configuration> + <xmlPath>${basedir}/xdocs/changes.xml</xmlPath> + <issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.1</version> + <configuration> + <configLocation>src/conf/checkstyle.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>1.2</version> + <configuration> + <threshold>Normal</threshold> + <effort>Default</effort> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.2</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>clirr-maven-plugin</artifactId> + <version>2.2.1</version> + <configuration> + <comparisonVersion>1.1</comparisonVersion> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-pmd-plugin</artifactId> + </plugin> + </plugins> </reporting> - <profiles> <!-- Profile to let Gump choose the name of the jar file generated --> <profile> Modified: commons/proper/cli/branches/cli-1.x/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/site/site.xml?rev=756341&r1=756340&r2=756341&view=diff ============================================================================== --- commons/proper/cli/branches/cli-1.x/src/site/site.xml (original) +++ commons/proper/cli/branches/cli-1.x/src/site/site.xml Fri Mar 20 06:27:40 2009 @@ -32,21 +32,13 @@ <item name="Source Repository" href="/source-repository.html"/> </menu> - <menu name="CLI 1 User Guide"> + <menu name="User Guide"> <item name="Getting started" href="/introduction.html"/> <item name="Usage scenarios" href="/usage.html"/> <item name="Option properties" href="/properties.html"/> <item name="Javadoc (1.2)" href="api-release/index.html"/> </menu> - <menu name="CLI 2 User Guide (dev)"> - <item name="Overview" href="/manual/index.html"/> - <item name="Examples" href="/examples/index.html"/> - <item name="Options" href="/manual/options.html"/> - <item name="Validators" href="/manual/validators.html"/> - <item name="Javadoc (SVN latest)" href="apidocs/index.html"/> - </menu> - </body> </project> Modified: commons/proper/cli/branches/cli-1.x/xdocs/index.xml URL: http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/xdocs/index.xml?rev=756341&r1=756340&r2=756341&view=diff ============================================================================== --- commons/proper/cli/branches/cli-1.x/xdocs/index.xml (original) +++ commons/proper/cli/branches/cli-1.x/xdocs/index.xml Fri Mar 20 06:27:40 2009 @@ -61,16 +61,12 @@ </p> </section> - <section name="1.x vs 2.x?"> + <section name="CLI 2?"> <p>Commons CLI 1.0 was formed from the merger of ideas and code from three different libraries - Werken, Avalon and Optz. In dealing with the bugs and the feature requests a freshly designed and not - backwards compatible CLI 2 was created, but never finished or released. Since then bugfix releases - have been made for CLI 1.</p> + backwards compatible CLI 2 was created in 2004, but never finished or released. </p> - <p>The current plan is to maintain the 1.x line until CLI 2 is officially released. The 2.x design is generally - preferred and is in use, however there is no current activity to make a 2.0 release. To this end, the 1.2 - release is recommended to most users while the 2.x line is recommended for anyone interested in helping to get - this better API released.</p> + <p>The current plan is to continue to maintain the 1.x line. The CLI2 work may be found in the Commons Sandbox. </p> </section> <section name="Documentation"> @@ -82,10 +78,10 @@ The Javadoc API documents are available online: </p> <ul> + <li><a href="apidocs/index.html">CLI 1.3-SNAPSHOT (latest SVN)</a></li> <li><a href="api-release/index.html">CLI 1.2 (current release)</a></li> <li><a href="api-1.1/index.html">CLI 1.1</a></li> <li><a href="api-1.0/index.html">CLI 1.0</a></li> - <li><a href="apidocs/index.html">CLI 2.0-SNAPSHOT (latest SVN)</a></li> </ul> <p> The <a href="source-repository.html">Subversion repository</a> can be @@ -114,78 +110,6 @@ <p>Issues may be reported via the <a href="issue-tracking.html">ASF JIRA</a>.</p> </section> - - <!-- <p> - CLI1 was formed by the merger of ideas and code from three different - libraries and allows most simple interfaces to be modelled. CLI1 - became increasingly difficult to maintain and develop further and so - CLI2 has been developed with the goals of clearer responsibilities and - being more flexible. The intention is that CLI2 should be able to - model a far greater selection of interfaces and do so more completely, - validating as much as possible. - </p> - <p> - The redesigned CLI2 is rooted in the <code>org.apache.commons.cli2</code> - package and the distribution retains the <code>org.apache.commons.cli</code> - package so that the upgrade doesn't break old code. The CLI1 package - should be regarded as deprecated to encourage the transition to the - more flexible CLI2 framework but minor bug fixes and patches may be - accepted to ensure that CLI1 based applications continue to function as - expected. - </p> - <p> - The rest of the documentation is split into the following three sections: - <ul> - <li><a href="manual/index.html">CLI2</a> - a reference manual for version 2</li> - <li><a href="introduction.html">CLI1</a> - documentation for version 1 </li> - <li><a href="examples/index.html">Examples</a> - a selection of worked examples demonstrating CLI2 features</li> - </ul> - </p> - <p> - The latest version of this documentation is available on the web: - <ul> - <li><a href="http://commons.apache.org/cli/">http://commons.apache.org/cli/</a></li> - <li> - <a href="http://commons.apache.org/cli/commons-cli.pdf">http://commons.apache.org/cli/commons-cli.pdf</a> - <a href="http://commons.apache.org/cli/commons-cli.pdf"><img border="0" src="images/pdf.gif"/></a> - </li> - </ul> - </p> - </section> - <section name="Dependancies"> - <p> - The generated list of <a href="dependencies.html">dependencies</a> - lists the libraries needed to compile and test Commons CLI. To use - the precompiled distribution none of these dependancies are strictly - necessary. The following is a breakdown of what is required and when: - </p> - <table> - <tr> - <th>Library</th><th>Usage</th> - </tr> - <tr> - <td>Java 1.2</td> - <td>This is the minimum java level needed to use CLI2</td> - </tr> - <tr> - <td>Java 1.4</td> - <td>Needed if the PreferencesCommandLine is needed</td> - </tr> - <tr> - <td>commons-lang</td> - <td>Needed if the CLI1 package is being used</td> - </tr> - <tr> - <td>jdepend</td> - <td>Needed to build and test CLI2 only</td> - </tr> - <tr> - <td>junit</td> - <td>Needed to build and test CLI1 and CLI2</td> - </tr> - </table> - </section> - --> </body> </document>