weaver 2004/02/27 09:45:56
Modified: portal/src/java/org/apache/jetspeed/engine
JetspeedEngine.java
portal/src/java/org/apache/jetspeed/tools/pamanager
FileSystemPAM.java
Log:
removed all HSQL specific references from the project.
Building will now require the user to start the test HSQL server for "allBuild"
and the production server for inatallProductionDb and any deployment goals
Revision Changes Path
1.15 +9 -23
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
Index: JetspeedEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JetspeedEngine.java 26 Feb 2004 17:36:09 -0000 1.14
+++ JetspeedEngine.java 27 Feb 2004 17:45:56 -0000 1.15
@@ -68,7 +68,6 @@
import org.apache.jetspeed.PortalReservedParameters;
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.datasource.DatasourceComponent;
-import org.apache.jetspeed.components.hsql.HSQLServerComponent;
import org.apache.jetspeed.components.jndi.JNDIComponent;
import org.apache.jetspeed.container.PortletContainerFactory;
import org.apache.jetspeed.container.services.JetspeedContainerServices;
@@ -158,23 +157,7 @@
System.setProperty("java.util.prefs.PreferencesFactory",
preferencesFactory);
log.info("Configured java.util.prefs.PreferencesFactory from " +
log4jFile);
}
-
- // Set the db script to be used, if not already set (HSQL only)
- String dbScriptPath =
System.getProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH);
-
- if(dbScriptPath == null)
- {
- dbScriptPath =
configuration.getString(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH,
getRealPath("WEB-INF/db/hsql/Registry"));
-
System.setProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH, dbScriptPath);
- log.info("Jetspeed Engine will use the value "+dbScriptPath+" set
in the configuration property "
- +HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH+" for
starting the HSQL server.");
- }
- else
- {
- log.info("Jetspeed Engine will use the value "+dbScriptPath+" set
in the system property "
- +HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH+" for
starting the HSQL server.");
- }
-
+
//
// bootstrap the initable services
@@ -263,13 +246,13 @@
public void shutdown() throws JetspeedException
{
CommonPortletServices.getInstance().shutdownServices();
-
+ componentManager.killContainer();
// TODO: DST: can I hook into Component Manager shutdown here?
try
{
PortletContainer container =
PortletContainerFactory.getPortletContainer();
- container.shutdown();
+ container.shutdown();
}
catch (PortletContainerException e)
{
@@ -363,8 +346,11 @@
if (jndi != null)
{
DatasourceComponent ds = (DatasourceComponent)
componentManager.getComponent(DatasourceComponent.class);
- jndi.bindObject("comp/env/jdbc/jetspeed", ds.getDatasource());
- jndi.bindToCurrentThread();
+ if(ds != null)
+ {
+ jndi.bindObject("comp/env/jdbc/jetspeed", ds.getDatasource());
+ jndi.bindToCurrentThread();
+ }
}
}
private void initServices() throws CPSInitializationException
1.20 +7 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FileSystemPAM.java 23 Feb 2004 14:53:32 -0000 1.19
+++ FileSystemPAM.java 27 Feb 2004 17:45:56 -0000 1.20
@@ -58,6 +58,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.components.persistence.store.PersistenceStore;
+import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
import org.apache.jetspeed.components.portletregsitry.RegistryException;
import org.apache.jetspeed.container.JetspeedPortletContext;
@@ -420,6 +422,10 @@
{
registry.registerPortletApplication(app);
+ log.info("Committing regsitry changes...");
+ PersistenceStoreContainer pContainer =
(PersistenceStoreContainer)Jetspeed.getComponentManager().getComponent(PersistenceStoreContainer.class);
+ PersistenceStore store = pContainer.getStoreForThread("jetspeed");
+ store.getTransaction().commit();
}
catch (Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
