7:24 a.m.
Author: thomas.heute(a)jboss.com
Date: 2009-05-13 08:24:04 -0400 (Wed, 13 May 2009)
New Revision: 13357
Added:
other/dzone_article/portalExtension/etc/default-object.xml
Removed:
other/dzone_article/myPortal/src/main/pom.xml
Modified:
other/dzone_article/myPortal/src/main/webapp/WEB-INF/default-object.xml
other/dzone_article/portalExtension/etc/jboss-service.xml
other/dzone_article/portalExtension/etc/web.xml
Log:
minor
Deleted: other/dzone_article/myPortal/src/main/pom.xml
===================================================================
--- other/dzone_article/myPortal/src/main/pom.xml 2009-05-13 11:21:01 UTC (rev 13356)
+++ other/dzone_article/myPortal/src/main/pom.xml 2009-05-13 12:24:04 UTC (rev 13357)
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.portal</groupId>
- <artifactId>myPortal</artifactId>
- <packaging>war</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <name>myPortal</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Modified: other/dzone_article/myPortal/src/main/webapp/WEB-INF/default-object.xml
===================================================================
--- other/dzone_article/myPortal/src/main/webapp/WEB-INF/default-object.xml 2009-05-13
11:21:01 UTC (rev 13356)
+++ other/dzone_article/myPortal/src/main/webapp/WEB-INF/default-object.xml 2009-05-13
12:24:04 UTC (rev 13357)
@@ -32,27 +32,6 @@
<context-name />
<properties>
<!--
- | Set the layout for the default portal, see also portal-layouts.xml.
- -->
- <property>
- <name>layout.id</name>
- <value>MyLayout</value>
- </property>
- <!--
- | Set the theme for the default portal, see also portal-themes.xml.
- -->
- <property>
- <name>theme.id</name>
- <value>mySkin</value>
- </property>
- <!--
- | Set the default render set name (used by the render tag in layouts), see also
portal-renderSet.xml
- -->
- <property>
- <name>theme.renderSetId</name>
- <value>myPortalRenderer</value>
- </property>
- <!--
| The default portal name, if the property is not explicited then the default portal
name is "default"
-->
<property>
@@ -133,6 +112,29 @@
<unchecked />
</policy-permission>
</security-constraint>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>MyLayout</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>mySkin</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see also
portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>myPortalRenderer</value>
+ </property>
+ </properties>
<coordination>
<wirings>
<implicit-mode>TRUE</implicit-mode>
Added: other/dzone_article/portalExtension/etc/default-object.xml
===================================================================
--- other/dzone_article/portalExtension/etc/default-object.xml
(rev 0)
+++ other/dzone_article/portalExtension/etc/default-object.xml 2009-05-13 12:24:04 UTC
(rev 13357)
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE deployments PUBLIC
+ "-//JBoss Portal//DTD Portal Object 2.6//EN"
+ "http://www.jboss.org/portal/dtd/portal-object_2_6.dtd">
+
+<deployments>
+ <deployment>
+ <context>
+ <context-name/>
+ <properties>
+ <!--
+ | The default portal name, if the property is not explicited then the default
portal name is "default"
+ -->
+ <property>
+ <name>portal.defaultObjectName</name>
+ <value>default</value>
+ </property>
+
+ <!-- Control policy config -->
+ <property>
+ <name>control.portal.access_denied</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.unavailable</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.not_found</name>
+ <value>ignore</value>
+ </property>
+ <property>
+ <name>control.portal.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.portal.resource_uri</name>
+ <value>/WEB-INF/jsp/error/portal.jsp</value>
+ </property>
+ <property>
+ <name>control.page.access_denied</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.unavailable</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.not_found</name>
+ <value>hide</value>
+ </property>
+ <property>
+ <name>control.page.internal_error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.error</name>
+ <value>jsp</value>
+ </property>
+ <property>
+ <name>control.page.resource_uri</name>
+ <value>/WEB-INF/jsp/error/page.jsp</value>
+ </property>
+ </properties>
+ </context>
+ </deployment>
+ <deployment>
+ <parent-ref/>
+ <if-exists>overwrite</if-exists>
+ <portal>
+ <portal-name>default</portal-name>
+ <supported-modes>
+ <mode>view</mode>
+ <mode>edit</mode>
+ <mode>help</mode>
+ </supported-modes>
+ <supported-window-states>
+ <window-state>normal</window-state>
+ <window-state>minimized</window-state>
+ <window-state>maximized</window-state>
+ </supported-window-states>
+ <security-constraint>
+ <policy-permission>
+ <action-name>view</action-name>
+ <unchecked/>
+ </policy-permission>
+ </security-constraint>
+ <properties>
+ <!--
+ | Set the layout for the default portal, see also portal-layouts.xml.
+ -->
+ <property>
+ <name>layout.id</name>
+ <value>MyLayout</value>
+ </property>
+ <!--
+ | Set the theme for the default portal, see also portal-themes.xml.
+ -->
+ <property>
+ <name>theme.id</name>
+ <value>mySkin</value>
+ </property>
+ <!--
+ | Set the default render set name (used by the render tag in layouts), see
also portal-renderSet.xml
+ -->
+ <property>
+ <name>theme.renderSetId</name>
+ <value>myPortalRenderer</value>
+ </property>
+ </properties>
+ <coordination>
+ <wirings>
+ <implicit-mode>TRUE</implicit-mode>
+ </wirings>
+ <bindings>
+ <implicit-mode>TRUE</implicit-mode>
+ </bindings>
+ </coordination>
+ <page>
+ <page-name>default</page-name>
+ <display-name xml:lang="en">Home</display-name>
+ <display-name xml:lang="fr">Accueil</display-name>
+ <properties>
+ <property>
+ <name>order</name>
+ <value>1</value>
+ </property>
+ </properties>
+ <security-constraint>
+ <policy-permission>
+ <action-name>view</action-name>
+ <unchecked/>
+ </policy-permission>
+ </security-constraint>
+ <window>
+ <window-name>JBossPortalRSSWindow</window-name>
+ <instance-ref>JBossPortalRSSInstance</instance-ref>
+ <region>FirstColumn</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>JBossRSSWindow</window-name>
+ <instance-ref>JBossRSSInstance</instance-ref>
+ <region>SecondColumn</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>cms</content-type>
+ <content-uri>/default/index.html</content-uri>
+ </content>
+ <region>MainColumn</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>other</page-name>
+ <display-name xml:lang="en">Other Page</display-name>
+ <display-name xml:lang="fr">Autre Page</display-name>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>TwoColumnsLayout</value>
+ </property>
+ <property>
+ <name>order</name>
+ <value>2</value>
+ </property>
+ </properties>
+ <security-constraint>
+ <policy-permission>
+ <action-name>view</action-name>
+ <unchecked/>
+ </policy-permission>
+ </security-constraint>
+ <window>
+ <window-name>AdminOnlyRSSWindow</window-name>
+ <instance-ref>AdminOnlyRSSInstance</instance-ref>
+ <region>FirstColumn</region>
+ <height>0</height>
+ </window>
+ <window>
+ <window-name>CMSWindow</window-name>
+ <content>
+ <content-type>netvibesWidget</content-type>
+
<content-uri>http://sudokushark.com/netvibes_uwa.php</content-uri>
+ </content>
+ <region>SecondColumn</region>
+ <height>0</height>
+ </window>
+ </page>
+ <page>
+ <page-name>adminonly</page-name>
+ <display-name xml:lang="en">Admin Only</display-name>
+ <display-name xml:lang="fr">Pour Admin</display-name>
+ <properties>
+ <property>
+ <name>layout.id</name>
+ <value>TwoColumnsLayout</value>
+ </property>
+ <property>
+ <name>order</name>
+ <value>3</value>
+ </property>
+ </properties>
+ <security-constraint>
+ <policy-permission>
+ <action-name>view</action-name>
+ <role>Admin</role>
+ </policy-permission>
+ </security-constraint>
+ <window>
+ <window-name>NYTWindow</window-name>
+ <content>
+ <content-type>netvibes-widget</content-type>
+
<content-uri>http://www.netvibes.com/modules/multipleFeeds/multipleFeed...
+ </content>
+ <region>FirstColumn</region>
+ <height>0</height>
+ </window>
+ </page>
+ </portal>
+ </deployment>
+
+ <deployment>
+ <if-exists>overwrite</if-exists>
+ <context>
+ <context-name>dashboard</context-name>
+ </context>
+ </deployment>
+
+ <deployment>
+ <parent-ref/>
+ <if-exists>keep</if-exists>
+ <portal>
+ <portal-name>template</portal-name>
+ </portal>
+ </deployment>
+</deployments>
Modified: other/dzone_article/portalExtension/etc/jboss-service.xml
===================================================================
--- other/dzone_article/portalExtension/etc/jboss-service.xml 2009-05-13 11:21:01 UTC (rev
13356)
+++ other/dzone_article/portalExtension/etc/jboss-service.xml 2009-05-13 12:24:04 UTC (rev
13357)
@@ -213,9 +213,9 @@
name="portal:service=Interceptor,type=Command,name=PageCustomizer"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="TargetContextPath">/portal-core</attribute>
- <attribute
name="HeaderPath">/WEB-INF/jsp/header/header.jsp</attribute>
- <attribute
name="TabsPath">/WEB-INF/jsp/header/tabs.jsp</attribute>
+ <attribute name="TargetContextPath">/myPortal</attribute>
+ <attribute
name="HeaderPath">/layouts/common/links.jsp</attribute>
+ <attribute
name="TabsPath">/layouts/common/tabs.jsp</attribute>
<!-- Overrides the value of core.login.namespace in config.xml --><!--
attribute name="LoginNamespace">dashboard</attribute -->
<depends optional-attribute-name="Config"
proxy-type="attribute">portal:service=ServerConfig</depends>
<depends optional-attribute-name="PortalAuthorizationManagerFactory"
proxy-type="attribute">
Modified: other/dzone_article/portalExtension/etc/web.xml
===================================================================
--- other/dzone_article/portalExtension/etc/web.xml 2009-05-13 11:21:01 UTC (rev 13356)
+++ other/dzone_article/portalExtension/etc/web.xml 2009-05-13 12:24:04 UTC (rev 13357)
@@ -64,7 +64,7 @@
<servlet>
<servlet-name>localeServlet</servlet-name>
-
<servlet-class>org.jboss.portal.myPortal.servlet.LocaleServlet</servlet-class>
+
<servlet-class>org.jboss.portal.extension.servlet.LocaleServlet</servlet-class>
</servlet>
<!-- The portal servlet is the main entrance point -->