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 dd...@apache.org on 2005/07/23 06:34:42 UTC
svn commit: r224441 - in
/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl:
om/entity/impl/PortletApplicationEntityImpl.java
om/entity/impl/PortletEntityImpl.java services/ConfigurationException.java
Author: ddewolf
Date: Fri Jul 22 21:34:38 2005
New Revision: 224441
URL: http://svn.apache.org/viewcvs?rev=224441&view=rev
Log:
PLUTO-130; Thank you Elliot Metsger.
Detailed Error Messages added to the Portal Driver Config Processing.
Added:
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ConfigurationException.java
Modified:
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletApplicationEntityImpl.java
portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletApplicationEntityImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletApplicationEntityImpl.java?rev=224441&r1=224440&r2=224441&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletApplicationEntityImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletApplicationEntityImpl.java Fri Jul 22 21:34:38 2005
@@ -27,6 +27,7 @@
import org.apache.pluto.om.entity.PortletEntityList;
import org.apache.pluto.om.portlet.PortletApplicationDefinition;
import org.apache.pluto.portalImpl.services.portletdefinitionregistry.PortletDefinitionRegistry;
+import org.apache.pluto.portalImpl.services.ConfigurationException;
import org.apache.pluto.util.StringUtils;
public class PortletApplicationEntityImpl
@@ -56,8 +57,15 @@
public PortletApplicationDefinition getPortletApplicationDefinition()
{
- return PortletDefinitionRegistry.getPortletApplicationDefinitionList().get(
- org.apache.pluto.portalImpl.util.ObjectID.createFromString(definitionId));
+ PortletApplicationDefinition definition =
+ PortletDefinitionRegistry.getPortletApplicationDefinitionList()
+ .get(org.apache.pluto.portalImpl.util.ObjectID.createFromString(definitionId));
+ if(definition == null) {
+ throw new ConfigurationException("Unable to find portlet application definition. "+
+ "Ensure that all portlets definied within the portlet registry are correct" +
+ "and have been deployed.");
+ }
+ return definition;
}
// additional methods.
Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java?rev=224441&r1=224440&r2=224441&view=diff
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java (original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/entity/impl/PortletEntityImpl.java Fri Jul 22 21:34:38 2005
@@ -30,9 +30,11 @@
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.entity.PortletEntityCtrl;
import org.apache.pluto.om.portlet.PortletDefinition;
+import org.apache.pluto.om.portlet.PortletDefinitionList;
import org.apache.pluto.om.window.PortletWindowList;
import org.apache.pluto.portalImpl.om.common.impl.DescriptionSetImpl;
import org.apache.pluto.portalImpl.services.portletentityregistry.PortletEntityRegistry;
+import org.apache.pluto.portalImpl.services.ConfigurationException;
import org.apache.pluto.util.StringUtils;
public class PortletEntityImpl
@@ -78,7 +80,15 @@
public PortletDefinition getPortletDefinition()
{
- return applicationEntity.getPortletApplicationDefinition().getPortletDefinitionList().get(org.apache.pluto.portalImpl.util.ObjectID.createFromString(definitionId));
+ PortletDefinition def =
+ applicationEntity.getPortletApplicationDefinition()
+ .getPortletDefinitionList()
+ .get(org.apache.pluto.portalImpl.util.ObjectID.createFromString(definitionId));
+ if(def == null) {
+ throw new ConfigurationException("Unable to obtain portlet definition for :"+definitionId+
+ " Perhaps a portlet has been defined incorrectly in the portlet registry.");
+ }
+ return def;
}
public void setPortletDefinition(PortletDefinition portletDefinition)
Added: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ConfigurationException.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ConfigurationException.java?rev=224441&view=auto
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ConfigurationException.java (added)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/services/ConfigurationException.java Fri Jul 22 21:34:38 2005
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2003,2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.pluto.portalImpl.services;
+
+/**
+ * Runtime Exception used to notify users
+ * of configuration errors.
+ *
+ * @author ddewolf@apache.org
+ * @since Jul 23, 2005
+ */
+public class ConfigurationException extends RuntimeException {
+
+ public ConfigurationException(String msg) {
+ super(msg);
+ }
+}