Author: thomas.heute(a)jboss.com
Date: 2009-09-01 16:47:28 -0400 (Tue, 01 Sep 2009)
New Revision: 149
Added:
components/pc/trunk/build/distrib/GateInPC-README.txt
components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml
components/pc/trunk/portal/src/main/resources/jboss51/
Removed:
components/pc/trunk/build/distrib/JBossPC-README.txt
components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
components/pc/trunk/portal/src/main/resources/jboss50/
Modified:
components/pc/trunk/build/distrib/distrib.xml
components/pc/trunk/docs/user-guide/en/modules/installation.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-tomcat60.xml
components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/remotecontroller/RemoteControllerPortlet.java
Log:
Fixing issue with simple-portal
Fixing packaging issues and wrong renaming issues
Added a workaround the fact that getNamespace returns an incorrect prefix for javascript
(was 0) (Will need a real fix)
Changed JBoss 5.0 -> JBoss 5.1
Replaced JBoss Portlet Container with GateIn Portlet Container in few places
Copied: components/pc/trunk/build/distrib/GateInPC-README.txt (from rev 144,
components/pc/trunk/build/distrib/JBossPC-README.txt)
===================================================================
--- components/pc/trunk/build/distrib/GateInPC-README.txt (rev 0)
+++ components/pc/trunk/build/distrib/GateInPC-README.txt 2009-09-01 20:47:28 UTC (rev
149)
@@ -0,0 +1,14 @@
+
+GateIn Portlet Container
+LGPL Licensed (See
http://www.gnu.org/copyleft/lesser.html for details on the product
usage)
+
+GateIn Portlet Container 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 JBoss Portlet Container.
This simple
+portal can be run on Tomcat 6.x, JBoss Application Server 4.2.x and JBoss Application
Server 5.1.x.
+
+INSTALLATION AND RUNNING:
+For installation, please refer to the user guide available in the 'gateinpc-docs'
directory
\ No newline at end of file
Deleted: components/pc/trunk/build/distrib/JBossPC-README.txt
===================================================================
--- components/pc/trunk/build/distrib/JBossPC-README.txt 2009-09-01 20:16:49 UTC (rev
148)
+++ components/pc/trunk/build/distrib/JBossPC-README.txt 2009-09-01 20:47:28 UTC (rev
149)
@@ -1,15 +0,0 @@
-
-JBoss Portlet Container
-LGPL Licensed (See
http://www.gnu.org/copyleft/lesser.html for details on the product
usage)
-
-JBoss Portlet Container is the next generation portlet container on which future versions
of JBoss
-Portal will be 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.
-JBoss Portlet Container is available through the business-friendly LGPL open source
license.
-
-This distribution also contains a simple portal built on top of JBoss 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 'jbosspc-docs'
directory
\ No newline at end of file
Modified: components/pc/trunk/build/distrib/distrib.xml
===================================================================
--- components/pc/trunk/build/distrib/distrib.xml 2009-09-01 20:16:49 UTC (rev 148)
+++ components/pc/trunk/build/distrib/distrib.xml 2009-09-01 20:47:28 UTC (rev 149)
@@ -1,23 +1,23 @@
-<project default="all" name="JBoss Portlet Container">
+<project default="all" name="GateIn Portlet Container">
<property name="source.dir" value="../.."/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.0.8"/>
- <property name="demo.release.version" value="2.0.8"/>
- <property name="maven.version" value="2.0.8"/>
+ <property name="pc.release.version"
value="2.1.0-SNAPSHOT"/>
+ <property name="demo.release.version"
value="2.1.0-SNAPSHOT"/>
+ <property name="maven.version" value="2.1.0-SNAPSHOT"/>
<!-- -->
- <property name="pc.release.name"
value="jboss-portletcontainer-${pc.release.version}"/>
- <property name="demo.release.name"
value="jboss-portletcontainer-${demo.release.version}"/>
+ <property name="pc.release.name"
value="gatein-portletcontainer-${pc.release.version}"/>
+ <property name="demo.release.name"
value="gatein-portletcontainer-${demo.release.version}"/>
<property name="pc.release.name.src"
value="${pc.release.name}-src"/>
<property name="demo.release.name.jboss42"
value="${demo.release.name}-jbossas42"/>
- <property name="demo.release.name.jboss50"
value="${demo.release.name}-jbossas50"/>
+ <property name="demo.release.name.jboss51"
value="${demo.release.name}-jbossas51"/>
<property name="demo.release.name.tomcat60"
value="${demo.release.name}-tomcat6"/>
<!-- -->
<property name="pc.build.src"
value="output/${pc.release.name.src}"/>
<property name="pc.build.bin.as42"
value="output/${demo.release.name.jboss42}"/>
- <property name="pc.build.bin.as50"
value="output/${demo.release.name.jboss50}"/>
+ <property name="pc.build.bin.as51"
value="output/${demo.release.name.jboss51}"/>
<property name="pc.build.bin.tomcat6"
value="output/${demo.release.name.tomcat60}"/>
<!-- Clean -->
@@ -31,8 +31,8 @@
<!-- Licenses -->
<target name="licenses" unless="no-doc">
- <mkdir dir="output/jbosspc-docs/licenses"/>
- <copy todir="output/jbosspc-docs/licenses">
+ <mkdir dir="output/gatein-docs/licenses"/>
+ <copy todir="output/gatein-docs/licenses">
<fileset dir="../licences" includes="*.txt"/>
</copy>
</target>
@@ -48,12 +48,12 @@
<antcall target="package-src"/>
<antcall target="package-jboss42"/>
- <antcall target="package-jboss50"/>
+ <antcall target="package-jboss51"/>
<antcall target="package-tomcat60"/>
</target>
<!--
- | JBoss Portlet Container source distribution
+ | GateIn Portlet Container source distribution
-->
<target name="package-src" description="package source
distribution" unless="no-src">
<antcall target="__package-distrib">
@@ -69,7 +69,7 @@
</target>
<!--
- | JBoss Portlet Container binary distribution for AS 4.2.x
+ | GateIn Portlet Container binary distribution for AS 4.2.x
-->
<target name="package-jboss42" description="package AS binary"
if="JBOSS_4_2_PATH" unless="no-jboss">
@@ -107,33 +107,33 @@
</target>
<!--
- | JBoss Portlet Container binary distribution for AS 5.0.x
+ | GateIn Portlet Container binary distribution for AS 5.1.x
-->
- <target name="package-jboss50" description="package AS binary"
if="JBOSS_5_0_PATH" unless="no-jboss">
+ <target name="package-jboss51" description="package AS binary"
if="JBOSS_5_1_PATH" unless="no-jboss">
<!-- -->
- <unzip src="${JBOSS_5_0_PATH}"
dest="${pc.build.bin.as50}">
+ <unzip src="${JBOSS_5_1_PATH}"
dest="${pc.build.bin.as51}">
<mapper type="regexp" from="^[^\/]*\/(.*)$$"
to="\1"/>
</unzip>
- <chmod dir="${pc.build.bin.as50}/bin" perm="ugo+rx"
includes="**/*.sh"/>
+ <chmod dir="${pc.build.bin.as51}/bin" perm="ugo+rx"
includes="**/*.sh"/>
<!-- -->
<antcall target="__package-binary">
- <param name="bin.dir" value="${pc.build.bin.as50}"/>
- <param name="deploy.dir"
value="${pc.build.bin.as50}/server/default/deploy"/>
- <param name="samples.dir"
value="${pc.build.bin.as50}/server/default/deploy/samples"/>
+ <param name="bin.dir" value="${pc.build.bin.as51}"/>
+ <param name="deploy.dir"
value="${pc.build.bin.as51}/server/default/deploy"/>
+ <param name="samples.dir"
value="${pc.build.bin.as51}/server/default/deploy/samples"/>
</antcall>
<!-- Simple portal -->
- <copy
todir="${pc.build.bin.as50}/server/default/deploy/simple-portal.sar">
+ <copy
todir="${pc.build.bin.as51}/server/default/deploy/simple-portal.sar">
<fileset
-
dir="${source.dir}/portal/target/simple-portal-jboss50.dir/simple-portal"/>
+
dir="${source.dir}/portal/target/simple-portal-jboss51.dir/simple-portal"/>
</copy>
<!-- Taglib integration -->
<!--
- <copy todir="${pc.build.bin.as50}" overwrite="true"
filtering="true">
- <fileset dir="jboss-5.0"/>
+ <copy todir="${pc.build.bin.as51}" overwrite="true"
filtering="true">
+ <fileset dir="jboss-5.1"/>
<filterset>
<filter token="maven.version"
value="${maven.version}"/>
</filterset>
@@ -142,7 +142,7 @@
<!-- -->
<antcall target="__zip">
- <param name="release.name"
value="${demo.release.name.jboss50}"/>
+ <param name="release.name"
value="${demo.release.name.jboss51}"/>
</antcall>
</target>
@@ -212,14 +212,14 @@
</copy>
<copy
file="${source.dir}/docs/user-guide/target/attach/user-guide-en-US-${maven.version}-html.war"
- tofile="${samples.dir}/jbosspc-docs.war"/>
+ tofile="${samples.dir}/gateinpc-docs.war"/>
</target>
<target name="__package-distrib">
<mkdir dir="${todir}"/>
- <copy file="JBossPC-README.txt" todir="${todir}"/>
+ <copy file="GateInPC-README.txt" todir="${todir}"/>
<antcall target="__package-doc">
- <param name="todir" value="${todir}/jbosspc-docs"/>
+ <param name="todir" value="${todir}/gateinpc-docs"/>
</antcall>
</target>
@@ -254,11 +254,11 @@
</not>
</and>
</condition>
- <condition property="JBOSS_5_0_PATH"
value="${env.JBOSS_5_0_PATH}">
+ <condition property="JBOSS_5_1_PATH"
value="${env.JBOSS_5_1_PATH}">
<and>
- <isset property="env.JBOSS_5_0_PATH"/>
+ <isset property="env.JBOSS_5_1_PATH"/>
<not>
- <isset property="JBOSS_5_0_PATH"/>
+ <isset property="JBOSS_5_1_PATH"/>
</not>
</and>
</condition>
@@ -271,9 +271,9 @@
</and>
</condition>
- <echo message="Set JBOSS_4_2_PATH and/or JBOSS_5_0_PATH and/or
TOMCAT_6_0_PATH variables for binary distributions:"/>
+ <echo message="Set JBOSS_4_2_PATH and/or JBOSS_5_1_PATH and/or
TOMCAT_6_0_PATH variables for binary distributions:"/>
<echo message="JBoss AS 4.2.x path: ${JBOSS_4_2_PATH}"/>
- <echo message="JBoss AS 5.0.x path: ${JBOSS_5_0_PATH}"/>
+ <echo message="JBoss AS 5.1.x path: ${JBOSS_5_1_PATH}"/>
<echo message="Tomcat 6.x path: ${TOMCAT_6_0_PATH}"/>
<echo message="Useful variables:"/>
<echo message="no-doc: do not generate documentation if set to true.
Currently: ${no-doc}"/>
Modified: components/pc/trunk/docs/user-guide/en/modules/installation.xml
===================================================================
--- components/pc/trunk/docs/user-guide/en/modules/installation.xml 2009-09-01 20:16:49
UTC (rev 148)
+++ components/pc/trunk/docs/user-guide/en/modules/installation.xml 2009-09-01 20:47:28
UTC (rev 149)
@@ -16,16 +16,16 @@
<title>Installation</title>
<sect1>
<title>Downloading and installing</title>
- <para>Two bundled versions are provided to showcase JBoss Portlet Container
in action with minimum effort. Theses
+ <para>Two bundled versions are provided to showcase Gatein Portlet Container
in action with minimum effort. Theses
bundles each include a servlet container configured with the Simple Portal
demonstration portal along with
some JSR-286 compliant portlets. You will need to have Java 5 configured on your
machine to run the
demonstration portal.
You can download Java 5 at<ulink
url="http://java.sun.com/javase/downloads/index_jdk5.jsp">
http://java.sun.com/javase/downloads/index_jdk5.jsp</ulink>. Once you have
Java installed, you are ready to
- download one of JBoss Portlet Container bundles. The following link has the list
of downloads for JBoss Portlet
- Container:<ulink
url="http://labs.jboss.com/portletcontainer/download">
+ download one of GateIn Portlet Container bundles. The following link has the
list of downloads for Gatein Portlet
+ Container:<ulink
url="http://www.jboss.org/gatein/portletcontainer/download">
http://labs.jboss.com/portal/portletcontainer/download</ulink>. Two
bundles are currently provided: one with
- Tomcat 6.0.16 and one with JBoss Application Server 4.2.2.GA.
+ Tomcat 6.0 one with JBoss Application Server 4.2 and one with JBoss Application
Server 5.1.
</para>
<sect2>
<title>JBoss AS 4.2.x bundle</title>
@@ -41,8 +41,8 @@
- Contains documentation for JBoss Application Server
</listitem>
<listitem>
- <emphasis role="bold">jbosspc-docs</emphasis>
- - Contains documentation for JBoss Portlet Container (this document
included)
+ <emphasis role="bold">gateinpc-docs</emphasis>
+ - Contains documentation for GateIn Portlet Container (this document
included)
</listitem>
<listitem>
<emphasis role="bold">server</emphasis>
@@ -82,12 +82,12 @@
in its name)
</listitem>
<listitem>
- <emphasis role="bold">jbosspc-docs</emphasis>
- - Contains documentation for JBoss Portlet Container (this document
included)
+ <emphasis role="bold">gateinpc-docs</emphasis>
+ - Contains documentation for GateIn Portlet Container (this document
included)
</listitem>
<listitem>
<emphasis role="bold">lib</emphasis>
- - Contains Tomcat libraries to which several support libraries for
JBoss Portlet Container have been
+ - Contains Tomcat libraries to which several support libraries for
GateIn Portlet Container have been
added
</listitem>
<listitem>
Modified: components/pc/trunk/portal/pom.xml
===================================================================
--- components/pc/trunk/portal/pom.xml 2009-09-01 20:16:49 UTC (rev 148)
+++ components/pc/trunk/portal/pom.xml 2009-09-01 20:47:28 UTC (rev 149)
@@ -19,6 +19,11 @@
</dependency>
<dependency>
+ <groupId>org.gatein.common</groupId>
+ <artifactId>common-common</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
<type>jar</type>
@@ -103,7 +108,7 @@
<descriptors>
<descriptor>src/assemble/simple-portal-jboss42.xml</descriptor>
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
-
<descriptor>src/assemble/simple-portal-jboss50.xml</descriptor>
+
<descriptor>src/assemble/simple-portal-jboss51.xml</descriptor>
</descriptors>
</configuration>
<executions>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-09-01 20:16:49
UTC (rev 148)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss42.xml 2009-09-01 20:47:28
UTC (rev 149)
@@ -14,10 +14,10 @@
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.jboss.portal.common:common-common</include>
- <include>org.jboss.portal.web:web-web</include>
- <include>org.jboss.portal.portlet:portlet-portlet</include>
- <include>org.jboss.portal.portlet:portlet-api</include>
+ <include>org.gatein.common:common-common</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>
@@ -28,9 +28,9 @@
<outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
<includes>
- <include>org.jboss.portal.common:common-mc</include>
- <include>org.jboss.portal.portlet:portlet-controller</include>
- <include>org.jboss.portal.portlet:portlet-mc</include>
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
<include>org.jboss:jboss-common-core</include>
<include>org.jboss.microcontainer:jboss-kernel</include>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-09-01 20:16:49
UTC (rev 148)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml 2009-09-01 20:47:28
UTC (rev 149)
@@ -1,51 +0,0 @@
-<assembly>
- <id>jboss50</id>
- <formats>
- <format>dir</format>
- </formats>
- <baseDirectory>simple-portal</baseDirectory>
-
- <componentDescriptors>
-
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
-
<componentDescriptor>src/assemble/simple-portal-war-jboss50.xml</componentDescriptor>
- </componentDescriptors>
-
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
-
- <include>org.jboss.portal.common:common-common</include>
- <include>org.jboss.portal.web:web-web</include>
- <include>org.jboss.portal.portlet:portlet-portlet</include>
-
- <include>javax.ccpp:ccpp</include>
- <include>javax.portlet:portlet-api</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
- <includes>
-
- <include>org.jboss.portal.common:common-mc</include>
- <include>org.jboss.portal.portlet:portlet-controller</include>
- <include>org.jboss.portal.portlet:portlet-mc</include>
-
- <include>org.jboss:jboss-common-core</include>
- <include>org.jboss.microcontainer:jboss-dependency</include>
- <include>org.jboss:jboss-reflect</include>
- <include>org.jboss:jboss-mdr</include>
- <include>org.jboss:jbossxb</include>
-
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
- </dependencySets>
-
-</assembly>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml (from rev 144,
components/pc/trunk/portal/src/assemble/simple-portal-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml
(rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-jboss51.xml 2009-09-01 20:47:28
UTC (rev 149)
@@ -0,0 +1,51 @@
+<assembly>
+ <id>jboss51</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+
<componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+
<componentDescriptor>src/assemble/simple-portal-war-jboss51.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-common</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>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
+
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-dependency</include>
+ <include>org.jboss:jboss-reflect</include>
+ <include>org.jboss:jboss-mdr</include>
+ <include>org.jboss:jbossxb</include>
+
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include></include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-09-01 20:16:49
UTC (rev 148)
+++ components/pc/trunk/portal/src/assemble/simple-portal-tomcat60.xml 2009-09-01 20:47:28
UTC (rev 149)
@@ -14,16 +14,16 @@
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.jboss.portal.common:common-common</include>
- <include>org.jboss.portal.web:web-web</include>
- <include>org.jboss.portal.portlet:portlet-portlet</include>
- <include>org.jboss.portal.portlet:portlet-api</include>
+ <include>org.gatein.common:common-common</include>
+ <include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.pc:pc-portlet</include>
+ <include>org.gatein.pc:pc-api</include>
- <include>javax.xml.bind:jaxb-api</include>
<include>apache-log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
<include>javax.portlet:portlet-api</include>
+ <include>sun-jaxb:jaxb-api</include>
<include>apache-xerces:xercesImpl</include>
<include>apache-xerces:resolver</include>
@@ -38,9 +38,9 @@
<outputDirectory>simple-portal.war/WEB-INF/lib</outputDirectory>
<includes>
- <include>org.jboss.portal.common:common-mc</include>
- <include>org.jboss.portal.portlet:portlet-controller</include>
- <include>org.jboss.portal.portlet:portlet-mc</include>
+ <include>org.gatein.common:common-mc</include>
+ <include>org.gatein.pc:pc-controller</include>
+ <include>org.gatein.pc:pc-mc</include>
<include>jboss:jboss-common-logging-spi</include>
<include>jboss:jboss-common-logging-log4j</include>
Deleted: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-09-01
20:16:49 UTC (rev 148)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml 2009-09-01
20:47:28 UTC (rev 149)
@@ -1,12 +0,0 @@
-<component>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/jboss50</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
-
- </fileSets>
-
-</component>
Copied: components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml (from rev
144, components/pc/trunk/portal/src/assemble/simple-portal-war-jboss50.xml)
===================================================================
--- components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml
(rev 0)
+++ components/pc/trunk/portal/src/assemble/simple-portal-war-jboss51.xml 2009-09-01
20:47:28 UTC (rev 149)
@@ -0,0 +1,12 @@
+<component>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/resources/jboss51</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+
+ </fileSets>
+
+</component>
Modified:
components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java
===================================================================
---
components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java 2009-09-01
20:16:49 UTC (rev 148)
+++
components/pc/trunk/portal/src/main/java/org/gatein/pc/portal/admin/ui/AdminPortlet.java 2009-09-01
20:47:28 UTC (rev 149)
@@ -23,6 +23,7 @@
package org.gatein.pc.portal.admin.ui;
import org.gatein.common.i18n.LocalizedString;
+import org.gatein.common.mc.bootstrap.WebBootstrap;
import org.gatein.pc.portlet.container.managed.ManagedObject;
import org.gatein.pc.portlet.container.managed.ManagedPortletApplication;
import org.gatein.pc.portlet.container.managed.ManagedPortletContainer;
@@ -59,7 +60,7 @@
if (applicationId != null)
{
// Use an alias
- PortletApplicationRegistry registry =
(PortletApplicationRegistry)getPortletContext().getAttribute("PortletApplicationDeployer");
+ PortletApplicationRegistry registry =
(PortletApplicationRegistry)getPortletContext().getAttribute(WebBootstrap.BEAN_PREFIX +
"PortletApplicationDeployer");
//
ManagedPortletApplication application =
registry.getManagedPortletApplication(applicationId);
@@ -112,7 +113,7 @@
//rd.include(request, response);
// Use an alias
- PortletApplicationRegistry registry =
(PortletApplicationRegistry)getPortletContext().getAttribute("PortletApplicationDeployer");
+ PortletApplicationRegistry registry =
(PortletApplicationRegistry)getPortletContext().getAttribute(WebBootstrap.BEAN_PREFIX +
"PortletApplicationDeployer");
//
writer.print("" +
@@ -317,4 +318,4 @@
}
-}
\ No newline at end of file
+}
Copied: components/pc/trunk/portal/src/main/resources/jboss51 (from rev 144,
components/pc/trunk/portal/src/main/resources/jboss50)
Modified:
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp
===================================================================
---
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp 2009-09-01
20:16:49 UTC (rev 148)
+++
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/jsp/view.jsp 2009-09-01
20:47:28 UTC (rev 149)
@@ -22,43 +22,15 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--%>
-<%@ taglib
uri="http://java.sun.com/portlet" prefix="portlet"
%>
+<%@ taglib
uri="http://java.sun.com/portlet_2_0" prefix="portlet"
%>
<%@ page isELIgnored="false" %>
<portlet:defineObjects/>
<table border="0" cellspacing="2" cellpadding="2">
<tr>
- <td align="center"><a
href="http://portal.demo.jboss.com" target="_blank"><img
- src="<%= renderRequest.getContextPath() %>/images/dodemo.gif"
border="0"
- alt="Try the latest release of JBoss Portal, live and
online."></a>
- <a
href="http://labs.jboss.com/portal/jbossportal/download/index.html&q...
target="_blank"><img
- src="<%= renderRequest.getContextPath()
%>/images/getcode.gif" border="0"
- alt="Download JBoss Portal and have it up and running in
minutes."></a>
- <a href="http://www.portletswap.com"
target="_blank"><img
- src="<%= renderRequest.getContextPath()
%>/images/accessorize.gif" border="0"
- alt="Download portlets and layouts for your new JBoss Portal
installation."></a></td>
- </tr>
- <tr>
- <td></td>
- </tr>
- <tr>
<td class="portlet-section-alternate">
- <font class="portlet-font">This is an installation of
<b>JBoss Portlet Container 2.0
- </b>. You may
- log in at any time, using the <i>Login</i> link at the top-right
of this page, with the following
- credentials:</font>
+ <font class="portlet-font">This is an installation of
<b>GateIn Portlet Container</font>
</td>
</tr>
- <tr>
- <td class="portlet-section-alternate" align="center">
- <b>user/user</b> or <b>admin/admin</b>
- </td>
- </tr>
- <tr>
- <td align="center">
- If you are in need of guidance with regards to navigating, configuring, or
operating the portal, please view
- our <a
href="http://labs.jboss.com/portal/jbossportal/docs/index.html"
target="_blank">online documentation</a>.
- </td>
- </tr>
</table>
Modified:
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml
===================================================================
---
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml 2009-09-01
20:16:49 UTC (rev 148)
+++
components/pc/trunk/samples/src/main/artifacts/jsp-portlet-war/WEB-INF/portlet.xml 2009-09-01
20:47:28 UTC (rev 149)
@@ -22,11 +22,10 @@
~ 02110-1301 USA, or see the FSF site:
http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<portlet-app
-
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
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-app
xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2...
http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
<portlet>
<description>Simple JSP portlet</description>
<portlet-name>JSPPortlet</portlet-name>
Modified:
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/remotecontroller/RemoteControllerPortlet.java
===================================================================
---
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/remotecontroller/RemoteControllerPortlet.java 2009-09-01
20:16:49 UTC (rev 148)
+++
components/pc/trunk/samples/src/main/java/org/gatein/pc/samples/remotecontroller/RemoteControllerPortlet.java 2009-09-01
20:47:28 UTC (rev 149)
@@ -29,7 +29,7 @@
{
renderResponse.setContentType("text/html");
PrintWriter printWriter = renderResponse.getWriter();
- String namespace = renderResponse.getNamespace();
+ String namespace = "n_" + renderResponse.getNamespace();
printWriter.print("<p><a href='#' onclick=\"" +
namespace + "_remote=" + namespace + "_openRemote('");
ResourceURL resource = renderResponse.createResourceURL();
printWriter.print(resource);
@@ -43,7 +43,7 @@
try
{
printWriter = renderResponse.getWriter();
- String namespace = renderResponse.getNamespace();
+ String namespace = "n_" + renderResponse.getNamespace();
String remoteWindowName = namespace + "_remote";
printWriter.print("<script type='text/javascript'>var "
+ remoteWindowName + "; function " + namespace
+ "_openRemote(url){window.name='" + namespace +
"_parent';window.open(url, '" + remoteWindowName
@@ -63,7 +63,7 @@
{
resourceResponse.setContentType("text/html");
PrintWriter writer = resourceResponse.getWriter();
- String namespace = resourceResponse.getNamespace();
+ String namespace = "n_" + resourceResponse.getNamespace();
writer.print("<html><head><script
type='text/javascript'>function
openLinkInParent(url){window.open(url,'"
+ namespace + "_parent');}</script>\n<link
rel=\"stylesheet\" href='" + resourceRequest.getContextPath() +
"/css/master.css'
type=\"text/css\"/></head><body>");
PortletURL url = resourceResponse.createRenderURL();