Author: niallp
Date: Mon Oct 4 18:54:36 2010
New Revision: 1004358
URL: http://svn.apache.org/viewvc?rev=1004358&view=rev
Log:
Build changes - re-organize to standard m2 layout, remove useless JIRA report
and fix some Ant issues
Added:
commons/proper/io/trunk/src/assembly/
- copied from r1004356, commons/proper/io/trunk/src/main/assembly/
commons/proper/io/trunk/src/main/java/
- copied from r1004356, commons/proper/io/trunk/src/java/
commons/proper/io/trunk/src/test/java/
commons/proper/io/trunk/src/test/java/org/
- copied from r1004356, commons/proper/io/trunk/src/test/org/
Removed:
commons/proper/io/trunk/src/java/
commons/proper/io/trunk/src/main/assembly/
commons/proper/io/trunk/src/test/org/
Modified:
commons/proper/io/trunk/build.xml
commons/proper/io/trunk/pom.xml
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
Modified: commons/proper/io/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/build.xml?rev=1004358&r1=1004357&r2=1004358&view=diff
==============================================================================
--- commons/proper/io/trunk/build.xml (original)
+++ commons/proper/io/trunk/build.xml Mon Oct 4 18:54:36 2010
@@ -56,13 +56,13 @@
<property name="component.title" value="Commons IO"/>
<!-- The current version number of this component -->
- <property name="component.version" value="1.5-SNAPSHOT"/>
+ <property name="component.version" value="2.0-SNAPSHOT"/>
<!-- The base directory for component sources -->
- <property name="source.home" value="src/java"/>
+ <property name="source.home" value="src/main/java"/>
<!-- The base directory for unit test sources -->
- <property name="test.home" value="src/test"/>
+ <property name="test.home" value="src/test/java"/>
<!-- Download lib dir -->
<property name="download.lib.dir" value="lib"/>
@@ -71,7 +71,7 @@
<property name="build.home" value="target"/>
<!-- The base directory for distribution targets -->
- <property name="dist.home" value="${build.home}/dist"/>
+ <property name="dist.home" value="${build.home}"/>
<!-- Base file name for dist files -->
<property name="final.name"
value="${component.name}-${component.version}"/>
@@ -233,10 +233,10 @@
<manifest file="${build.home}/MANIFEST.MF">
<attribute name="Specification-Title" value="${component.title}"/>
<attribute name="Specification-Version"
value="${component.version}"/>
- <attribute name="Specification-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Specification-Vendor" value="The Apache Software
Foundation"/>
<attribute name="Implementation-Title" value="${component.title}"/>
<attribute name="Implementation-Version"
value="${component.version}"/>
- <attribute name="Implementation-Vendor" value="Apache Software
Foundation"/>
+ <attribute name="Implementation-Vendor" value="The Apache Software
Foundation"/>
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
<attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
<attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
@@ -285,7 +285,6 @@
<copy todir="${stage.src.dir}/${final.name}-src">
<fileset dir=".">
<include name="build.xml"/>
- <include name="build-check-jdk13.xml"/>
<include name="checkstyle.xml"/>
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
@@ -297,9 +296,6 @@
<copy todir="${stage.src.dir}/${final.name}-src/src">
<fileset dir="src" />
</copy>
- <copy todir="${stage.src.dir}/${final.name}-src/xdocs">
- <fileset dir="xdocs" />
- </copy>
<zip zipfile="${dist.home}/${final.name}.zip"
basedir="${stage.bin.dir}"/>
<zip zipfile="${dist.home}/${final.name}-src.zip"
basedir="${stage.src.dir}"/>
Modified: commons/proper/io/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/pom.xml?rev=1004358&r1=1004357&r2=1004358&view=diff
==============================================================================
--- commons/proper/io/trunk/pom.xml (original)
+++ commons/proper/io/trunk/pom.xml Mon Oct 4 18:54:36 2010
@@ -217,8 +217,6 @@
</properties>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -243,8 +241,8 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/assembly/bin.xml</descriptor>
+ <descriptor>src/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -261,27 +259,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <issueLinkTemplatePerSystem>
- <default>%URL%/%ISSUE%</default>
- </issueLinkTemplatePerSystem>
- <columnNames>Fix
Version,Type,Key,Summary,Priority,Reporter,Resolution</columnNames>
- <sortColumnNames>Fix Version DESC,Type,Key DESC</sortColumnNames>
- <resolutionIds>Fixed</resolutionIds>
- <statusIds>Resolved,Closed</statusIds>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.1</version>
<configuration>
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java?rev=1004358&r1=1004356&r2=1004358&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java
Mon Oct 4 18:54:36 2010
@@ -43,7 +43,7 @@ public class DirectoryWalkerTestCase ext
// Directories
private static final File current = new File(".");
- private static final File javaDir = new File("src/java");
+ private static final File javaDir = new File("src/main/java");
private static final File orgDir = new File(javaDir, "org");
private static final File apacheDir = new File(orgDir, "apache");
private static final File commonsDir = new File(apacheDir, "commons");
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java?rev=1004358&r1=1004356&r2=1004358&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java
Mon Oct 4 18:54:36 2010
@@ -44,7 +44,7 @@ public class DirectoryWalkerTestCaseJava
// Directories
private static final File current = new File(".");
- private static final File javaDir = new File("src/java");
+ private static final File javaDir = new File("src/main/java");
private static final File orgDir = new File(javaDir, "org");
private static final File apacheDir = new File(orgDir, "apache");
private static final File commonsDir = new File(apacheDir, "commons");
