jford 2004/02/19 14:12:44
Modified: cps/src/test/org/apache/jetspeed/components
TestNanoComponentManager.java
Log:
Added getApplicationRoot() to fix test when ran using maven allBuild from root
Revision Changes Path
1.2 +18 -2
jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/components/TestNanoComponentManager.java
Index: TestNanoComponentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/cps/src/test/org/apache/jetspeed/components/TestNanoComponentManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestNanoComponentManager.java 19 Feb 2004 21:42:33 -0000 1.1
+++ TestNanoComponentManager.java 19 Feb 2004 22:12:44 -0000 1.2
@@ -96,9 +96,25 @@
return new TestSuite(TestNanoComponentManager.class);
}
+ public String getApplicationRoot()
+ {
+ String applicationRoot = "test";
+ File testPath = new File(applicationRoot);
+ if (!testPath.exists())
+ {
+ testPath = new File( "cps" + File.separator + applicationRoot);
+ if (testPath.exists())
+ {
+ applicationRoot = testPath.getAbsolutePath();
+ }
+ }
+ return applicationRoot;
+ }
+
public void testLoadGroovy() throws Exception
{
- File containerAssembler = new File("./test/WEB-INF/conf/container.groovy");
+ String applicationRoot = getApplicationRoot();
+ File containerAssembler = new File(applicationRoot +
"/WEB-INF/conf/container.groovy");
assertTrue(containerAssembler.exists());
NanoComponentManager containerManager = new
NanoComponentManager(containerAssembler);
ObjectReference rootContainerRef = new SimpleReference();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
