You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2004/08/01 22:23:01 UTC
cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed AbstractPrefsSupportedTestCase.java
weaver 2004/08/01 13:23:00
Modified: components/prefs/src/test/org/apache/jetspeed/prefs
TestPropertyManager.java TestPreferences.java
components/prefs/src/java/org/apache/jetspeed/prefs/impl
PreferencesProviderImpl.java PreferencesImpl.java
portal/src/test/org/apache/jetspeed
AbstractPrefsSupportedTestCase.java
Log:
Removed static init of user and system root into the PrefProviderImpl.start() method
Revision Changes Path
1.18 +2 -1 jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java
Index: TestPropertyManager.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPropertyManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestPropertyManager.java 16 Jul 2004 19:29:09 -0000 1.17
+++ TestPropertyManager.java 1 Aug 2004 20:23:00 -0000 1.18
@@ -44,7 +44,7 @@
private final static int USER_PROPERTY_SET_TYPE = 0;
private final static int SYSTEM_PROPERTY_SET_TYPE = 1;
- private PreferencesProvider provider;
+ private PreferencesProviderImpl provider;
/**
* <p>Defines the test case name for junit.</p>
@@ -64,6 +64,7 @@
pms =new PropertyManagerImpl(persistenceStore);
provider = new PreferencesProviderImpl(persistenceStore, "org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl", true);
// Class.forName("org.apache.jetspeed.prefs.impl.PreferencesImpl");
+ provider.start();
}
/**
1.18 +2 -1 jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java
Index: TestPreferences.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TestPreferences.java 16 Jul 2004 19:29:09 -0000 1.17
+++ TestPreferences.java 1 Aug 2004 20:23:00 -0000 1.18
@@ -47,7 +47,7 @@
private final static int USER_PROPERTY_SET_TYPE = 0;
private final static int SYSTEM_PROPERTY_SET_TYPE = 1;
- private PreferencesProvider provider;
+ private PreferencesProviderImpl provider;
/**
* <p>
@@ -71,6 +71,7 @@
pms = new PropertyManagerImpl(persistenceStore);
provider = new PreferencesProviderImpl(persistenceStore,
"org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl", true);
+ provider.start();
}
/**
1.8 +3 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PreferencesProviderImpl.java 21 Jun 2004 19:05:26 -0000 1.7
+++ PreferencesProviderImpl.java 1 Aug 2004 20:23:00 -0000 1.8
@@ -103,8 +103,9 @@
log.debug("Loading prefernces api into classloader...");
try
- { // Initializes the static systemRoot and userRoot
- Class prefImplClass = PreferencesImpl.class;
+ {
+ PreferencesImpl.systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE);
+ PreferencesImpl.userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE);
}
catch(Throwable e)
1.15 +2 -2 jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java
Index: PreferencesImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PreferencesImpl.java 16 Jul 2004 19:29:09 -0000 1.14
+++ PreferencesImpl.java 1 Aug 2004 20:23:00 -0000 1.15
@@ -88,8 +88,8 @@
protected PreferencesProvider prefProvider;
- static PreferencesImpl systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE);
- static PreferencesImpl userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE);
+ static PreferencesImpl systemRoot;
+ static PreferencesImpl userRoot;
/**
* <p>Constructs a root node in the underlying
1.2 +2 -1 jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/AbstractPrefsSupportedTestCase.java
Index: AbstractPrefsSupportedTestCase.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/AbstractPrefsSupportedTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractPrefsSupportedTestCase.java 29 Jul 2004 15:44:47 -0000 1.1
+++ AbstractPrefsSupportedTestCase.java 1 Aug 2004 20:23:00 -0000 1.2
@@ -54,6 +54,7 @@
super.setUp();
PropertyManagerImpl pms = new PropertyManagerImpl(persistenceStore);
PreferencesProviderImpl provider = new PreferencesProviderImpl(persistenceStore, "org.apache.jetspeed.prefs.impl.PreferencesFactoryImpl", false);
+ provider.start();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org