Author: niallp
Date: Sat Mar 13 16:11:58 2010
New Revision: 922592
URL: http://svn.apache.org/viewvc?rev=922592&view=rev
Log:
Switch build from Maven-1 to Maven-2
Added:
commons/sandbox/convert/trunk/pom.xml
- copied, changed from r922568, commons/sandbox/convert/trunk/project.xml
commons/sandbox/convert/trunk/src/main/
commons/sandbox/convert/trunk/src/main/java/
- copied from r922591, commons/sandbox/convert/trunk/src/java/
commons/sandbox/convert/trunk/src/site/
commons/sandbox/convert/trunk/src/site/resources/
commons/sandbox/convert/trunk/src/site/resources/images/
- copied from r922568, commons/sandbox/convert/trunk/xdocs/images/
commons/sandbox/convert/trunk/src/site/site.xml (with props)
commons/sandbox/convert/trunk/src/site/xdoc/
- copied from r922568, commons/sandbox/convert/trunk/xdocs/
commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml (with
props)
commons/sandbox/convert/trunk/src/test/java/
commons/sandbox/convert/trunk/src/test/java/org/
- copied from r922568, commons/sandbox/convert/trunk/src/test/org/
Removed:
commons/sandbox/convert/trunk/project.properties
commons/sandbox/convert/trunk/project.xml
commons/sandbox/convert/trunk/src/java/
commons/sandbox/convert/trunk/src/site/xdoc/images/
commons/sandbox/convert/trunk/src/site/xdoc/navigation.xml
commons/sandbox/convert/trunk/src/site/xdoc/style/
commons/sandbox/convert/trunk/src/test/org/
commons/sandbox/convert/trunk/xdocs/
Modified:
commons/sandbox/convert/trunk/NOTICE.txt
commons/sandbox/convert/trunk/build.xml
Modified: commons/sandbox/convert/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/NOTICE.txt?rev=922592&r1=922591&r2=922592&view=diff
==============================================================================
--- commons/sandbox/convert/trunk/NOTICE.txt (original)
+++ commons/sandbox/convert/trunk/NOTICE.txt Sat Mar 13 16:11:58 2010
@@ -1,2 +1,5 @@
+Apache Commons Convert
+Copyright 2009-2010 The Apache Software Foundation
+
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/sandbox/convert/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/build.xml?rev=922592&r1=922591&r2=922592&view=diff
==============================================================================
--- commons/sandbox/convert/trunk/build.xml (original)
+++ commons/sandbox/convert/trunk/build.xml Sat Mar 13 16:11:58 2010
@@ -33,7 +33,7 @@
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/java">
+ <pathelement location="${basedir}/src/main/java">
</pathelement>
</src>
<classpath>
@@ -101,7 +101,7 @@
</pathelement>
</classpath>
<batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/test">
+ <fileset dir="${basedir}/src/test/java">
<include name="**/Test*.java">
</include>
</fileset>
Copied: commons/sandbox/convert/trunk/pom.xml (from r922568,
commons/sandbox/convert/trunk/project.xml)
URL:
http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/pom.xml?p2=commons/sandbox/convert/trunk/pom.xml&p1=commons/sandbox/convert/trunk/project.xml&r1=922568&r2=922592&rev=922592&view=diff
==============================================================================
--- commons/sandbox/convert/trunk/project.xml (original)
+++ commons/sandbox/convert/trunk/pom.xml Sat Mar 13 16:11:58 2010
@@ -1,21 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
-<project>
- <extend>../commons-build/sandbox-project.xml</extend>
+ 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.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-sandbox-parent</artifactId>
+ <version>7</version>
+ </parent>
<name>Commons Convert</name>
- <id>commons-convert</id>
-
- <logo>/images/convert-logo-white.png</logo>
-
- <currentVersion>0.1</currentVersion>
+ <artifactId>commons-convert</artifactId>
+ <version>1.0-SNAPSHOT</version>
<inceptionYear>2003</inceptionYear>
- <shortDescription>Commons Convert</shortDescription>
<description>Java Conversion Utilities</description>
<url>http://commons.apache.org/sandbox/convert/</url>
- <siteAddress>jakarta.apache.org</siteAddress>
- <siteDirectory>/www/commons.apache.org/sandbox/convert/</siteDirectory>
-
<developers>
<developer>
<name>Adrian Crum</name>
@@ -36,27 +50,22 @@
</contributors>
<dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+ <properties>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
+ <commons.componentid>convert</commons.componentid>
+ <commons.jira.componentid>12313467</commons.jira.componentid>
+ </properties>
+
<build>
- <unitTest>
- <includes>
- <include>**/Test*.java</include>
- </includes>
- </unitTest>
</build>
- <reports>
- <report>maven-changelog-plugin</report>
- <report>maven-changes-plugin</report>
- <report>maven-checkstyle-plugin</report>
- <report>maven-jcoverage-plugin</report>
- <report>maven-developer-activity-plugin</report>
- <report>maven-file-activity-plugin</report>
- <report>maven-javadoc-plugin</report>
- <report>maven-junit-report-plugin</report>
- <report>maven-jxr-plugin</report>
- <report>maven-license-plugin</report>
- </reports>
-
</project>
Added: commons/sandbox/convert/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/src/site/site.xml?rev=922592&view=auto
==============================================================================
--- commons/sandbox/convert/trunk/src/site/site.xml (added)
+++ commons/sandbox/convert/trunk/src/site/site.xml Sat Mar 13 16:11:58 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project name="Commons Convert">
+
+ <bannerRight>
+ <name>Commons Convert</name>
+ <src>/images/convert-logo-white.png</src>
+ <href>/index.html</href>
+ </bannerRight>
+
+ <body>
+
+ <menu name="Convert">
+ <item name="Home" href="/index.html"/>
+ <item name="Mailing Lists" href="/mail-lists.html"/>
+ <item name="Issue Tracking" href="/issue-tracking.html"/>
+ <item name="Source Repository" href="/source-repository.html"/>
+ <item name="Javadoc (latest)" href="/apidocs/index.html"/>
+ </menu>
+
+ </body>
+
+</project>
Propchange: commons/sandbox/convert/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/convert/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml
URL:
http://svn.apache.org/viewvc/commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml?rev=922592&view=auto
==============================================================================
--- commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml (added)
+++ commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml Sat Mar 13
16:11:58 2010
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!--
+ +======================================================================+
+ |**** ****|
+ |**** THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN ****|
+ |**** DO NOT EDIT DIRECTLY ****|
+ |**** ****|
+ +======================================================================+
+ | TEMPLATE FILE: sandbox-issue-tracking-template.xml |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ | |
+ | 1) Re-generate using: mvn commons:sandbox-jira-page |
+ | |
+ | 2) Set the following properties in the component's pom: |
+ | - commons.jira.componentid (required, numeric) |
+ | |
+ | 3) Example Properties |
+ | |
+ | <properties> |
+ | <commons.jira.componentid>12311182</commons.jira.componentid> |
+ | </properties> |
+ | |
+ +======================================================================+
+-->
+<document>
+ <properties>
+ <title>Commons Convert Issue tracking</title>
+ <author email="d...@commons.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+
+ <section name="Commons Convert Issue tracking">
+ <p>
+ Commons Convert uses <a href="http://issues.apache.org/jira/";>ASF
JIRA</a> for tracking issues.
+ See the <a href="http://issues.apache.org/jira/browse/SANDBOX";>Sandbox
JIRA project page</a>.
+ </p>
+
+ <p>
+ To use JIRA you may need to <a
href="http://issues.apache.org/jira/secure/Signup!default.jspa";>create an
account</a>
+ (if you have previously created/updated Commons issues using Bugzilla an
account will have been automatically
+ created and you can use the <a
href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa";>Forgot
Password</a>
+ page to get a new password).
+ </p>
+
+ <p>
+ If you would like to report a bug, or raise an enhancement request with
+ Commons Convert please do the following:
+ <ol>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12313467&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>Search
existing open bugs</a>.
+ If you find your issue listed then please add a comment with your
details.</li>
+ <li><a href="mail-lists.html">Search the mailing list archive(s)</a>.
+ You may find your issue or idea has already been discussed.</li>
+ <li>Decide if your issue is a bug or an enhancement.</li>
+ <li>Submit either a <a
href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12313467&issuetype=1&priority=4&assignee=-1";>bug
report</a>
+ or <a
href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310491&components=12313467&issuetype=4&priority=4&assignee=-1";>enhancement
request</a>.</li>
+ </ol>
+ </p>
+
+ <p>
+ Please also remember these points:
+ <ul>
+ <li>the more information you provide, the better we can help you</li>
+ <li>test cases are vital, particularly for any proposed
enhancements</li>
+ <li>the developers of Commons Convert are all unpaid volunteers</li>
+ </ul>
+ </p>
+
+ <p>
+ For more information on subversion and creating patches see the
+ <a href="http://www.apache.org/dev/contributors.html";>Apache
Contributors Guide</a>.
+ </p>
+
+ <p>
+ You may also find these links useful:
+ <ul>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12313467&sorter/field=issuekey&sorter/order=DESC&status=1&status=3&status=4";>All
Open Commons Convert bugs</a></li>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12313467&sorter/field=issuekey&sorter/order=DESC&status=5&status=6";>All
Resolved Commons Convert bugs</a></li>
+ <li><a
href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&pid=12310491&component=12313467&sorter/field=issuekey&sorter/order=DESC";>All
Commons Convert bugs</a></li>
+ </ul>
+ </p>
+ </section>
+ </body>
+</document>
Propchange: commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: commons/sandbox/convert/trunk/src/site/xdoc/issue-tracking.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
