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 15:27:43 UTC
cvs commit: jakarta-turbine-fulcrum/factory/impl maven.xml project.xml
epugh 2004/10/20 06:27:43
Modified: factory/impl/xdocs changes.xml
factory/impl/src/test/org/apache/fulcrum/factory
FactoryServiceTest.java
factory/impl maven.xml project.xml
Added: factory/impl/src/test TestComponentConfig.xml
TestRoleConfig.xml
Log:
Bump versions, clean up dependencies. Use TestContainer.
Revision Changes Path
1.1 jakarta-turbine-fulcrum/factory/impl/src/test/TestComponentConfig.xml
Index: TestComponentConfig.xml
===================================================================
<componentConfig>
<factory/>
</componentConfig>
1.1 jakarta-turbine-fulcrum/factory/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.fulcrum.factory.FactoryService"
shorthand="factory"
default-class="org.apache.fulcrum.factory.DefaultFactoryService"/>
</role-list>
1.2 +5 -0 jakarta-turbine-fulcrum/factory/impl/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/xdocs/changes.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes.xml 30 Jun 2004 13:07:59 -0000 1.1
+++ changes.xml 20 Oct 2004 13:27:43 -0000 1.2
@@ -6,6 +6,11 @@
</properties>
<body>
+ <release version="1.0.3" date="">
+ <action dev="epugh" type="update">
+ Clean up dependencies. Use TestContainer.
+ </action>
+ </release>
<release version="1.0.2" date="">
<action dev="epugh" type="update">
Update to use Merlin 3.3.0
1.3 +4 -10 jakarta-turbine-fulcrum/factory/impl/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java
Index: FactoryServiceTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/src/test/org/apache/fulcrum/factory/FactoryServiceTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FactoryServiceTest.java 14 Feb 2004 14:23:13 -0000 1.2
+++ FactoryServiceTest.java 20 Oct 2004 13:27:43 -0000 1.3
@@ -1,7 +1,7 @@
package org.apache.fulcrum.factory;
import java.util.ArrayList;
-import org.apache.avalon.merlin.unit.AbstractMerlinTestCase;
+import org.apache.fulcrum.testcontainer.BaseUnitTest;
/**
* @author Eric Pugh
@@ -10,7 +10,7 @@
* To change the template for this generated type comment go to
* Window>Preferences>Java>Code Generation>Code and Comments
*/
-public class FactoryServiceTest extends AbstractMerlinTestCase
+public class FactoryServiceTest extends BaseUnitTest
{
private FactoryService factoryService = null;
/**
@@ -29,14 +29,8 @@
public void setUp() throws Exception
{
super.setUp();
- try
- {
- factoryService = (FactoryService) this.resolve( "/test/factory" );
- }
- catch (Throwable e)
- {
- fail(e.getMessage());
- }
+ factoryService = (FactoryService) this.resolve( FactoryService.class.getName() );
+
}
/*
* Class to test for Object getInstance(String)
1.2 +2 -2 jakarta-turbine-fulcrum/factory/impl/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 15 Nov 2003 16:13:57 -0000 1.1
+++ maven.xml 20 Oct 2004 13:27:43 -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.4 +11 -4 jakarta-turbine-fulcrum/factory/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/factory/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 30 Jun 2004 13:07:46 -0000 1.3
+++ project.xml 20 Oct 2004 13:27:43 -0000 1.4
@@ -1,22 +1,29 @@
<?xml version="1.0"?>
<project>
- <extend>${basedir}/../../merlin-project.xml</extend>
+ <extend>${basedir}/../../project.xml</extend>
<id>fulcrum-factory-impl</id>
<name>Fulcrum Factory Component</name>
- <currentVersion>1.0.2</currentVersion>
+ <currentVersion>1.0.3-dev</currentVersion>
<dependencies>
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-factory-api</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-dev</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
+
+ <!-- Needed only for testing -->
+ <dependency>
+ <groupId>fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.4-dev</version>
+ </dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org