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/09/09 14:43:58 UTC
svn commit: r279757 - in
/portals/pluto/trunk/portal/src/java/org/apache/pluto: portalImpl/util/
portalImpl/xml/ portlet/admin/ portlet/admin/bean/
portlet/admin/controller/ portlet/admin/model/ portlet/admin/services/
portlet/admin/util/
Author: cziegeler
Date: Fri Sep 9 05:43:42 2005
New Revision: 279757
URL: http://svn.apache.org/viewcvs?rev=279757&view=rev
Log:
Just code cleanup - no functional changes
Modified:
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/xml/XmlException.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/BaseAdminObject.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminConstants.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminException.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PageTO.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessage.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessageType.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletTO.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/controller/DeployWarPortlet.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PortletEntityRegistryPortlet.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/DeployWarService.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletConfigService.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletRegistryService.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/NameValuePairs.java Fri Sep 9 05:43:42 2005
@@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
-
- */
-
package org.apache.pluto.portalImpl.util;
import java.util.Iterator;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/ObjectID.java Fri Sep 9 05:43:42 2005
@@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
-
- */
-
package org.apache.pluto.portalImpl.util;
import java.io.IOException;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Parameters.java Fri Sep 9 05:43:42 2005
@@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
-
- */
-
package org.apache.pluto.portalImpl.util;
import java.util.ArrayList;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/util/Properties.java Fri Sep 9 05:43:42 2005
@@ -13,10 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
-
- */
-
package org.apache.pluto.portalImpl.util;
import java.io.BufferedReader;
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/xml/XmlException.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/xml/XmlException.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/xml/XmlException.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/xml/XmlException.java Fri Sep 9 05:43:42 2005
@@ -29,7 +29,7 @@
public class XmlException extends java.lang.Exception
{
- private Throwable throwable = null;
+ private Throwable throwable;
/**
** Constructs a new xml exception.
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/BaseAdminObject.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/BaseAdminObject.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/BaseAdminObject.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/BaseAdminObject.java Fri Sep 9 05:43:42 2005
@@ -25,9 +25,7 @@
public class BaseAdminObject {
//Name of the subclass
- private String _className = null;
- //Identifier for the logging record
- private String _logId = null;
+ private String _className;
/**
* Default constructor.
@@ -42,7 +40,6 @@
protected BaseAdminObject(String className, String logId) {
_className = className;
- _logId = logId;
}
protected void logMethodStart(String methodName) {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminConstants.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminConstants.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminConstants.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminConstants.java Fri Sep 9 05:43:42 2005
@@ -25,24 +25,24 @@
*/
public interface PlutoAdminConstants {
- public static final String ENCODING = "UTF-8";
- public static final String FS = File.separator;
- public static final String LS = System.getProperty("line.separator");
- public static final String PROP_FILENAME = "pluto-admin.properties";
- public static final String PAGE_ATTR = "page";
- public static final String PORTLET_MAP_ATTR = "portlet-map";
- public static final String PORTLET_APP_LIST_ATTR = "portlet-app-list";
+ String ENCODING = "UTF-8";
+ String FS = File.separator;
+ String LS = System.getProperty("line.separator");
+ String PROP_FILENAME = "pluto-admin.properties";
+ String PAGE_ATTR = "page";
+ String PORTLET_MAP_ATTR = "portlet-map";
+ String PORTLET_APP_LIST_ATTR = "portlet-app-list";
- //for pageregistry
- public static final String PAGE_LIST_ATTR = "pagelist";
+ // for pageregistry
+ String PAGE_LIST_ATTR = "pagelist";
- //for portlet entity registry
- public static final String PER_LIST_ATTR = "perlist";
- public static final String APP_ATTR = "app";
- public static final String PREF_LIST_ATTR = "preflist";
+ // for portlet entity registry
+ String PER_LIST_ATTR = "perlist";
+ String APP_ATTR = "app";
+ String PREF_LIST_ATTR = "preflist";
- // public static final String PAGE_ATTR = "portletpage";
- //Used for messages
- public static final String MESSAGE_ATTR = "message";
- public static final String ERROR_ATTR = "error";
+ // public static final String PAGE_ATTR = "portletpage";
+ // Used for messages
+ String MESSAGE_ATTR = "message";
+ String ERROR_ATTR = "error";
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminException.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminException.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminException.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/PlutoAdminException.java Fri Sep 9 05:43:42 2005
@@ -24,7 +24,7 @@
*/
public class PlutoAdminException extends RuntimeException {
- private Throwable _cause = null;
+ private Throwable _cause;
/**
*
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PageTO.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PageTO.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PageTO.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PageTO.java Fri Sep 9 05:43:42 2005
@@ -34,7 +34,7 @@
public static final String CLASS_NAME = "PageTO";
- private FragmentImpl _page = null;
+ private FragmentImpl _page;
//By default there will be one row and one col
private int _rows = 1;
private int _cols = 1;
@@ -153,7 +153,6 @@
*
* @param row
* @param col
- * @return
*/
public PortletTO getPortlet(int row, int col) {
PortletTO portlet = null;
@@ -172,7 +171,6 @@
/**
*
* @param value
- * @return
*/
public PortletTO getPortlet(String value) {
final String METHOD_NAME = "getPortlet(value)";
@@ -193,8 +191,8 @@
/**
*
- * @param value
- * @return
+ * @param row
+ * @param col
*/
public PortletTO getPortletByCell(int row, int col) {
final String METHOD_NAME = "getPortletByCell(row,col)";
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessage.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessage.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessage.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessage.java Fri Sep 9 05:43:42 2005
@@ -23,8 +23,8 @@
*@see org.apache.pluto.portlet.admin.taglib.MessageTag
*/
public class PortletMessage {
- private String message = null;
- private PortletMessageType type = null;
+ private String message;
+ private PortletMessageType type;
/**
*
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessageType.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessageType.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessageType.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletMessageType.java Fri Sep 9 05:43:42 2005
@@ -29,8 +29,8 @@
public static PortletMessageType ALERT = new PortletMessageType("alert", "portlet-msg-alert");
public static PortletMessageType SUCCESS = new PortletMessageType("success", "portlet-msg-success");
- public String name = null;
- public String CssClass = null;
+ public String name;
+ public String CssClass;
/**
*
@@ -63,17 +63,15 @@
public static boolean equals(PortletMessageType msgType, String testName) {
if (msgType == getTypeByName(testName)) {
return true;
- } else {
- return false;
}
+ return false;
}
public boolean equals(Object obj) {
if (obj instanceof PortletMessageType) {
PortletMessageType comp = (PortletMessageType)obj;
return name.equals(comp.name);
- } else {
- return false;
}
+ return false;
}
}
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletTO.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletTO.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletTO.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/bean/PortletTO.java Fri Sep 9 05:43:42 2005
@@ -29,7 +29,7 @@
private static final String CLASS_NAME = "PortletTO";
private String _name = "";
//Value is appID.portletID
- private String _value = null;
+ private String _value;
//row in column in the page layout
private int _row = 1;
private int _col = 1;
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=279757&r1=279756&r2=279757&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 Fri Sep 9 05:43:42 2005
@@ -42,8 +42,8 @@
protected String _incView = "/view.jsp";
protected String _incEdit = "/edit.jsp";
protected String _incHelp = "/help.jsp";
- protected Properties _properties = null;
- protected PortletContext _ctx = null;
+ protected Properties _properties;
+ protected PortletContext _ctx;
/* (non-Javadoc)
* @see javax.portlet.GenericPortlet#doEdit(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/DeployWarPortlet.java Fri Sep 9 05:43:42 2005
@@ -40,7 +40,7 @@
*
*/
public class DeployWarPortlet extends ControllerPortlet {
- private DeployWarService service = null;
+ private DeployWarService service;
protected void doEdit(RenderRequest request, RenderResponse response)
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PageRegistryPortlet.java Fri Sep 9 05:43:42 2005
@@ -34,7 +34,7 @@
*/
public class PageRegistryPortlet extends ControllerPortlet {
- private PageRegistryService service = null;
+ private PageRegistryService service;
/* (non-Javadoc)
* @see javax.portlet.GenericPortlet#doEdit(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PortletEntityRegistryPortlet.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PortletEntityRegistryPortlet.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PortletEntityRegistryPortlet.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/controller/PortletEntityRegistryPortlet.java Fri Sep 9 05:43:42 2005
@@ -33,7 +33,7 @@
*
*/
public class PortletEntityRegistryPortlet extends ControllerPortlet {
- private PortletRegistryService service = null;
+ private PortletRegistryService service;
/* (non-Javadoc)
* @see javax.portlet.GenericPortlet#doEdit(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
*/
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PageRegistryXao.java Fri Sep 9 05:43:42 2005
@@ -46,7 +46,7 @@
public final static String DEFAULT_MAPPING = "WEB-INF/data/xml/pageregistrymapping.xml";
private final static String CLASS_NAME = "PageRegistryXao";
// Castor mapping file
- private Mapping mapping = null;
+ private Mapping mapping;
/**
*
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/model/PortletEntityRegistryXao.java Fri Sep 9 05:43:42 2005
@@ -52,7 +52,7 @@
private Collection castorApplications = new ArrayList();
// Castor mapping file
- private Mapping mapping = null;
+ private Mapping mapping;
/**
*
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=279757&r1=279756&r2=279757&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 Fri Sep 9 05:43:42 2005
@@ -19,7 +19,6 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
@@ -41,13 +40,6 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.PortletDiskFileUpload;
import org.apache.pluto.descriptors.portlet.PortletDD;
-import org.apache.pluto.descriptors.services.PortletAppDescriptorService;
-import org.apache.pluto.descriptors.services.WebAppDescriptorService;
-import org.apache.pluto.descriptors.services.impl.FilePortletAppDescriptorServiceImpl;
-import org.apache.pluto.descriptors.services.impl.FileWebAppDescriptorServiceImpl;
-import org.apache.pluto.driver.deploy.Deploy;
-import org.apache.pluto.driver.deploy.impl.ContextRegistryRegistrarService;
-import org.apache.pluto.driver.deploy.impl.PortletEntityRegistryRegistrarService;
import org.apache.pluto.portalImpl.om.entity.impl.PortletApplicationEntityImpl;
import org.apache.pluto.portlet.admin.BaseAdminObject;
import org.apache.pluto.portlet.admin.PlutoAdminConstants;
@@ -70,9 +62,6 @@
*/
public class DeployWarService extends BaseAdminObject {
- /** Used to log <code>Deploy</code> calls to stdout
- * @see Deploy*/
- private static final boolean DEBUG = true;
public static final String ERROR_NO_FILE = "ERROR_NO_FILE";
public static final String CLASS_NAME = "DeployWarService";
@@ -296,7 +285,7 @@
sb.append("Number of entries: " + es.size());
for (int i = 0; i < es.size(); i++) {
Map.Entry entry = (Map.Entry) it.next();
- sb.append((String) entry.getKey().toString());
+ sb.append(entry.getKey().toString());
sb.append(entry.getValue().toString());
sb.append("\n");
}
@@ -608,7 +597,7 @@
//elements to check prior to servlet-mapping (if not found)
final String[] PRIOR_ELEMENTS_SERVLET_MAPPING =
{"servlet-mapping", "servlet"};
- String webapps = PlutoAdminContext.getInstance().getDeploymentPath();
+ String webapps = PlutoAdminContext.getDeploymentPath();
File webXml = new File(webapps +
PlutoAdminConstants.FS +
context +
@@ -625,8 +614,6 @@
"WEB-INF" +
PlutoAdminConstants.FS +
"portlet.xml");
- ArrayList nameList = null;
- ArrayList classNameList = null;
List plist = null;
try {
InputStream ins = new FileInputStream(portletXml);
@@ -659,10 +646,8 @@
* @param elements Elements in web.xml to search for. If found, new
* elements will be inserted to the contents String. NOTE: First element
* (elements[0] signals the kind of record to add (servlet or servlet-mapping).
- * @param nameList List of portlet names in order that they appear in
+ * @param portletData List of portlet names in order that they appear in
* portlet.xml
- * @param classNameList List of fully qualified portlet class names in
- * order that they appear in portlet.xml
* TODO: Add security-role-ref param for servlet record
*/
String addRecordsToWebXml(String context, String contents,
@@ -721,7 +706,7 @@
*
* @param context Context name
* @param portletData Data from portlet.xml
- * @return
+ * @return The servlet record
*/
private String getServletRecord(String context, PortletDD portletData) {
@@ -757,7 +742,6 @@
*
* @param context Context name
* @param portletData Data from portlet.xml
- * @return
*/
private String getSecurityRoleRefRecord(String context, PortletDD portletData) {
@@ -784,9 +768,7 @@
* Gets the web.xml servlet-mapping record for PortletServlet
* from portlet.xml data
*
- * @param context Context name
* @param portletData Data from portlet.xml
- * @return
*/
private String getServletMappingRecord(PortletDD portletData) {
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletConfigService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletConfigService.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletConfigService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletConfigService.java Fri Sep 9 05:43:42 2005
@@ -46,8 +46,8 @@
*
*/
public class PortletConfigService {
- private Document _doc = null;
- private List portletDDList = null;
+ private Document _doc;
+ private List portletDDList;
public static final String CLASS_NAME = "PortletConfigService";
@@ -105,8 +105,6 @@
/**
*
- * @return
- * @throws Exception
*/
private void createPortletDDList() {
final String METHOD_NAME = "createPortletDDList";
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletRegistryService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletRegistryService.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletRegistryService.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/services/PortletRegistryService.java Fri Sep 9 05:43:42 2005
@@ -56,8 +56,7 @@
}
public List getPageRegistryData(String prPath) {
- List alist = null;
- return alist;
+ return null;
}
/*
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java?rev=279757&r1=279756&r2=279757&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portlet/admin/util/PlutoAdminContext.java Fri Sep 9 05:43:42 2005
@@ -89,7 +89,7 @@
* container is installed.
*/
public String getPlutoHome(){
- final String METHOD_NAME = "getPlutoHome()";
+// final String METHOD_NAME = "getPlutoHome()";
// String plutoHome = null;
// Properties props = getProperties();
// String plutoContext = props.getProperty("pluto-web-context");
@@ -127,8 +127,6 @@
*
* @param propFileName Name of the properties file.
* @return Properties The filled properties object
- * @throws IOException If there is a problem loading the properties
- * from the file
* @throws NullPointerException If the InputStream accessing the properties
* file is null.
*/
@@ -147,7 +145,7 @@
PlutoAdminLogger.logError(CLASS_NAME, METHOD_NAME, e);
throw e;
}
- props = new Properties();
+ props = new Properties();
try {
props.load(stream);
} catch (IOException e) {
@@ -156,10 +154,8 @@
}
//add props to the cache
_cache.put(propFileName, props);
- return props;
- } else {
- return props;
}
+ return props;
}
public static Properties getProperties(){
@@ -173,7 +169,6 @@
/**
* Accessor for the full path to the portletcontexts.txt file
- * @return
*/
public String getPortletContextsPath() {
String path = getPlutoHome() + PlutoAdminConstants.FS + getRelDataDir() + PlutoAdminConstants.FS + getProperties().getProperty("portletcontexts-file");
@@ -183,18 +178,17 @@
/**
* Finds home directory of the container that holds Pluto (usually Tomcat)
*
- * @return
*/
public static String getContainerHome(){
- final String METHOD_NAME = "getContainerHome()";
+// final String METHOD_NAME = "getContainerHome()";
return _containerHome;
- }
+ }
/**
- * Parses out paths from the Pluto Home directory sent in from
- * PortletContext.getRealPath("") call in ControllerPortlet.init()
- *
- * @param home The _plutoHome to set.
+ * Parses out paths from the Pluto Home directory sent in from
+ * PortletContext.getRealPath("") call in ControllerPortlet.init()
+ *
+ * @param plutoHome The _plutoHome to set.
*/
public static void parseDeploymentPaths(String plutoHome) {
final String METHOD_NAME = "parseDeploymentPaths(plutoHome)";
@@ -228,7 +222,6 @@
/**
* Accessor for the path to the portlet deployment directory (webapps in Tomcat container)
- * @return
*/
public static String getDeploymentPath(){
return _deploymentPath;
@@ -236,7 +229,6 @@
/**
* Accessor for the web context for Pluto (default=pluto)
- * @return
*/
public static String getPlutoWebContext(){
return _plutoContext;