6:22 a.m.
Author: thomas.heute(a)jboss.com
Date: 2010-01-12 07:22:13 -0500 (Tue, 12 Jan 2010)
New Revision: 1237
Added:
components/pc/trunk/distrib/GateInPC-README.txt
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/jsp/
Removed:
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/
Modified:
components/pc/trunk/distrib/distrib.xml
components/pc/trunk/portal/pom.xml
components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml
components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
components/pc/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/jsp/JSPPortlet.java
Log:
GTNPC-16: simple-portal does not work
Added: components/pc/trunk/distrib/GateInPC-README.txt
===================================================================
--- components/pc/trunk/distrib/GateInPC-README.txt (rev 0)
+++ components/pc/trunk/distrib/GateInPC-README.txt 2010-01-12 12:22:13 UTC (rev 1237)
@@ -0,0 +1,15 @@
+
+GateIn Portlet Container
+LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product
usage)
+
+GateIn Portlet Container is the next generation portlet container on which GateIn Portal
+is based. It provides a standard-compliant implementation of the JSR-286 Portlet 2.0
+specification. It has been developed with reusability in mind so that advanced users, who
don't require
+a full-fledged portal, can leverage the portlet management services it provides in their
own applications.
+GateIn Portlet Container is available through the business-friendly LGPL open source
license.
+
+This distribution also contains a simple portal built on top of GateIn Portlet Container.
This simple
+portal can be run on Tomcat 6.x and JBoss Application Server 4.2.x.
+
+INSTALLATION AND RUNNING:
+For installation, please refer to the user guide available in the 'gateinpc-docs'
directory
Modified: components/pc/trunk/distrib/distrib.xml
===================================================================
--- components/pc/trunk/distrib/distrib.xml 2010-01-12 11:28:30 UTC (rev 1236)
+++ components/pc/trunk/distrib/distrib.xml 2010-01-12 12:22:13 UTC (rev 1237)
@@ -2,9 +2,9 @@
<property name="source.dir" value="../"/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.1.0-Beta02"/>
- <property name="demo.release.version"
value="2.1.0-Beta02"/>
- <property name="maven.version" value="2.1.0-Beta02"/>
+ <property name="pc.release.version"
value="2.1.0-CR02-SNAPSHOT"/>
+ <property name="demo.release.version"
value="2.1.0-CR02-SNAPSHOT"/>
+ <property name="maven.version"
value="2.1.0-CR02-SNAPSHOT"/>
<!-- -->
<property name="pc.release.name"
value="gatein-portletcontainer-${pc.release.version}"/>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2010-01-12 11:28:30 UTC (rev 1236)
+++ components/pc/trunk/portal/pom.xml 2010-01-12 12:22:13 UTC (rev 1237)
@@ -27,6 +27,11 @@
</dependency>
<dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
</dependency>
@@ -89,6 +94,18 @@
<groupId>apache-taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+
</dependencies>
<build>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2010-01-12 11:28:30
UTC (rev 1236)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2010-01-12 12:22:13
UTC (rev 1237)
@@ -15,11 +15,11 @@
<includes>
<include>org.gatein.common:common-common</include>
+ <include>org.gatein.common:common-logging</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-log4j12</include>
<include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.pc:pc-portlet</include>
- <include>org.gatein.pc:pc-api</include>
-
- <include>javax.ccpp:ccpp</include>
+ <include>org.gatein.wci:wci-tomcat</include>
<include>javax.portlet:portlet-api</include>
</includes>
@@ -28,6 +28,10 @@
<outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
<includes>
+ <include>org.gatein.pc:pc-portlet</include>
+ <include>org.gatein.pc:pc-api</include>
+ <include>javax.ccpp:ccpp</include>
+
<include>org.gatein.common:common-mc</include>
<include>org.gatein.pc:pc-controller</include>
<include>org.gatein.pc:pc-mc</include>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2010-01-12 11:28:30
UTC (rev 1236)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2010-01-12 12:22:13
UTC (rev 1237)
@@ -16,11 +16,10 @@
<includes>
<include>org.gatein.common:common-common</include>
+ <include>org.gatein.common:common-logging</include>
+ <include>javax.portlet:portlet-api</include>
<include>org.gatein.wci:wci-wci</include>
- <include>org.gatein.pc:pc-portlet</include>
- <include>org.gatein.pc:pc-api</include>
- <include>javax.ccpp:ccpp</include>
- <include>javax.portlet:portlet-api</include>
+ <include>org.gatein.wci:wci-tomcat</include>
</includes>
</dependencySet>
@@ -28,6 +27,10 @@
<outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
<includes>
+ <include>org.gatein.pc:pc-portlet</include>
+ <include>org.gatein.pc:pc-api</include>
+ <include>javax.ccpp:ccpp</include>
+
<include>org.gatein.common:common-mc</include>
<include>org.gatein.pc:pc-controller</include>
<include>org.gatein.pc:pc-mc</include>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-01-12 11:28:30
UTC (rev 1236)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2010-01-12 12:22:13
UTC (rev 1237)
@@ -15,10 +15,15 @@
<includes>
<include>org.gatein.common:common-common</include>
+ <include>org.gatein.common:common-logging</include>
<include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.wci:wci-tomcat</include>
<include>org.gatein.pc:pc-portlet</include>
<include>org.gatein.pc:pc-api</include>
-
+
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-log4j12</include>
+
<include>apache-log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
Modified: components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
---
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-01-12
11:28:30 UTC (rev 1236)
+++
components/pc/trunk/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-01-12
12:22:13 UTC (rev 1237)
@@ -51,7 +51,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
-
<servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+
<servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
</web-app>
Modified:
components/pc/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp
===================================================================
---
components/pc/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2010-01-12
11:28:30 UTC (rev 1236)
+++
components/pc/trunk/portal/src/main/resources/simple-portal-war/layouts/nav/main.jsp 2010-01-12
12:22:13 UTC (rev 1237)
@@ -32,9 +32,11 @@
<li>
<a href="${pageContext.request.contextPath}/demo/demo4.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'demo4.jsp' ? 'selected' : ''}">Demo4</a>
</li>
+ <!--
<li>
<a href="${pageContext.request.contextPath}/demo/jsr-301.jsp"
class="${fn:substringAfter(pageContext.request.servletPath, 'demo/') ==
'jsr-301.jsp' ? 'selected' : ''}">JSR-301 Demo</a>
</li>
+ -->
</ul>
<br class="clear"/>
</div>
Copied: components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/jsp (from rev 1228,
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp)
Modified:
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/jsp/JSPPortlet.java
===================================================================
---
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/jsp/JSPPortlet.java 2010-01-12
11:28:30 UTC (rev 1236)
+++
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/jsp/JSPPortlet.java 2010-01-12
12:22:13 UTC (rev 1237)
@@ -34,7 +34,7 @@
*/
public class JSPPortlet extends GenericPortlet
{
- private static final String JSP_PATH = "/WEB-INF/jsp";
+ private static final String JSP_PATH = "/jsp";
protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws
PortletException, IOException, UnavailableException
{