You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2005/05/19 16:36:13 UTC
svn commit: r170934 - in /portals/pluto/trunk:
deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java
portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java
portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
Author: cziegeler
Date: Thu May 19 07:36:13 2005
New Revision: 170934
URL: http://svn.apache.org/viewcvs?rev=170934&view=rev
Log:
Remove unused imports and access static methods directly
Modified:
portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
Modified: portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java?rev=170934&r1=170933&r2=170934&view=diff
==============================================================================
--- portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java (original)
+++ portals/pluto/trunk/deploy/src/java/org/apache/pluto/driver/deploy/Deploy.java Thu May 19 07:36:13 2005
@@ -17,10 +17,7 @@
package org.apache.pluto.driver.deploy;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -37,7 +34,6 @@
import org.apache.pluto.descriptors.servlet.ServletDD;
import org.apache.pluto.descriptors.servlet.ServletMappingDD;
import org.apache.pluto.descriptors.servlet.WebAppDD;
-import org.apache.pluto.driver.deploy.impl.PortletEntityRegistryRegistrarService;
public class Deploy {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java?rev=170934&r1=170933&r2=170934&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/ControllerPortlet.java Thu May 19 07:36:13 2005
@@ -104,14 +104,14 @@
log("Help include: " + _incHelp);
//load properties
- _properties = PlutoAdminContext.getInstance().getProperties();
+ _properties = PlutoAdminContext.getProperties();
//Configure the paths to the container home dir,
// Pluto's dir and the deployment dir. This needs to
// be done before any admin portlets are called.
String plutoPath = _ctx.getRealPath("");//Path with single slash is also allowed
// String plutoPath = null;//for testing
- PlutoAdminContext.getInstance().parseDeploymentPaths(plutoPath);
+ PlutoAdminContext.parseDeploymentPaths(plutoPath);
} catch (Throwable e) {
log("Error thrown in ControllerPortlet.init()", e);
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java?rev=170934&r1=170933&r2=170934&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java Thu May 19 07:36:13 2005
@@ -226,13 +226,13 @@
*/
private ArrayList createDeploymentArgs(String serverFileName, String tempDir, ActionRequest request, boolean appExists) throws Exception {
final String METHOD_NAME = "createDeploymentArgs(serverFileName,tempDir,request)";
- Properties props = PlutoAdminContext.getInstance().getProperties();
- final String CONTAINER_HOME = PlutoAdminContext.getInstance().getContainerHome();
+ Properties props = PlutoAdminContext.getProperties();
+ final String CONTAINER_HOME = PlutoAdminContext.getContainerHome();
final String PORTLET_DEPLOY_DIR = props.getProperty("portlet-deploy-dir");
ArrayList args = new ArrayList();
- args.add(PlutoAdminContext.getInstance().getDeploymentPath());
- args.add(PlutoAdminContext.getInstance().getPlutoWebContext());
+ args.add(PlutoAdminContext.getDeploymentPath());
+ args.add(PlutoAdminContext.getPlutoWebContext());
args.add(tempDir + PlutoAdminConstants.FS + serverFileName);
//This is probably not used???, but left here to as to not change
// args indexing used by Deploy class.