Author: niallp
Date: Mon Mar 22 16:41:12 2010
New Revision: 926168
URL: http://svn.apache.org/viewvc?rev=926168&view=rev
Log:
Re-organize into default Maven-2 project structure
Added:
commons/proper/beanutils/trunk/src/changes/
commons/proper/beanutils/trunk/src/changes/changes.xml
- copied unchanged from r926144,
commons/proper/beanutils/trunk/xdocs/changes.xml
commons/proper/beanutils/trunk/src/main/java/
- copied from r926144, commons/proper/beanutils/trunk/src/java/
commons/proper/beanutils/trunk/src/site/xdoc/
- copied from r926144, commons/proper/beanutils/trunk/xdocs/
commons/proper/beanutils/trunk/src/test/java/
commons/proper/beanutils/trunk/src/test/java/org/
- copied from r926144, commons/proper/beanutils/trunk/src/test/org/
Removed:
commons/proper/beanutils/trunk/src/java/
commons/proper/beanutils/trunk/src/site/xdoc/changes.xml
commons/proper/beanutils/trunk/src/site/xdoc/style/
commons/proper/beanutils/trunk/src/test/org/
commons/proper/beanutils/trunk/xdocs/
Modified:
commons/proper/beanutils/trunk/build.properties.sample
commons/proper/beanutils/trunk/build.xml
commons/proper/beanutils/trunk/pom.xml
Modified: commons/proper/beanutils/trunk/build.properties.sample
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.properties.sample?rev=926168&r1=926167&r2=926168&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/build.properties.sample (original)
+++ commons/proper/beanutils/trunk/build.properties.sample Mon Mar 22 16:41:12
2010
@@ -14,20 +14,20 @@
# limitations under the License.
# Repository base path
-repository=${user.home}/.maven/repository
+repository=${user.home}/.m2/repository
# The pathname of the collections classes JAR file
-commons-collections.home=${repository}/commons-collections/jars
-commons-collections.jar=${commons-collections.home}/commons-collections-3.2.1.jar
-commons-collections-testframework.jar=${commons-collections.home}/commons-collections-testframework-3.2.1.jar
+commons-collections.home=${repository}/commons-collections
+commons-collections.jar=${commons-collections.home}/commons-collections/3.2.1/commons-collections-3.2.1.jar
+commons-collections-testframework.jar=${commons-collections.home}/commons-collections-testframework/3.2.1/commons-collections-testframework-3.2.1.jar
# The pathname of the Commons Logging JAR file
-commons-logging.home=${repository}/commons-logging/jars
-commons-logging.jar=${commons-logging.home}/commons-logging-1.1.1.jar
+commons-logging.home=${repository}/commons-logging/commons-logging
+commons-logging.jar=${commons-logging.home}/1.1.1/commons-logging-1.1.1.jar
# The pathname of the "junit.jar" JAR file
-junit.home=${repository}/junit/jars
-junit.jar=${junit.home}/junit-3.8.1.jar
+junit.home=${repository}/junit/junit
+junit.jar=${junit.home}/3.8.1/junit-3.8.1.jar
# Configuration Example for Commons Logging in maven
maven.junit.fork=true
Modified: commons/proper/beanutils/trunk/build.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/build.xml?rev=926168&r1=926167&r2=926168&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/build.xml (original)
+++ commons/proper/beanutils/trunk/build.xml Mon Mar 22 16:41:12 2010
@@ -27,7 +27,6 @@
<property file="build.properties"/> <!-- Component local -->
- <property file="project.properties"/> <!-- Project local -->
<property file="${user.home}/build.properties"/> <!-- User local -->
@@ -53,15 +52,21 @@
<property name="dist.home" value="dist"/>
<!-- 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"/>
<!-- ========== Compiler Defaults ========================================= -->
+ <!-- Compiler source JDK version -->
+ <property name="compile.source" value="1.3"/>
+
+ <!-- Compiler target JDK version -->
+ <property name="compile.target" value="1.3"/>
+
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>
@@ -139,8 +144,8 @@
description="Compile shareable components">
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
- source="${maven.compile.source}"
- target="${maven.compile.target}"
+ source="${compile.source}"
+ target="${compile.target}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}">
@@ -232,8 +237,8 @@
<attribute name="Implementation-Version"
value="${component.version}"/>
<attribute name="Implementation-Vendor" value="The Apache Software
Foundation"/>
<attribute name="Implementation-Vendor-Id" value="org.apache"/>
- <attribute name="X-Compile-Source-JDK"
value="${maven.compile.source}"/>
- <attribute name="X-Compile-Target-JDK"
value="${maven.compile.target}"/>
+ <attribute name="X-Compile-Source-JDK" value="${compile.source}"/>
+ <attribute name="X-Compile-Target-JDK" value="${compile.target}"/>
</manifest>
<fileset dir="${build.home}/classes">
<include name="**/*.class"/>
@@ -246,8 +251,8 @@
<property name="dist.dir" value="${dist.home}"/>
<property name="build.dir" value="${build.home}"/>
<property name="component.version" value="${component.version}"/>
- <property name="maven.compile.source" value="${maven.compile.source}"/>
- <property name="maven.compile.target" value="${maven.compile.target}"/>
+ <property name="maven.compile.source" value="${compile.source}"/>
+ <property name="maven.compile.target" value="${compile.target}"/>
</ant>
</target>
Modified: commons/proper/beanutils/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/pom.xml?rev=926168&r1=926167&r2=926168&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/pom.xml (original)
+++ commons/proper/beanutils/trunk/pom.xml Mon Mar 22 16:41:12 2010
@@ -163,8 +163,6 @@
</dependencies>
<build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -288,7 +286,6 @@
<artifactId>maven-changes-plugin</artifactId>
<version>2.1</version>
<configuration>
- <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
<issueLinkTemplate>%URL%/%ISSUE%</issueLinkTemplate>
</configuration>
<reportSets>
