1:26 a.m.
Author: julien(a)jboss.com
Date: 2007-01-24 19:26:27 -0500 (Wed, 24 Jan 2007)
New Revision: 6095
Removed:
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jsp/info/
Modified:
trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml
trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPortletWindowCommand.java
trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
- jsp portlet stays in samples (makes more sense)
- forgot to use entity resolver when parsing -object.xml in the war file (fixed now)
Modified: trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-01-25
00:22:24 UTC (rev 6094)
+++ trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -33,5 +33,9 @@
<orderEntry type="module" module-name="federation" />
<orderEntryProperties />
</component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-01-25
00:22:24 UTC (rev 6094)
+++ trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -34,5 +34,9 @@
</orderEntry>
<orderEntryProperties />
</component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
</module>
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-01-25
00:22:24 UTC (rev 6094)
+++
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-01-25
00:26:27 UTC (rev 6095)
@@ -175,6 +175,17 @@
{
in = Tools.safeBufferedWrapper(url.openStream());
DocumentBuilder builder =
XML.getDocumentBuilderFactory().newDocumentBuilder();
+ EntityResolver entityResolver =
factory.getPortalObjectEntityResolver();
+ if (entityResolver == null)
+ {
+ log.debug("Coult not obtain entity resolver for " +
url);
+ entityResolver = new NullEntityResolver();
+ }
+ else
+ {
+ log.debug("Obtained entity resolver " +
entityResolver + " for " + url);
+ }
+ builder.setEntityResolver(entityResolver);
Document doc = builder.parse(in);
Element deploymentsElt = doc.getDocumentElement();
for (Iterator i = XML.getChildrenIterator(deploymentsElt,
"deployment"); i.hasNext();)
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java 2007-01-25
00:22:24 UTC (rev 6094)
+++
trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java 2007-01-25
00:26:27 UTC (rev 6095)
@@ -48,11 +48,24 @@
/** . */
protected EntityResolver portletInstancesEntityResolver;
+ /** . */
+ protected EntityResolver portalObjectEntityResolver;
+
public Deployment newInstance(URL url, PortalWebApp pwa, MBeanServer mbeanServer)
throws DeploymentException
{
return new PortletAppDeployment(url, pwa, mbeanServer, this);
}
+ public EntityResolver getPortalObjectEntityResolver()
+ {
+ return portalObjectEntityResolver;
+ }
+
+ public void setPortalObjectEntityResolver(EntityResolver portalObjectEntityResolver)
+ {
+ this.portalObjectEntityResolver = portalObjectEntityResolver;
+ }
+
public EntityResolver getPortletInstancesEntityResolver()
{
return portletInstancesEntityResolver;
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPortletWindowCommand.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPortletWindowCommand.java 2007-01-25
00:22:24 UTC (rev 6094)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPortletWindowCommand.java 2007-01-25
00:26:27 UTC (rev 6095)
@@ -75,21 +75,9 @@
super(windowId);
}
- /** The instance. */
- protected Instance instance;
-
public void create() throws ControllerException
{
super.create();
-
- //
- instance = findInstance();
-
- // No instance means we can't continue
- if (instance == null)
- {
- throw new ResourceNotFoundException(window.getURI());
- }
}
protected Instance findInstance()
@@ -142,6 +130,14 @@
//
try
{
+ // Obtain instance
+ Instance instance = findInstance();
+ if (instance == null)
+ {
+ // No instance means we can't continue
+ throw new ResourceNotFoundException(window.getURI());
+ }
+
//
PortletInvocationResponse response;
try
Modified: trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-25
00:22:24 UTC (rev 6094)
+++ trunk/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -1050,6 +1050,9 @@
optional-attribute-name="JBossPortletEntityResolver"
proxy-type="attribute">portal:service=EntityResolver</depends>
<depends
+ optional-attribute-name="PortalObjectEntityResolver"
+
proxy-type="attribute">portal:service=EntityResolver</depends>
+ <depends
optional-attribute-name="PortletInstancesEntityResolver"
proxy-type="attribute">portal:service=EntityResolver</depends>
<attribute
name="StandardJBossApplicationMetaDataLocation">conf/standardjboss-portlet.xml</attribute>
Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml
===================================================================
---
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-01-25
00:22:24 UTC (rev 6094)
+++
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/jboss-portlet.xml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -66,18 +66,6 @@
<portlet-name>SecuredTestPortlet</portlet-name>
</portlet>
<portlet>
- <portlet-name>ContentRewritePortlet</portlet-name>
- </portlet>
- <portlet>
- <portlet-name>HintPortlet</portlet-name>
- </portlet>
- <portlet>
- <portlet-name>WsrpSelectorTestPortlet</portlet-name>
- </portlet>
- <portlet>
- <portlet-name>ThemeSelectorPortlet</portlet-name>
- </portlet>
- <portlet>
<portlet-name>WeatherPortlet</portlet-name>
</portlet>
<portlet>
Modified:
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml
===================================================================
---
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-01-25
00:22:24 UTC (rev 6094)
+++
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -29,35 +29,17 @@
<deployments>
<deployment>
<instance>
- <instance-id>HeaderContentPortletInstance</instance-id>
- <portlet-ref>HeaderContentPortlet</portlet-ref>
+ <instance-id>JSPPortletInstance</instance-id>
+ <portlet-ref>JSPPortlet</portlet-ref>
</instance>
</deployment>
<deployment>
<instance>
- <instance-id>WeatherPortletInstance</instance-id>
- <portlet-ref>WeatherPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
<instance-id>NewsPortletInstance</instance-id>
<portlet-ref>NewsPortlet</portlet-ref>
</instance>
</deployment>
<deployment>
- <instance>
- <instance-id>JSPPortletInstance</instance-id>
- <portlet-ref>JSPPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
- <instance>
- <instance-id>URLPortletInstance</instance-id>
- <portlet-ref>URLPortlet</portlet-ref>
- </instance>
- </deployment>
- <deployment>
<if-exists>overwrite</if-exists>
<instance>
<instance-id>NewsPortletInstance2</instance-id>
@@ -76,6 +58,24 @@
</deployment>
<deployment>
<instance>
+ <instance-id>WeatherPortletInstance</instance-id>
+ <portlet-ref>WeatherPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <instance-id>HeaderContentPortletInstance</instance-id>
+ <portlet-ref>HeaderContentPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
+ <instance-id>URLPortletInstance</instance-id>
+ <portlet-ref>URLPortlet</portlet-ref>
+ </instance>
+ </deployment>
+ <deployment>
+ <instance>
<instance-id>TestPortletInstance</instance-id>
<portlet-ref>TestPortlet</portlet-ref>
</instance>
Modified: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml
===================================================================
--- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-01-25
00:22:24 UTC (rev 6094)
+++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/portlet.xml 2007-01-25
00:26:27 UTC (rev 6095)
@@ -28,6 +28,19 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1...
http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
version="1.0">
<portlet>
+ <description>Simple JSP portlet</description>
+ <portlet-name>JSPPortlet</portlet-name>
+ <display-name>JSP Portlet</display-name>
+
<portlet-class>org.jboss.samples.portlet.jsp.JSPPortlet</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <portlet-info>
+ <title>Greetings!</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
<description>Portlet to test modification of head
content.</description>
<portlet-name>HeaderContentPortlet</portlet-name>
<display-name>Header Content Portlet</display-name>
@@ -292,19 +305,6 @@
</portlet-preferences>
</portlet>
<portlet>
- <description>Simple JSP portlet</description>
- <portlet-name>JSPPortlet</portlet-name>
- <display-name>JSP Portlet</display-name>
-
<portlet-class>org.jboss.samples.portlet.jsp.JSPPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <portlet-info>
- <title>Greetings!</title>
- </portlet-info>
- </portlet>
- <portlet>
<description>URL Portlet</description>
<portlet-name>URLPortlet</portlet-name>
<display-name>URL Portlet</display-name>