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/06/21 19:53:08 UTC
cvs commit: jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl PreferencesProviderImpl.java PreferencesImpl.java PreferencesFactoryImpl.java
weaver 2004/06/21 10:53:08
Modified: components/prefs/src/java/org/apache/jetspeed/prefs/impl
PreferencesProviderImpl.java PreferencesImpl.java
PreferencesFactoryImpl.java
Log:
fixed ClassNotFound issues being generated by prefs api when used for Portlet Preferences
Revision Changes Path
1.6 +32 -15 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PreferencesProviderImpl.java 18 Jun 2004 20:40:24 -0000 1.5
+++ PreferencesProviderImpl.java 21 Jun 2004 17:53:08 -0000 1.6
@@ -45,20 +45,20 @@
*/
public PreferencesProviderImpl(PersistenceStore persistenceStore, String prefsFactoryImpl, boolean enablePropertyManager)
{
- if (log.isDebugEnabled()) log.debug("Constructing PreferencesProviderImpl...");
- this.persistenceStore = persistenceStore;
- System.setProperty("java.util.prefs.PreferencesFactory", prefsFactoryImpl);
- PreferencesProviderImpl.prefProvider = this;
- this.enablePropertyManager = enablePropertyManager;
-// if(ignoredPathes != null)
-// {
-// this.ignoredPathes = Arrays.asList(ignoredPathes);
-// }
-// else
-// {
-// this.ignoredPathes = new ArrayList(0);
-// }
-
+ try
+ {
+ if (log.isDebugEnabled()) log.debug("Constructing PreferencesProviderImpl...");
+ this.persistenceStore = persistenceStore;
+ Class.forName(prefsFactoryImpl);
+ System.setProperty("java.util.prefs.PreferencesFactory", prefsFactoryImpl);
+ PreferencesProviderImpl.prefProvider = this;
+ this.enablePropertyManager = enablePropertyManager;
+ }
+ catch (ClassNotFoundException e)
+ {
+ log.error("Unable to load PreferenceFactory "+prefsFactoryImpl, e);
+ }
+
}
@@ -100,7 +100,24 @@
public void start()
{
// 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();
+ }
+ 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);
+ }
+
}
/**
* <p>
1.12 +3 -0 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PreferencesImpl.java 18 Jun 2004 20:40:24 -0000 1.11
+++ PreferencesImpl.java 21 Jun 2004 17:53:08 -0000 1.12
@@ -86,6 +86,9 @@
protected PersistenceStore persistenceStore;
protected PreferencesProvider prefProvider;
+
+ static PreferencesImpl systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE);
+ static PreferencesImpl userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE);
/**
* <p>Constructs a root node in the underlying
1.3 +4 -24 jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java
Index: PreferencesFactoryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreferencesFactoryImpl.java 18 Jun 2004 20:40:24 -0000 1.2
+++ PreferencesFactoryImpl.java 21 Jun 2004 17:53:08 -0000 1.3
@@ -25,26 +25,16 @@
*/
public class PreferencesFactoryImpl implements PreferencesFactory
{
- static Preferences userRoot;
+
- static Preferences systemRoot;
-
- public PreferencesFactoryImpl()
- {
- systemRoot();
- userRoot();
- }
+
/**
* @see java.util.prefs.PreferencesFactory#systemRoot()
*/
public Preferences systemRoot()
{
- if(systemRoot == null)
- {
- systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE);
- }
- return systemRoot;
+ return PreferencesImpl.systemRoot;
}
/**
@@ -52,17 +42,7 @@
*/
public Preferences userRoot()
{
- if(userRoot == null)
- {
- userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE);
- }
- return userRoot;
- }
-
- public void reset()
- {
- systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE);
- userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE);
+ return PreferencesImpl.userRoot;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org