weaver 2004/06/21 12:05:26
Modified: components/prefs/src/java/org/apache/jetspeed/prefs/impl
PreferencesProviderImpl.java
portal/src/test/org/apache/jetspeed/engine TestEngine.java
Log:
- fixed TestEngine so that it uses the internal JNDI server.
- cleaned up PreferenceProviderImpl class pre-loading logic
Revision Changes Path
1.7 +5 -9
jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesProviderImpl.java
Index: PreferencesProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesProviderImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PreferencesProviderImpl.java 21 Jun 2004 17:53:08 -0000 1.6
+++ PreferencesProviderImpl.java 21 Jun 2004 19:05:26 -0000 1.7
@@ -101,22 +101,18 @@
{
// This will make sure that we are loaded into the vm immediately
log.debug("Loading prefernces api into classloader...");
- // ClassLoader cl = Thread.currentThread().getContextClassLoader();
+
try
- {
- //
Thread.currentThread().setContextClassLoader(PreferencesFactoryImpl.class.getClassLoader());
- new PreferencesFactoryImpl().systemRoot();
- new PreferencesFactoryImpl().userRoot();
+ { // Initializes the static systemRoot and userRoot
+ Class prefImplClass = PreferencesImpl.class;
+
}
catch(Throwable e)
{
log.fatal("Failed to initialize prefs api. "+e.toString(), e);
throw new RuntimeException("Failed to initialize prefs api.
"+e.toString());
}
- finally
- {
- // Thread.currentThread().setContextClassLoader(cl);
- }
+
}
/**
1.3 +2 -0
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/TestEngine.java
Index: TestEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/engine/TestEngine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestEngine.java 4 Jun 2004 16:12:33 -0000 1.2
+++ TestEngine.java 21 Jun 2004 19:05:26 -0000 1.3
@@ -65,6 +65,8 @@
protected void setUp() throws Exception
{
super.setUp();
+ // need to flag internal JNDI on...
+ System.setProperty("portal.use.internal.jndi", "true");
PropertiesConfiguration config = new PropertiesConfiguration();
config.load(new
FileInputStream("./src/webapp/WEB-INF/conf/jetspeed.properties"));
Jetspeed.createEngine(config, "./src/webapp", null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
