You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2004/10/20 11:03:54 UTC
cvs commit: jakarta-turbine-fulcrum/configuration/impl/xdocs changes.xml
epugh 2004/10/20 02:03:54
Modified: configuration/impl/src/test configuration.xml
configuration/impl maven.xml project.xml
configuration/impl/src/test/org/apache/fulcrum/configuration
ConfigTest.java
configuration/impl/xdocs changes.xml
Added: configuration/impl/src/test TestComponentConfig.xml
TestRoleConfig.xml
Log:
Update versions. Use TestContainer.
Revision Changes Path
1.4 +2 -5 jakarta-turbine-fulcrum/configuration/impl/src/test/configuration.xml
Index: configuration.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/test/configuration.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configuration.xml 12 Oct 2004 10:07:06 -0000 1.3
+++ configuration.xml 20 Oct 2004 09:03:54 -0000 1.4
@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<configuration>
- <properties
- className="org.apache.commons.configuration.PropertiesConfiguration"
- fileName="../../../src/test/org/test.properties"/>
- <xml
- fileName="../../../src/test/org/test.xml"/>
+ <properties fileName="src/test/org/test.properties"/>
+ <xml fileName="src/test/org/test.xml"/>
</configuration>
1.1 jakarta-turbine-fulcrum/configuration/impl/src/test/TestComponentConfig.xml
Index: TestComponentConfig.xml
===================================================================
<componentConfig>
<config configurationPath="src/test/configuration.xml"/>
</componentConfig>
1.1 jakarta-turbine-fulcrum/configuration/impl/src/test/TestRoleConfig.xml
Index: TestRoleConfig.xml
===================================================================
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.commons.configuration.Configuration"
shorthand="config"
default-class="org.apache.fulcrum.configuration.DefaultConfigurationService"/>
</role-list>
1.2 +2 -2 jakarta-turbine-fulcrum/configuration/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 12 Nov 2003 11:27:07 -0000 1.1
+++ maven.xml 20 Oct 2004 09:03:54 -0000 1.2
@@ -1,7 +1,7 @@
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
- <preGoal name="java:compile">
+ <!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
- </preGoal>
+ </preGoal-->
</project>
1.10 +32 -19 jakarta-turbine-fulcrum/configuration/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 12 Oct 2004 10:17:20 -0000 1.9
+++ project.xml 20 Oct 2004 09:03:54 -0000 1.10
@@ -3,17 +3,34 @@
<project>
<id>fulcrum-configuration-impl</id>
- <extend>${basedir}/../../merlin-project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<name>Fulcrum Configuration Impl</name>
<currentVersion>1.0.3-dev</currentVersion>
<package>org.apache.fulcrum.configuration</package>
<dependencies>
- <dependency>
+ <dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
+ <url>http://avalon.apache.org/framework/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ <ear.bundle>true</ear.bundle>
+ </properties>
</dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ <url>http://jakarta.apache.org/commons/collections.html</url>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -24,34 +41,30 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.4</version>
</dependency>
+
+ <!-- Needed only for testing -->
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4-dev</version>
+ </dependency>
</dependencies>
1.6 +4 -4 jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
Index: ConfigTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConfigTest.java 30 Jun 2004 12:50:28 -0000 1.5
+++ ConfigTest.java 20 Oct 2004 09:03:54 -0000 1.6
@@ -16,7 +16,7 @@
*/
import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
+import org.apache.fulcrum.testcontainer.BaseUnitTest;
import org.apache.commons.configuration.Configuration;
/**
@@ -26,7 +26,7 @@
* @author <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
* @version $Id$
*/
-public class ConfigTest extends AbstractMerlinTestCase
+public class ConfigTest extends BaseUnitTest
{
private Configuration config = null;
@@ -45,7 +45,7 @@
super.setUp();
try
{
- config = (Configuration) this.resolve( "/test/config" );
+ config = (Configuration) this.resolve( Configuration.class.getName() );
}
catch (ComponentException e)
1.3 +3 -0 jakarta-turbine-fulcrum/configuration/impl/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/configuration/impl/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 12 Oct 2004 10:07:07 -0000 1.2
+++ changes.xml 20 Oct 2004 09:03:54 -0000 1.3
@@ -8,6 +8,9 @@
<body>
<release version="1.0.3" date="">
<action dev="epugh" type="update">
+ Bump versions of dependencies.
+ </action>
+ <action dev="epugh" type="update">
Upgrade to commons-configuration-1.0
</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org