gatein SVN: r157 - portal.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-02 11:28:43 -0400 (Wed, 02 Sep 2009)
New Revision: 157
Modified:
portal/
Log:
test
Property changes on: portal
___________________________________________________________________
Name: svn:externals
+ trunk http://svn.exoplatform.org/projects/portal/branches/integration/
14 years, 8 months
- 1
- 0
gatein SVN: r156 - components/pc/tags/2.1.0-Beta01/build/distrib.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 21:37:50 -0400 (Tue, 01 Sep 2009)
New Revision: 156
Modified:
components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml
Log:
double oups
Modified: components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml 2009-09-02 01:37:15 UTC (rev 155)
+++ components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml 2009-09-02 01:37:50 UTC (rev 156)
@@ -1,4 +1,4 @@
-project default="all" name="GateIn Portlet Container">
+<project default="all" name="GateIn Portlet Container">
<property name="source.dir" value="../.."/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
14 years, 8 months
- 1
- 0
gatein SVN: r155 - components/pc/tags/2.1.0-Beta01/build/distrib.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 21:37:15 -0400 (Tue, 01 Sep 2009)
New Revision: 155
Modified:
components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml
Log:
oups
Modified: components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml 2009-09-02 01:14:40 UTC (rev 154)
+++ components/pc/tags/2.1.0-Beta01/build/distrib/distrib.xml 2009-09-02 01:37:15 UTC (rev 155)
@@ -1,10 +1,10 @@
-<project default="all" name="GateIn 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.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.version" value="2.1.0-Beta01"/>
+ <property name="demo.release.version" value="2.1.0-Beta01"/>
+ <property name="maven.version" value="2.1.0-Beta01"/>
<!-- -->
<property name="pc.release.name" value="gatein-portletcontainer-${pc.release.version}"/>
14 years, 8 months
- 1
- 0
gatein SVN: r154 - in components/pc/tags/2.1.0-Beta01: api and 13 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 21:14:40 -0400 (Tue, 01 Sep 2009)
New Revision: 154
Modified:
components/pc/tags/2.1.0-Beta01/api/pom.xml
components/pc/tags/2.1.0-Beta01/bridge/pom.xml
components/pc/tags/2.1.0-Beta01/build/pom.xml
components/pc/tags/2.1.0-Beta01/controller/pom.xml
components/pc/tags/2.1.0-Beta01/docs/pom.xml
components/pc/tags/2.1.0-Beta01/docs/user-guide/pom.xml
components/pc/tags/2.1.0-Beta01/federation/pom.xml
components/pc/tags/2.1.0-Beta01/jsr168api/pom.xml
components/pc/tags/2.1.0-Beta01/management/pom.xml
components/pc/tags/2.1.0-Beta01/mc/pom.xml
components/pc/tags/2.1.0-Beta01/pom.xml
components/pc/tags/2.1.0-Beta01/portal/pom.xml
components/pc/tags/2.1.0-Beta01/portlet/pom.xml
components/pc/tags/2.1.0-Beta01/samples/pom.xml
components/pc/tags/2.1.0-Beta01/test/pom.xml
Log:
Using correct version numbers
Modified: components/pc/tags/2.1.0-Beta01/api/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/api/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/api/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/bridge/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/bridge/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/bridge/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/build/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/build/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/build/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<packaging>pom</packaging>
<name>GateIn - Portlet Container (parent)</name>
Modified: components/pc/tags/2.1.0-Beta01/controller/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/controller/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/controller/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/docs/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/docs/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/docs/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
Modified: components/pc/tags/2.1.0-Beta01/docs/user-guide/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/docs/user-guide/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/docs/user-guide/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<packaging>jdocbook</packaging>
<name>GateIn - Portlet Container (User Guide ${translation})</name>
Modified: components/pc/tags/2.1.0-Beta01/federation/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/federation/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/federation/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/jsr168api/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/jsr168api/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/jsr168api/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/management/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/management/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/management/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/mc/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/mc/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/mc/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>GateIn - Portlet Container (aggregator)</name>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<distributionManagement>
<repository>
Modified: components/pc/tags/2.1.0-Beta01/portal/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/portal/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/portal/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/portlet/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/portlet/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/portlet/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/samples/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/samples/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/samples/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/pc/tags/2.1.0-Beta01/test/pom.xml
===================================================================
--- components/pc/tags/2.1.0-Beta01/test/pom.xml 2009-09-02 01:10:08 UTC (rev 153)
+++ components/pc/tags/2.1.0-Beta01/test/pom.xml 2009-09-02 01:14:40 UTC (rev 154)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>module-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.1.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 8 months
- 1
- 0
gatein SVN: r153 - components/pc/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 21:10:08 -0400 (Tue, 01 Sep 2009)
New Revision: 153
Added:
components/pc/tags/2.1.0-Beta01/
Log:
Tagging GateIn 2.1.0 Beta 1
Copied: components/pc/tags/2.1.0-Beta01 (from rev 152, components/pc/trunk)
14 years, 8 months
- 1
- 0
gatein SVN: r152 - in components/pc/trunk: test/src/test and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 21:07:18 -0400 (Tue, 01 Sep 2009)
New Revision: 152
Added:
components/pc/trunk/test/src/test/resources/jboss-5.1/
Removed:
components/pc/trunk/test/src/test/resources/jboss-5.0/
Modified:
components/pc/trunk/build/pom.xml
components/pc/trunk/test/src/test/build.xml
Log:
Updating versions + using JBoss 5.1.0 for tests
Modified: components/pc/trunk/build/pom.xml
===================================================================
--- components/pc/trunk/build/pom.xml 2009-09-02 00:45:39 UTC (rev 151)
+++ components/pc/trunk/build/pom.xml 2009-09-02 01:07:18 UTC (rev 152)
@@ -33,15 +33,15 @@
<version.jbossxb>2.0.1.GA</version.jbossxb>
<version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
<version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
- <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
- <version.gatein.wci>2.0.0-SNAPSHOT</version.gatein.wci>
+ <version.gatein.common>2.0.0-Beta01</version.gatein.common>
+ <version.gatein.wci>2.0.0-Beta01</version.gatein.wci>
<version.jboss.unit>1.2.3</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.6.GA</version.jboss.microcontainer>
<version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
- <version.cargo>1.0.1-SNAPSHOT</version.cargo>
+ <version.cargo>1.0.1-alpha-1</version.cargo>
<version.junit>3.8.2</version.junit>
<version.ant>1.7.0</version.ant>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-09-02 00:45:39 UTC (rev 151)
+++ components/pc/trunk/test/src/test/build.xml 2009-09-02 01:07:18 UTC (rev 152)
@@ -119,7 +119,7 @@
<path location="${dependency.ccpp.jar}"/>
</path>
- <path id="jboss-5.0">
+ <path id="jboss-5.1">
<path refid="portal-common"/>
<path refid="portal-web"/>
<path refid="portal-portlet"/>
@@ -127,7 +127,7 @@
<path location="${dependency.jboss-common-core.jar}"/>
</path>
- <path id="jboss-5.0-shared">
+ <path id="jboss-5.1-shared">
<path refid="portal-common-shared"/>
<path refid="portal-web-shared"/>
<path refid="portal-portlet-shared"/>
@@ -230,11 +230,11 @@
</not>
</and>
</condition>
- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
+ <condition property="JBOSS_5_1_0_HOME" value="${env.JBOSS_5_1_0_HOME}">
<and>
- <isset property="env.JBOSS_5_0_HOME"/>
+ <isset property="env.JBOSS_5_1_0_HOME"/>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -259,7 +259,7 @@
<echo message="JBOSS_4_2_1_HOME: ${JBOSS_4_2_1_HOME}"/>
<echo message="JBOSS_4_2_2_HOME: ${JBOSS_4_2_2_HOME}"/>
<echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_HOME}"/>
- <echo message="JBOSS_5_0_HOME: ${JBOSS_5_0_HOME}"/>
+ <echo message="JBOSS_5_1_0_HOME: ${JBOSS_5_1_0_HOME}"/>
<echo message="TOMCAT_6_0_HOME: ${TOMCAT_6_0_HOME}"/>
<echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
</target>
@@ -307,11 +307,11 @@
</and>
</condition>
</fail>
- <fail message="Please set the environment variable JBOSS_5_0_HOME">
+ <fail message="Please set the environment variable JBOSS_5_1_0_HOME">
<condition>
<and>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -540,18 +540,18 @@
<fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/>
</jar>
- <!-- JBoss 5.0 portlet-test.war -->
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <!-- JBoss 5.1 portlet-test.war -->
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
- <fileset dir="${target}/test-classes/jboss-5.0/portlet-test-war"/>
+ <fileset dir="${target}/test-classes/jboss-5.1/portlet-test-war"/>
</copy>
- <copy todir="${test.temp.dir}/jboss-5.0/portlet-test-war/WEB-INF/lib" flatten="true">
+ <copy todir="${test.temp.dir}/jboss-5.1/portlet-test-war/WEB-INF/lib" flatten="true">
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
- <path refid="jboss-5.0"/>
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0"/>
- <jar jarfile="${test.temp.lib}/jboss-5.0/portlet-test.war">
- <fileset dir="${test.temp.dir}/jboss-5.0/portlet-test-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1"/>
+ <jar jarfile="${test.temp.lib}/jboss-5.1/portlet-test.war">
+ <fileset dir="${test.temp.dir}/jboss-5.1/portlet-test-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
</jar>
@@ -720,7 +720,7 @@
<antcall target="__tests.jboss-4.2.3"/>
</target>
- <target name="__cargo.jboss-5.0.start" depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.start" depends="__cargo.setup">
<!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown
@@ -728,12 +728,12 @@
org.jboss.ws.integration.jboss42.DeployerInterceptorJSE.isWebserviceDeployment(DeployerInterceptorJSE.java:84)
-->
- <property name="jboss-5.0-shared-property" refid="jboss-5.0-shared"/>
- <echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/>
+ <property name="jboss-5.1-shared-property" refid="jboss-5.1-shared"/>
+ <echo message="jboss-5.1-shared : ${jboss-5.1-shared-property}"/>
<cargo
containerId="jboss51x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
@@ -741,74 +741,74 @@
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
<sharedClasspath>
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</sharedClasspath>
- <configuration home="${test.jboss-5.0.tempdir}">
+ <configuration home="${test.jboss-5.1.tempdir}">
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
<property name="cargo.jvmargs" value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
- <deployable type="war" file="${test.temp.lib}/jboss-5.0/portlet-test.war"/>
- <file file="${target}/test-classes/jboss-5.0/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/>
+ <deployable type="war" file="${test.temp.lib}/jboss-5.1/portlet-test.war"/>
+ <file file="${target}/test-classes/jboss-5.1/config/context.xml" tofile="deploy/jbossweb.sar/context.xml" overwrite="true"/>
</configuration>
</cargo>
</target>
- <target name="__cargo.jboss-5.0.stop" depends="__cargo.setup">
+ <target name="__cargo.jboss-5.1.stop" depends="__cargo.setup">
<cargo
containerId="jboss51x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
action="stop">
<!--<sysproperty key="java.io.tmpdir" value="${target}/cargo-tmp"/>-->
- <configuration home="${test.jboss-5.0.tempdir}">
+ <configuration home="${test.jboss-5.1.tempdir}">
<property name="cargo.rmi.port" value="1099"/>
</configuration>
</cargo>
</target>
- <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}">
- <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/>
- <antcall target="__cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.container-servlet" if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 container-servlet tests with ${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="test.spi.server.path" value="${test.archive.path}"/>
</antcall>
<antcall target="__tests.remote">
- <param name="test.server.name" value="${test.jboss-5.0.name}"/>
- <param name="test.deploy.name" value="jboss-5.0-container-servlet"/>
+ <param name="test.server.name" value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name" value="jboss-5.1-container-servlet"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}">
- <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/>
- <antcall target="__cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.generic" if="${test.jboss-5.1.home.variable-name}">
+ <echo message="Starting JBoss 5.1 generic tests with ${test.jboss-5.1.home}"/>
+ <antcall target="__cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="test.spi.server.path" value="${test.archive.path}"/>
</antcall>
<antcall target="__tests.remote">
- <param name="test.server.name" value="${test.jboss-5.0.name}"/>
- <param name="test.deploy.name" value="jboss-5.0-generic"/>
+ <param name="test.server.name" value="${test.jboss-5.1.name}"/>
+ <param name="test.deploy.name" value="jboss-5.1-generic"/>
</antcall>
- <antcall target="__cargo.jboss-5.0.stop">
+ <antcall target="__cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0" if="JBOSS_5_0_HOME">
- <antcall target="tests.jboss-5.0.container-servlet">
- <param name="test.id" value="JBoss-5_0-container-servlet"/>
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
- <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
- <param name="test.jboss-5.0.tempdir" value="${target}/cargo-tmp/5_0"/>
+ <target name="tests.jboss-5.1" if="JBOSS_5_1_HOME">
+ <antcall target="tests.jboss-5.1.container-servlet">
+ <param name="test.id" value="JBoss-5_1-container-servlet"/>
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_0_HOME}"/>
+ <param name="test.jboss-5.1.home.variable-name" value="JBOSS_5_1_0_HOME"/>
+ <param name="test.jboss-5.1.tempdir" value="${target}/cargo-tmp/5_1"/>
</antcall>
</target>
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
- <antcall target="tests.jboss-5.0"/>
+ <antcall target="tests.jboss-5.1"/>
</target>
<target name="tests.local">
@@ -1021,12 +1021,12 @@
<fileset dir="${target}/test-classes/portlet-tck-war"/>
</copy>
<copy todir="${tck-jboss5}/portlet-tck-war">
- <fileset dir="${target}/test-classes/jboss-5.0/portlet-tck-war"/>
+ <fileset dir="${target}/test-classes/jboss-5.1/portlet-tck-war"/>
</copy>
<copy todir="${tck-jboss5}/portlet-tck-war/WEB-INF/lib" flatten="true">
<fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
- <path refid="jboss-5.0"/>
+ <path refid="jboss-5.1"/>
</copy>
<mkdir dir="${tck-jboss5}/tck-portal"/>
@@ -1038,7 +1038,7 @@
</jar>
<copy todir="${tck-jboss5}/tck-portal" flatten="true">
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</copy>
<!--TOMCAT-->
Copied: components/pc/trunk/test/src/test/resources/jboss-5.1 (from rev 151, components/pc/trunk/test/src/test/resources/jboss-5.0)
14 years, 8 months
- 1
- 0
gatein SVN: r151 - in components/wci/tags/2.0.0-Beta01: build and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 20:45:39 -0400 (Tue, 01 Sep 2009)
New Revision: 151
Added:
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-container-servlet/
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-endpoint/
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-generic/
Removed:
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-container-servlet/
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-endpoint/
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-generic/
Modified:
components/wci/tags/2.0.0-Beta01/build/pom.xml
components/wci/tags/2.0.0-Beta01/pom.xml
components/wci/tags/2.0.0-Beta01/wci/pom.xml
components/wci/tags/2.0.0-Beta01/wci/src/test/build.xml
components/wci/tags/2.0.0-Beta01/wci/src/test/resources/config/servers.xml
Log:
Testing against JBoss 5.1.0
Modified: components/wci/tags/2.0.0-Beta01/build/pom.xml
===================================================================
--- components/wci/tags/2.0.0-Beta01/build/pom.xml 2009-09-02 00:45:18 UTC (rev 150)
+++ components/wci/tags/2.0.0-Beta01/build/pom.xml 2009-09-02 00:45:39 UTC (rev 151)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
<packaging>pom</packaging>
<name>GateIn - Web Container Integration component (parent)</name>
@@ -30,14 +30,14 @@
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
<version.jboss-remoting>2.5.0.GA</version.jboss-remoting>
- <version.gatein.common>2.0.0-SNAPSHOT</version.gatein.common>
+ <version.gatein.common>2.0.0-Beta01</version.gatein.common>
<version.jboss.unit>1.2.2</version.jboss.unit>
<version.jboss-reflect>2.0.2.GA</version.jboss-reflect>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
<version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
- <version.cargo>1.0.1-SNAPSHOT</version.cargo>
+ <version.cargo>1.0.1-alpha-1</version.cargo>
<version.junit>3.8.2-brew</version.junit>
<version.ant>1.7.0</version.ant>
<version.jaxb>2.1</version.jaxb>
Modified: components/wci/tags/2.0.0-Beta01/pom.xml
===================================================================
--- components/wci/tags/2.0.0-Beta01/pom.xml 2009-09-02 00:45:18 UTC (rev 150)
+++ components/wci/tags/2.0.0-Beta01/pom.xml 2009-09-02 00:45:39 UTC (rev 151)
@@ -4,7 +4,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>GateIn - Web Container Integration component (aggregator)</name>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies />
Modified: components/wci/tags/2.0.0-Beta01/wci/pom.xml
===================================================================
--- components/wci/tags/2.0.0-Beta01/wci/pom.xml 2009-09-02 00:45:18 UTC (rev 150)
+++ components/wci/tags/2.0.0-Beta01/wci/pom.xml 2009-09-02 00:45:39 UTC (rev 151)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>module-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta01</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wci/tags/2.0.0-Beta01/wci/src/test/build.xml
===================================================================
--- components/wci/tags/2.0.0-Beta01/wci/src/test/build.xml 2009-09-02 00:45:18 UTC (rev 150)
+++ components/wci/tags/2.0.0-Beta01/wci/src/test/build.xml 2009-09-02 00:45:39 UTC (rev 151)
@@ -40,7 +40,7 @@
<antcall target="tests.jboss-4.2"/>
</target>
<target name="tests.jboss5">
- <antcall target="tests.jboss-5.0"/>
+ <antcall target="tests.jboss-5.1"/>
</target>
<target name="tests.tomcat">
<antcall target="tests.tomcat-6.0"/>
@@ -100,11 +100,11 @@
</not>
</and>
</condition>
- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
+ <condition property="JBOSS_5_1_0_HOME" value="${env.JBOSS_5_1_0_HOME}">
<and>
- <isset property="env.JBOSS_5_0_HOME"/>
+ <isset property="env.JBOSS_5_1_0_HOME"/>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -147,14 +147,14 @@
</condition>
</fail>
- <fail message="Please set the environment variable JBOSS_5_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
+ <fail message="Please set the environment variable JBOSS_5_1_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
<condition>
<and>
<not>
<isset property="test.specified.containers"/>
</not>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -239,13 +239,13 @@
<path location="${target}/wci-wci-${project.version}.jar"/>
</path>
- <path id="jboss-5.0">
+ <path id="jboss-5.1">
<path refid="gatein-common"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
</path>
- <path id="jboss-5.0-shared">
+ <path id="jboss-5.1-shared">
<path refid="gatein-common-shared"/>
<path location="${target}/wci-wci-${project.version}.jar"/>
</path>
@@ -421,39 +421,39 @@
</jar>
<!-- *************************** -->
- <!-- JBoss 5.0 container servlet -->
+ <!-- JBoss 5.1 container servlet -->
<!-- *************************** -->
<!-- -->
- <copy todir="${test.support}/jboss-5.0-container-servlet/server-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-container-servlet/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0-container-servlet"/>
- <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war">
- <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1-container-servlet"/>
+ <war jarfile="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.1-container-servlet/server-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
</war>
- <jar jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-app.war">
+ <jar jarfile="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-app.war">
<fileset dir="${target}/test-classes/spi/app-war"/>
</jar>
<!-- ***************** -->
- <!-- JBoss 5.0 generic -->
+ <!-- JBoss 5.1 generic -->
<!-- ***************** -->
- <copy todir="${test.support}/jboss-5.0-generic/server-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-generic/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0-generic"/>
- <war jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war">
- <fileset dir="${test.support}/jboss-5.0-generic/server-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1-generic"/>
+ <war jarfile="${test.temp.lib}/jboss-5.1-generic/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.1-generic/server-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
</war>
- <jar jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-app.war">
+ <jar jarfile="${test.temp.lib}/jboss-5.1-generic/test-spi-app.war">
<fileset dir="${target}/test-classes/spi/generic/app-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
@@ -561,36 +561,36 @@
</war>
<!-- ********* -->
- <!-- JBoss 5.0 -->
+ <!-- JBoss 5.1 -->
<!-- ********* -->
- <mkdir dir="${test.temp.lib}/jboss-5.0"/>
+ <mkdir dir="${test.temp.lib}/jboss-5.1"/>
- <copy todir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/default-servlet-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/default-servlet-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
- <copy todir="${test.support}/jboss-5.0-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/path-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/path-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/path-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/path-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
- <copy todir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/root-path-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/root-path-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/root-path-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
@@ -752,7 +752,7 @@
</antcall>
</target>
- <target name="cargo.jboss-5.0.start" depends="cargo.setup">
+ <target name="cargo.jboss-5.1.start" depends="cargo.setup">
<!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown
@@ -762,14 +762,14 @@
<cargo
containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
wait="false">
<sharedClasspath>
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</sharedClasspath>
<configuration>
@@ -782,10 +782,10 @@
</cargo>
</target>
- <target name="cargo.jboss-5.0.stop" depends="cargo.setup">
+ <target name="cargo.jboss-5.1.stop" depends="cargo.setup">
<cargo
containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
<configuration>
@@ -796,73 +796,73 @@
</cargo>
</target>
- <target name="tests.jboss-5.0.execute" unless="tests.jboss-5.0.execute.skip">
- <echo message="Starting JBoss 5.0 ${test.jboss-5.0.name} with ${test.jboss-5.0.home} to execute ${test.id} tests"/>
- <antcall target="cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.execute" unless="tests.jboss-5.1.execute.skip">
+ <echo message="Starting JBoss 5.1 ${test.jboss-5.1.name} with ${test.jboss-5.1.home} to execute ${test.id} tests"/>
+ <antcall target="cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="cargo.war" value="${test.war}"/>
</antcall>
<antcall target="tests.remote">
- <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.remote.server.name" value="${test.jboss-5.1.name}"/>
<param name="test.remote.archive.path" value="${test.archive.path}"/>
</antcall>
- <antcall target="cargo.jboss-5.0.stop">
+ <antcall target="cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0.spi">
- <condition property="tests.jboss-5.0.execute.skip">
+ <target name="tests.jboss-5.1.spi">
+ <condition property="tests.jboss-5.1.execute.skip">
<not>
- <available file="${test.jboss-5.0.home}" type="dir"/>
+ <available file="${test.jboss-5.1.home}" type="dir"/>
</not>
</condition>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-spi-container-servlet"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war"/>
- <param name="test.archive.path" value="jboss-5.0-container-servlet"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-spi-container-servlet"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-server.war"/>
+ <param name="test.archive.path" value="jboss-5.1-container-servlet"/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-spi-generic"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war"/>
- <param name="test.archive.path" value="jboss-5.0-generic"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-spi-generic"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1-generic/test-spi-server.war"/>
+ <param name="test.archive.path" value="jboss-5.1-generic"/>
</antcall>
</target>
- <target name="tests.jboss-5.0.endpoint">
- <condition property="tests.jboss-5.0.execute.skip">
+ <target name="tests.jboss-5.1.endpoint">
+ <condition property="tests.jboss-5.1.execute.skip">
<not>
- <available file="${test.jboss-5.0.home}" type="dir"/>
+ <available file="${test.jboss-5.1.home}" type="dir"/>
</not>
</condition>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-default-servlet-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-default-servlet-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/default-servlet-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-path-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/path-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/path-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-root-path-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/root-path-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-root-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/root-path-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
</target>
- <target name="tests.jboss-5.0">
+ <target name="tests.jboss-5.1">
<!-- spi tests -->
- <antcall target="tests.jboss-5.0.spi">
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <antcall target="tests.jboss-5.1.spi">
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_0_HOME}"/>
</antcall>
<!-- endpoint tests -->
- <antcall target="tests.jboss-5.0.endpoint">
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <antcall target="tests.jboss-5.1.endpoint">
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_0_HOME}"/>
</antcall>
</target>
Modified: components/wci/tags/2.0.0-Beta01/wci/src/test/resources/config/servers.xml
===================================================================
--- components/wci/tags/2.0.0-Beta01/wci/src/test/resources/config/servers.xml 2009-09-02 00:45:18 UTC (rev 150)
+++ components/wci/tags/2.0.0-Beta01/wci/src/test/resources/config/servers.xml 2009-09-02 00:45:39 UTC (rev 151)
@@ -116,7 +116,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_5_0</server-name>
+ <server-name>RemoteJBoss_5_1</server-name>
<node>
<node-id>default</node-id>
<service>
Copied: components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-container-servlet (from rev 148, components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-container-servlet)
Copied: components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-endpoint (from rev 148, components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-endpoint)
Copied: components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.1-generic (from rev 148, components/wci/tags/2.0.0-Beta01/wci/src/test/resources/support/jboss-5.0-generic)
14 years, 8 months
- 1
- 0
gatein SVN: r150 - in components/wci/trunk/wci/src/test: resources/config and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 20:45:18 -0400 (Tue, 01 Sep 2009)
New Revision: 150
Added:
components/wci/trunk/wci/src/test/resources/support/jboss-5.1-container-servlet/
components/wci/trunk/wci/src/test/resources/support/jboss-5.1-endpoint/
components/wci/trunk/wci/src/test/resources/support/jboss-5.1-generic/
Removed:
components/wci/trunk/wci/src/test/resources/support/jboss-5.0-container-servlet/
components/wci/trunk/wci/src/test/resources/support/jboss-5.0-endpoint/
components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic/
Modified:
components/wci/trunk/wci/src/test/build.xml
components/wci/trunk/wci/src/test/resources/config/servers.xml
Log:
Testing against JBoss AS 5.1.0
Modified: components/wci/trunk/wci/src/test/build.xml
===================================================================
--- components/wci/trunk/wci/src/test/build.xml 2009-09-01 20:47:28 UTC (rev 149)
+++ components/wci/trunk/wci/src/test/build.xml 2009-09-02 00:45:18 UTC (rev 150)
@@ -40,7 +40,7 @@
<antcall target="tests.jboss-4.2"/>
</target>
<target name="tests.jboss5">
- <antcall target="tests.jboss-5.0"/>
+ <antcall target="tests.jboss-5.1"/>
</target>
<target name="tests.tomcat">
<antcall target="tests.tomcat-6.0"/>
@@ -100,11 +100,11 @@
</not>
</and>
</condition>
- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
+ <condition property="JBOSS_5_1_0_HOME" value="${env.JBOSS_5_1_0_HOME}">
<and>
- <isset property="env.JBOSS_5_0_HOME"/>
+ <isset property="env.JBOSS_5_1_0_HOME"/>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -147,14 +147,14 @@
</condition>
</fail>
- <fail message="Please set the environment variable JBOSS_5_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
+ <fail message="Please set the environment variable JBOSS_5_1_0_HOME or use -Dtest.specified.containers to only run tests for containers specified with a HOME variable">
<condition>
<and>
<not>
<isset property="test.specified.containers"/>
</not>
<not>
- <isset property="JBOSS_5_0_HOME"/>
+ <isset property="JBOSS_5_1_0_HOME"/>
</not>
</and>
</condition>
@@ -239,13 +239,13 @@
<path location="${target}/wci-wci-${project.version}.jar"/>
</path>
- <path id="jboss-5.0">
+ <path id="jboss-5.1">
<path refid="gatein-common"/>
<path refid="jboss-unit"/>
<path refid="jboss-microcontainer"/>
</path>
- <path id="jboss-5.0-shared">
+ <path id="jboss-5.1-shared">
<path refid="gatein-common-shared"/>
<path location="${target}/wci-wci-${project.version}.jar"/>
</path>
@@ -421,39 +421,39 @@
</jar>
<!-- *************************** -->
- <!-- JBoss 5.0 container servlet -->
+ <!-- JBoss 5.1 container servlet -->
<!-- *************************** -->
<!-- -->
- <copy todir="${test.support}/jboss-5.0-container-servlet/server-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-container-servlet/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0-container-servlet"/>
- <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war">
- <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1-container-servlet"/>
+ <war jarfile="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.1-container-servlet/server-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
</war>
- <jar jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-app.war">
+ <jar jarfile="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-app.war">
<fileset dir="${target}/test-classes/spi/app-war"/>
</jar>
<!-- ***************** -->
- <!-- JBoss 5.0 generic -->
+ <!-- JBoss 5.1 generic -->
<!-- ***************** -->
- <copy todir="${test.support}/jboss-5.0-generic/server-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-generic/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <mkdir dir="${test.temp.lib}/jboss-5.0-generic"/>
- <war jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war">
- <fileset dir="${test.support}/jboss-5.0-generic/server-war">
+ <mkdir dir="${test.temp.lib}/jboss-5.1-generic"/>
+ <war jarfile="${test.temp.lib}/jboss-5.1-generic/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.1-generic/server-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
</war>
- <jar jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-app.war">
+ <jar jarfile="${test.temp.lib}/jboss-5.1-generic/test-spi-app.war">
<fileset dir="${target}/test-classes/spi/generic/app-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
@@ -561,36 +561,36 @@
</war>
<!-- ********* -->
- <!-- JBoss 5.0 -->
+ <!-- JBoss 5.1 -->
<!-- ********* -->
- <mkdir dir="${test.temp.lib}/jboss-5.0"/>
+ <mkdir dir="${test.temp.lib}/jboss-5.1"/>
- <copy todir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/default-servlet-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/default-servlet-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/default-servlet-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/default-servlet-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
- <copy todir="${test.support}/jboss-5.0-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/path-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/path-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/path-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/path-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
- <copy todir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true">
- <path refid="jboss-5.0"/>
+ <copy todir="${test.support}/jboss-5.1-endpoint/root-path-mapping-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.1"/>
</copy>
- <war jarfile="${test.temp.lib}/jboss-5.0/root-path-mapping.war">
- <fileset dir="${test.support}/jboss-5.0-endpoint/root-path-mapping-war">
+ <war jarfile="${test.temp.lib}/jboss-5.1/root-path-mapping.war">
+ <fileset dir="${test.support}/jboss-5.1-endpoint/root-path-mapping-war">
<exclude name="**/jboss-kernel*.jar"/>
</fileset>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
@@ -752,7 +752,7 @@
</antcall>
</target>
- <target name="cargo.jboss-5.0.start" depends="cargo.setup">
+ <target name="cargo.jboss-5.1.start" depends="cargo.setup">
<!-- The lib portal-test-lib.jar must be loaded at the shared level rather than in the war file
otherwise it is somehow inspected and produce a NoClassDefFoundError in the web service integration
layer on the class org/jboss/portal/test/framework/driver/remote/RemoteTestDriver for some unknown
@@ -762,14 +762,14 @@
<cargo
containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
action="start"
wait="false">
<sharedClasspath>
- <path refid="jboss-5.0-shared"/>
+ <path refid="jboss-5.1-shared"/>
</sharedClasspath>
<configuration>
@@ -782,10 +782,10 @@
</cargo>
</target>
- <target name="cargo.jboss-5.0.stop" depends="cargo.setup">
+ <target name="cargo.jboss-5.1.stop" depends="cargo.setup">
<cargo
containerId="jboss5x"
- home="${test.jboss-5.0.home}"
+ home="${test.jboss-5.1.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
<configuration>
@@ -796,73 +796,73 @@
</cargo>
</target>
- <target name="tests.jboss-5.0.execute" unless="tests.jboss-5.0.execute.skip">
- <echo message="Starting JBoss 5.0 ${test.jboss-5.0.name} with ${test.jboss-5.0.home} to execute ${test.id} tests"/>
- <antcall target="cargo.jboss-5.0.start">
+ <target name="tests.jboss-5.1.execute" unless="tests.jboss-5.1.execute.skip">
+ <echo message="Starting JBoss 5.1 ${test.jboss-5.1.name} with ${test.jboss-5.1.home} to execute ${test.id} tests"/>
+ <antcall target="cargo.jboss-5.1.start">
<param name="cargo.wait" value="false"/>
<param name="cargo.war" value="${test.war}"/>
</antcall>
<antcall target="tests.remote">
- <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.remote.server.name" value="${test.jboss-5.1.name}"/>
<param name="test.remote.archive.path" value="${test.archive.path}"/>
</antcall>
- <antcall target="cargo.jboss-5.0.stop">
+ <antcall target="cargo.jboss-5.1.stop">
</antcall>
</target>
- <target name="tests.jboss-5.0.spi">
- <condition property="tests.jboss-5.0.execute.skip">
+ <target name="tests.jboss-5.1.spi">
+ <condition property="tests.jboss-5.1.execute.skip">
<not>
- <available file="${test.jboss-5.0.home}" type="dir"/>
+ <available file="${test.jboss-5.1.home}" type="dir"/>
</not>
</condition>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-spi-container-servlet"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war"/>
- <param name="test.archive.path" value="jboss-5.0-container-servlet"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-spi-container-servlet"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1-container-servlet/test-spi-server.war"/>
+ <param name="test.archive.path" value="jboss-5.1-container-servlet"/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-spi-generic"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war"/>
- <param name="test.archive.path" value="jboss-5.0-generic"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-spi-generic"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1-generic/test-spi-server.war"/>
+ <param name="test.archive.path" value="jboss-5.1-generic"/>
</antcall>
</target>
- <target name="tests.jboss-5.0.endpoint">
- <condition property="tests.jboss-5.0.execute.skip">
+ <target name="tests.jboss-5.1.endpoint">
+ <condition property="tests.jboss-5.1.execute.skip">
<not>
- <available file="${test.jboss-5.0.home}" type="dir"/>
+ <available file="${test.jboss-5.1.home}" type="dir"/>
</not>
</condition>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-default-servlet-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/default-servlet-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-default-servlet-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/default-servlet-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-path-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/path-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/path-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
- <antcall target="tests.jboss-5.0.execute">
- <param name="test.id" value="${test.jboss-5.0.name}-endpoint-root-path-mapping"/>
- <param name="test.war" value="${test.temp.lib}/jboss-5.0/root-path-mapping.war"/>
+ <antcall target="tests.jboss-5.1.execute">
+ <param name="test.id" value="${test.jboss-5.1.name}-endpoint-root-path-mapping"/>
+ <param name="test.war" value="${test.temp.lib}/jboss-5.1/root-path-mapping.war"/>
<param name="test.archive.path" value=""/>
</antcall>
</target>
- <target name="tests.jboss-5.0">
+ <target name="tests.jboss-5.1">
<!-- spi tests -->
- <antcall target="tests.jboss-5.0.spi">
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <antcall target="tests.jboss-5.1.spi">
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_0_HOME}"/>
</antcall>
<!-- endpoint tests -->
- <antcall target="tests.jboss-5.0.endpoint">
- <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
- <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <antcall target="tests.jboss-5.1.endpoint">
+ <param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
+ <param name="test.jboss-5.1.home" value="${JBOSS_5_1_0_HOME}"/>
</antcall>
</target>
Modified: components/wci/trunk/wci/src/test/resources/config/servers.xml
===================================================================
--- components/wci/trunk/wci/src/test/resources/config/servers.xml 2009-09-01 20:47:28 UTC (rev 149)
+++ components/wci/trunk/wci/src/test/resources/config/servers.xml 2009-09-02 00:45:18 UTC (rev 150)
@@ -116,7 +116,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_5_0</server-name>
+ <server-name>RemoteJBoss_5_1</server-name>
<node>
<node-id>default</node-id>
<service>
Copied: components/wci/trunk/wci/src/test/resources/support/jboss-5.1-container-servlet (from rev 149, components/wci/trunk/wci/src/test/resources/support/jboss-5.0-container-servlet)
Copied: components/wci/trunk/wci/src/test/resources/support/jboss-5.1-endpoint (from rev 149, components/wci/trunk/wci/src/test/resources/support/jboss-5.0-endpoint)
Copied: components/wci/trunk/wci/src/test/resources/support/jboss-5.1-generic (from rev 149, components/wci/trunk/wci/src/test/resources/support/jboss-5.0-generic)
14 years, 8 months
- 1
- 0
gatein SVN: r149 - in components/pc/trunk: docs/user-guide/en/modules and 7 other directories.
by do-not-reply＠jboss.org
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" 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_0.xsd 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_0.xsd 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();
14 years, 8 months
- 1
- 0
gatein SVN: r148 - components/wci/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-09-01 16:16:49 -0400 (Tue, 01 Sep 2009)
New Revision: 148
Added:
components/wci/tags/2.0.0-Beta01/
Log:
Tagging WCI 2.0.0-Beta01
Copied: components/wci/tags/2.0.0-Beta01 (from rev 147, components/wci/trunk)
14 years, 8 months
- 1
- 0