gatein SVN: r5493 - in components/pc/branches/adf: distrib and 17 other directories.
by do-not-reply＠jboss.org
Author: alain_defrance
Date: 2010-12-06 11:32:38 -0500 (Mon, 06 Dec 2010)
New Revision: 5493
Added:
components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml
components/pc/branches/adf/test/servers/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties
components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml
Modified:
components/pc/branches/adf/distrib/distrib.xml
components/pc/branches/adf/pom.xml
components/pc/branches/adf/portal/pom.xml
components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
components/pc/branches/adf/test/pom.xml
components/pc/branches/adf/test/src/test/build.xml
components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml
components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml
components/pc/branches/adf/test/src/test/resources/test/servers.xml
Log:
Jetty integration test run
Tomcat7 preparation
Modified: components/pc/branches/adf/distrib/distrib.xml
===================================================================
--- components/pc/branches/adf/distrib/distrib.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/distrib/distrib.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -13,12 +13,14 @@
<property name="demo.release.name.jboss42" value="${demo.release.name}-jbossas42"/>
<property name="demo.release.name.jboss51" value="${demo.release.name}-jbossas51"/>
<property name="demo.release.name.tomcat60" value="${demo.release.name}-tomcat6"/>
+ <property name="demo.release.name.tomcat70" value="${demo.release.name}-tomcat7"/>
<!-- -->
<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.as51" value="output/${demo.release.name.jboss51}"/>
<property name="pc.build.bin.tomcat6" value="output/${demo.release.name.tomcat60}"/>
+ <property name="pc.build.bin.tomcat7" value="output/${demo.release.name.tomcat70}"/>
<!-- Clean -->
<target name="clean">
@@ -50,6 +52,7 @@
<antcall target="package-jboss42"/>
<antcall target="package-jboss51"/>
<antcall target="package-tomcat60"/>
+ <antcall target="package-tomcat70"/>
</target>
<!--
@@ -183,6 +186,42 @@
</target>
<!--
+ | JBoss Portlet Container binary distribution for Tomcat 7.x
+ -->
+ <target name="package-tomcat70" description="package Tomcat binary" if="TOMCAT_7_0_PATH" unless="no-tomcat">
+
+ <!-- -->
+ <unzip src="${TOMCAT_7_0_PATH}" dest="${pc.build.bin.tomcat7}">
+ <mapper type="regexp" from="^[^\/]*\/(.*)$$" to="\1"/>
+ </unzip>
+ <chmod dir="${pc.build.bin.tomcat6}/bin" perm="ugo+rx" includes="**/*.sh"/>
+
+ <!-- -->
+ <antcall target="__package-binary">
+ <param name="bin.dir" value="${pc.build.bin.tomcat7}"/>
+ <param name="deploy.dir" value="${pc.build.bin.tomcat7}/webapps"/>
+ <param name="samples.dir" value="${pc.build.bin.tomcat7}/webapps"/>
+ </antcall>
+
+ <!-- -->
+ <copy todir="${pc.build.bin.tomcat7}/lib">
+ <fileset
+ dir="${source.dir}/portal/target/simple-portal-tomcat60/simple-portal/lib"
+ includes="**/*.jar"/>
+ </copy>
+ <jar file="${pc.build.bin.tomcat7}/webapps/simple-portal.war">
+ <fileset
+ dir="${source.dir}/portal/target/simple-portal-tomcat70/simple-portal/simple-portal.war"
+ includes="**"/>
+ </jar>
+
+ <!-- -->
+ <antcall target="__zip">
+ <param name="release.name" value="${demo.release.name.tomcat70}"/>
+ </antcall>
+ </target>
+
+ <!--
| Internal tasks
-->
Modified: components/pc/branches/adf/pom.xml
===================================================================
--- components/pc/branches/adf/pom.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/pom.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -53,7 +53,8 @@
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.2</version.cargo>
+ <version.cargo>1.0.3</version.cargo>
+ <version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
<preparationGoals>clean install</preparationGoals>
</properties>
@@ -133,6 +134,16 @@
<artifactId>wci-tomcat6</artifactId>
<version>${version.gatein.wci}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ <version>${version.gatein.wci}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jetty</artifactId>
+ <version>${version.gatein.wci}</version>
+ </dependency>
<dependency>
<groupId>apache-taglibs</groupId>
@@ -145,6 +156,13 @@
<version>${version.apache.taglibs}</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
+ <version>${version.cargo.jetty.deployer}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: components/pc/branches/adf/portal/pom.xml
===================================================================
--- components/pc/branches/adf/portal/pom.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/portal/pom.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -32,6 +32,16 @@
</dependency>
<dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jetty</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
</dependency>
@@ -118,6 +128,7 @@
<descriptors>
<descriptor>src/assemble/simple-portal-jboss42.xml</descriptor>
<descriptor>src/assemble/simple-portal-tomcat60.xml</descriptor>
+ <descriptor>src/assemble/simple-portal-tomcat70.xml</descriptor>
<descriptor>src/assemble/simple-portal-jboss51.xml</descriptor>
</descriptors>
</configuration>
Added: components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml
===================================================================
--- components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml (rev 0)
+++ components/pc/branches/adf/portal/src/assemble/simple-portal-tomcat70.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,66 @@
+<assembly>
+ <id>tomcat70</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <baseDirectory>simple-portal</baseDirectory>
+
+ <componentDescriptors>
+ <componentDescriptor>src/assemble/simple-portal-war.xml</componentDescriptor>
+ </componentDescriptors>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+
+ <include>org.gatein.common:common-common</include>
+ <include>org.gatein.common:common-logging</include>
+ <include>org.gatein.wci:wci-wci</include>
+ <include>org.gatein.wci:wci-tomcat7</include>
+ <include>org.gatein.pc:pc-portlet</include>
+ <include>org.gatein.pc:pc-api</include>
+
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:slf4j-log4j12</include>
+
+ <include>apache-log4j:log4j</include>
+ <include>javax.ccpp:ccpp</include>
+ <include>javax.activation:activation</include>
+ <include>javax.portlet:portlet-api</include>
+ <include>sun-jaxb:jaxb-api</include>
+
+ <include>apache-xerces:xercesImpl</include>
+ <include>apache-xerces:resolver</include>
+ <include>apache-xerces:xml-apis</include>
+
+ <include>apache-taglibs:jstl</include>
+ <include>apache-taglibs:standard</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>jboss:jboss-common-logging-spi</include>
+ <include>jboss:jboss-common-logging-log4j</include>
+ <include>jboss:jboss-common-logging-jdk</include>
+ <include>org.jboss:jboss-common-core</include>
+ <include>org.jboss.microcontainer:jboss-kernel</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>
+
+ <include>concurrent:concurrent</include>
+
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Modified: components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -51,7 +51,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
</web-app>
Modified: components/pc/branches/adf/test/pom.xml
===================================================================
--- components/pc/branches/adf/test/pom.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/test/pom.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -30,6 +30,14 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat7</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-jetty</artifactId>
+ </dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
@@ -376,6 +384,8 @@
<property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
<property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat6.jar.path}" />
+ <property name="dependency.portal-wci-tomcat7.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat7.jar.path}" />
+ <property name="dependency.portal-wci-jetty.jar" value="${maven.dependency.org.gatein.wci.wci-jetty.jar.path}" />
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}" />
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}" />
Modified: components/pc/branches/adf/test/src/test/build.xml
===================================================================
--- components/pc/branches/adf/test/src/test/build.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/test/src/test/build.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -27,7 +27,7 @@
<antcall target="__evaluate_properties.all"/>
<antcall target="tests.jboss"/>
<antcall target="tests.tomcat"/>
- <!--<antcall target="tests.jetty"/>-->
+ <antcall target="tests.jetty"/>
</target>
<target name="tests.call.single" if="tests">
@@ -168,6 +168,35 @@
<path location="${dependency.portal-wci-tomcat.jar}"/>
</path>
+ <path id="tomcat-7.0">
+ <path refid="portal-common"/>
+ <path refid="portal-web"/>
+ <path refid="portal-portlet"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ <pathelement path="${dependency.javassist.jar}"/>
+ <pathelement path="${dependency.xercesImpl.jar}"/>
+ <pathelement path="${dependency.resolver.jar}"/>
+ <pathelement path="${dependency.xml-apis.jar}"/>
+ <pathelement path="${dependency.trove.jar}"/>
+ </path>
+
+ <path id="tomcat-7.0-shared">
+ <path refid="portal-common-shared"/>
+ <path refid="portal-web-shared"/>
+ <path refid="portal-portlet-shared"/>
+ <path refid="jboss-unit-shared"/>
+ <path refid="jboss-logging"/>
+ <path location="${dependency.jboss-common-core.jar}"/>
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.jaxb.jar}"/>
+ <path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat7.jar}"/>
+ </path>
+
<path id="jetty-6.1">
<path refid="portal-common"/>
<path refid="portal-web"/>
@@ -193,6 +222,8 @@
<path location="${dependency.activation.jar}"/>
<path location="${dependency.jaxb.jar}"/>
<path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-jetty.jar}"/>
</path>
</target>
@@ -251,6 +282,14 @@
</not>
</and>
</condition>
+ <condition property="TOMCAT_7_0_HOME" value="${env.TOMCAT_7_0_HOME}">
+ <and>
+ <isset property="env.TOMCAT_7_0_HOME"/>
+ <not>
+ <isset property="TOMCAT_7_0_HOME"/>
+ </not>
+ </and>
+ </condition>
<condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
<and>
<isset property="env.JETTY_6_1_HOME"/>
@@ -266,6 +305,7 @@
<echo message="JBOSS_4_2_3_HOME: ${JBOSS_4_2_3_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="TOMCAT_7_0_HOME: ${TOMCAT_7_0_HOME}"/>
<echo message="JETTY_6_1_HOME: ${JETTY_6_1_HOME}"/>
</target>
@@ -329,7 +369,7 @@
<target name="__evaluate_properties.all">
<antcall target="__evaluate_properties.jboss"/>
- <!-- <antcall target="__evaluate_properties.jetty"/> -->
+ <antcall target="__evaluate_properties.jetty"/>
<antcall target="__evaluate_properties.tomcat"/>
</target>
@@ -554,6 +594,21 @@
<jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war">
<fileset dir="${test.temp.dir}/tomcat-6.0/portlet-test-war"/>
</jar>
+
+ <!-- Tomcat 7.0 portlet-test.war -->
+ <copy todir="${test.temp.dir}/tomcat-7.0/portlet-test-war">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ <fileset dir="${target}/test-classes/tomcat-7.0/portlet-test-war"/>
+ </copy>
+ <copy todir="${test.temp.dir}/tomcat-7.0/portlet-test-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/>
+ <path refid="tomcat-7.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/tomcat-7.0"/>
+ <jar jarfile="${test.temp.lib}/tomcat-7.0/portlet-test.war">
+ <fileset dir="${test.temp.dir}/tomcat-7.0/portlet-test-war"/>
+ </jar>
+
<!-- Jetty 6.1 portlet-test.war -->
<copy todir="${test.temp.dir}/jetty-6.1/portlet-test-war">
<fileset dir="${target}/test-classes/portlet-test-war"/>
@@ -867,8 +922,71 @@
</antcall>
</target>
+ <target name="__cargo.tomcat-7.start" depends="__cargo.setup">
+
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+
+ <cargo
+ containerId="tomcat7x"
+ home="${test.tomcat-7.home}"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+
+ <path refid="tomcat-7.0-shared"/>
+
+ </sharedClasspath>
+ <configuration>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
+ <property name="cargo.jvmargs" value="-Duser.language=en"/>
+ <!--<deployable type="war" file="${test.temp.lib}/manager.war"/>-->
+ <!--<file file="${test.temp.lib}/manager" todir="webapps/manager"/>-->
+ <deployable type="war" file="${test.temp.lib}/tomcat-7.0/portlet-test.war"/>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="__cargo.tomcat-7.stop" depends="__cargo.setup">
+ <cargo
+ containerId="tomcat7x"
+ home="${test.tomcat-7.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ action="stop">
+ <configuration/>
+ </cargo>
+ </target>
+
+ <target name="__tests.tomcat-7.container-servlet" if="${test.tomcat-7.home.variable-name}">
+ <echo message="Starting Tomcat 7 container-servlet tests with ${test.tomcat-7.home}"/>
+ <antcall target="__cargo.tomcat-7.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="__tests.remote">
+ <param name="test.server.name" value="RemoteTomcat_7_0"/>
+ </antcall>
+ <antcall target="__cargo.tomcat-7.stop"/>
+ </target>
+
+ <target name="tests.tomcat-7">
+ <antcall target="__tests.tomcat-7.container-servlet">
+ <param name="test.id" value="Tomcat-7_0-container-servlet"/>
+ <param name="test.tomcat-7.name" value="RemoteTomcat_7_0"/>
+ <param name="test.tomcat-7.home" value="${TOMCAT_7_0_HOME}"/>
+ <param name="test.tomcat-7.home.variable-name" value="TOMCAT_7_0_HOME"/>
+ </antcall>
+ </target>
+
<target name="tests.tomcat">
- <antcall target="tests.tomcat-6"/>
+ <!--<antcall target="tests.tomcat-6"/>-->
+ <antcall target="tests.tomcat-7"/>
</target>
<target name="__cargo.jetty-6.start" depends="__cargo.setup">
@@ -892,7 +1010,8 @@
<configuration>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
- <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>
+ <!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>-->
+ <property name="cargo.jvmargs" value="-Duser.language=en"/>
<configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/>
<configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/>
<deployable type="war" file="${dependency.cargo.jetty-deployer}">
@@ -971,12 +1090,14 @@
<property name="tck-jboss" value="${tck}/jboss42"/>
<property name="tck-jboss5" value="${tck}/jboss50"/>
<property name="tck-tomcat" value="${tck}/tomcat6"/>
+ <property name="tck-tomcat7" value="${tck}/tomcat7"/>
<property name="tck-jetty" value="${tck}/jetty6"/>
<mkdir dir="${tck}"/>
<mkdir dir="${tck-jboss}"/>
<mkdir dir="${tck-jboss5}"/>
<mkdir dir="${tck-tomcat}"/>
+ <mkdir dir="${tck-tomcat7}"/>
<mkdir dir="${tck-jetty}"/>
<jar jarfile="${target}/portlet-test-lib.jar">
@@ -1054,6 +1175,30 @@
<path refid="tomcat-6.0-shared"/>
</copy>
+ <!--TOMCAT 7-->
+
+ <copy todir="${tck-tomcat7}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/portlet-tck-war"/>
+ </copy>
+ <copy todir="${tck-tomcat7}/portlet-tck-war">
+ <fileset dir="${target}/test-classes/tomcat-7.0/portlet-tck-war"/>
+ </copy>
+
+ <copy todir="${tck-tomcat7}/portlet-tck-war/WEB-INF/lib" flatten="true">
+ <fileset dir="${target}" includes="portlet-test-lib.jar"/>
+ <path refid="tomcat-7.0"/>
+ </copy>
+
+ <mkdir dir="${tck-tomcat7}/tck-portal"/>
+
+ <jar jarfile="${tck-tomcat7}/tck-portal/portlet-tck.war">
+ <fileset dir="${tck-tomcat7}/portlet-tck-war"/>
+ </jar>
+
+ <copy todir="${tck-tomcat7}/tck-portal" flatten="true">
+ <path refid="tomcat-7.0-shared"/>
+ </copy>
+
<!--JETTY-->
<copy todir="${tck-jetty}/portlet-tck-war">
<fileset dir="${target}/test-classes/portlet-tck-war"/>
Modified: components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-tck-war/WEB-INF/jetty-web.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -4,7 +4,7 @@
<Get id="serverObject" name="server"/>
- <New id="jettySetup" class="org.gatein.wci.impl.jetty.Jetty6Handler">
+ <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler">
<Arg><Ref id="serverObject"/></Arg>
</New>
Modified: components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/test/src/test/resources/jetty-6.1/portlet-test-war/WEB-INF/jetty-web.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -4,7 +4,7 @@
<Get id="serverObject" name="server"/>
- <New id="jettySetup" class="org.gatein.wci.impl.jetty.Jetty6Handler">
+ <New id="jettySetup" class="org.gatein.wci.jetty.Jetty6Handler">
<Arg><Ref id="serverObject"/></Arg>
</New>
Modified: components/pc/branches/adf/test/src/test/resources/test/servers.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/test/servers.xml 2010-12-06 14:05:01 UTC (rev 5492)
+++ components/pc/branches/adf/test/src/test/resources/test/servers.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -22,6 +22,28 @@
</node>
</server>
<server>
+ <server-name>RemoteTomcat_7_0</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>tomcat7x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ <authentication>
+ <username>admin</username>
+ <password>admin</password>
+ </authentication>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJetty_6_1</server-name>
<node>
<node-id>default</node-id>
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/META-INF/context.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-tck-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.gatein.pc.test.tck.TCKServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/META-INF/context.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,2 @@
+<Context privileged="true">
+</Context>
\ No newline at end of file
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/log4j.properties 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/classes/logging.properties 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = servlet-examples.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml (rev 0)
+++ components/pc/branches/adf/test/src/test/resources/tomcat-7.0/portlet-test-war/WEB-INF/web.xml 2010-12-06 16:32:38 UTC (rev 5493)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>/WEB-INF/jboss-portal-beans.xml</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.gatein.wci.tomcat.TC7ContainerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>PortalServlet</servlet-name>
+ <servlet-class>org.gatein.pc.test.PortalServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>PortalServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
14 years
- 1
- 0
gatein SVN: r5492 - in components/wsrp/trunk: consumer and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-12-06 09:05:01 -0500 (Mon, 06 Dec 2010)
New Revision: 5492
Modified:
components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/session/SessionEventBroadcaster.java
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java
Log:
- GTNWSRP-180: make sure that we don't start consumers when stopping the ConsumerRegistry. Added associated test case.
- Added SessionEventBroadcaster.NO_OP_BROADCASTER to use by default so that we don't always need to provide an implementation in case we don't care about SessionEvents.
Modified: components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/session/SessionEventBroadcaster.java
===================================================================
--- components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/session/SessionEventBroadcaster.java 2010-12-06 10:09:01 UTC (rev 5491)
+++ components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/session/SessionEventBroadcaster.java 2010-12-06 14:05:01 UTC (rev 5492)
@@ -29,9 +29,33 @@
*/
public interface SessionEventBroadcaster
{
- public void registerListener(String listenerId, SessionEventListener listener);
+ void registerListener(String listenerId, SessionEventListener listener);
- public void unregisterListener(String listenerId);
+ void unregisterListener(String listenerId);
- public void notifyListenersOf(SessionEvent event);
+ void notifyListenersOf(SessionEvent event);
+
+ /**
+ * A default implementation of SessionEventBroadcaster that does nothing, in case we're not interested in
+ * SessionEvents.
+ */
+ final static class NullSessionEventBroadcaster implements SessionEventBroadcaster
+ {
+ public void registerListener(String listenerId, SessionEventListener listener)
+ {
+ // do nothing
+ }
+
+ public void unregisterListener(String listenerId)
+ {
+ // do nothing
+ }
+
+ public void notifyListenersOf(SessionEvent event)
+ {
+ // do nothing
+ }
+ }
+
+ static final SessionEventBroadcaster NO_OP_BROADCASTER = new NullSessionEventBroadcaster();
}
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2010-12-06 10:09:01 UTC (rev 5491)
+++ components/wsrp/trunk/consumer/pom.xml 2010-12-06 14:05:01 UTC (rev 5492)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -100,6 +101,12 @@
<version>4.6</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.8.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- Ignore all classes in the org.gatein.wsrp.test packages as they are not tests -->
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-12-06 10:09:01 UTC (rev 5491)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/AbstractConsumerRegistry.java 2010-12-06 14:05:01 UTC (rev 5492)
@@ -60,7 +60,7 @@
private SortedMap<String, WSRPConsumer> consumers;
private Map<String, String> keysToIds;
- private SessionEventBroadcaster sessionEventBroadcaster;
+ private SessionEventBroadcaster sessionEventBroadcaster = SessionEventBroadcaster.NO_OP_BROADCASTER;
private MigrationService migrationService;
private static final String CONSUMER_WITH_ID = "Consumer with id '";
@@ -183,12 +183,23 @@
private WSRPConsumer createConsumerFrom(ProducerInfo producerInfo)
{
- WSRPConsumer consumer = new WSRPConsumerImpl(producerInfo, migrationService);
+ WSRPConsumer consumer = newConsumer(producerInfo);
add(consumer);
return consumer;
}
+ /**
+ * Extracted for testing purposes...
+ *
+ * @param producerInfo
+ * @return
+ */
+ protected WSRPConsumer newConsumer(ProducerInfo producerInfo)
+ {
+ return new WSRPConsumerImpl(producerInfo, migrationService);
+ }
+
public void activateConsumerWith(String id) throws ConsumerException
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "Consumer identifier", "Activating a Consumer");
@@ -291,7 +302,7 @@
public void stop() throws Exception
{
- for (WSRPConsumer consumer : getConsumers())
+ for (WSRPConsumer consumer : getConsumers(false))
{
// if producer is not active, it shouldn't be registered with the federating portlet invoker, hence do not
// unregister it. We have changed how consumers are registered (active consumers are not automatically
@@ -423,7 +434,7 @@
// internal management methods
- private void add(WSRPConsumer consumer)
+ protected void add(WSRPConsumer consumer)
{
String id = consumer.getProducerId();
consumers.put(id, consumer);
@@ -439,20 +450,29 @@
protected Collection<WSRPConsumer> getConsumers()
{
+ return getConsumers(true);
+ }
+
+ protected Collection<WSRPConsumer> getConsumers(boolean startConsumers)
+ {
Collection<WSRPConsumer> consumerz = consumers.values();
- for (WSRPConsumer consumer : consumerz)
+
+ if (startConsumers)
{
- if (consumer.getProducerInfo().isActive() && !consumer.isActive())
+ for (WSRPConsumer consumer : consumerz)
{
- try
+ if (consumer.getProducerInfo().isActive() && !consumer.isActive())
{
- consumer.refresh(false);
+ try
+ {
+ consumer.refresh(false);
+ }
+ catch (Exception e)
+ {
+ log.info("Couldn't activate consumer " + consumer.getProducerId());
+ consumer.getProducerInfo().setActiveAndSave(false);
+ }
}
- catch (Exception e)
- {
- log.info("Couldn't activate consumer " + consumer.getProducerId());
- consumer.getProducerInfo().setActiveAndSave(false);
- }
}
}
return consumerz;
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2010-12-06 10:09:01 UTC (rev 5491)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2010-12-06 14:05:01 UTC (rev 5492)
@@ -1,37 +1,38 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2009, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2010, Red Hat Middleware, LLC, and individual
+ * contributors as indicated by the @authors tag. See the
+ * copyright.txt in the distribution for a full listing of
+ * individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
package org.gatein.wsrp.consumer.registry;
import junit.framework.TestCase;
-import org.gatein.pc.federation.impl.FederatingPortletInvokerService;
import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.consumer.ConsumerException;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.RegistrationInfo;
+import org.mockito.Mockito;
import java.util.Collection;
+import java.util.Collections;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -46,7 +47,6 @@
protected void setUp() throws Exception
{
registry = new InMemoryConsumerRegistry();
- registry.setFederatingPortletInvoker(new FederatingPortletInvokerService());
}
public void testCreateAndGet()
@@ -146,4 +146,41 @@
assertEquals(info, registry.getProducerInfoByKey(key));
assertEquals(consumer, registry.getConsumer("bar"));
}
+
+ public void testStoppingShouldntStartConsumers() throws Exception
+ {
+ // fake marking consumer as active in persistence
+ ProducerInfo info = Mockito.mock(ProducerInfo.class);
+ Mockito.stub(info.isActive()).toReturn(true);
+ Mockito.stub(info.getId()).toReturn("foo");
+ Mockito.stub(info.getKey()).toReturn("fooKey");
+ EndpointConfigurationInfo endpoint = Mockito.mock(EndpointConfigurationInfo.class);
+ Mockito.stub(info.getEndpointConfigurationInfo()).toReturn(endpoint);
+
+ // create a consumer to spy from
+ WSRPConsumer original = ((AbstractConsumerRegistry)registry).newConsumer(info);
+ WSRPConsumer consumer = Mockito.spy(original);
+
+ // force re-init of registry from "persistence" to ensure that the spy registry actually uses our spy consumer
+ ConsumerRegistry registrySpy = Mockito.spy(registry);
+ Mockito.doReturn(Collections.singletonList(info).iterator()).when((AbstractConsumerRegistry)registrySpy).getProducerInfosFromStorage();
+ Mockito.doReturn(consumer).when((AbstractConsumerRegistry)registrySpy).newConsumer(info);
+ registrySpy.reloadConsumers();
+
+ WSRPConsumer foo = registrySpy.getConsumer("foo");
+ assertTrue(foo.getProducerInfo().isActive());
+ assertEquals(consumer, foo);
+
+ // start consumer and check that it's properly added to the FederatingPortletInvoker
+ ((AbstractConsumerRegistry)registrySpy).activateConsumer(foo);
+ assertEquals(consumer, registrySpy.getFederatingPortletInvoker().getFederatedInvoker("foo").getPortletInvoker());
+
+ // stop the consumer and then the registry and check that consumer.start has only been called once
+ consumer.stop();
+ registrySpy.stop();
+ Mockito.verify(consumer, Mockito.times(1)).start();
+
+ // check that consumer is not known by the FederatingPortletInvoker anymore
+ assertEquals(null, registrySpy.getFederatingPortletInvoker().getFederatedInvoker("foo"));
+ }
}
14 years
- 1
- 0
gatein SVN: r5491 - epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-12-06 05:09:01 -0500 (Mon, 06 Dec 2010)
New Revision: 5491
Modified:
epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml
Log:
oups
Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-06 06:31:28 UTC (rev 5490)
+++ epp/examples/branches/EPP_5_1_Branch/portlets/jsfhellouser/pom.xml 2010-12-06 10:09:01 UTC (rev 5491)
@@ -3,17 +3,88 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.portal.examples.portlets</groupId>
- <artifactId>reactor</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0-GA-SNAPSHOT</version>
- <name>EPP Portlets Examples</name>
+ <version>1.1.0-GA-SNAPSHOT</version>
+ <artifactId>gatein-jsf-hellouser</artifactId>
- <modules>
- <module>idmhelloworld</module>
- <module>jsfhellouser</module>
- <module>jsphellouser</module>
- <module>simplesthelloworld</module>
- <module>prpapi</module>
- </modules>
+ <packaging>war</packaging>
+ <name>EPP Portlets Examples - JSF Hello User Portlet</name>
+ <description />
+ <properties>
+ <portletBridge.home>${EPP_HOME}/portletbridge</portletBridge.home>
+ <portletBridge.version>2.1.0.CR1</portletBridge.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${portletBridge.home}</directory>
+ <includes>
+ <include>portletbridge-api-${portletbridge.version}.jar</include>
+ <include>portletbridge-impl-${portletbridge.version}.jar</include>
+ </includes>
+ <targetPath>WEB-INF/lib</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ <scope>provided</scope>
+ <version>2.0</version>
+ </dependency>
+
+ <!-- Portlet bridge -->
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-api</artifactId>
+ <version>${portletBridge.version}</version>
+ <scope>system</scope>
+ <systemPath>${portletBridge.home}/portletbridge-api-${portletBridge.version}.jar</systemPath>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.portletbridge</groupId>
+ <artifactId>portletbridge-impl</artifactId>
+ <version>${portletBridge.version}</version>
+ <scope>system</scope>
+ <systemPath>${portletBridge.home}/portletbridge-impl-${portletBridge.version}.jar</systemPath>
+ </dependency>
+
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>JBoss repository</id>
+ <url>https://repository.jboss.org/nexus/content/repositories/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
</project>
14 years
- 1
- 0
gatein SVN: r5490 - exo/portal/branches/3.1.x/testsuite.
by do-not-reply＠jboss.org
Author: hangnguyen
Date: 2010-12-06 01:31:28 -0500 (Mon, 06 Dec 2010)
New Revision: 5490
Added:
exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods
Log:
TESTVN-2052 Verify Normalization and completeness of TestDefinitions for GateIn product in PLF - GateIn 3.1.x
Added: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods
===================================================================
(Binary files differ)
Property changes on: exo/portal/branches/3.1.x/testsuite/eXo_TechTests_GateIn_v3.1.x_TestDefinition.ods
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years
- 1
- 0
gatein SVN: r5489 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:43:04 -0500 (Mon, 06 Dec 2010)
New Revision: 5489
Added:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.ent
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.xml
Removed:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.ent
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.xml
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2010-12-06 05:41:50 UTC (rev 5488)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Book_Info.xml 2010-12-06 05:43:04 UTC (rev 5489)
@@ -4,12 +4,12 @@
%BOOK_ENTITIES;
]>
<bookinfo id="book-Installation_Guide-Installation_Guide">
- <title>Installation Guide</title>
+ <title>Site Publisher Installation Guide</title>
<subtitle>An Installation Guide for &PRODUCT;</subtitle>
- <productname>JBoss Site Publisher</productname>
- <productnumber>5</productnumber>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.1</pubsnumber>
+ <pubsnumber>1.2</pubsnumber>
<abstract>
<para>
This book provides information about obtaining, installing and running &PRODUCT;. It forms the documentation suite along with the &PRODUCT; User Guide available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html" />
Deleted: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.ent
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.ent 2010-12-06 05:41:50 UTC (rev 5488)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.ent 2010-12-06 05:43:04 UTC (rev 5489)
@@ -1,20 +0,0 @@
-<!-- Product Specifics: -->
-<!ENTITY PRODUCT "JBoss Site Publisher">
-
-<!-- Book specifics: -->
-<!ENTITY BOOKID "Installation Guide">
-
-<!-- Corporate Specifics: -->
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "Red Hat, Inc">
-
-<!-- Version Specifcs: -->
-<!ENTITY VERSION_MAJOR "5">
-<!ENTITY VERSION_MINOR "5.1">
-<!ENTITY VERSION_MICRO "5.1.0">
-
-<!-- Extras: -->
-<!ENTITY RHEL "Red Hat Enterprise Linux">
-<!ENTITY JBEAP "JBoss Enterprise Application Platform">
-<!ENTITY JBEPP "JBoss Enterprise Portal Platform">
-<!ENTITY JBSP "JBoss Site Publisher">
\ No newline at end of file
Deleted: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.xml 2010-12-06 05:41:50 UTC (rev 5488)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Installation_Guide.xml 2010-12-06 05:43:04 UTC (rev 5489)
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
-%BOOK_ENTITIES;
-]>
-<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <index />
-</book>
-
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-12-06 05:41:50 UTC (rev 5488)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Revision_History.xml 2010-12-06 05:43:04 UTC (rev 5489)
@@ -7,9 +7,23 @@
<title>Revision History</title>
<simpara>
<revhistory>
+ <revision>
+ <revnumber>1-1.2</revnumber>
+ <date>Mon Dec 06 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Published to 5.1 branch.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
<revnumber>1-1.1</revnumber>
- <date></date>
+ <date>Wed Nov 17 2010</date>
<author>
<firstname>Scott</firstname>
<surname>Mumford</surname>
Added: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.ent
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.ent (rev 0)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.ent 2010-12-06 05:43:04 UTC (rev 5489)
@@ -0,0 +1,20 @@
+<!-- Product Specifics: -->
+<!ENTITY PRODUCT "JBoss Site Publisher">
+
+<!-- Book specifics: -->
+<!ENTITY BOOKID "Installation Guide">
+
+<!-- Corporate Specifics: -->
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat, Inc">
+
+<!-- Version Specifcs: -->
+<!ENTITY VERSION_MAJOR "5">
+<!ENTITY VERSION_MINOR "5.1">
+<!ENTITY VERSION_MICRO "5.1.0">
+
+<!-- Extras: -->
+<!ENTITY RHEL "Red Hat Enterprise Linux">
+<!ENTITY JBEAP "JBoss Enterprise Application Platform">
+<!ENTITY JBEPP "JBoss Enterprise Portal Platform">
+<!ENTITY JBSP "JBoss Site Publisher">
\ No newline at end of file
Added: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.xml (rev 0)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Installation_Guide/en-US/Site_Publisher_Installation_Guide.xml 2010-12-06 05:43:04 UTC (rev 5489)
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<book>
+ <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <index />
+</book>
+
14 years
- 1
- 0
gatein SVN: r5488 - epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:41:50 -0500 (Mon, 06 Dec 2010)
New Revision: 5488
Added:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.ent
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml
Removed:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.ent
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml
Modified:
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml
epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2010-12-06 05:40:37 UTC (rev 5487)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Article_Info.xml 2010-12-06 05:41:50 UTC (rev 5488)
@@ -4,12 +4,12 @@
%BOOK_ENTITIES;
]>
<articleinfo id="arti-Release_Notes-Release_Notes">
- <title>Release Notes</title>
+ <title>Site Publisher 5.1.0 Release Notes</title>
<subtitle>For use with the JBoss Enterprise Portal Platform Site Publisher extension.</subtitle>
- <productname>JBoss Site Publisher</productname>
- <productnumber>5</productnumber>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.0</pubsnumber>
+ <pubsnumber>1.2</pubsnumber>
<abstract>
<para>
These release notes contain important information related to &PRODUCT; &VERSION_MICRO; that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing the product.
Deleted: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.ent
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.ent 2010-12-06 05:40:37 UTC (rev 5487)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.ent 2010-12-06 05:41:50 UTC (rev 5488)
@@ -1,8 +0,0 @@
-<!ENTITY PRODUCT "JBoss Site Publisher">
-<!ENTITY BOOKID "Release_Notes">
-<!ENTITY YEAR "2010">
-<!ENTITY HOLDER "Red Hat, Inc">
-<!ENTITY EPP "JBoss Enterprise Portal Platform">
-<!ENTITY VERSION_MAJOR "5">
-<!ENTITY VERSION_MINOR "5.1">
-<!ENTITY VERSION_MICRO "5.1.0">
Deleted: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml 2010-12-06 05:40:37 UTC (rev 5487)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Release_Notes.xml 2010-12-06 05:41:50 UTC (rev 5488)
@@ -1,330 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-<!ENTITY % BOOK_ENTITIES SYSTEM "Release_Notes.ent">
-%BOOK_ENTITIES;
-]>
-<article>
- <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <section id="sect-Release_Notes-Introduction">
- <title>Introduction</title>
- <para>
- &PRODUCT; (powered by eXo) is a new add-on component for &EPP;. &PRODUCT; enables users to create, edit and publish rich web content within the context of their portal installation.
- </para>
- <note>
- <title>Subscription</title>
- <para>
- A subscriptions to &PRODUCT; are available at an additional fee over and above &EPP; Subscriptions.
- </para>
- </note>
- <para>
- &PRODUCT; simplifies the authoring and management for every website an organization needs to deploy. It includes the ability to administer sites, manage navigation, and publish content. &PRODUCT; delivers powerful functionality to everyone responsible for maintaining web content:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Webmasters can easily administer multiple websites.
- </para>
- </listitem>
- <listitem>
- <para>
- Website administrators can set permission policies according to user roles to better control website changes.
- </para>
- </listitem>
- <listitem>
- <para>
- Content providers can use &PRODUCT;’s tools to create content and then choose how to publish it using blogs, RSS feeds, social networks and more.
- </para>
- </listitem>
- <listitem>
- <para>
- Web developers can introduce other forms of rich media content to create truly professional websites easily and efficiently.
- </para>
- </listitem>
- </itemizedlist>
- </section>
- <!-- <section id="sect-Release_Notes-New_Features_and_Components">
- <title>New and Upgraded Components</title>
- <variablelist id="vari-Release_Notes-New_Features_and_Components-New_Features">
- <title>New Components</title>
- <varlistentry>
- <term></term>
- <listitem>
- <para>
- stuff
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- <variablelist id="vari-Release_Notes-New_Features_and_Components-Component_Upgrades_in_VERSION_MICRO">
- <title><emphasis role="bold">Upgraded Components</emphasis></title>
- <varlistentry>
- <term></term>
- <listitem>
- <para>
- stuff
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- </section>-->
-
- <!--<section id="sect-Release_Notes-Component_Versions">
- <title>Component Versions</title>
- <para>
- This section details the versions of the components in JBoss Enterprise Portal Platform 5.1.0.
- </para>
- <table id="tabl-Release_Notes-Component_Versions-JBoss_Enterprise_Portal_Platform_Component_Versions">
- <title>JBoss Enterprise Portal Platform Component Versions</title>
- <tgroup cols="2">
- <thead>
- <row>
- <entry>
- Component
- </entry>
- <entry>
- Version
- </entry>
- </row>
- </thead>
- <tbody>
- <row>
- <entry>
-
- </entry>
- <entry>
-
- </entry>
- </row>
- </tbody>
-
- </tgroup>
-
- </table>
-
- </section> -->
-
- <section id="sect-Release_Notes-Component_Features">
- <title>Component Features</title>
- <variablelist>
- <varlistentry>
- <term>Search</term>
- <listitem>
- <para>
- Categorization and tag features enable users to search contents and documents in the current website or all websites.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Broken link detection engine</term>
- <listitem>
- <para>
- Site Publisher’s site explorer displays the current number of broken links.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term> Versioning and rollback of content</term>
- <listitem>
- <para>
- If needed, administrators can simply roll back website content with automatic site versioning.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Web-based administration</term>
- <listitem>
- <para>
- Your website can be administered remotely, simply by using a web browser, and requires no additional software to be installed on your computer.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Media library</term>
- <listitem>
- <para>
- Users can add any media they want to use on a website to the media library. They can also re-use this media on other websites and update media across multiple websites.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Web page management tools</term>
- <listitem>
- <para>
- Webmasters can organize website content and menus.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Content features</term>
- <listitem>
- <para>
- Webmasters can easily edit categories, comments, versions, and permissions.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Search engine optimization (SEO)</term>
- <listitem>
- <para>
- SEO processes are now easier and more effective with an intuitive interface to edit meta tags.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>Friendly URLs</term>
- <listitem>
- <para>
- Site Publisher gives every piece of content a specific URL, which further helps your organization improve SEO processes and results.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
-
- <section id="sect-Release_Notes-Installation">
- <title>Installation</title>
- <para>
- The &PRODUCT; Installation Guide contains environment requirements as well as detailed installation instructions.
- </para>
- <para>
- The Installation Guide can be found online at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html"/>.
- </para>
- </section>
-
-<!--<section id="sect-Release_Notes-Issues_fixed_in_this_release">
- <title> Issues fixed in this release </title>
- <para>
- The following is a list of issues fixed in this release:
- </para>
- Commented out for current release. Retaining the text to be reused in future release drafts.
- <warning>
- <title>Draft Content!</title>
- <para>
- These entries are drafts.
- </para>
- <para>
- <emphasis role="bold">They are likely not technically correct at the moment</emphasis>, but they will serve as a basis and will be corrected in subsequent iterations after technical and QE reviews.
- </para>
- </warning>
- <variablelist>
- <title><emphasis role="bold">Issues fixed in the product:</emphasis></title>
- <varlistentry>
- <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-"></ulink></term>
- <listitem>
- <para>
- stuff
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <variablelist>
- <title>New Features</title>
- <varlistentry>
- <term></term>
- <listitem>
- <para>
- stuff
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <variablelist>
- <title>Issues fixed upstream:</title>
- <varlistentry>
- <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-454"></ulink></term>
- <listitem>
- <para>
- This release includes numerous fixes for issues reported upstream. Follow the link above to review a tracking ticket listing these issues and fixes.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section> -->
-
- <section id="sect-Release_Notes-_Known_Issues_in_this_release">
- <title> Known Issues in this release</title>
- <para>
- The following is a list of known issues in this release:
- </para>
- <variablelist>
- <varlistentry>
- <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-XYZ" /></term>
- <listitem>
- <para>
- TEXT
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </section>
-
- <section id="sect-Release_Notes-Security_Issues">
- <title>Security Issues</title>
- <para>
- At this time there are no known Security Issues in &PRODUCT;.
- </para>
- </section>
-
- <section id="sect-Release_Notes-Documentation">
- <title>Documentation</title>
- <para>
- An Installation Guide and a User Guide for &PRODUCT; are available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html" />.
- </para>
- <para>
- &EPP; specific documentation is also available from <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...."></ulink>
- </para>
- </section>
-
- <section id="sect-Release_Notes-_Product_Support_and_License_Website_Links_">
- <title> Product Support and License Website Links </title>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-Support_Processes">
- <title>Support Processes</title>
- <para>
- <ulink url="http://www.redhat.com/support/process/">http://www.redhat.com/support/process/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Production_Support_Scope_of_Coverage_">
- <title> Production Support Scope of Coverage </title>
- <para>
- <ulink url="http://www.redhat.com/support/policy/soc/production">http://www.redhat.com/support/policy/soc/production</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Production_Support_Service_Level_Agreement_">
- <title> Production Support Service Level Agreement </title>
- <para>
- <ulink url="http://www.redhat.com/support/policy/sla/production/">http://www.redhat.com/support/policy/sla/production/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Scope_of_Coverage_">
- <title> Developer Support Scope of Coverage </title>
- <para>
- <ulink url="http://www.redhat.com/support/policy/soc/developer/">http://www.redhat.com/support/policy/soc/developer/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Service_Level_Agreement_">
- <title> Developer Support Service Level Agreement </title>
- <para>
- <ulink url="http://www.redhat.com/support/policy/sla/developer/">http://www.redhat.com/support/policy/sla/developer/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Product_Update_and_Support_Policy_by_Product_">
- <title> Product Update and Support Policy by Product </title>
- <para>
- <ulink url="http://www.redhat.com/security/updates/jboss_notes/">http://www.redhat.com/security/updates/jboss_notes/</ulink>
- </para>
- </formalpara>
- <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_JBoss_End_User_License_Agreement_">
- <title> JBoss End User License Agreement </title>
- <para>
- <ulink url="http://www.redhat.com/licenses/jboss_eula.html">http://www.redhat.com/licenses/jboss_eula.html</ulink>
- </para>
- </formalpara>
- </section>
-
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <index />
-</article>
-
Modified: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2010-12-06 05:40:37 UTC (rev 5487)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Revision_History.xml 2010-12-06 05:41:50 UTC (rev 5488)
@@ -8,8 +8,22 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>1-1.2</revnumber>
+ <date>Mon Dec 06 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Publish to 5.1 branch.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!--<revision>
<revnumber>1-1.1</revnumber>
- <date></date>
+ <date>Wed Nov 17 2010</date>
<author>
<firstname>Scott</firstname>
<surname>Mumford</surname>
@@ -20,26 +34,21 @@
<member>Added draft content and section placeholders.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.0</revnumber>
- <date></date>
+ <date>Wed Nov 17 2010</date>
<author>
<firstname>Scott</firstname>
<surname>Mumford</surname>
<email>smumford(a)redhat.com</email>
-
</author>
<revdescription>
<simplelist>
<member>Initial creation of book by publican</member>
-
</simplelist>
-
</revdescription>
-
</revision>
-
</revhistory>
</simpara>
Added: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.ent
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.ent (rev 0)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.ent 2010-12-06 05:41:50 UTC (rev 5488)
@@ -0,0 +1,8 @@
+<!ENTITY PRODUCT "JBoss Site Publisher">
+<!ENTITY BOOKID "Release_Notes">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat, Inc">
+<!ENTITY EPP "JBoss Enterprise Portal Platform">
+<!ENTITY VERSION_MAJOR "5">
+<!ENTITY VERSION_MINOR "5.1">
+<!ENTITY VERSION_MICRO "5.1.0">
Added: epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml (rev 0)
+++ epp/docs/branches/EPP_5_1_Branch/Site_Publisher/Release_Notes/en-US/Site_Publisher_5.1.0_Release_Notes.xml 2010-12-06 05:41:50 UTC (rev 5488)
@@ -0,0 +1,330 @@
+<?xml version='1.0' encoding='utf-8' ?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Release_Notes.ent">
+%BOOK_ENTITIES;
+]>
+<article>
+ <xi:include href="Article_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <section id="sect-Release_Notes-Introduction">
+ <title>Introduction</title>
+ <para>
+ &PRODUCT; (powered by eXo) is a new add-on component for &EPP;. &PRODUCT; enables users to create, edit and publish rich web content within the context of their portal installation.
+ </para>
+ <note>
+ <title>Subscription</title>
+ <para>
+ A subscriptions to &PRODUCT; are available at an additional fee over and above &EPP; Subscriptions.
+ </para>
+ </note>
+ <para>
+ &PRODUCT; simplifies the authoring and management for every website an organization needs to deploy. It includes the ability to administer sites, manage navigation, and publish content. &PRODUCT; delivers powerful functionality to everyone responsible for maintaining web content:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Webmasters can easily administer multiple websites.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Website administrators can set permission policies according to user roles to better control website changes.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Content providers can use &PRODUCT;’s tools to create content and then choose how to publish it using blogs, RSS feeds, social networks and more.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Web developers can introduce other forms of rich media content to create truly professional websites easily and efficiently.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
+ <!-- <section id="sect-Release_Notes-New_Features_and_Components">
+ <title>New and Upgraded Components</title>
+ <variablelist id="vari-Release_Notes-New_Features_and_Components-New_Features">
+ <title>New Components</title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ <variablelist id="vari-Release_Notes-New_Features_and_Components-Component_Upgrades_in_VERSION_MICRO">
+ <title><emphasis role="bold">Upgraded Components</emphasis></title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ </section>-->
+
+ <!--<section id="sect-Release_Notes-Component_Versions">
+ <title>Component Versions</title>
+ <para>
+ This section details the versions of the components in JBoss Enterprise Portal Platform 5.1.0.
+ </para>
+ <table id="tabl-Release_Notes-Component_Versions-JBoss_Enterprise_Portal_Platform_Component_Versions">
+ <title>JBoss Enterprise Portal Platform Component Versions</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>
+ Component
+ </entry>
+ <entry>
+ Version
+ </entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>
+
+ </entry>
+ <entry>
+
+ </entry>
+ </row>
+ </tbody>
+
+ </tgroup>
+
+ </table>
+
+ </section> -->
+
+ <section id="sect-Release_Notes-Component_Features">
+ <title>Component Features</title>
+ <variablelist>
+ <varlistentry>
+ <term>Search</term>
+ <listitem>
+ <para>
+ Categorization and tag features enable users to search contents and documents in the current website or all websites.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Broken link detection engine</term>
+ <listitem>
+ <para>
+ Site Publisher’s site explorer displays the current number of broken links.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term> Versioning and rollback of content</term>
+ <listitem>
+ <para>
+ If needed, administrators can simply roll back website content with automatic site versioning.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Web-based administration</term>
+ <listitem>
+ <para>
+ Your website can be administered remotely, simply by using a web browser, and requires no additional software to be installed on your computer.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Media library</term>
+ <listitem>
+ <para>
+ Users can add any media they want to use on a website to the media library. They can also re-use this media on other websites and update media across multiple websites.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Web page management tools</term>
+ <listitem>
+ <para>
+ Webmasters can organize website content and menus.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Content features</term>
+ <listitem>
+ <para>
+ Webmasters can easily edit categories, comments, versions, and permissions.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Search engine optimization (SEO)</term>
+ <listitem>
+ <para>
+ SEO processes are now easier and more effective with an intuitive interface to edit meta tags.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Friendly URLs</term>
+ <listitem>
+ <para>
+ Site Publisher gives every piece of content a specific URL, which further helps your organization improve SEO processes and results.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+
+ <section id="sect-Release_Notes-Installation">
+ <title>Installation</title>
+ <para>
+ The &PRODUCT; Installation Guide contains environment requirements as well as detailed installation instructions.
+ </para>
+ <para>
+ The Installation Guide can be found online at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html"/>.
+ </para>
+ </section>
+
+<!--<section id="sect-Release_Notes-Issues_fixed_in_this_release">
+ <title> Issues fixed in this release </title>
+ <para>
+ The following is a list of issues fixed in this release:
+ </para>
+ Commented out for current release. Retaining the text to be reused in future release drafts.
+ <warning>
+ <title>Draft Content!</title>
+ <para>
+ These entries are drafts.
+ </para>
+ <para>
+ <emphasis role="bold">They are likely not technically correct at the moment</emphasis>, but they will serve as a basis and will be corrected in subsequent iterations after technical and QE reviews.
+ </para>
+ </warning>
+ <variablelist>
+ <title><emphasis role="bold">Issues fixed in the product:</emphasis></title>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-"></ulink></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>New Features</title>
+ <varlistentry>
+ <term></term>
+ <listitem>
+ <para>
+ stuff
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <variablelist>
+ <title>Issues fixed upstream:</title>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-454"></ulink></term>
+ <listitem>
+ <para>
+ This release includes numerous fixes for issues reported upstream. Follow the link above to review a tracking ticket listing these issues and fixes.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section> -->
+
+ <section id="sect-Release_Notes-_Known_Issues_in_this_release">
+ <title> Known Issues in this release</title>
+ <para>
+ The following is a list of known issues in this release:
+ </para>
+ <variablelist>
+ <varlistentry>
+ <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-XYZ" /></term>
+ <listitem>
+ <para>
+ TEXT
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </section>
+
+ <section id="sect-Release_Notes-Security_Issues">
+ <title>Security Issues</title>
+ <para>
+ At this time there are no known Security Issues in &PRODUCT;.
+ </para>
+ </section>
+
+ <section id="sect-Release_Notes-Documentation">
+ <title>Documentation</title>
+ <para>
+ An Installation Guide and a User Guide for &PRODUCT; are available at <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Site_Publisher/index.html" />.
+ </para>
+ <para>
+ &EPP; specific documentation is also available from <ulink type="http" url="http://docs.redhat.com/docs/en-US/JBoss_Enterprise_Portal_Platform/index...."></ulink>
+ </para>
+ </section>
+
+ <section id="sect-Release_Notes-_Product_Support_and_License_Website_Links_">
+ <title> Product Support and License Website Links </title>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-Support_Processes">
+ <title>Support Processes</title>
+ <para>
+ <ulink url="http://www.redhat.com/support/process/">http://www.redhat.com/support/process/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Production_Support_Scope_of_Coverage_">
+ <title> Production Support Scope of Coverage </title>
+ <para>
+ <ulink url="http://www.redhat.com/support/policy/soc/production">http://www.redhat.com/support/policy/soc/production</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Production_Support_Service_Level_Agreement_">
+ <title> Production Support Service Level Agreement </title>
+ <para>
+ <ulink url="http://www.redhat.com/support/policy/sla/production/">http://www.redhat.com/support/policy/sla/production/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Scope_of_Coverage_">
+ <title> Developer Support Scope of Coverage </title>
+ <para>
+ <ulink url="http://www.redhat.com/support/policy/soc/developer/">http://www.redhat.com/support/policy/soc/developer/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Developer_Support_Service_Level_Agreement_">
+ <title> Developer Support Service Level Agreement </title>
+ <para>
+ <ulink url="http://www.redhat.com/support/policy/sla/developer/">http://www.redhat.com/support/policy/sla/developer/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_Product_Update_and_Support_Policy_by_Product_">
+ <title> Product Update and Support Policy by Product </title>
+ <para>
+ <ulink url="http://www.redhat.com/security/updates/jboss_notes/">http://www.redhat.com/security/updates/jboss_notes/</ulink>
+ </para>
+ </formalpara>
+ <formalpara id="form-Release_Notes-_Product_Support_and_License_Website_Links_-_JBoss_End_User_License_Agreement_">
+ <title> JBoss End User License Agreement </title>
+ <para>
+ <ulink url="http://www.redhat.com/licenses/jboss_eula.html">http://www.redhat.com/licenses/jboss_eula.html</ulink>
+ </para>
+ </formalpara>
+ </section>
+
+ <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <index />
+</article>
+
14 years
- 1
- 0
gatein SVN: r5487 - epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:40:37 -0500 (Mon, 06 Dec 2010)
New Revision: 5487
Modified:
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-06 05:39:57 UTC (rev 5486)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-06 05:40:37 UTC (rev 5487)
@@ -7,9 +7,9 @@
<title>Reference Guide</title>
<subtitle>An in-depth guide to Enterprise Portal Platform 5</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5</productnumber>
+ <productnumber>5.1</productnumber>
<edition>1</edition>
- <pubsnumber>1.21</pubsnumber>
+ <pubsnumber>1.22</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-06 05:39:57 UTC (rev 5486)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-06 05:40:37 UTC (rev 5487)
@@ -7,9 +7,9 @@
<title>Revision History</title>
<simpara>
<revhistory>
- <revision>
- <revnumber>1-1.21</revnumber>
- <date>Wed Dec 01 2010</date>
+ <revision>
+ <revnumber>1-1.22</revnumber>
+ <date>Mon Dec 06 2010</date>
<author>
<firstname>Scott</firstname>
<surname>Mumford</surname>
@@ -17,84 +17,98 @@
</author>
<revdescription>
<simplelist>
- <member>Incorporated further QA feedback. Corrected errors in WSRP update.</member>
+ <member>Republished for 5.1 branch.</member>
</simplelist>
</revdescription>
</revision>
-<!-- <revision>
- <revnumber>1-1.20</revnumber>
- <date>Mon Nov 29 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added Localization Configuration chapter. Incorporated QA feedback.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>1-1.18</revnumber>
- <date>Wed Nov 17 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Removed version-specific content and documentation notes for limited Beta release.</member>
- </simplelist>
- </revdescription>
- </revision> -->
+ <revision>
+ <revnumber>1-1.21</revnumber>
+ <date>Wed Dec 01 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated further QA feedback. Corrected errors in WSRP update.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!-- <revision>
+ <revnumber>1-1.20</revnumber>
+ <date>Mon Nov 29 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added Localization Configuration chapter. Incorporated QA feedback.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>1-1.18</revnumber>
+ <date>Wed Nov 17 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Removed version-specific content and documentation notes for limited Beta release.</member>
+ </simplelist>
+ </revdescription>
+ </revision> -->
- <revision>
- <revnumber>1-1.17</revnumber>
- <date>Mon Nov 15 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Refined handling of version-specific information.</member>
- </simplelist>
- </revdescription>
- </revision>
-<!-- <revision>
- <revnumber>1-1.15</revnumber>
- <date>Thu Nov 11 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Incorporated further feedback from GLS.</member>
- <member>Added first cut of WSRP 2.0 content.</member>
- <member>Highlighted JCR sections for possible removal.</member>
- </simplelist>
- </revdescription>
- </revision>
<revision>
- <revnumber>1-1.14</revnumber>
- <date>Tue Nov 02 2010</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email>smumford(a)redhat.com</email>
- </author>
- <revdescription>
- <simplelist>
- <member>Updated to remove numerous minor spelling and typographic errors.</member>
- </simplelist>
- </revdescription>
- </revision> -->
+ <revnumber>1-1.17</revnumber>
+ <date>Mon Nov 15 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Refined handling of version-specific information.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <!-- <revision>
+ <revnumber>1-1.15</revnumber>
+ <date>Thu Nov 11 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Incorporated further feedback from GLS.</member>
+ <member>Added first cut of WSRP 2.0 content.</member>
+ <member>Highlighted JCR sections for possible removal.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
<revision>
+ <revnumber>1-1.14</revnumber>
+ <date>Tue Nov 02 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updated to remove numerous minor spelling and typographic errors.</member>
+ </simplelist>
+ </revdescription>
+ </revision> -->
+ <revision>
<revnumber>1-1.13</revnumber>
<date>Tue Oct 26 2010</date>
<author>
14 years
- 1
- 0
gatein SVN: r5486 - epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:39:57 -0500 (Mon, 06 Dec 2010)
New Revision: 5486
Modified:
epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-06 05:39:29 UTC (rev 5485)
+++ epp/docs/branches/EPP_5_1_Branch/Installation_Guide/en-US/Book_Info.xml 2010-12-06 05:39:57 UTC (rev 5486)
@@ -2,14 +2,12 @@
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "Installation_Guide.ent">
%BOOK_ENTITIES;
-
-
]>
<bookinfo id="book-Install_Guide-Install_Guide">
<title>Installation Guide</title>
<subtitle>An Installation Guide for &PRODUCT;</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5</productnumber>
+ <productnumber>5.1</productnumber>
<edition>1</edition>
<pubsnumber>2.3</pubsnumber>
<abstract>
14 years
- 1
- 0
gatein SVN: r5485 - epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:39:29 -0500 (Mon, 06 Dec 2010)
New Revision: 5485
Modified:
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml
epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml 2010-12-06 05:38:58 UTC (rev 5484)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Book_Info.xml 2010-12-06 05:39:29 UTC (rev 5485)
@@ -7,9 +7,9 @@
<title>5.1.0 Release Notes</title>
<subtitle>For use with JBoss Enterprise Portal Platform 5.1.0</subtitle>
<edition>1</edition>
- <pubsnumber>1.4</pubsnumber>
+ <pubsnumber>1.5</pubsnumber>
<productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5</productnumber>
+ <productnumber>5.1</productnumber>
<abstract>
<para>
These release notes contain important information related to &PRODUCT; &VERSION_MICRO; that may not be currently available in the Product Manuals. You should read these Release Notes in their entirety before installing the product.
Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2010-12-06 05:38:58 UTC (rev 5484)
+++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2010-12-06 05:39:29 UTC (rev 5485)
@@ -7,7 +7,21 @@
<title>Revision History</title>
<simpara>
<revhistory>
- <revision>
+ <revision>
+ <revnumber>1-1.5</revnumber>
+ <date>Mon Dec 06 2010</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email>smumford(a)redhat.com</email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Re-publish for 5.1 branch.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>1-1.4</revnumber>
<date>Wed Nov 10 2010</date>
<author>
@@ -17,11 +31,11 @@
</author>
<revdescription>
<simplelist>
- <member>Updated component list.</member>
+ <member>Updated component list.</member>
</simplelist>
</revdescription>
</revision>
- <revision>
+ <!--<revision>
<revnumber>1-1.3</revnumber>
<date>Wed Nov 10 2010</date>
<author>
@@ -49,7 +63,7 @@
<member>Added further JIRA descriptions to Known and Resolved Issues sections and added 'Resolved Upstream' section.</member>
</simplelist>
</revdescription>
- </revision>
+ </revision> -->
<revision>
<revnumber>1-1.1</revnumber>
<date>Thur Nov 04 2010</date>
14 years
- 1
- 0
gatein SVN: r5484 - epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-12-06 00:38:58 -0500 (Mon, 06 Dec 2010)
New Revision: 5484
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
Log:
Updated for 5.0/5.1 branching
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-06 05:38:35 UTC (rev 5483)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Book_Info.xml 2010-12-06 05:38:58 UTC (rev 5484)
@@ -7,9 +7,9 @@
<title>Reference Guide</title>
<subtitle>An in-depth guide to Enterprise Portal Platform 5.0.1</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5</productnumber>
+ <productnumber>5.0</productnumber>
<edition>1</edition>
- <pubsnumber>1.11</pubsnumber>
+ <pubsnumber>1.12</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the &PRODUCT; product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-06 05:38:35 UTC (rev 5483)
+++ epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/Revision_History.xml 2010-12-06 05:38:58 UTC (rev 5484)
@@ -22,7 +22,7 @@
</revdescription>
</revision>
<!-- <revision>
- <revnumber>1.11</revnumber>
+ <revnumber>1-1.11</revnumber>
<date>Thu Sep 30 2010</date>
<author>
<firstname>Scott</firstname>
@@ -36,7 +36,7 @@
</revdescription>
</revision>
<revision>
- <revnumber>1.10</revnumber>
+ <revnumber>1-1.10</revnumber>
<date>Thu Sep 23 2010</date>
<author>
<firstname>Scott</firstname>
@@ -50,7 +50,7 @@
</revdescription>
</revision>
<revision>
- <revnumber>1.9</revnumber>
+ <revnumber>1-1.9</revnumber>
<date>Wed Sep 15 2010</date>
<author>
<firstname>Scott</firstname>
@@ -77,8 +77,8 @@
</simplelist>
</revdescription>
</revision>
- <revision>
-<!-- <revnumber>1.7</revnumber>
+ <!--<revision>
+ <revnumber>1-1.7</revnumber>
<date>Mon Aug 9 2010</date>
<author>
<firstname>Scott</firstname>
@@ -92,7 +92,7 @@
</revdescription>
</revision>
<revision>
- <revnumber>1.6</revnumber>
+ <revnumber>1-1.6</revnumber>
<date>Thu Aug 5 2010</date>
<author>
<firstname>Scott</firstname>
@@ -120,7 +120,7 @@
</revdescription>
</revision>
<!-- <revision>
- <revnumber>1.1</revnumber>
+ <revnumber>1-1.2</revnumber>
<date>Sat Mar 20 2010</date>
<author>
<firstname>Scott</firstname>
@@ -134,7 +134,7 @@
</revdescription>
</revision>
<revision>
- <revnumber>1</revnumber>
+ <revnumber>1-1.1</revnumber>
<date>Mon Feb 15 2010</date>
<author>
<firstname>Scott</firstname>
14 years
- 1
- 0