You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cd...@apache.org on 2006/04/29 03:33:33 UTC
svn commit: r398059 - in /portals/pluto/tags/release-1.1.0-beta1: README
dist-build.xml pluto-testsuite/pom.xml pom.xml
Author: cdoremus
Date: Fri Apr 28 18:33:32 2006
New Revision: 398059
URL: http://svn.apache.org/viewcvs?rev=398059&view=rev
Log:
Merged in changes from trunk since creating this branch
Modified:
portals/pluto/tags/release-1.1.0-beta1/README
portals/pluto/tags/release-1.1.0-beta1/dist-build.xml
portals/pluto/tags/release-1.1.0-beta1/pluto-testsuite/pom.xml
portals/pluto/tags/release-1.1.0-beta1/pom.xml
Modified: portals/pluto/tags/release-1.1.0-beta1/README
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/README?rev=398059&r1=398058&r2=398059&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/README (original)
+++ portals/pluto/tags/release-1.1.0-beta1/README Fri Apr 28 18:33:32 2006
@@ -1,13 +1,37 @@
-For the most up to date information please see:
- http://portals.apache.org/pluto
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+README for Pluto 1.1-beta1
+
+To run the Pluto Portal Driver deployed in Tomcat 5.5.9:
+1. Unzip the binary distribution into a directory.
+ a. <PLUTO-HOME> will be the pluto-1.1.0-beta1 subdirectory.
+2. Execute startup.bat (Windows) or startup.sh (Unix)
+in <PLUTO-HOME>/bin.
+ a. Use shutdown.bat/shutdown.sh to stop the portal
+3. Browse to http://localhost:8080/pluto/portal
+4. Login as tomcat user (password=tomcat).
+For information on deploying portlets, building the portal from source
+ and for the most up to date documentation please go to:
+ http://portals.apache.org/pluto
+
***********************************************************
-* RELEASE NOTES: 1.1.0-alpha1 Dec 10, 2005 *
+* RELEASE NOTES: 1.1.0-beta1 April 15, 2006 *
***********************************************************
-* Resolved Issues *
+* Fixed or Resolved Issues *
***********************************************************
-
** Bug
* [PLUTO-78] - Pluto 1.1: portlet info not initialized when defined in resource external to portlet.xml
* [PLUTO-79] - Pluto 1.1: portal driver servlet's doPost() method calls itself
@@ -21,25 +45,51 @@
* [PLUTO-150] - In version 1.1-ALPHA, RenderResponseImpl.getNamespace() should be updated
* [PLUTO-159] - ClassNotFoundException when using testsuites Simple Preference Test
* [PLUTO-162] - Some suggestions to the Pluto testsuite, and a bug report.
+ * [PLUTO-166] - Creation of PreferencesValidator breaks the portlet spec.
* [PLUTO-167] - PortletPreferencesImpl.getMap() breaks the spec: PLT 14.1 (xci)
* [PLUTO-168] - Portlet session binding problem
* [PLUTO-173] - Build (mvn install) fails
* [PLUTO-175] - [1.1] Testsuite Simple Action Parameter Test fails
* [PLUTO-176] - [1.1] Testsuite Simple Preference Test fails
+ * [PLUTO-177] - [1.1] Multiple failures in Testsuite Resource Bundle Test
* [PLUTO-178] - [1.1] Testsuite Security Mapping Test cannot be run
* [PLUTO-179] - [1.1] Testsuite Application Scoped Session Attributes Test fails
* [PLUTO-180] - [1.1] Testsuite Misc Test: Portal Info Test fails
* [PLUTO-185] - EmbeddedDataSourceManager not properly connecting to Derby database
-
-** New Feature
- * [PLUTO-156] - Support for PortletPreferences
- * [PLUTO-160] - New Pluto Admin for version 1.1
+ * [PLUTO-188] - [1.1] Four failures in the testsuite's Simple Preference Test
+ * [PLUTO-189] - [1.1] Three failures in the testsuite's Resource Bundle Test on Test Portlet #1
+ * [PLUTO-190] - [1.1] Two problems in the testsuite's Security Mapping Test
+ * [PLUTO-192] - ActionRequest.isPortletModeAllowed Fails
+ * [PLUTO-193] - ActionRequest.GetParameterMap
+ * [PLUTO-194] - ActionResponse.SetPortletMode IllegalStateException not thrown
+ * [PLUTO-197] - ActionRequest.GetParameterMap
+ * [PLUTO-198] - ActionRequest.GetPreferences NullPointerException
+ * [PLUTO-199] - ActionResponse.setRenderParameter
+ * [PLUTO-205] - PortletPreferences.store() does not throw IllegalStateException when called within render()
+ * [PLUTO-207] - Request did not return correct query string when dispatched
+ * [PLUTO-208] - Render parameters are lost when dispatching request
+ * [PLUTO-209] - RenderResponse: getWriter() and getPortletOutputStream() should have thrown IllegalStateException if content-type is not set
+ * [PLUTO-210] - Default preference value not returned correctly
+ * [PLUTO-213] - PortletSession not invalidated after max inactive interval.
+ * [PLUTO-220] - flush causing problem in doEndTag() in BasicURLTag.java
+ * [PLUTO-221-231] - Sub-project descriptors referencing basedir break multi-project build
+ * [PLUTO-235] - Add example of installing Pluto on Windows
** Improvement
+ * [PLUTO-151] - New class hierarchy to implement portlet request and response, and resolve the dispatching parameters problem.
+ * [PLUTO-195] - Validate Container Startup / init before servicing requests
+ * [PLUTO-204] - Add spec PLT number to TestResult in portlet tests
+ * [PLUTO-211] - Too many methods overwritten in RenderRequestImpl
+ * [PLUTO-212] - Merge methods in RenderRequestImpl and PortletContextImpl
+
+** New Feature
* [PLUTO-108] - Use CSS Positioning for Portal
* [PLUTO-144] - Class PlutoTestCase does not compile under JDK1.4 (in container/src/test)
* [PLUTO-158] - Sperate pluto-portal-driver from pluto-portal subprojects.
+ * [PLUTO-156] - Support for PortletPreferences
* [PLUTO-165] - EL support for portlet:param tag
+ * [PLUTO-181] - Install Pluto Portal from Repository
+ * [PLUTO-183] - pluto 1.1 portal-driver and Spring
***********************************************************
* Open Issues *
@@ -48,19 +98,28 @@
** Bug
* [PLUTO-122] - Portlet Preferences need to be user specific
* [PLUTO-124] - POST Data gets truncated due to internal redirect by pluto
- * [PLUTO-166] - Creation of PreferencesValidator breaks the portlet spec.
- * [PLUTO-177] - [1.1] Multiple failures in Testsuite Resource Bundle Test
-
+ * [PLUTO-191] - Dynamic Inclusion of dependencies in Maven Plugin
+ * [PLUTO-200] - Missing Resource Exception from PortletConfig.getResourceBundle
+ * [PLUTO-232] - Maximize window state does not work properly
+ * [PLUTO-233] - Exception thrown if edit or help mode is not supported by portlet
+ * [PLUTO-234] - Session Timeout Test in testsuite fails
+
** New Feature
* [PLUTO-38] - user profile attribute support
* [PLUTO-182] - [1.1] Add assembly plugin to create distributions
* [PLUTO-186] - ToolTips to Portlet Controls
-
+ * [PLUTO-214] - Add logout link to portal page.
+
** Improvement
- * [PLUTO-151] - New class hierarchy to implement portlet request and response, and resolve the dispatching parameters problem.
- * [PLUTO-183] - pluto 1.1 portal-driver and Spring
-
-
+ * [PLUTO-215] - Create admin portlet for Pluto portal driver
+ * [PLUTO-204] - Add spec PLT number to TestResult in portlet tests
+
+** Task
+ * [PLUTO-217] - [1.1] Script to package binary release
+ * [PLUTO-218] - [1.1] Script to package source release
+
+** Test
+ * [PLUTO-206] - Improve pluto-testsuite to test more aspects
+
** Wish
* [PLUTO-153] - Jetty Deployment Support
-
Modified: portals/pluto/tags/release-1.1.0-beta1/dist-build.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/dist-build.xml?rev=398059&r1=398058&r2=398059&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/dist-build.xml (original)
+++ portals/pluto/tags/release-1.1.0-beta1/dist-build.xml Fri Apr 28 18:33:32 2006
@@ -1,9 +1,24 @@
<!--
- Builds a binary and source distribution of Pluto 1.1, bundling it into zip and gzip files.
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ Builds a binary and source distribution of Pluto 1.1, bundling it into zip, gzip and bzip2 files.
- Run the source build using the command line:
- ant -f dist-build.xml
-
+ Run the binary build using the command line:
+ ant -f dist-build.xml
+
The binary distribution is done in the following way:
1. Downloads Tomcat from Apache and unzips it into a working directory. To this distribution, the
build:
@@ -12,14 +27,14 @@
c. Adds a pluto role to the tomcat user in tomcat-users.xml.
2. Runs 'mvn install' and 'mvn pluto:install' to create the Pluto driver and testsuite
and installs them into the Tomcat dist in the working directory.
- 3. Bundles up the altered Tomcat dist with Pluto into a zip and gzip file.
+ 3. Bundles up the altered Tomcat dist with Pluto into a zip, gzip and bzip2 file.
- Run the binary build using the command line:
- ant -f dist-build.xml bin-dist
-
+ Run the source build using the command line:
+ ant -f dist-build.xml src-dist
+
All built distributions end up in target/dist.
-->
-<project name="Dist" default="src-dist">
+<project name="PlutoDistributions" default="bin-dist">
<property name="pluto.version" value="1.1.0-beta1" description="Version of Pluto 1.1 to build"/>
<property name="tomcat.version" value="5.5.9" description="Version of Tomcat to deploy Pluto"/>
@@ -37,6 +52,7 @@
<exclude name="**/*.class"/>
<exclude name="**/*.zip"/>
<exclude name="**/*.tar.gz"/>
+ <exclude name="**/*.tar.b2"/>
<exclude name="**/target/**/*"/>
<exclude name="**/.svn/*"/>
<exclude name="bin/**/*"/>
@@ -49,37 +65,72 @@
<zipfileset refid="src.fileset"/>
</zip>
- <tar destfile="${dist.basedir}/${pluto.name}-src.tar.gz" compression="gzip">
- <tarfileset dir=".">
- <include name="**/*"/>
- <exclude name="**/*.class"/>
- <exclude name="**/*.zip"/>
- <exclude name="**/*.tar.gz"/>
- <exclude name="**/target/**/*"/>
- <exclude name="**/.svn/*"/>
- <exclude name="bin/**/*"/>
- <exclude name=".classpath"/>
- <exclude name=".project"/>
- </tarfileset>
- </tar>
+ <antcall target="srctar-nocompress"/>
+
+ <gzip src="${dist.basedir}/${pluto.name}-src.tar"
+ destfile="${dist.basedir}/${pluto.name}-src.tar.gz"/>
+
+ <bzip2 src="${dist.basedir}/${pluto.name}-src.tar"
+ destfile="${dist.basedir}/${pluto.name}-src.tar.bz2"/>
+
<antcall target="clean"/>
</target>
+ <target name="srctar-nocompress" description="Creates tar source distributions">
+ <tar destfile="${dist.basedir}/${pluto.name}-src.tar">
+ <tarfileset dir="."> <!-- refid does not work -->
+ <include name="**/*"/>
+ <exclude name="**/*.class"/>
+ <exclude name="**/*.zip"/>
+ <exclude name="**/*.tar.gz"/>
+ <exclude name="**/*.tar.bz2"/>
+ <exclude name="**/target/**/*"/>
+ <exclude name="**/.svn/*"/>
+ <exclude name="bin/**/*"/>
+ <exclude name=".classpath"/>
+ <exclude name=".project"/>
+ </tarfileset>
+ </tar>
+ </target>
+
<target name="prepare-src-dist">
<mkdir dir="${dist.basedir}"/>
</target>
- <target name="bin-dist" depends="prepare-bin-dist,run-maven">
+ <target name="bin-dist" depends="prepare-bin-dist,run-maven" description="Creates zip, gzip, and bzip2 distributions">
+ <!-- Copy over jars needed to deploy custom portlets -->
+ <copy file="pluto-util/target/pluto-util-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
+ <copy file="pluto-descriptor-api/target/pluto-descriptor-api-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
+ <copy file="pluto-descriptor-impl/target/pluto-descriptor-impl-${pluto.version}.jar" todir="${dist.dir}/PlutoDomain"/>
+
+ <!-- Zip everything up -->
<zip destfile="${dist.basedir}/${pluto.name}-bin.zip">
<zipfileset prefix="${pluto.name}" dir="${dist.dir}" includes="**/*"/>
</zip>
- <tar destfile="${dist.basedir}/${pluto.name}-bin.tar.gz" compression="gzip">
- <tarfileset prefix="${pluto.name}" dir="${dist.dir}" includes="**/*"/>
- </tar>
+ <antcall target="tar-nocompress"/>
+
+ <gzip src="${dist.basedir}/${pluto.name}-bin.tar"
+ destfile="${dist.basedir}/${pluto.name}-bin.tar.gz"/>
+
+ <bzip2 src="${dist.basedir}/${pluto.name}-bin.tar"
+ destfile="${dist.basedir}/${pluto.name}-bin.tar.bz2"/>
+
<antcall target="clean"/>
</target>
-
+
+ <target name="tar-nocompress" description="Creates tar binary distributions">
+ <tar destfile="${dist.basedir}/${pluto.name}-bin.tar">
+ <tarfileset prefix="${pluto.name}" dir="${dist.dir}" mode="755" username="pluto" group="pluto">
+ <include name="bin/*.sh"/>
+ </tarfileset>
+ <tarfileset prefix="${pluto.name}" dir="${dist.dir}" username="pluto" group="pluto">
+ <include name="**/*"/>
+ <exclude name="bin/*.sh"/>
+ </tarfileset>
+ </tar>
+ </target>
+
<target name="prepare-bin-dist">
<mkdir dir="${dist.basedir}"/>
@@ -96,7 +147,10 @@
dest="${dist.basedir}"
description="Untars tomcat dist"
/>
-
+
+ <!-- Copy over README -->
+ <copy file="README" todir="${dist.dir}"/>
+
<!-- Add emptySessionPath="true" to Connector element in server.xml -->
<replace file="${dist.dir}/conf/server.xml"
token="connectionTimeout="20000" disableUploadTimeout="true" />"
@@ -119,7 +173,7 @@
/>
</target>
- <target name="run-maven">
+ <target name="run-maven" description="Runs maven2 goals">
<exec executable="mvn" vmlauncher="false" dir="${basedir}">
<arg line="install"/>
</exec>
@@ -127,11 +181,13 @@
<arg line="pluto:install -DinstallDir=${user.dir}/${dist.dir}"/>
</exec>
</target>
-
+
<target name="clean">
<delete dir="${dist.dir}"/>
<delete file="${unzip.file}"/>
<delete file="${tar.file}"/>
+ <delete file="${dist.basedir}/${pluto.name}-src.tar"/>
+ <delete file="${dist.basedir}/${pluto.name}-bin.tar"/>
</target>
</project>
Modified: portals/pluto/tags/release-1.1.0-beta1/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/pluto-testsuite/pom.xml?rev=398059&r1=398058&r2=398059&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/pluto-testsuite/pom.xml (original)
+++ portals/pluto/tags/release-1.1.0-beta1/pluto-testsuite/pom.xml Fri Apr 28 18:33:32 2006
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<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">
@@ -7,7 +21,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0-beta1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-testsuite</artifactId>
Modified: portals/pluto/tags/release-1.1.0-beta1/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/tags/release-1.1.0-beta1/pom.xml?rev=398059&r1=398058&r2=398059&view=diff
==============================================================================
--- portals/pluto/tags/release-1.1.0-beta1/pom.xml (original)
+++ portals/pluto/tags/release-1.1.0-beta1/pom.xml Fri Apr 28 18:33:32 2006
@@ -1,5 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ Copyright 2005-2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<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">
@@ -9,7 +23,7 @@
<artifactId>pluto</artifactId>
<packaging>pom</packaging>
<name>Apache Pluto</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0-beta1</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
<description>Pluto is the Reference Implementation of the Java Portlet Specfication.</description>
<url>http://portals.apache.org/pluto</url>