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/02/23 14:15:30 UTC
cvs commit: jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager CatalinaPAM.java FileSystemPAM.java
weaver 2004/02/23 05:15:30
Modified: portal/src/java/org/apache/jetspeed/tools/pamanager
CatalinaPAM.java FileSystemPAM.java
Log:
now uses registry component
Revision Changes Path
1.9 +1 -4 jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java
Index: CatalinaPAM.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/CatalinaPAM.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CatalinaPAM.java 4 Feb 2004 21:30:16 -0000 1.8
+++ CatalinaPAM.java 23 Feb 2004 13:15:29 -0000 1.9
@@ -55,11 +55,8 @@
-import java.io.IOException;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.registry.JetspeedPortletRegistry;
import org.apache.jetspeed.tools.pamanager.servletcontainer.TomcatManager;
1.18 +36 -70 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FileSystemPAM.java 4 Feb 2004 21:32:32 -0000 1.17
+++ FileSystemPAM.java 23 Feb 2004 13:15:29 -0000 1.18
@@ -55,20 +55,16 @@
import java.io.File;
-// Registry class
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.registry.JetspeedPortletRegistry;
-import org.apache.jetspeed.util.DirectoryUtils;
+import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
import org.apache.jetspeed.container.JetspeedPortletContext;
import org.apache.jetspeed.exception.RegistryException;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
-
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
-import org.apache.jetspeed.persistence.TransactionStateException;
+import org.apache.jetspeed.util.DirectoryUtils;
/**
* This is the catalina specific implemenation for deplyment of Portlet Applications.
@@ -87,9 +83,11 @@
protected boolean useDefaultPluginFordeploy = false;
private DeployUtilities util;
+ private PortletRegistryComponent registry;
public FileSystemPAM()
{
super();
+ registry = (PortletRegistryComponent) Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
util = new DeployUtilities();
}
@@ -149,8 +147,8 @@
public void unregister(String webAppsDir, String paName) throws PortletApplicationException
{
-
- String portletAppDir = util.formatWebApplicationPath(webAppsDir, paName);
+
+ String portletAppDir = util.formatWebApplicationPath(webAppsDir, paName);
String portletXMLPath = portletAppDir + "/WEB-INF/portlet.xml";
try
{
@@ -158,8 +156,8 @@
// load the portlet.xml
log.info("Loading " + portletXMLPath + " into memory....");
- MutablePortletApplication app = (MutablePortletApplication) JetspeedPortletRegistry.getPortletApplication(paName);
- // Application app = JetspeedPortletRegistry.loadPortletApplicationSettings(portletXMLPath, paName);
+ MutablePortletApplication app = (MutablePortletApplication) registry.getPortletApplication(paName);
+ // Application app = registry.loadPortletApplicationSettings(portletXMLPath, paName);
if (app == null)
{
@@ -170,30 +168,23 @@
// remove entries from the registry
log.info("Remove all registry entries defined in " + portletXMLPath);
- // JetspeedPortletRegistry.processPortletApplicationTree(app, "remove");
+ // registry.processPortletApplicationTree(app, "remove");
// locate the deployment home
- JetspeedPortletRegistry.beginTransaction();
- JetspeedPortletRegistry.removeApplication(app);
- JetspeedPortletRegistry.commitTransaction();
+
+ registry.removeApplication(app);
+
// Remove the webapps directory
-
+
log.info("Remove " + portletAppDir + " and all sub-directories.");
}
catch (Exception re)
{
- try
- {
- log.error(
- "Failed to unregister internal portlet application: " + re.toString() + " attempting to rollback changes",
- re);
- JetspeedPortletRegistry.rollbackTransaction();
- }
- catch (TransactionStateException e)
- {
- log.error("Failed to rollback \"unregister\" opreration: " + re.toString(), re);
- }
+ log.error(
+ "Failed to unregister internal portlet application: " + re.toString() + " attempting to rollback changes",
+ re);
+
throw new PortletApplicationException(re.getMessage());
}
@@ -218,8 +209,7 @@
DeployUtilities util = new DeployUtilities();
File webAppRootDir = new File(util.formatWebApplicationPath(webAppsDir, paName));
// prepend a slash if need be
-
-
+
if (webAppRootDir.exists())
{
@@ -247,15 +237,9 @@
}
catch (Exception re)
{
- try
- {
- log.error("Failed to undeploy portlet application: " + re.toString() + " attempting to rollback changes", re);
- JetspeedPortletRegistry.rollbackTransaction();
- }
- catch (TransactionStateException e)
- {
- log.error("Failed to rollback \"undeploy\" opreration: " + re.toString(), re);
- }
+
+ log.error("Failed to undeploy portlet application: " + re.toString() + " attempting to rollback changes", re);
+
throw new PortletApplicationException(re.getMessage());
}
@@ -282,13 +266,13 @@
// if (nState >= 2 && app != null)
// {
// // remove entries from the registry
- // // JetspeedPortletRegistry.processPortletApplicationTree(app, "remove");
+ // // registry.processPortletApplicationTree(app, "remove");
// log.info("Saving the portlet.xml in the registry...");
// // locate the deployment home
// identifyDeploymentSystem();
- // JetspeedPortletRegistry.beginTransaction();
- // JetspeedPortletRegistry.removeApplication(app);
- // JetspeedPortletRegistry.commitTransaction();
+ // registry.beginTransaction();
+ // registry.removeApplication(app);
+ // registry.commitTransaction();
// }
//
// }
@@ -297,7 +281,7 @@
// try
// {
// log.error("Error processing rollback. Attempting to rollback registry transaction.", e1);
- // JetspeedPortletRegistry.rollbackTransaction();
+ // registry.rollbackTransaction();
// }
// catch (TransactionStateException e2)
// {
@@ -333,7 +317,7 @@
// }
protected void sysDeploy(String webAppsDir, String warFile, String paName, int startState) throws PortletApplicationException
- {
+ {
// State of deployment -- use integer to signal the state
// 0 Initial state
@@ -434,24 +418,15 @@
try
{
- JetspeedPortletRegistry.beginTransaction();
- JetspeedPortletRegistry.registerPortletApplication(app);
- JetspeedPortletRegistry.commitTransaction();
+
+ registry.registerPortletApplication(app);
+
}
catch (Exception e)
{
String msg =
"Unable to register portlet application, " + app.getName() + ", through the portlet registry: " + e.toString();
log.error(msg, e);
- try
- {
- // attempt a rollback
- JetspeedPortletRegistry.rollbackTransaction();
- }
- catch (Exception e1)
- {
-
- }
throw new RegistryException(msg, e);
}
@@ -477,7 +452,7 @@
{
// Remove the webapps directory
- String portletAppDir = util.formatWebApplicationPath(webAppsDir, paName);
+ String portletAppDir = util.formatWebApplicationPath(webAppsDir, paName);
log.info("Rollback: Remove " + portletAppDir + " and all sub-directories.");
// Call into DeplyUtilities class
@@ -506,25 +481,16 @@
{
// remove entries from the registry
- // JetspeedPortletRegistry.processPortletApplicationTree(app, "remove");
+ // registry.processPortletApplicationTree(app, "remove");
log.info("Saving the portlet.xml in the registry...");
+ registry.removeApplication(app);
- JetspeedPortletRegistry.beginTransaction();
- JetspeedPortletRegistry.removeApplication(app);
- JetspeedPortletRegistry.commitTransaction();
}
catch (Exception e1)
{
- try
- {
- log.error("Error processing rollback. Attempting to rollback registry transaction.", e1);
- JetspeedPortletRegistry.rollbackTransaction();
- }
- catch (TransactionStateException e2)
- {
- log.error("Error processing tranasction: " + e2.toString(), e2);
- }
+
+ log.error("Error processing rollback. Attempting to rollback registry transaction.", e1);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org