geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r559986 [2/7] - in /geronimo/sandbox/portals: pluto-portal/src/assemble/ pluto-portal/src/assemble/config/ pluto-portal/src/main/resources/ pluto-portal/src/main/webapp/ pluto-portal/src/main/webapp/WEB-INF/ pluto-portal/src/main/webapp/WEB...
Date Thu, 26 Jul 2007 21:22:14 GMT
Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css Thu Jul 26 14:22:10 2007
@@ -1,277 +1,277 @@
-/*
+/*
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You 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.
-*/
-/*
-NOTE: 
-This stylesheet is a formatted copy of Appendix PLT. C in the Portlet API specification, which defines
-CSS styles to be used in portlets conforming to the spec.
-*/
-
-/*****************************************************************************************
-Java(TM) Portlet Specification, version 1.0 (10/07/2003) pp. 115-118
-
-PLT.C
-CSS Style Definitions
-To achieve a common look and feel throughout the portal page, all portlets in the portal
-page should use a common CSS style sheet when generating content.
-This appendix defines styles for a variety of logical units in the markup. It follows the
-style being considered by the OASIS Web Services for Remote Portlets Technical Committee.
-******************************************************************************************/
-
-/*****************************************************************************************
-PLT.C.1 Links (Anchor)
-A custom CSS class is not defined for the <a> tag. The entity should use the default
-classes when embedding anchor tags.
-******************************************************************************************/
-
-/*****************************************************************************************
-PLT.C.2 Fonts
-The font style definitions affect the font attributes only (font face, size, color, style, etc).
-******************************************************************************************/
-
-/* Font attributes for the "normal" fragment font. Used for the display of non-accentuated information. 
-Example: Normal Text */
-.portlet-font {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	font-size: 10pt;
-	color:black;
-}
-
-/* Font attributes similar to the portlet-font but the color is lighter. Example: Dim Text */
-.portlet-font-dim {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	font-size: 10pt;
-	color:lightgrey;
-}
-
-/*****************************************************************************************
-PLT.C.3 Messages
-Message style definitions affect the rendering of a paragraph (alignment, borders,
-background color, etc) as well as text attributes.
-******************************************************************************************/
-/* Status of the current operation. Example: Progress: 80% */
-.portlet-msg-status {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size:10pt;
-   	color:black;
-}
-
-/* Help messages, general additional information, etc. Example: Info about */
-.portlet-msg-info {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size:10pt;
-   	color:blue;
-}
-
-/* Error messages. 
-Example: Portlet not available*/
-.portlet-msg-error {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size:8pt;
-   	color:red;
-}
-
-/* Warning messages. 
-Example: Timeout occurred, try again later */
-.portlet-msg-alert {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size:10pt;
-   	color:yellow;
-}
-
-/* Verification of the successful completion of a task. Example: Operation completed successfully */
-.portlet-msg-success {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size:10pt;
-   	color:green;
-}
-
-/*****************************************************************************************
-PLT.C.4 Sections
-Section style definitions affect the rendering of markup sections such as table, div and  
-span (alignment, borders, background color, etc) as well as their text attributes.
-******************************************************************************************/
-/* Table or section header */
-.portlet-section-header {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size: 16pt;
-	margin-top: 0; 
-	margin-bottom: 1em;
-}
-
-/* Normal text in a table cell */
-.portlet-section-body {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	font-size: 12pt;
-
-}
-
-/* Text in every other row in the cell */
-.portlet-section-alternate {
-
-}
-
-/* Text in a selected cell range */
-.portlet-section-selected {
-
-}
-
-/* Text of a subheading */
-.portlet-section-subheader {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size: 12pt;
-}
-
-/* Table or section footnote */
-.portlet-section-footer {
-
-}
-
-/* Text that belongs to the table but does not fall in one of
-the other categories (e.g. explanatory or help text that is
-associated with the section). */
-.portlet-section-text {
-
-}
-
-/*****************************************************************************************
-PLT.C.5 Forms
-Form styles define the look-and-feel of the elements in an HTML form.
-******************************************************************************************/
-/* Text used for the descriptive label of the whole form (not the labels for fields). */
-.portlet-form-label {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size: 12pt;
-	color: black;
-}
-
-/* Text of the user-input in an input field. */
-.portlet-form-input-field {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	font-size: 10pt;
-	color: black;
-}
-
-/* Text on a button */
-.portlet-form-button {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: normal;
-	font-size: 12pt;
-	color: black;
-}
-
-/* Text that appears beside a context dependent action icon. */
-.portlet-icon-label {
-
-}
-
-/* Text that appears beside a "standard" icon (e.g. Ok, or Cancel) */
-.portlet-dlg-icon-label {
-
-}
-
-/* Text for a separator of fields (e.g. checkboxes, etc.) */
-.portlet-form-field-label {
-	font-family: Arial,Helvetica,sans-serif;
-	font-style: normal;
-	font-weight: bold;
-	font-size: 10pt;
-	color: black;
-}
-
-/* Text for a field (not input field, e.g. checkboxes, etc) */
-.portlet-form-field {
-
-}
-
-/*****************************************************************************************
-PLT.C.6 Menus
-Menu styles define the look-and-feel of the text and background of a menu structure. This
-structure may be embedded in the aggregated page or may appear as a context sensitive
-popup menu.
-******************************************************************************************/
-/* General menu settings such as background color, margins, etc */
-.portlet-menu {
-
-}
-
-/* Normal, unselected menu item. */
-.portlet-menu-item {
-
-}
-
-/* Selected menu item. */
-.portlet-menu-item-selected {
-
-}
-
-/* Normal, unselected menu item when the mouse hovers over it. */
-.portlet-menu-item-hover {
-
-}
-
-/* Selected menu item when the mouse hovers over it. */
-.portlet-menu-item-hover-selected {
-
-}
-
-/* Normal, unselected menu item that has submenus. */
-.portlet-menu-cascade-item {
-
-}
-
-/* Selected sub-menu item that has sub-menus. */
-.portlet-menu-cascade-item-selected {
-
-}
-
-/* Descriptive text for the menu (e.g. in a help context below the menu) */
-.portlet-menu-description {
-
-}
-
-/* Menu caption */
-.portlet-menu-caption {
-
-}
-
+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.
+*/
+/*
+NOTE: 
+This stylesheet is a formatted copy of Appendix PLT. C in the Portlet API specification, which defines
+CSS styles to be used in portlets conforming to the spec.
+*/
+
+/*****************************************************************************************
+Java(TM) Portlet Specification, version 1.0 (10/07/2003) pp. 115-118
+
+PLT.C
+CSS Style Definitions
+To achieve a common look and feel throughout the portal page, all portlets in the portal
+page should use a common CSS style sheet when generating content.
+This appendix defines styles for a variety of logical units in the markup. It follows the
+style being considered by the OASIS Web Services for Remote Portlets Technical Committee.
+******************************************************************************************/
+
+/*****************************************************************************************
+PLT.C.1 Links (Anchor)
+A custom CSS class is not defined for the <a> tag. The entity should use the default
+classes when embedding anchor tags.
+******************************************************************************************/
+
+/*****************************************************************************************
+PLT.C.2 Fonts
+The font style definitions affect the font attributes only (font face, size, color, style, etc).
+******************************************************************************************/
+
+/* Font attributes for the "normal" fragment font. Used for the display of non-accentuated information. 
+Example: Normal Text */
+.portlet-font {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 10pt;
+	color:black;
+}
+
+/* Font attributes similar to the portlet-font but the color is lighter. Example: Dim Text */
+.portlet-font-dim {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 10pt;
+	color:lightgrey;
+}
+
+/*****************************************************************************************
+PLT.C.3 Messages
+Message style definitions affect the rendering of a paragraph (alignment, borders,
+background color, etc) as well as text attributes.
+******************************************************************************************/
+/* Status of the current operation. Example: Progress: 80% */
+.portlet-msg-status {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size:10pt;
+   	color:black;
+}
+
+/* Help messages, general additional information, etc. Example: Info about */
+.portlet-msg-info {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size:10pt;
+   	color:blue;
+}
+
+/* Error messages. 
+Example: Portlet not available*/
+.portlet-msg-error {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size:8pt;
+   	color:red;
+}
+
+/* Warning messages. 
+Example: Timeout occurred, try again later */
+.portlet-msg-alert {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size:10pt;
+   	color:yellow;
+}
+
+/* Verification of the successful completion of a task. Example: Operation completed successfully */
+.portlet-msg-success {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size:10pt;
+   	color:green;
+}
+
+/*****************************************************************************************
+PLT.C.4 Sections
+Section style definitions affect the rendering of markup sections such as table, div and  
+span (alignment, borders, background color, etc) as well as their text attributes.
+******************************************************************************************/
+/* Table or section header */
+.portlet-section-header {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 16pt;
+	margin-top: 0; 
+	margin-bottom: 1em;
+}
+
+/* Normal text in a table cell */
+.portlet-section-body {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 12pt;
+
+}
+
+/* Text in every other row in the cell */
+.portlet-section-alternate {
+
+}
+
+/* Text in a selected cell range */
+.portlet-section-selected {
+
+}
+
+/* Text of a subheading */
+.portlet-section-subheader {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 12pt;
+}
+
+/* Table or section footnote */
+.portlet-section-footer {
+
+}
+
+/* Text that belongs to the table but does not fall in one of
+the other categories (e.g. explanatory or help text that is
+associated with the section). */
+.portlet-section-text {
+
+}
+
+/*****************************************************************************************
+PLT.C.5 Forms
+Form styles define the look-and-feel of the elements in an HTML form.
+******************************************************************************************/
+/* Text used for the descriptive label of the whole form (not the labels for fields). */
+.portlet-form-label {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 12pt;
+	color: black;
+}
+
+/* Text of the user-input in an input field. */
+.portlet-form-input-field {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 10pt;
+	color: black;
+}
+
+/* Text on a button */
+.portlet-form-button {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	font-size: 12pt;
+	color: black;
+}
+
+/* Text that appears beside a context dependent action icon. */
+.portlet-icon-label {
+
+}
+
+/* Text that appears beside a "standard" icon (e.g. Ok, or Cancel) */
+.portlet-dlg-icon-label {
+
+}
+
+/* Text for a separator of fields (e.g. checkboxes, etc.) */
+.portlet-form-field-label {
+	font-family: Arial,Helvetica,sans-serif;
+	font-style: normal;
+	font-weight: bold;
+	font-size: 10pt;
+	color: black;
+}
+
+/* Text for a field (not input field, e.g. checkboxes, etc) */
+.portlet-form-field {
+
+}
+
+/*****************************************************************************************
+PLT.C.6 Menus
+Menu styles define the look-and-feel of the text and background of a menu structure. This
+structure may be embedded in the aggregated page or may appear as a context sensitive
+popup menu.
+******************************************************************************************/
+/* General menu settings such as background color, margins, etc */
+.portlet-menu {
+
+}
+
+/* Normal, unselected menu item. */
+.portlet-menu-item {
+
+}
+
+/* Selected menu item. */
+.portlet-menu-item-selected {
+
+}
+
+/* Normal, unselected menu item when the mouse hovers over it. */
+.portlet-menu-item-hover {
+
+}
+
+/* Selected menu item when the mouse hovers over it. */
+.portlet-menu-item-hover-selected {
+
+}
+
+/* Normal, unselected menu item that has submenus. */
+.portlet-menu-cascade-item {
+
+}
+
+/* Selected sub-menu item that has sub-menus. */
+.portlet-menu-cascade-item-selected {
+
+}
+
+/* Descriptive text for the menu (e.g. in a help context below the menu) */
+.portlet-menu-description {
+
+}
+
+/* Menu caption */
+.portlet-menu-caption {
+
+}
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp Thu Jul 26 14:22:10 2007
@@ -1,20 +1,20 @@
-<%--
+<%--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You 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.
---%>
-<%
-    RequestDispatcher rd = application.getContext("/testsuite").getRequestDispatcher("/test_session.jsp");
-    rd.forward(request, response);
+  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.
+--%>
+<%
+    RequestDispatcher rd = application.getContext("/testsuite").getRequestDispatcher("/test_session.jsp");
+    rd.forward(request, response);
 %>

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/site/site.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/site/site.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/site/site.xml Thu Jul 26 14:22:10 2007
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You 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 name="Maven">
-  <bannerLeft>
-    <name>Pluto</name>
-    <src>http://portals.apache.org/pluto/images/pluto.png</src>
-    <href>http://portals.apache.org/pluto</href>
-  </bannerLeft>
-  <bannerRight>
-    <src>http://portals.apache.org/pluto/images/banner.png</src>
-  </bannerRight>
-  <body>
-    <links>
-      <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
-      <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
-	  <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
-    </links>
-
-	<menu name="Pluto Portal">
-      <item name="Getting Started" href="/getting-started.html"/>
-	</menu>
-
-    ${reports}
-  </body>
-</project>
+  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 name="Maven">
+  <bannerLeft>
+    <name>Pluto</name>
+    <src>http://portals.apache.org/pluto/images/pluto.png</src>
+    <href>http://portals.apache.org/pluto</href>
+  </bannerLeft>
+  <bannerRight>
+    <src>http://portals.apache.org/pluto/images/banner.png</src>
+  </bannerRight>
+  <body>
+    <links>
+      <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
+      <item name="JSR 168" href="http://jcp.org/en/jsr/detail?id=168"/>
+	  <item name="Chinese Translation" href="http://heavyz.sourceforge.net/pluto_zh/pluto-container"/>
+    </links>
+
+	<menu name="Pluto Portal">
+      <item name="Getting Started" href="/getting-started.html"/>
+	</menu>
+
+    ${reports}
+  </body>
+</project>

Propchange: geronimo/sandbox/portals/pluto-portal/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml Thu Jul 26 14:22:10 2007
@@ -1,44 +1,44 @@
-<!--
+<!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You 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.
--->
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-
-  </dependencySets>
-</assembly>
-
+  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.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+
+  </dependencySets>
+</assembly>
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java Thu Jul 26 14:22:10 2007
@@ -1,29 +1,29 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-
-/**
- * Empty interface that marks a PortletTest class that has test code which
- * should be run in the <code>Portlet.processAction()</code> method.
- *
- */
-public interface ActionTest extends PortletTest {
-
-	// Empty interface.
-
-}
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+
+/**
+ * Empty interface that marks a PortletTest class that has test code which
+ * should be run in the <code>Portlet.processAction()</code> method.
+ *
+ */
+public interface ActionTest extends PortletTest {
+
+	// Empty interface.
+
+}

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java Thu Jul 26 14:22:10 2007
@@ -1,29 +1,29 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- * 
- */
-package org.apache.pluto.testsuite;
-
-/**
- * Indicates that a configuration error has been detected
- */
-public class InvalidConfigurationException extends RuntimeException {
-
-	public InvalidConfigurationException(String message) {
-		super(message);
-	}
-
-}
+ * 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.
+ * 
+ */
+package org.apache.pluto.testsuite;
+
+/**
+ * Indicates that a configuration error has been detected
+ */
+public class InvalidConfigurationException extends RuntimeException {
+
+	public InvalidConfigurationException(String message) {
+		super(message);
+	}
+
+}

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java Thu Jul 26 14:22:10 2007
@@ -1,73 +1,73 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @version 1.0
- * @since Mar 9, 2005
- */
-public class NoOpTest implements PortletTest {
-
-	/** The test configuration. */
-    private TestConfig config;
-
-
-    // Constructor -------------------------------------------------------------
-
-    /**
-     * Default no-arg constructor.
-     */
-    public NoOpTest() {
-    	// Do nothing.
-    }
-
-
-    // PortletTest Impl --------------------------------------------------------
-
-    public String getTestSuiteName() {
-        return "NoOpTest";
-    }
-
-    public Map getRenderParameters(PortletRequest request) {
-        return new HashMap();
-    }
-
-    public TestResults doTest(PortletConfig config,
-                              PortletContext context,
-                              PortletRequest request,
-                              PortletResponse response) {
-        return new TestResults("None");
-    }
-
-    public void init(TestConfig config) {
-        this.config = config;
-    }
-
-    public TestConfig getConfig() {
-        return config;
-    }
-
-}
-
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version 1.0
+ * @since Mar 9, 2005
+ */
+public class NoOpTest implements PortletTest {
+
+	/** The test configuration. */
+    private TestConfig config;
+
+
+    // Constructor -------------------------------------------------------------
+
+    /**
+     * Default no-arg constructor.
+     */
+    public NoOpTest() {
+    	// Do nothing.
+    }
+
+
+    // PortletTest Impl --------------------------------------------------------
+
+    public String getTestSuiteName() {
+        return "NoOpTest";
+    }
+
+    public Map getRenderParameters(PortletRequest request) {
+        return new HashMap();
+    }
+
+    public TestResults doTest(PortletConfig config,
+                              PortletContext context,
+                              PortletRequest request,
+                              PortletResponse response) {
+        return new TestResults("None");
+    }
+
+    public void init(TestConfig config) {
+        this.config = config;
+    }
+
+    public TestConfig getConfig() {
+        return config;
+    }
+
+}
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java Thu Jul 26 14:22:10 2007
@@ -1,75 +1,75 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import java.util.Map;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-
-/**
- * Interface for pluto portlet test classes.
- *
- */
-public interface PortletTest {
-
-	/**
-	 * Returns the test suite name.
-	 * @return the test suite name.
-	 */
-    public String getTestSuiteName();
-
-    /**
-     * Initializes the portlet test using test configuration.
-     * @param config  the test configuration.
-     */
-    public void init(TestConfig config);
-
-    /**
-     * Returns the render parameters. This method will be invoked in
-     * <code>Portlet.processAction()</code> method. All parameters returned
-     * by this method will be set as render parameters.
-     *
-     * @param request  the portlet request.
-     * @return a map of render parameters, key is the string name of the
-     *         parameter, value is a string array.
-     */
-    public Map getRenderParameters(PortletRequest request);
-
-    /**
-     * Runs the test.
-     * @param config  the portlet config.
-     * @param context  the portlet context.
-     * @param request  the portlet request.
-     * @param response  the portlet response.
-     * @return the results of the test.
-     */
-    public TestResults doTest(PortletConfig config,
-                              PortletContext context,
-                              PortletRequest request,
-                              PortletResponse response);
-
-    /**
-     * Returns the test configuration.
-     * @return the test configuration.
-     */
-    public TestConfig getConfig();
-
-}
-
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+
+/**
+ * Interface for pluto portlet test classes.
+ *
+ */
+public interface PortletTest {
+
+	/**
+	 * Returns the test suite name.
+	 * @return the test suite name.
+	 */
+    public String getTestSuiteName();
+
+    /**
+     * Initializes the portlet test using test configuration.
+     * @param config  the test configuration.
+     */
+    public void init(TestConfig config);
+
+    /**
+     * Returns the render parameters. This method will be invoked in
+     * <code>Portlet.processAction()</code> method. All parameters returned
+     * by this method will be set as render parameters.
+     *
+     * @param request  the portlet request.
+     * @return a map of render parameters, key is the string name of the
+     *         parameter, value is a string array.
+     */
+    public Map getRenderParameters(PortletRequest request);
+
+    /**
+     * Runs the test.
+     * @param config  the portlet config.
+     * @param context  the portlet context.
+     * @param request  the portlet request.
+     * @param response  the portlet response.
+     * @return the results of the test.
+     */
+    public TestResults doTest(PortletConfig config,
+                              PortletContext context,
+                              PortletRequest request,
+                              PortletResponse response);
+
+    /**
+     * Returns the test configuration.
+     * @return the test configuration.
+     */
+    public TestConfig getConfig();
+
+}
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java Thu Jul 26 14:22:10 2007
@@ -1,155 +1,155 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Configuration for <code>PortletTest</code>.
- *
- * @see TestConfigFactory
- * @see PortletTest
- *
- * @version 1.0
- * @since Sep 15, 2004
- */
-public class TestConfig implements Serializable {
-
-	// Private Member Variables ------------------------------------------------
-
-	/** PortletTest class name. */
-    private String testClassName;
-
-    /** Test name. */
-    private String name;
-
-    private String displayURI;
-
-    private Map initParameters = new HashMap();
-
-    /**
-     * The action parameters list holding TestConfig.Parameter objects.
-     * We are not using Map to hold action parameters because parameters with
-     * the same name are allowed.
-     */
-    private List actionParameters = new ArrayList();
-
-    /**
-     * The render parameters list holding TestConfig.Parameter objects.
-     * We are not using Map to hold render parameters because parameters with
-     * the same name are allowed.
-     *
-     * FIXME: when is this field used?
-     */
-    private List renderParameters = new ArrayList();
-
-
-    // Constructor -------------------------------------------------------------
-
-    /**
-     * Default constructor required by Digester.
-     */
-    public TestConfig() {
-    	// Do nothing.
-    }
-
-    // Public Methods ----------------------------------------------------------
-
-    public String getTestClassName() {
-        return testClassName;
-    }
-
-    public void setTestClassName(String testClassName) {
-        this.testClassName = testClassName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String testName) {
-        this.name = testName;
-    }
-
-    public String getDisplayURI() {
-        return displayURI;
-    }
-
-    public void setDisplayURI(String displayURI) {
-        this.displayURI = displayURI;
-    }
-
-    public void addInitParameter(String parameter, String value) {
-        initParameters.put(parameter, value);
-    }
-
-    public Map getInitParameters() {
-        return Collections.unmodifiableMap(initParameters);
-    }
-
-    public void addActionParameter(String name, String value) {
-    	actionParameters.add(new Parameter(name, value));
-    }
-
-    public List getActionParameters() {
-    	return actionParameters;
-    }
-
-    /**
-     * FIXME: why is this method required?
-     */
-    public void addRenderParameter(String name, String value) {
-    	renderParameters.add(new Parameter(name, value));
-    }
-
-    /**
-     * FIXME: when is this method used?
-     */
-    public List getRenderParameters() {
-    	return renderParameters;
-    }
-
-    public String toString() {
-    	StringBuffer buffer = new StringBuffer();
-    	buffer.append(getClass().getName());
-    	buffer.append("[").append(getName()).append("]");
-    	return buffer.toString();
-    }
-
-    public static class Parameter {
-    	private String name = null;
-    	private String value = null;
-    	public Parameter(String name, String value) {
-    		this.name = name;
-    		this.value = value;
-    	}
-
-    	public String getName() {
-    		return name;
-    	}
-    	public String getValue() {
-    		return value;
-    	}
-    }
-
-}
-
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Configuration for <code>PortletTest</code>.
+ *
+ * @see TestConfigFactory
+ * @see PortletTest
+ *
+ * @version 1.0
+ * @since Sep 15, 2004
+ */
+public class TestConfig implements Serializable {
+
+	// Private Member Variables ------------------------------------------------
+
+	/** PortletTest class name. */
+    private String testClassName;
+
+    /** Test name. */
+    private String name;
+
+    private String displayURI;
+
+    private Map initParameters = new HashMap();
+
+    /**
+     * The action parameters list holding TestConfig.Parameter objects.
+     * We are not using Map to hold action parameters because parameters with
+     * the same name are allowed.
+     */
+    private List actionParameters = new ArrayList();
+
+    /**
+     * The render parameters list holding TestConfig.Parameter objects.
+     * We are not using Map to hold render parameters because parameters with
+     * the same name are allowed.
+     *
+     * FIXME: when is this field used?
+     */
+    private List renderParameters = new ArrayList();
+
+
+    // Constructor -------------------------------------------------------------
+
+    /**
+     * Default constructor required by Digester.
+     */
+    public TestConfig() {
+    	// Do nothing.
+    }
+
+    // Public Methods ----------------------------------------------------------
+
+    public String getTestClassName() {
+        return testClassName;
+    }
+
+    public void setTestClassName(String testClassName) {
+        this.testClassName = testClassName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String testName) {
+        this.name = testName;
+    }
+
+    public String getDisplayURI() {
+        return displayURI;
+    }
+
+    public void setDisplayURI(String displayURI) {
+        this.displayURI = displayURI;
+    }
+
+    public void addInitParameter(String parameter, String value) {
+        initParameters.put(parameter, value);
+    }
+
+    public Map getInitParameters() {
+        return Collections.unmodifiableMap(initParameters);
+    }
+
+    public void addActionParameter(String name, String value) {
+    	actionParameters.add(new Parameter(name, value));
+    }
+
+    public List getActionParameters() {
+    	return actionParameters;
+    }
+
+    /**
+     * FIXME: why is this method required?
+     */
+    public void addRenderParameter(String name, String value) {
+    	renderParameters.add(new Parameter(name, value));
+    }
+
+    /**
+     * FIXME: when is this method used?
+     */
+    public List getRenderParameters() {
+    	return renderParameters;
+    }
+
+    public String toString() {
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append(getClass().getName());
+    	buffer.append("[").append(getName()).append("]");
+    	return buffer.toString();
+    }
+
+    public static class Parameter {
+    	private String name = null;
+    	private String value = null;
+    	public Parameter(String name, String value) {
+    		this.name = name;
+    		this.value = value;
+    	}
+
+    	public String getName() {
+    		return name;
+    	}
+    	public String getValue() {
+    		return value;
+    	}
+    }
+
+}
+

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java Thu Jul 26 14:22:10 2007
@@ -1,94 +1,94 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.digester.Digester;
-import org.xml.sax.SAXException;
-
-/**
- * Test configuration factory that reads and parses testsuite config file using
- * Digester and constructs <code>TestConfig</code> objects.
- *
- * @see TestConfig
- *
- */
-public class TestConfigFactory {
-
-	/** Digester instance used to parse testsuite config file. */
-    private Digester digester = new Digester();
-
-
-    // Constructor -------------------------------------------------------------
-
-    /**
-     * Creates a factory instance.
-     */
-    public TestConfigFactory() {
-        digester = new Digester();
-        digester.addObjectCreate("testportlet-config", ArrayList.class);
-
-
-        digester.addObjectCreate("testportlet-config/testsuite-config",
-                                 TestConfig.class);
-
-        digester.addBeanPropertySetter("testportlet-config/testsuite-config/name",
-                                       "name");
-        digester.addBeanPropertySetter("testportlet-config/testsuite-config/class",
-                                       "testClassName");
-        digester.addBeanPropertySetter("testportlet-config/testsuite-config/display-uri",
-                                       "displayURI");
-
-        digester.addCallMethod("testportlet-config/testsuite-config/init-param", "addInitParameter", 2);
-        digester.addCallParam("testportlet-config/testsuite-config/init-param/name", 0);
-        digester.addCallParam("testportlet-config/testsuite-config/init-param/value", 1);
-
-        digester.addCallMethod("testportlet-config/testsuite-config/action-param", "addActionParameter", 2);
-        digester.addCallParam("testportlet-config/testsuite-config/action-param/name", 0);
-        digester.addCallParam("testportlet-config/testsuite-config/action-param/value", 1);
-
-        digester.addCallMethod("testportlet-config/testsuite-config/render-param", "addRenderParameter", 2);
-        digester.addCallParam("testportlet-config/testsuite-config/render-param/name", 0);
-        digester.addCallParam("testportlet-config/testsuite-config/render-param/value", 1);
-
-        digester.addSetRoot("testportlet-config/testsuite-config", "add");
-
-    }
-
-
-    // Public Methods ----------------------------------------------------------
-
-    /**
-     * Reads and parses testsuite config file, creates a list of
-     * <code>TestConfig</code> objects.
-     *
-     * @param in  the input stream of the testsuite config file.
-     * @return a list of <code>TestConfig</code> objects.
-     * @throws SAXException  if a parsing error occurs.
-     * @throws IOException  if an IO error occurs.
-     * @see TestConfig
-     */
-    public List createTestConfigs(InputStream in)
-    throws SAXException, IOException {
-        return (List) digester.parse(in);
-    }
-
-}
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.digester.Digester;
+import org.xml.sax.SAXException;
+
+/**
+ * Test configuration factory that reads and parses testsuite config file using
+ * Digester and constructs <code>TestConfig</code> objects.
+ *
+ * @see TestConfig
+ *
+ */
+public class TestConfigFactory {
+
+	/** Digester instance used to parse testsuite config file. */
+    private Digester digester = new Digester();
+
+
+    // Constructor -------------------------------------------------------------
+
+    /**
+     * Creates a factory instance.
+     */
+    public TestConfigFactory() {
+        digester = new Digester();
+        digester.addObjectCreate("testportlet-config", ArrayList.class);
+
+
+        digester.addObjectCreate("testportlet-config/testsuite-config",
+                                 TestConfig.class);
+
+        digester.addBeanPropertySetter("testportlet-config/testsuite-config/name",
+                                       "name");
+        digester.addBeanPropertySetter("testportlet-config/testsuite-config/class",
+                                       "testClassName");
+        digester.addBeanPropertySetter("testportlet-config/testsuite-config/display-uri",
+                                       "displayURI");
+
+        digester.addCallMethod("testportlet-config/testsuite-config/init-param", "addInitParameter", 2);
+        digester.addCallParam("testportlet-config/testsuite-config/init-param/name", 0);
+        digester.addCallParam("testportlet-config/testsuite-config/init-param/value", 1);
+
+        digester.addCallMethod("testportlet-config/testsuite-config/action-param", "addActionParameter", 2);
+        digester.addCallParam("testportlet-config/testsuite-config/action-param/name", 0);
+        digester.addCallParam("testportlet-config/testsuite-config/action-param/value", 1);
+
+        digester.addCallMethod("testportlet-config/testsuite-config/render-param", "addRenderParameter", 2);
+        digester.addCallParam("testportlet-config/testsuite-config/render-param/name", 0);
+        digester.addCallParam("testportlet-config/testsuite-config/render-param/value", 1);
+
+        digester.addSetRoot("testportlet-config/testsuite-config", "add");
+
+    }
+
+
+    // Public Methods ----------------------------------------------------------
+
+    /**
+     * Reads and parses testsuite config file, creates a list of
+     * <code>TestConfig</code> objects.
+     *
+     * @param in  the input stream of the testsuite config file.
+     * @return a list of <code>TestConfig</code> objects.
+     * @throws SAXException  if a parsing error occurs.
+     * @throws IOException  if an IO error occurs.
+     * @see TestConfig
+     */
+    public List createTestConfigs(InputStream in)
+    throws SAXException, IOException {
+        return (List) digester.parse(in);
+    }
+
+}

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java Thu Jul 26 14:22:10 2007
@@ -1,287 +1,287 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Pluto testsuite's test portlet.
- *
- * @see TestConfig
- * @see PortletTest
- * @version 1.0
- */
-public class TestPortlet extends GenericPortlet {
-
-	/** Internal logger. */
-	private static final Log LOG = LogFactory.getLog(TestPortlet.class);
-
-
-	// Private Member Variables ------------------------------------------------
-
-	/** List of test configurations. */
-    private List testConfigs;
-
-    /**
-     * Map of test instances: key is an integer ID (as a string), and value is
-     * the <code>PortletTest</code> instances.
-     */
-    private Map tests;
-
-
-    // GenericPortlet Impl -----------------------------------------------------
-
-    /**
-     * Initialize the test portlet. This method reads the testsuite's config
-     * files, constructs and initializes all <code>PortletTest</code> instances.
-     * @throws PortletException if fail to read the configuration file.
-     */
-    public void init() throws PortletException {
-
-    	// Get configuration file name.
-        String configFile = getInitParameter("config");
-        if (configFile == null) {
-            configFile = "/WEB-INF/testsuite-config.xml";
-        }
-
-        // Get configuration file as an input stream.
-        InputStream is = getPortletContext().getResourceAsStream(configFile);
-        if (is == null) {
-        	String message = "Testsuite configuration file not found.";
-        	LOG.error(message);
-        	throw new PortletException(message);
-        }
-
-        // Load PortletTest instances: constructing and initializing.
-        TestConfigFactory factory = new TestConfigFactory();
-        try {
-        	testConfigs = factory.createTestConfigs(is);
-            tests = new HashMap();
-            int i = 0;
-            for (Iterator it = testConfigs.iterator(); it.hasNext(); ) {
-                TestConfig testConfig = (TestConfig) it.next();
-                String name = testConfig.getTestClassName();
-                PortletTest test = null;
-                if (name != null) {
-                	if (LOG.isDebugEnabled()) {
-                		LOG.debug("Loading test: " + name);
-                	}
-                    Class clazz = Class.forName(testConfig.getTestClassName());
-                    test = (PortletTest) clazz.newInstance();
-                } else {
-                	if (LOG.isDebugEnabled()) {
-                		LOG.debug("Loading NoOpTest (test with no name).");
-                	}
-                    test = new NoOpTest();
-                }
-                test.init(testConfig);
-                tests.put(String.valueOf(i++), test);
-            }
-        } catch (Throwable th) {
-        	String message = "Unable to read testsuite configuration.";
-        	LOG.error(message, th);
-            throw new PortletException(message, th);
-        }
-    }
-
-
-    public void processAction(ActionRequest request, ActionResponse response)
-    throws PortletException, IOException {
-
-        String testId = getTestId(request);
-        PortletTest test = (PortletTest) tests.get(testId);
-
-        // For ActionTest, run test and save results in session.
-        if (test != null && test instanceof ActionTest) {
-            TestResults results = test.doTest(getPortletConfig(),
-                                              getPortletContext(),
-                                              request,
-                                              response);
-            PortletSession session = request.getPortletSession();
-            session.setAttribute(test.getClass().getName(), results);
-        }
-
-        Map renderParameters = null;
-        if (test != null) {
-            renderParameters = test.getRenderParameters(request);
-        }
-        if (renderParameters == null) {
-            renderParameters = new HashMap();
-        }
-        renderParameters.put("testId", new String[] { testId });
-        response.setRenderParameters(renderParameters);
-    }
-
-    /**
-     * Serves up the <code>view</code> mode.
-     * TODO: more javadoc.
-     *
-     * @param request  the protlet request.
-     * @param response  the portlet response.
-     */
-    public void doView(RenderRequest request, RenderResponse response)
-    throws PortletException, IOException {
-
-    	// Get the current test ID, the test instance and its config.
-        String testId = getTestId(request);
-        TestConfig testConfig = null;
-        PortletTest test = null;
-        if (testId != null) {
-        	testConfig = (TestConfig) testConfigs.get(Integer.parseInt(testId));
-        	test = (PortletTest) tests.get(testId);
-        }
-
-        // For non-ActionTest, run test and save results in request.
-        if (test != null && !(test instanceof ActionTest)) {
-            TestResults results = test.doTest(getPortletConfig(),
-                                              getPortletContext(),
-                                              request,
-                                              response);
-            request.setAttribute("results", results);
-        }
-        // For ActionTest, retrieve results from session and save in request.
-        else if (test != null) {
-            PortletSession session = request.getPortletSession();
-            TestResults results = (TestResults) session.getAttribute(
-            		test.getClass().getName());
-            request.setAttribute("results", results);
-        }
-
-
-        if (testId == null) {
-        	// FIXME: update attribute name from tests to testConfigs.
-            request.setAttribute("tests", testConfigs);
-        } else {
-            TestConfig nextTestConfig = null;
-            TestConfig prevTestConfig = null;
-            int index = testConfigs.indexOf(test.getConfig());
-            if (index == 0) {
-            	prevTestConfig = (TestConfig) testConfigs.get(testConfigs.size() - 1);
-                nextTestConfig = (TestConfig) testConfigs.get(index + 1);
-            } else if (index == testConfigs.size() - 1) {
-            	prevTestConfig = (TestConfig) testConfigs.get(index - 1);
-                nextTestConfig = (TestConfig) testConfigs.get(0);
-            } else {
-            	prevTestConfig = (TestConfig) testConfigs.get(index - 1);
-                nextTestConfig = (TestConfig) testConfigs.get(index + 1);
-            }
-            request.setAttribute("prevTest", prevTestConfig);
-            request.setAttribute("nextTest", nextTestConfig);
-        }
-
-        // Set content type for render response, and dispatch to JSP.
-        response.setContentType("text/html");
-        String displayUri = null;
-        if (testConfig != null) {
-        	displayUri = testConfig.getDisplayURI();
-        } else {
-        	displayUri = "/jsp/introduction.jsp";
-        }
-        PortletRequestDispatcher dispatcher = getPortletContext()
-        		.getRequestDispatcher(displayUri);
-        dispatcher.include(request, response);
-    }
-
-    /**
-     * Serves up the <code>edit</code> mode. This method dispatches the request
-     * and response to the edit JSP page (<code>/jsp/edit.jsp</code>).
-     * @param request  the portlet request.
-     * @param response  the portlet response.
-     */
-    protected void doEdit(RenderRequest request, RenderResponse response)
-    throws PortletException, IOException {
-        PortletRequestDispatcher dispatcher = getPortletContext()
-        		.getRequestDispatcher("/jsp/edit.jsp");
-        dispatcher.include(request, response);
-    }
-
-    /**
-     * Serves up the <code>help</code> mode. This method dispatches the request
-     * and response to the help JSP page (<code>/jsp/help.jsp</code>).
-     * @param request  the portlet request.
-     * @param response  the portlet response.
-     */
-    protected void doHelp(RenderRequest request, RenderResponse response)
-    throws PortletException, IOException {
-    	PortletRequestDispatcher dispatcher = getPortletContext()
-    			.getRequestDispatcher("/jsp/help.jsp");
-    	dispatcher.include(request, response);
-    }
-
-
-    // Private Methods ---------------------------------------------------------
-
-    /**
-     * Returns the current test ID.
-     * @param request  the portlet request.
-     * @return the current test ID.
-     */
-    private String getTestId(PortletRequest request) {
-
-    	String testId = request.getParameter("testId");
-        String prevTestId = request.getParameter("previousTestId");
-        String nextTestId = request.getParameter("nextTestId");
-
-        // If none of the parameters are available, return null.
-        if ((testId == null || testId.trim().length() == 0)
-        		&& nextTestId == null && prevTestId == null
-        		&& tests.size() > 0) {
-            return null;
-        }
-
-        // Retrieve the test which is next to the previous test.
-        else if (testId == null && prevTestId != null) {
-            int previousTestIdInt = Integer.parseInt(prevTestId);
-            if (previousTestIdInt >= testConfigs.size() - 1) {
-                testId = "0";
-            } else {
-                testId = String.valueOf(previousTestIdInt + 1);
-            }
-        }
-
-        // Retrieve the test which is previous to the next test.
-        else if (testId == null && nextTestId != null) {
-            int nextTestIdInt = Integer.parseInt(nextTestId);
-            if (nextTestIdInt <= 0) {
-                testId = String.valueOf(testConfigs.size()-1);
-            } else {
-                testId = String.valueOf(nextTestIdInt - 1);
-            }
-        }
-
-        // Return the current test ID.
-        return testId;
-    }
-}
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Pluto testsuite's test portlet.
+ *
+ * @see TestConfig
+ * @see PortletTest
+ * @version 1.0
+ */
+public class TestPortlet extends GenericPortlet {
+
+	/** Internal logger. */
+	private static final Log LOG = LogFactory.getLog(TestPortlet.class);
+
+
+	// Private Member Variables ------------------------------------------------
+
+	/** List of test configurations. */
+    private List testConfigs;
+
+    /**
+     * Map of test instances: key is an integer ID (as a string), and value is
+     * the <code>PortletTest</code> instances.
+     */
+    private Map tests;
+
+
+    // GenericPortlet Impl -----------------------------------------------------
+
+    /**
+     * Initialize the test portlet. This method reads the testsuite's config
+     * files, constructs and initializes all <code>PortletTest</code> instances.
+     * @throws PortletException if fail to read the configuration file.
+     */
+    public void init() throws PortletException {
+
+    	// Get configuration file name.
+        String configFile = getInitParameter("config");
+        if (configFile == null) {
+            configFile = "/WEB-INF/testsuite-config.xml";
+        }
+
+        // Get configuration file as an input stream.
+        InputStream is = getPortletContext().getResourceAsStream(configFile);
+        if (is == null) {
+        	String message = "Testsuite configuration file not found.";
+        	LOG.error(message);
+        	throw new PortletException(message);
+        }
+
+        // Load PortletTest instances: constructing and initializing.
+        TestConfigFactory factory = new TestConfigFactory();
+        try {
+        	testConfigs = factory.createTestConfigs(is);
+            tests = new HashMap();
+            int i = 0;
+            for (Iterator it = testConfigs.iterator(); it.hasNext(); ) {
+                TestConfig testConfig = (TestConfig) it.next();
+                String name = testConfig.getTestClassName();
+                PortletTest test = null;
+                if (name != null) {
+                	if (LOG.isDebugEnabled()) {
+                		LOG.debug("Loading test: " + name);
+                	}
+                    Class clazz = Class.forName(testConfig.getTestClassName());
+                    test = (PortletTest) clazz.newInstance();
+                } else {
+                	if (LOG.isDebugEnabled()) {
+                		LOG.debug("Loading NoOpTest (test with no name).");
+                	}
+                    test = new NoOpTest();
+                }
+                test.init(testConfig);
+                tests.put(String.valueOf(i++), test);
+            }
+        } catch (Throwable th) {
+        	String message = "Unable to read testsuite configuration.";
+        	LOG.error(message, th);
+            throw new PortletException(message, th);
+        }
+    }
+
+
+    public void processAction(ActionRequest request, ActionResponse response)
+    throws PortletException, IOException {
+
+        String testId = getTestId(request);
+        PortletTest test = (PortletTest) tests.get(testId);
+
+        // For ActionTest, run test and save results in session.
+        if (test != null && test instanceof ActionTest) {
+            TestResults results = test.doTest(getPortletConfig(),
+                                              getPortletContext(),
+                                              request,
+                                              response);
+            PortletSession session = request.getPortletSession();
+            session.setAttribute(test.getClass().getName(), results);
+        }
+
+        Map renderParameters = null;
+        if (test != null) {
+            renderParameters = test.getRenderParameters(request);
+        }
+        if (renderParameters == null) {
+            renderParameters = new HashMap();
+        }
+        renderParameters.put("testId", new String[] { testId });
+        response.setRenderParameters(renderParameters);
+    }
+
+    /**
+     * Serves up the <code>view</code> mode.
+     * TODO: more javadoc.
+     *
+     * @param request  the protlet request.
+     * @param response  the portlet response.
+     */
+    public void doView(RenderRequest request, RenderResponse response)
+    throws PortletException, IOException {
+
+    	// Get the current test ID, the test instance and its config.
+        String testId = getTestId(request);
+        TestConfig testConfig = null;
+        PortletTest test = null;
+        if (testId != null) {
+        	testConfig = (TestConfig) testConfigs.get(Integer.parseInt(testId));
+        	test = (PortletTest) tests.get(testId);
+        }
+
+        // For non-ActionTest, run test and save results in request.
+        if (test != null && !(test instanceof ActionTest)) {
+            TestResults results = test.doTest(getPortletConfig(),
+                                              getPortletContext(),
+                                              request,
+                                              response);
+            request.setAttribute("results", results);
+        }
+        // For ActionTest, retrieve results from session and save in request.
+        else if (test != null) {
+            PortletSession session = request.getPortletSession();
+            TestResults results = (TestResults) session.getAttribute(
+            		test.getClass().getName());
+            request.setAttribute("results", results);
+        }
+
+
+        if (testId == null) {
+        	// FIXME: update attribute name from tests to testConfigs.
+            request.setAttribute("tests", testConfigs);
+        } else {
+            TestConfig nextTestConfig = null;
+            TestConfig prevTestConfig = null;
+            int index = testConfigs.indexOf(test.getConfig());
+            if (index == 0) {
+            	prevTestConfig = (TestConfig) testConfigs.get(testConfigs.size() - 1);
+                nextTestConfig = (TestConfig) testConfigs.get(index + 1);
+            } else if (index == testConfigs.size() - 1) {
+            	prevTestConfig = (TestConfig) testConfigs.get(index - 1);
+                nextTestConfig = (TestConfig) testConfigs.get(0);
+            } else {
+            	prevTestConfig = (TestConfig) testConfigs.get(index - 1);
+                nextTestConfig = (TestConfig) testConfigs.get(index + 1);
+            }
+            request.setAttribute("prevTest", prevTestConfig);
+            request.setAttribute("nextTest", nextTestConfig);
+        }
+
+        // Set content type for render response, and dispatch to JSP.
+        response.setContentType("text/html");
+        String displayUri = null;
+        if (testConfig != null) {
+        	displayUri = testConfig.getDisplayURI();
+        } else {
+        	displayUri = "/jsp/introduction.jsp";
+        }
+        PortletRequestDispatcher dispatcher = getPortletContext()
+        		.getRequestDispatcher(displayUri);
+        dispatcher.include(request, response);
+    }
+
+    /**
+     * Serves up the <code>edit</code> mode. This method dispatches the request
+     * and response to the edit JSP page (<code>/jsp/edit.jsp</code>).
+     * @param request  the portlet request.
+     * @param response  the portlet response.
+     */
+    protected void doEdit(RenderRequest request, RenderResponse response)
+    throws PortletException, IOException {
+        PortletRequestDispatcher dispatcher = getPortletContext()
+        		.getRequestDispatcher("/jsp/edit.jsp");
+        dispatcher.include(request, response);
+    }
+
+    /**
+     * Serves up the <code>help</code> mode. This method dispatches the request
+     * and response to the help JSP page (<code>/jsp/help.jsp</code>).
+     * @param request  the portlet request.
+     * @param response  the portlet response.
+     */
+    protected void doHelp(RenderRequest request, RenderResponse response)
+    throws PortletException, IOException {
+    	PortletRequestDispatcher dispatcher = getPortletContext()
+    			.getRequestDispatcher("/jsp/help.jsp");
+    	dispatcher.include(request, response);
+    }
+
+
+    // Private Methods ---------------------------------------------------------
+
+    /**
+     * Returns the current test ID.
+     * @param request  the portlet request.
+     * @return the current test ID.
+     */
+    private String getTestId(PortletRequest request) {
+
+    	String testId = request.getParameter("testId");
+        String prevTestId = request.getParameter("previousTestId");
+        String nextTestId = request.getParameter("nextTestId");
+
+        // If none of the parameters are available, return null.
+        if ((testId == null || testId.trim().length() == 0)
+        		&& nextTestId == null && prevTestId == null
+        		&& tests.size() > 0) {
+            return null;
+        }
+
+        // Retrieve the test which is next to the previous test.
+        else if (testId == null && prevTestId != null) {
+            int previousTestIdInt = Integer.parseInt(prevTestId);
+            if (previousTestIdInt >= testConfigs.size() - 1) {
+                testId = "0";
+            } else {
+                testId = String.valueOf(previousTestIdInt + 1);
+            }
+        }
+
+        // Retrieve the test which is previous to the next test.
+        else if (testId == null && nextTestId != null) {
+            int nextTestIdInt = Integer.parseInt(nextTestId);
+            if (nextTestIdInt <= 0) {
+                testId = String.valueOf(testConfigs.size()-1);
+            } else {
+                testId = String.valueOf(nextTestIdInt - 1);
+            }
+        }
+
+        // Return the current test ID.
+        return testId;
+    }
+}

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java (original)
+++ geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java Thu Jul 26 14:22:10 2007
@@ -1,128 +1,128 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You 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.
- */
-package org.apache.pluto.testsuite;
-
-import java.io.Serializable;
-
-/**
- * The test result represents the result of one test method.
- *
- */
-public class TestResult implements Serializable {
-
-	/** The undefined return code. */
-	public static final int UNDEFINED = -1;
-
-	/** The warning return code. */
-	public static final int WARNING = 0;
-
-	/** The failed return code. */
-	public static final int FAILED = 1;
-
-	/** The passed return code. */
-	public static final int PASSED = 2;
-
-
-    // Private Member Variables ------------------------------------------------
-
-    /** The name of the test. */
-    private String name;
-
-    /** The description of the test. */
-    private String description = "[unknown]";
-
-    /** The PLT number in the spec that is tested. */
-    private String specPLT = "[unknown]";
-
-    /** The return code of the test result: PASSED, WARNING, FAILED. */
-    private int returnCode = UNDEFINED;
-
-    /** The message of the test result. */
-    private String resultMessage ="[unknown]";
-
-
-    // Public Methods ----------------------------------------------------------
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-    	return description;
-    }
-
-    public void setDescription(String description) {
-    	this.description = description;
-    }
-
-    public String getSpecPLT() {
-    	return specPLT;
-    }
-
-    public void setSpecPLT(String specPLT) {
-    	this.specPLT = specPLT;
-    }
-
-    public int getReturnCode() {
-        return returnCode;
-    }
-
-    public String getReturnCodeAsString() {
-    	if (returnCode == WARNING) {
-    		return "WARNING";
-    	} else if (returnCode == FAILED) {
-    		return "FAILED";
-    	} else if (returnCode == PASSED) {
-    		return "PASSED";
-    	} else {
-    		return "UNKNOWN RETURN CODE";
-    	}
-    }
-
-    public void setReturnCode(int returnCode) {
-        this.returnCode = returnCode;
-    }
-
-    public String getResultMessage() {
-    	return resultMessage;
-    }
-
-    public void setResultMessage(String resultMessage) {
-    	this.resultMessage = resultMessage;
-    }
-
-
-    // Object Methods ----------------------------------------------------------
-
-    /**
-     * Override of toString() that prints out name and results values.
-     * @see java.lang.Object#toString()
-     */
-    public String toString(){
-    	StringBuffer buffer = new StringBuffer();
-    	buffer.append(getClass().getName());
-    	buffer.append("[name=").append(name);
-    	buffer.append(";returnCode=").append(returnCode);
-    	buffer.append(";resultMessage=").append(resultMessage).append("]");
-    	return buffer.toString();
-    }
-
-}
+ * 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.
+ */
+package org.apache.pluto.testsuite;
+
+import java.io.Serializable;
+
+/**
+ * The test result represents the result of one test method.
+ *
+ */
+public class TestResult implements Serializable {
+
+	/** The undefined return code. */
+	public static final int UNDEFINED = -1;
+
+	/** The warning return code. */
+	public static final int WARNING = 0;
+
+	/** The failed return code. */
+	public static final int FAILED = 1;
+
+	/** The passed return code. */
+	public static final int PASSED = 2;
+
+
+    // Private Member Variables ------------------------------------------------
+
+    /** The name of the test. */
+    private String name;
+
+    /** The description of the test. */
+    private String description = "[unknown]";
+
+    /** The PLT number in the spec that is tested. */
+    private String specPLT = "[unknown]";
+
+    /** The return code of the test result: PASSED, WARNING, FAILED. */
+    private int returnCode = UNDEFINED;
+
+    /** The message of the test result. */
+    private String resultMessage ="[unknown]";
+
+
+    // Public Methods ----------------------------------------------------------
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+    	return description;
+    }
+
+    public void setDescription(String description) {
+    	this.description = description;
+    }
+
+    public String getSpecPLT() {
+    	return specPLT;
+    }
+
+    public void setSpecPLT(String specPLT) {
+    	this.specPLT = specPLT;
+    }
+
+    public int getReturnCode() {
+        return returnCode;
+    }
+
+    public String getReturnCodeAsString() {
+    	if (returnCode == WARNING) {
+    		return "WARNING";
+    	} else if (returnCode == FAILED) {
+    		return "FAILED";
+    	} else if (returnCode == PASSED) {
+    		return "PASSED";
+    	} else {
+    		return "UNKNOWN RETURN CODE";
+    	}
+    }
+
+    public void setReturnCode(int returnCode) {
+        this.returnCode = returnCode;
+    }
+
+    public String getResultMessage() {
+    	return resultMessage;
+    }
+
+    public void setResultMessage(String resultMessage) {
+    	this.resultMessage = resultMessage;
+    }
+
+
+    // Object Methods ----------------------------------------------------------
+
+    /**
+     * Override of toString() that prints out name and results values.
+     * @see java.lang.Object#toString()
+     */
+    public String toString(){
+    	StringBuffer buffer = new StringBuffer();
+    	buffer.append(getClass().getName());
+    	buffer.append("[name=").append(name);
+    	buffer.append(";returnCode=").append(returnCode);
+    	buffer.append(";resultMessage=").append(resultMessage).append("]");
+    	return buffer.toString();
+    }
+
+}

Propchange: geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message