You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ps...@apache.org on 2011/04/11 07:00:20 UTC

svn commit: r1090934 - in /commons/proper/lang/trunk: build.properties.sample build.xml default.properties src/assembly/src.xml

Author: psteitz
Date: Mon Apr 11 05:00:19 2011
New Revision: 1090934

URL: http://svn.apache.org/viewvc?rev=1090934&view=rev
Log:
Restored Ant build.

Added:
    commons/proper/lang/trunk/build.properties.sample
    commons/proper/lang/trunk/build.xml
      - copied, changed from r1090926, commons/proper/lang/tags/LANG_2_6/build.xml
    commons/proper/lang/trunk/default.properties
      - copied, changed from r1090926, commons/proper/lang/tags/LANG_2_6/default.properties
Modified:
    commons/proper/lang/trunk/src/assembly/src.xml

Added: commons/proper/lang/trunk/build.properties.sample
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/build.properties.sample?rev=1090934&view=auto
==============================================================================
--- commons/proper/lang/trunk/build.properties.sample (added)
+++ commons/proper/lang/trunk/build.properties.sample Mon Apr 11 05:00:19 2011
@@ -0,0 +1,26 @@
+#   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.
+##########################################################################
+# Sample Ant build.properties file
+#
+# This setup assumes dependent jars are in a local maven 2 repository.
+# However the jars are located, the properties ending in ".jar" need
+# expand to full paths to the jars.
+##########################################################################
+
+# Repository base path - unnecessary if full jar paths are provided below
+repository=${user.home}/.m2/repository
+junit.home=${repository}/junit/junit/4.7/
+easymock.home=${repository}/org/easymock/easymock/2.5.2/

Copied: commons/proper/lang/trunk/build.xml (from r1090926, commons/proper/lang/tags/LANG_2_6/build.xml)
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/build.xml?p2=commons/proper/lang/trunk/build.xml&p1=commons/proper/lang/tags/LANG_2_6/build.xml&r1=1090926&r2=1090934&rev=1090934&view=diff
==============================================================================
--- commons/proper/lang/tags/LANG_2_6/build.xml (original)
+++ commons/proper/lang/trunk/build.xml Mon Apr 11 05:00:19 2011
@@ -42,6 +42,7 @@
         <pathelement location="${build.home}/classes"/>
         <pathelement location="${build.home}/tests"/>
         <pathelement location="${junit.jar}"/>
+    	<pathelement location="${easymock.jar}"/>
     </path>
 
     <!-- ========== Executable Targets ======================================== -->

Copied: commons/proper/lang/trunk/default.properties (from r1090926, commons/proper/lang/tags/LANG_2_6/default.properties)
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/default.properties?p2=commons/proper/lang/trunk/default.properties&p1=commons/proper/lang/tags/LANG_2_6/default.properties&r1=1090926&r2=1090934&rev=1090934&view=diff
==============================================================================
--- commons/proper/lang/tags/LANG_2_6/default.properties (original)
+++ commons/proper/lang/trunk/default.properties Mon Apr 11 05:00:19 2011
@@ -17,8 +17,11 @@
 
 # $Id$
 
-# The pathname of the "junit.jar" JAR file
-junit.jar = ${junit.home}/junit-3.8.1.jar
+# The location of the "junit.jar" JAR file
+junit.jar = ${junit.home}/junit-4.7.jar
+
+# The location of the Easymock jar
+easymock.jar = ${easymock.home}/easymock-2.5.2.jar
 
 # Whether or not to fork tests
 junit.fork = true
@@ -27,13 +30,13 @@ junit.fork = true
 component.name = commons-lang
 
 # The primary package name of this component
-component.package = org.apache.commons.lang
+component.package = org.apache.commons.lang3
 
 # The title of this component
 component.title = Core Language Utilities
 
 # The current version number of this component
-component.version = 2.6
+component.version = 3.0
 
 # The name that is used to create the jar file
 final.name = ${component.name}-${component.version}
@@ -64,12 +67,12 @@ compile.optimize = true
 # In particular, if you use JDK 1.4+ the generated classes will not be usable
 # for a 1.1 Java VM unless you explicitly set this attribute to the value 1.1 
 # (which is the default value for JDK 1.1 to 1.3).
-compile.target = 1.3
+compile.target = 1.5
 
 # Specifies the source version for the Java compiler.
 # Corresponds to the source attribute for the ant javac task. 
 # Valid values are 1.3, 1.4, 1.5. 
-compile.source = 1.3
+compile.source = 1.5
 
 # Should all tests fail if one does?
 test.failonerror = true

Modified: commons/proper/lang/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/assembly/src.xml?rev=1090934&r1=1090933&r2=1090934&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/assembly/src.xml (original)
+++ commons/proper/lang/trunk/src/assembly/src.xml Mon Apr 11 05:00:19 2011
@@ -31,6 +31,9 @@
                 <include>pom.xml</include>
                 <include>PROPOSAL.html</include>
                 <include>RELEASE-NOTES.txt</include>
+                <include>build.xml</include>
+                <include>default.properties</include>
+                <include>build.properties.sample</include>
             </includes>
         </fileSet>
         <fileSet>