bloritsch 2002/08/07 06:09:15
Modified: fortress/src/test/org/apache/excalibur/fortress/util/test
ConfigurableRoleManagerTestCase.java
ExcaliburRoleManagerTestCase.java
Log:
resolve conflicts
Revision Changes Path
1.12 +4 -3
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java
Index: ConfigurableRoleManagerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ConfigurableRoleManagerTestCase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ConfigurableRoleManagerTestCase.java 7 Aug 2002 04:55:55 -0000
1.11
+++ ConfigurableRoleManagerTestCase.java 7 Aug 2002 13:09:15 -0000
1.12
@@ -69,14 +69,14 @@
extends TestCase
{
Logger m_logger;
-
+
/**
* Default constructor--this RoleManager has no parent.
*/
public ConfigurableRoleManagerTestCase( String name )
{
super( name );
-
+
m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
}
@@ -218,3 +218,4 @@
);
}
}
+
1.14 +3 -2
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
Index: ExcaliburRoleManagerTestCase.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ExcaliburRoleManagerTestCase.java 7 Aug 2002 04:55:55 -0000 1.13
+++ ExcaliburRoleManagerTestCase.java 7 Aug 2002 13:09:15 -0000 1.14
@@ -86,7 +86,7 @@
{
m_informixClassExists = false;
}
-
+
m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
}
@@ -445,3 +445,4 @@
);
}
}
+
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
