[portal-commits] JBoss Portal SVN: r7233 - in trunk: portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2007-05-09 23:10:55 -0400 (Wed, 09 May 2007)
New Revision: 7233
Modified:
trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java
Log:
- Added check for null jbossPortletMD.
- Typo.
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java
===================================================================
---
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java 2007-05-09
23:16:23 UTC (rev 7232)
+++
trunk/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/info/ContainerPortletInfo.java 2007-05-10
03:10:55 UTC (rev 7233)
@@ -22,6 +22,7 @@
******************************************************************************/
package org.jboss.portal.portlet.impl.jsr168.info;
+import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
import org.jboss.portal.portlet.info.CacheInfo;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
@@ -31,7 +32,6 @@
import org.jboss.portal.portlet.info.SecurityInfo;
import org.jboss.portal.portlet.info.SessionInfo;
import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
-import org.jboss.portal.common.i18n.ResourceBundleManager;
/**
* For now implementation that use the portlet container directly.
@@ -62,7 +62,7 @@
this.security = new ContainerSecurityInfo(portletMD);
this.cache = new ContainerCacheInfo(portletMD, jbossPortletMD);
this.session = new ContainerSessionInfo(jbossPortletMD);
- this.remotable = jbossPortletMD.getRemotable() != null ?
jbossPortletMD.getRemotable() : Boolean.FALSE;
+ this.remotable = (jbossPortletMD != null && jbossPortletMD.getRemotable()
!= null) ? jbossPortletMD.getRemotable() : Boolean.FALSE;
}
public CapabilitiesInfo getCapabilities()
Modified:
trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java
===================================================================
---
trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-05-09
23:16:23 UTC (rev 7232)
+++
trunk/portlet-server/src/main/org/jboss/portal/portlet/deployment/jboss/PortletAppDeployment.java 2007-05-10
03:10:55 UTC (rev 7233)
@@ -25,10 +25,10 @@
import org.jboss.deployment.DeploymentException;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.common.xml.NullEntityResolver;
-import org.jboss.portal.portlet.impl.container.PortletApplicationContextImpl;
import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory;
import org.jboss.portal.portlet.deployment.ValueTrimmingFilter;
+import org.jboss.portal.portlet.impl.container.PortletApplicationContextImpl;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
@@ -295,7 +295,7 @@
EntityResolver entityResolver =
this.factory.getJBossPortletEntityResolver();
if (entityResolver == null)
{
- log.debug("Coult not obtain entity resolver for
jboss-portlet.xml");
+ log.debug("Could not obtain entity resolver for
jboss-portlet.xml");
entityResolver = new NullEntityResolver();
}
else