You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/07 16:01:41 UTC
svn commit: rev 20867 - in avalon/trunk/runtime/util: configuration criteria defaults defaults/etc defaults/etc/test defaults/etc/test/unit defaults/src/test defaults/src/test/org/apache/avalon/util/defaults/test env exception extension/api extension/impl extension/impl/src/test/org/apache/avalon/extension/test i18n
Author: mcconnell
Date: Mon Jun 7 07:01:41 2004
New Revision: 20867
Added:
avalon/trunk/runtime/util/configuration/build.properties
avalon/trunk/runtime/util/configuration/build.xml
avalon/trunk/runtime/util/criteria/build.xml
avalon/trunk/runtime/util/defaults/build.xml
avalon/trunk/runtime/util/defaults/etc/
avalon/trunk/runtime/util/defaults/etc/test/
avalon/trunk/runtime/util/defaults/etc/test/unit/
avalon/trunk/runtime/util/defaults/etc/test/unit/static.properties
avalon/trunk/runtime/util/defaults/etc/test/unit/test.keys
avalon/trunk/runtime/util/defaults/etc/test/unit/test.properties
avalon/trunk/runtime/util/env/build.xml
avalon/trunk/runtime/util/exception/build.xml
avalon/trunk/runtime/util/extension/api/build.xml
avalon/trunk/runtime/util/extension/impl/build.xml
avalon/trunk/runtime/util/i18n/build.xml
Removed:
avalon/trunk/runtime/util/defaults/src/test/static.properties
avalon/trunk/runtime/util/defaults/src/test/test.keys
avalon/trunk/runtime/util/defaults/src/test/test.properties
Modified:
avalon/trunk/runtime/util/defaults/src/test/org/apache/avalon/util/defaults/test/DefaultsBuilderTestCase.java
avalon/trunk/runtime/util/extension/impl/src/test/org/apache/avalon/extension/test/PackageRepositoryTestCase.java
Log:
Add resources supporting ant based builds of the avalon/util package.
Added: avalon/trunk/runtime/util/configuration/build.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/configuration/build.properties Mon Jun 7 07:01:41 2004
@@ -0,0 +1,3 @@
+project.name = avalon-util-configuration
+project.src.main = java
+project.home = ../../../central/system
Added: avalon/trunk/runtime/util/configuration/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/configuration/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-configuration" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/criteria/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/criteria/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-criteria" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/defaults/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-criteria" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/defaults/etc/test/unit/static.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/etc/test/unit/static.properties Mon Jun 7 07:01:41 2004
@@ -0,0 +1,7 @@
+
+#
+# test application static properties
+#
+
+aaa = Aaaaaaaaaaaa
+xxx = Xxxxxxxxxxxx
Added: avalon/trunk/runtime/util/defaults/etc/test/unit/test.keys
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/etc/test/unit/test.keys Mon Jun 7 07:01:41 2004
@@ -0,0 +1,9 @@
+
+#
+# test application keys
+#
+
+test.home =
+aaa =
+xxx =
+qqq =
Added: avalon/trunk/runtime/util/defaults/etc/test/unit/test.properties
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/defaults/etc/test/unit/test.properties Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+
+#
+# test application properties
+#
+
+aaa = bbb
Modified: avalon/trunk/runtime/util/defaults/src/test/org/apache/avalon/util/defaults/test/DefaultsBuilderTestCase.java
==============================================================================
--- avalon/trunk/runtime/util/defaults/src/test/org/apache/avalon/util/defaults/test/DefaultsBuilderTestCase.java (original)
+++ avalon/trunk/runtime/util/defaults/src/test/org/apache/avalon/util/defaults/test/DefaultsBuilderTestCase.java Mon Jun 7 07:01:41 2004
@@ -39,10 +39,7 @@
protected void setUp() throws Exception
{
File base = new File( System.getProperty( "basedir" ) );
- File dir = new File( base, "target/test-classes" );
- System.out.println( "dir: " + dir );
-
- m_builder = new DefaultsBuilder( KEY, dir );
+ m_builder = new DefaultsBuilder( KEY, base );
}
public void testHomeDirectory() throws Exception
@@ -68,8 +65,7 @@
public void testConsolidatedProperties() throws Exception
{
File base = new File( System.getProperty( "basedir" ) );
- File dir = new File( base, "target/test-classes" );
- File props = new File( dir, "test.keys" );
+ File props = new File( base, "test.keys" );
Properties properties = DefaultsBuilder.getProperties( props );
String[] keys = (String[]) properties.keySet().toArray( new String[0] );
Properties defaults =
Added: avalon/trunk/runtime/util/env/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/env/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-env" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/exception/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/exception/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-exception" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/extension/api/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/api/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-extension-api" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Added: avalon/trunk/runtime/util/extension/impl/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/extension/impl/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-extension-impl" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
Modified: avalon/trunk/runtime/util/extension/impl/src/test/org/apache/avalon/extension/test/PackageRepositoryTestCase.java
==============================================================================
--- avalon/trunk/runtime/util/extension/impl/src/test/org/apache/avalon/extension/test/PackageRepositoryTestCase.java (original)
+++ avalon/trunk/runtime/util/extension/impl/src/test/org/apache/avalon/extension/test/PackageRepositoryTestCase.java Mon Jun 7 07:01:41 2004
@@ -52,7 +52,9 @@
File root = new File( System.getProperty( "basedir" ) );
m_baseDirectory =
- ( new File( root, "target/test-classes/org/apache/avalon/extension/test/" ) ).getCanonicalFile();
+ new File(
+ root,
+ "../classes/org/apache/avalon/extension/test/" ).getCanonicalFile();
m_pathElement1 = new File( m_baseDirectory, "path1" );
m_pathElement2 = new File( m_baseDirectory, "path2" );
Added: avalon/trunk/runtime/util/i18n/build.xml
==============================================================================
--- (empty file)
+++ avalon/trunk/runtime/util/i18n/build.xml Mon Jun 7 07:01:41 2004
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="avalon-util-i18n" default="dist" basedir=".">
+ <property file="build.properties"/>
+ <import file="${project.home}/build/standard.xml"/>
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org