geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r559986 [1/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
Author: jbohn
Date: Thu Jul 26 14:22:10 2007
New Revision: 559986

URL: http://svn.apache.org/viewvc?view=rev&rev=559986
Log:
more fixes for eol and other properties

Modified:
    geronimo/sandbox/portals/pluto-portal/src/assemble/bin.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/assemble/config/pluto-docs.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/resources/server.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.js   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/portlet-spec-1.0.css   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/test_session.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-portal/src/site/site.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/assemble/bin.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/ActionTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/InvalidConfigurationException.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/NoOpTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/PortletTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfig.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestPortlet.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResult.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestResults.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestUtils.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AbstractReflectivePortletTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/ActionParameterTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/AppScopedSessionAttributeTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/ContextInitParameterTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRenderParameterTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/DispatcherRequestTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/ExpectedResults.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/ExternalAppScopedAttributeTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/MiscTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceCommonTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInActionTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/PreferenceInRenderTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderParameterTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/RenderResponseNoContentTypeTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/ResourceBundleTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SecurityMappingTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SessionTimeoutTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SimpleAttributeTest.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl2.java   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/resources/testsuite.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/classes/TestPortlet.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/classes/TestPortlet_de.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/classes/TestPortlet_en.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/classes/logging.properties   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/portlet.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-2-config.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/testsuite-config.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/WEB-INF/web.xml   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/index.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/ExternalAppScopedAttributeTest_companion.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/edit.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/help.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/introduction.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/portlet_mode_test.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test4.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/test_results.jsp   (contents, props changed)
    geronimo/sandbox/portals/pluto-testsuite/src/main/webapp/jsp/window_state_test.jsp   (contents, props changed)

Modified: geronimo/sandbox/portals/pluto-portal/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/assemble/bin.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/assemble/bin.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/assemble/bin.xml Thu Jul 26 14:22:10 2007
@@ -1,57 +1,57 @@
-<!--
+<!--
   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.
--->
-<!--
-To manually build this distribution:
-	1. Download Tomcat 5.5.9 and unpack it into the root drive of your machine.
-	2. Add pluto user in pluto role to Tomcat's conf/tomcat-users.xml
-	3. Add emptySessionPath="true" to Tomcat's conf/server.xml.
-	4. Run mvn clean followed by mvn install from the root dir.
-	5. Run mvn pluto:install -DinstallDir=/jakarta-tomcat-5.5.9 from the root dir.
-	6. Run mvn site:site to build web site from the pluto-portal dir.
-	7. Run mvn assembly:assembly from the pluto-portal dir to create the archives.
--->
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>../</directory>	
-	  <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-      </includes>
-    </fileSet>
-
-    <fileSet>
-      <directory>target/tomcat</directory>
-      <outputDirectory></outputDirectory>
-    </fileSet>
-
-    <fileSet>
-      <directory>../pluto-site/target/site</directory>
-	  <outputDirectory>webapps/ROOT</outputDirectory>
-    </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.
+-->
+<!--
+To manually build this distribution:
+	1. Download Tomcat 5.5.9 and unpack it into the root drive of your machine.
+	2. Add pluto user in pluto role to Tomcat's conf/tomcat-users.xml
+	3. Add emptySessionPath="true" to Tomcat's conf/server.xml.
+	4. Run mvn clean followed by mvn install from the root dir.
+	5. Run mvn pluto:install -DinstallDir=/jakarta-tomcat-5.5.9 from the root dir.
+	6. Run mvn site:site to build web site from the pluto-portal dir.
+	7. Run mvn assembly:assembly from the pluto-portal dir to create the archives.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../</directory>	
+	  <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>target/tomcat</directory>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+
+    <fileSet>
+      <directory>../pluto-site/target/site</directory>
+	  <outputDirectory>webapps/ROOT</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+  </dependencySets>
+</assembly>

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

Modified: geronimo/sandbox/portals/pluto-portal/src/assemble/config/pluto-docs.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/assemble/config/pluto-docs.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/assemble/config/pluto-docs.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/assemble/config/pluto-docs.xml Thu Jul 26 14:22:10 2007
@@ -1,17 +1,17 @@
-<!--
+<!--
   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.
--->
-<Context path="/" docBase="..\PlutoDomain\docs" crossContext="false"></Context>
+  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.
+-->
+<Context path="/" docBase="..\PlutoDomain\docs" crossContext="false"></Context>

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

Modified: geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto.xml 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.
--->
-<Context path="/pluto" docBase="pluto-portal.war" crossContext="true">
-</Context>
+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.
+-->
+<Context path="/pluto" docBase="pluto-portal.war" crossContext="true">
+</Context>

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

Modified: geronimo/sandbox/portals/pluto-portal/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/resources/server.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/resources/server.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/resources/server.xml Thu Jul 26 14:22:10 2007
@@ -1,19 +1,19 @@
-<!--
+<!--
   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.
--->
+  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.
+-->
 <!-- Pluto ResourceConfig File -->
 
 <Server port="8005" shutdown="SHUTDOWN">

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

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties Thu Jul 26 14:22:10 2007
@@ -1,28 +1,28 @@
-#
+#
 # 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.
-#
-
-#AdminPortlet.properties
-
-#URL to the war deployer for this app server.
-#Tomcat's manager app is located at /manager/html
-#and requires that the logged in user is in the manager role.
-appserver.deployer.url=/manager/html/
-#Page in /WEB-INF/fragments/admin/page/ containing
-#  help on using the app server's deployer, which is
-#  displayed in the help mode. Help file for
-#  Tomcat is TomcatDeploymentHelp.jsp  
+# 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.
+#
+
+#AdminPortlet.properties
+
+#URL to the war deployer for this app server.
+#Tomcat's manager app is located at /manager/html
+#and requires that the logged in user is in the manager role.
+appserver.deployer.url=/manager/html/
+#Page in /WEB-INF/fragments/admin/page/ containing
+#  help on using the app server's deployer, which is
+#  displayed in the help mode. Help file for
+#  Tomcat is TomcatDeploymentHelp.jsp  
 appserver.deployer.help.page=TomcatDeploymentHelp.jsp

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/AdminPortlet.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties Thu Jul 26 14:22:10 2007
@@ -1,36 +1,36 @@
-# 
+# 
 # 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.
-
-handlers = org.apache.juli.FileHandler
-
-############################################################
-#
-# JDK 1.4+ logging handler specific properties for Pluto portal
-# using Tomcat's custom implementation of LogManager.
-# Logging level can be set to any one of:
-# SEVERE, WARN, INFO, CONFIG, FINE, FINEST or ALL. 
-# See the Tomcat documentation for more details.
-# 
-############################################################
-
-org.apache.juli.FileHandler.level = FINE
-org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-#Log file will be named pluto.<yyyy-mm-dd>.log
-org.apache.juli.FileHandler.prefix = pluto.
-
+# 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.
+
+handlers = org.apache.juli.FileHandler
+
+############################################################
+#
+# JDK 1.4+ logging handler specific properties for Pluto portal
+# using Tomcat's custom implementation of LogManager.
+# Logging level can be set to any one of:
+# SEVERE, WARN, INFO, CONFIG, FINE, FINEST or ALL. 
+# See the Tomcat documentation for more details.
+# 
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+#Log file will be named pluto.<yyyy-mm-dd>.log
+org.apache.juli.FileHandler.prefix = pluto.
+
 org.apache.pluto.level=FINE

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp Thu Jul 26 14:22:10 2007
@@ -1,21 +1,21 @@
-<%--
+<%--
 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.
---%>
-
-THIS IS THE EDIT PAGE
-
+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.
+--%>
+
+THIS IS THE EDIT PAGE
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp Thu Jul 26 14:22:10 2007
@@ -1,21 +1,21 @@
-<%--
+<%--
 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.
---%>
-
-THIS IS THE HELP PAGE
-
+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.
+--%>
+
+THIS IS THE HELP PAGE
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp Thu Jul 26 14:22:10 2007
@@ -1,70 +1,70 @@
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<%--
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<%--
 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.
---%>
-
-<!-- Pluto about portlet fragment (displayed in VIEW mode). -->
-
-<table>
-  
-  <tr>
-    <td colspan="2"><h2>About Pluto Portal Driver</h2></td>
-  </tr>
-  
-  <tr>
-    <td>Portal Name:</td>
-    <td><c:out value="${driverConfig.portalName}"/></td>
-  </tr>
-  <tr>
-    <td>Portal Version:</td>
-    <td><c:out value="${driverConfig.portalVersion}"/></td>
-  </tr>
-  <tr>
-    <td>Servlet Container:</td>
-    <td><%= config.getServletContext().getServerInfo() %></td>
-  </tr>
-  <tr>
-    <td>Java Version:</td>
-    <td><%= System.getProperty("java.version") %>  (<%= System.getProperty("java.vm.vendor") %> - <%= System.getProperty("java.vm.name") %> build <%= System.getProperty("java.vm.version") %>)</td>
-  </tr>
-  <tr>
-    <td>Operating System:</td>
-    <td><%= System.getProperty("os.name") %>  (<%= System.getProperty("os.arch") %> version <%= System.getProperty("os.version") %>)</td>
-  </tr>
-  <tr>
-    <td>Pluto Website:</td>
-    <td>
-      <a href="http://portals.apache.org/pluto/" target="_blank">
-        http://portals.apache.org/pluto/
-      </a>
-    </td>
-  </tr>
-  
-  <tr>
-    <td colspan="2">
-      <i>Please use the <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10560" target="_blank">
-      Jira issue tracking site</a> to record any problems you are having with
-      the Pluto portal driver. When you report an issue, please include the data (version, os, etc.) collected in 
-      this portlet in addition to any relevant stack traces or log records and detailed steps on what you were doing when 
-      the problem arose.</i>
-    </td>
-  </tr>
-  
-</table>
-
+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.
+--%>
+
+<!-- Pluto about portlet fragment (displayed in VIEW mode). -->
+
+<table>
+  
+  <tr>
+    <td colspan="2"><h2>About Pluto Portal Driver</h2></td>
+  </tr>
+  
+  <tr>
+    <td>Portal Name:</td>
+    <td><c:out value="${driverConfig.portalName}"/></td>
+  </tr>
+  <tr>
+    <td>Portal Version:</td>
+    <td><c:out value="${driverConfig.portalVersion}"/></td>
+  </tr>
+  <tr>
+    <td>Servlet Container:</td>
+    <td><%= config.getServletContext().getServerInfo() %></td>
+  </tr>
+  <tr>
+    <td>Java Version:</td>
+    <td><%= System.getProperty("java.version") %>  (<%= System.getProperty("java.vm.vendor") %> - <%= System.getProperty("java.vm.name") %> build <%= System.getProperty("java.vm.version") %>)</td>
+  </tr>
+  <tr>
+    <td>Operating System:</td>
+    <td><%= System.getProperty("os.name") %>  (<%= System.getProperty("os.arch") %> version <%= System.getProperty("os.version") %>)</td>
+  </tr>
+  <tr>
+    <td>Pluto Website:</td>
+    <td>
+      <a href="http://portals.apache.org/pluto/" target="_blank">
+        http://portals.apache.org/pluto/
+      </a>
+    </td>
+  </tr>
+  
+  <tr>
+    <td colspan="2">
+      <i>Please use the <a href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10560" target="_blank">
+      Jira issue tracking site</a> to record any problems you are having with
+      the Pluto portal driver. When you report an issue, please include the data (version, os, etc.) collected in 
+      this portlet in addition to any relevant stack traces or log records and detailed steps on what you were doing when 
+      the problem arose.</i>
+    </td>
+  </tr>
+  
+</table>
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp Thu Jul 26 14:22:10 2007
@@ -1,21 +1,21 @@
-<%--
+<%--
 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.
---%>
-
-THIS IS THE EDIT PAGE
-
+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.
+--%>
+
+THIS IS THE EDIT PAGE
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp Thu Jul 26 14:22:10 2007
@@ -1,21 +1,21 @@
-<%--
+<%--
 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.
---%>
-
-THIS IS THE HELP PAGE
-
+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.
+--%>
+
+THIS IS THE HELP PAGE
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp Thu Jul 26 14:22:10 2007
@@ -1,77 +1,77 @@
-<%--
+<%--
 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.
---%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-
-<div class="portlet-section-header">Deploying Portlet Applications in Tomcat</div>
-
-<div class="portlet-section-subheader">Adding New Portlets to a Portal Page</div>
-
-<p class="portlet-font">
-The Page Administrator Portlet works with deployed portlet applications. This deployment can be done via the Pluto 
-Maven plugin or Ant task. Alternately, you can deploy the war using the 'Upload and deploy portlet war' 
-link on the bottom of the Page Administrator Portlet that points to the app server's war deployer application. 
-Clicking on that link opens up a new browser window, so you should disable any popup blockers for this page.
-</p>
-
-<div class="portlet-section-subheader">Uploading and deploying using Tomcat's Manager Application</div>
-<p class="portlet-font">
-The binary distribution of Pluto is built on Tomcat. Tomcat'’s deployer application is the manager application. 
-Use that application to upload and deploy the war. A properly deployed portlet on Tomcat requires that the war 
-have a context.xml file in META-INF containing a Context element and the crossContext attribute set to true 
-like this:<br/>
-&lt;Context path="HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"&gt;
-</p>
-
-<p class="portlet-font">
-The logged in user also needs to have a manager role also, 
-which is configured in conf/tomcat-users.xml. In the binary distribution, the tomcat and pluto users have the manager 
-role already set.  
-</p>
-<p class="portlet-font">
-When the portlet application has been deployed, restart Pluto and use the Page Administrator Portlet to add the new portlet to a page. 
-If you want to put the portlet on a new page, you must do so by manually adding a page element as a child of the 
-render-config element in pluto-portal-driver-config.xml before you restart Pluto. See the Help mode for more details
-on doing this process.
-</p>
-
-<div class="portlet-section-subheader">Deployment in Another Application Server</div>
-<p class="portlet-font">
-	The 'Upload and deploy portlet war' link can be changed to an appropriate administrative page when Pluto
-	is deployed inside another (non-Tomcat) app server. This is done by changing the appserver.deployer.url property
-	inside AdminPortlet.properties located in the WEB-INF/classes directory to point to the URL of an appropriate administrative
-	page. The 'Help' link can also be changed to another help page using the appserver.deployer.help.page property. 
-	That help file needs to reside in this directory (WEB-INF/fragments/admin/page).
-</p>
-
-
-<fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
-</fmt:bundle> 
-
-<p class="portlet-font">
-<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
-</p>
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
-</p>
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="help"/>'>Page Administrator Portlet Help</a> 
-</p>
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<div class="portlet-section-header">Deploying Portlet Applications in Tomcat</div>
+
+<div class="portlet-section-subheader">Adding New Portlets to a Portal Page</div>
+
+<p class="portlet-font">
+The Page Administrator Portlet works with deployed portlet applications. This deployment can be done via the Pluto 
+Maven plugin or Ant task. Alternately, you can deploy the war using the 'Upload and deploy portlet war' 
+link on the bottom of the Page Administrator Portlet that points to the app server's war deployer application. 
+Clicking on that link opens up a new browser window, so you should disable any popup blockers for this page.
+</p>
+
+<div class="portlet-section-subheader">Uploading and deploying using Tomcat's Manager Application</div>
+<p class="portlet-font">
+The binary distribution of Pluto is built on Tomcat. Tomcat'’s deployer application is the manager application. 
+Use that application to upload and deploy the war. A properly deployed portlet on Tomcat requires that the war 
+have a context.xml file in META-INF containing a Context element and the crossContext attribute set to true 
+like this:<br/>
+&lt;Context path="HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"&gt;
+</p>
+
+<p class="portlet-font">
+The logged in user also needs to have a manager role also, 
+which is configured in conf/tomcat-users.xml. In the binary distribution, the tomcat and pluto users have the manager 
+role already set.  
+</p>
+<p class="portlet-font">
+When the portlet application has been deployed, restart Pluto and use the Page Administrator Portlet to add the new portlet to a page. 
+If you want to put the portlet on a new page, you must do so by manually adding a page element as a child of the 
+render-config element in pluto-portal-driver-config.xml before you restart Pluto. See the Help mode for more details
+on doing this process.
+</p>
+
+<div class="portlet-section-subheader">Deployment in Another Application Server</div>
+<p class="portlet-font">
+	The 'Upload and deploy portlet war' link can be changed to an appropriate administrative page when Pluto
+	is deployed inside another (non-Tomcat) app server. This is done by changing the appserver.deployer.url property
+	inside AdminPortlet.properties located in the WEB-INF/classes directory to point to the URL of an appropriate administrative
+	page. The 'Help' link can also be changed to another help page using the appserver.deployer.help.page property. 
+	That help file needs to reside in this directory (WEB-INF/fragments/admin/page).
+</p>
+
+
+<fmt:bundle basename="AdminPortlet">
+	<fmt:message key="appserver.deployer.url" var="deployerURL"/>
+</fmt:bundle> 
+
+<p class="portlet-font">
+<a href='<c:out value="${deployerURL}"/>' target="_blank">Upload and deploy a new portlet war</a> 
+</p>
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
+</p>
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="help"/>'>Page Administrator Portlet Help</a> 
+</p>

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/TomcatDeploymentHelp.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp Thu Jul 26 14:22:10 2007
@@ -1,114 +1,114 @@
-<%--
+<%--
 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.
---%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-
-<div class="portlet-section-header">Page Adminstrator Portlet Help</div>
-
-<p class="portlet-font">
-The Page Administrator Portlet is used to add and remove portlets from portal pages. The current
-version of this application does not deploy the portlet application war or persist page
-configurations that are held in pluto-portal-driver-config.xml.
-</p>
-
-<div class="portlet-section-subheader">Configuring a Portlet Application</div>
-<p class="portlet-font">
-The portlet application needs to be bundled in a war file as per the Java Portlet Specification. 
-The war also needs to include proper PortletServlet servlet and servlet-mapping records in WEB-INF/web.xml.
-An assembly process has been developed to add these records to web.xml using Maven 2 (the
-pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask). 
-See the testsuite web.xml file for an example how the servlet and servlet-mapping
-records should look like after assembly (other items the developer adds to web.xml should be 
-carried forward into the updated file). 
-</p>
-
-<p class="portlet-font">
-A custom portlet war deployed into the bundled distribution of Pluto also needs a Tomcat context descriptor 
-with the same name as the portlet app war name (a.k.a. context name). This context file needs to be 
-in the META-INF directory of the war file. Here's an example of one for a portlet bundled for a 
-HelloWorldPortlet context (file name is HelloWorldPortlet.xml): 
-<pre>
-&lt;Context path="/HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"/&gt; 
-</pre>  
-The crossContext attribute allows Pluto, which is deployed in its own Tomcat context, to work with this custom portlet. 
-</p>
-
-<div class="portlet-section-subheader">Deploying a Portlet Application</div>
-<p class="portlet-font">
-	The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
-	Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
-	war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
-	the manager app	in the bundled distribution (this link can be changed for other app servers -- see the 
-	adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's 
-    webapp directory.
-</p>
-
-<div class="portlet-section-subheader">Adding Portlets to a Portal Pages</div>
-<p class="portlet-font">
-Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal 
-page using the Portal Pages drop-down and then selecting a portlet application using the Portlet Applications 
-drop-down and finally a portlet in the adjacent drop down. When this is done, click the Add Portlet button.
-</p>
-
-<div class="portlet-section-subheader">Removing Portal Pages</div>
-<p class="portlet-font">
-Removing portlets from a portal page involves selecting a portal page using the Portal Pages drop-down, selecting
-the portlet in the adjacent list and then clicking on the Remove Page button.
-</p>
-
-
-<div class="portlet-section-subheader">Manually Updating the Configuration File</div>
-<p class="portlet-font">
-The Page Administrator Portlet does not persist any portlet additions or portal page removals to 
-the pluto-portal-driver-config.xml file. This must be done manually in the config file. Removal of portlets
-from pages must also be done manually in pluto-portal-driver-config.xml.
-</p>
-
-<p class="portlet-font">
-To manually add a portlet to a page in pluto-portal-driver-config.xml, a portlet child element must be added to the 
-page element, which is a child of render-config. This element should look like this:
-<pre>
-&lt;portlet context="/HelloWorldPortlet" name="HelloWorldPortlet"/&gt;
-</pre>
-</p>
-
-<p class="portlet-font">
-New portal pages can be created by adding a page element under render-config in pluto-portal-driver-config.xml. 
-The uri attribute of the page element points to a JSP page that will contain a portlet (or portlets) defined in 
-its child (or children) portlet element(s). The default 'theme' lays out the portlets in two columns 
-(see WEB-INF\themes\pluto-default-theme.jsp in the pluto webapp for details). 
-</p>
-
-
-<%-- Properties for link to app server deployer and help mode file --%>
-<fmt:bundle basename="AdminPortlet">
-	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
-</fmt:bundle> 
-<portlet:renderURL portletMode="help" var="deployerhelpURL">
-	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
-</portlet:renderURL>
-
-<p class="portlet-font">
-<a href='<c:out value="${deployerhelpURL}"/>'>Upload and Deployment in App Server Help</a>
-</p>
-
-<p class="portlet-font">
-<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
-</p>
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+
+<div class="portlet-section-header">Page Adminstrator Portlet Help</div>
+
+<p class="portlet-font">
+The Page Administrator Portlet is used to add and remove portlets from portal pages. The current
+version of this application does not deploy the portlet application war or persist page
+configurations that are held in pluto-portal-driver-config.xml.
+</p>
+
+<div class="portlet-section-subheader">Configuring a Portlet Application</div>
+<p class="portlet-font">
+The portlet application needs to be bundled in a war file as per the Java Portlet Specification. 
+The war also needs to include proper PortletServlet servlet and servlet-mapping records in WEB-INF/web.xml.
+An assembly process has been developed to add these records to web.xml using Maven 2 (the
+pluto:assemble goal in maven-pluto-plugin) or Ant (AssembleTask). 
+See the testsuite web.xml file for an example how the servlet and servlet-mapping
+records should look like after assembly (other items the developer adds to web.xml should be 
+carried forward into the updated file). 
+</p>
+
+<p class="portlet-font">
+A custom portlet war deployed into the bundled distribution of Pluto also needs a Tomcat context descriptor 
+with the same name as the portlet app war name (a.k.a. context name). This context file needs to be 
+in the META-INF directory of the war file. Here's an example of one for a portlet bundled for a 
+HelloWorldPortlet context (file name is HelloWorldPortlet.xml): 
+<pre>
+&lt;Context path="/HelloWorldPortlet" docBase="HelloWorldPortlet" crossContext="true"/&gt; 
+</pre>  
+The crossContext attribute allows Pluto, which is deployed in its own Tomcat context, to work with this custom portlet. 
+</p>
+
+<div class="portlet-section-subheader">Deploying a Portlet Application</div>
+<p class="portlet-font">
+	The way to deploy a portlet application depends on the app server Pluto is running in. In the bundled distribution
+	Pluto is deployed in Tomcat. In this case, you can use the Tomcat manager app to deploy the portlet
+	war. There is a 'Upload and deploy portlet war' link at the bottom of the Page Administrator portlet that points to 
+	the manager app	in the bundled distribution (this link can be changed for other app servers -- see the 
+	adjacent Help link). In the bundled distribution of Pluto, you can also simply drop the portlet application war into Tomcat's 
+    webapp directory.
+</p>
+
+<div class="portlet-section-subheader">Adding Portlets to a Portal Pages</div>
+<p class="portlet-font">
+Adding portlets to a portal page using the Pluto Page Administrator portlet involves first selecting a portal 
+page using the Portal Pages drop-down and then selecting a portlet application using the Portlet Applications 
+drop-down and finally a portlet in the adjacent drop down. When this is done, click the Add Portlet button.
+</p>
+
+<div class="portlet-section-subheader">Removing Portal Pages</div>
+<p class="portlet-font">
+Removing portlets from a portal page involves selecting a portal page using the Portal Pages drop-down, selecting
+the portlet in the adjacent list and then clicking on the Remove Page button.
+</p>
+
+
+<div class="portlet-section-subheader">Manually Updating the Configuration File</div>
+<p class="portlet-font">
+The Page Administrator Portlet does not persist any portlet additions or portal page removals to 
+the pluto-portal-driver-config.xml file. This must be done manually in the config file. Removal of portlets
+from pages must also be done manually in pluto-portal-driver-config.xml.
+</p>
+
+<p class="portlet-font">
+To manually add a portlet to a page in pluto-portal-driver-config.xml, a portlet child element must be added to the 
+page element, which is a child of render-config. This element should look like this:
+<pre>
+&lt;portlet context="/HelloWorldPortlet" name="HelloWorldPortlet"/&gt;
+</pre>
+</p>
+
+<p class="portlet-font">
+New portal pages can be created by adding a page element under render-config in pluto-portal-driver-config.xml. 
+The uri attribute of the page element points to a JSP page that will contain a portlet (or portlets) defined in 
+its child (or children) portlet element(s). The default 'theme' lays out the portlets in two columns 
+(see WEB-INF\themes\pluto-default-theme.jsp in the pluto webapp for details). 
+</p>
+
+
+<%-- Properties for link to app server deployer and help mode file --%>
+<fmt:bundle basename="AdminPortlet">
+	<fmt:message key="appserver.deployer.help.page" var="deployerHelp"/>
+</fmt:bundle> 
+<portlet:renderURL portletMode="help" var="deployerhelpURL">
+	<portlet-el:param name="helpPage" value="${deployerHelp}"/>
+</portlet:renderURL>
+
+<p class="portlet-font">
+<a href='<c:out value="${deployerhelpURL}"/>'>Upload and Deployment in App Server Help</a>
+</p>
+
+<p class="portlet-font">
+<a href='<portlet:renderURL portletMode="view"/>'>Page Administrator Portlet</a> 
+</p>

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/page/help.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp Thu Jul 26 14:22:10 2007
@@ -1,53 +1,53 @@
-<%--
+<%--
 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.
---%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<div>
-  <h2>Portlet Applications</h2>
-  <p>
-    <ul>
-      <c:forEach items="${driverConfig.portletApplications}" var="app">
-        <li>
-          <c:out value="${app.contextPath}"/>
-          <ul>
-            <c:forEach items="${app.portlets}" var="portlet">
-              <c:out value="${portlet.portletName}"/>
-            </c:forEach>
-          </ul>
-        </li>
-      </c:forEach>
-    </ul>
-  </p>
-</div>
-
-<div>
-  <h2>Portal Pages</h2>
-  <p>
-    <ul>
-      <c:forEach items="${driverConfig.pages}" var="page">
-        <li>
-          <c:out value="${page.name}"/><br/>
-          &nbsp;&nbsp;<small><c:out value="${page.uri}"/></small>
-        </li>
-      </c:forEach>
-    </ul>
-  </p>
-</div>
-
-
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+
+<div>
+  <h2>Portlet Applications</h2>
+  <p>
+    <ul>
+      <c:forEach items="${driverConfig.portletApplications}" var="app">
+        <li>
+          <c:out value="${app.contextPath}"/>
+          <ul>
+            <c:forEach items="${app.portlets}" var="portlet">
+              <c:out value="${portlet.portletName}"/>
+            </c:forEach>
+          </ul>
+        </li>
+      </c:forEach>
+    </ul>
+  </p>
+</div>
+
+<div>
+  <h2>Portal Pages</h2>
+  <p>
+    <ul>
+      <c:forEach items="${driverConfig.pages}" var="page">
+        <li>
+          <c:out value="${page.name}"/><br/>
+          &nbsp;&nbsp;<small><c:out value="${page.uri}"/></small>
+        </li>
+      </c:forEach>
+    </ul>
+  </p>
+</div>
+
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml Thu Jul 26 14:22:10 2007
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
 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.
--->
-<portlet-app version="1.0">
-
-    <portlet>
-        <description>AboutPortletDescription</description>
-        <portlet-name>AboutPortlet</portlet-name>
-        <display-name>About Portlet</display-name>
-
-        <portlet-class>org.apache.pluto.driver.portlets.AboutPortlet</portlet-class>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>EDIT</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-        <portlet-info>
-            <title>About Apache Pluto</title>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>AdminPortletDescription</description>
-        <portlet-name>AdminPortlet</portlet-name>
-        <display-name>Admin Portlet</display-name>
-        <portlet-class>org.apache.pluto.driver.portlets.AdminPortlet</portlet-class>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>EDIT</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-        <portlet-info>
-            <title>Apache Pluto Portal Admin</title>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Used to administer pluto pages</description>
-        <portlet-name>PlutoPageAdmin</portlet-name>
-        <display-name>Pluto Page Administration Portlet</display-name>
-        <portlet-class>org.apache.pluto.driver.portlets.PageAdminPortlet</portlet-class>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>EDIT</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-        <portlet-info>
-            <title>Pluto Page Administrator</title>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-
-
+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.
+-->
+<portlet-app version="1.0">
+
+    <portlet>
+        <description>AboutPortletDescription</description>
+        <portlet-name>AboutPortlet</portlet-name>
+        <display-name>About Portlet</display-name>
+
+        <portlet-class>org.apache.pluto.driver.portlets.AboutPortlet</portlet-class>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <portlet-info>
+            <title>About Apache Pluto</title>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>AdminPortletDescription</description>
+        <portlet-name>AdminPortlet</portlet-name>
+        <display-name>Admin Portlet</display-name>
+        <portlet-class>org.apache.pluto.driver.portlets.AdminPortlet</portlet-class>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <portlet-info>
+            <title>Apache Pluto Portal Admin</title>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Used to administer pluto pages</description>
+        <portlet-name>PlutoPageAdmin</portlet-name>
+        <display-name>Pluto Page Administration Portlet</display-name>
+        <portlet-class>org.apache.pluto.driver.portlets.PageAdminPortlet</portlet-class>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <portlet-info>
+            <title>Pluto Page Administrator</title>
+        </portlet-info>
+    </portlet>
+</portlet-app>
+
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp Thu Jul 26 14:22:10 2007
@@ -1,47 +1,47 @@
-<%--
+<%--
 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.
---%>
-<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
-
-<!-- Use pluto portlet tag to render the portlet -->
-<pluto:portlet portletId="${portlet}">
-
-  <!-- Assemble the rendering result -->
-  <div class="portlet" id='<c:out value="${portlet}"/>'>
-    <div class="header">
-      <!-- Portlet Mode Controls -->
-      <pluto:modeAnchor portletMode="view"/>
-      <pluto:modeAnchor portletMode="edit"/>
-      <pluto:modeAnchor portletMode="help"/>
-      <!-- Window State Controls -->
-      <pluto:windowStateAnchor windowState="minimized"/>
-      <pluto:windowStateAnchor windowState="maximized"/>
-      <pluto:windowStateAnchor windowState="normal"/>
-      <a href="<pluto:url windowState="minimized"/>"><span class="min"></span></a>
-      <a href="<pluto:url windowState="maximized"/>"><span class="max"></span></a>
-      <a href="<pluto:url windowState="normal"/>"><span class="norm"></span></a>
-      <!-- Portlet Title -->
-      <h2 class="title"><pluto:title/></h2>
-    </div>
-    <div class="body">
-      <pluto:render/>
-    </div>
-  </div>
-
-</pluto:portlet>
-
+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.
+--%>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<!-- Use pluto portlet tag to render the portlet -->
+<pluto:portlet portletId="${portlet}">
+
+  <!-- Assemble the rendering result -->
+  <div class="portlet" id='<c:out value="${portlet}"/>'>
+    <div class="header">
+      <!-- Portlet Mode Controls -->
+      <pluto:modeAnchor portletMode="view"/>
+      <pluto:modeAnchor portletMode="edit"/>
+      <pluto:modeAnchor portletMode="help"/>
+      <!-- Window State Controls -->
+      <pluto:windowStateAnchor windowState="minimized"/>
+      <pluto:windowStateAnchor windowState="maximized"/>
+      <pluto:windowStateAnchor windowState="normal"/>
+      <a href="<pluto:url windowState="minimized"/>"><span class="min"></span></a>
+      <a href="<pluto:url windowState="maximized"/>"><span class="max"></span></a>
+      <a href="<pluto:url windowState="normal"/>"><span class="norm"></span></a>
+      <!-- Portlet Title -->
+      <h2 class="title"><pluto:title/></h2>
+    </div>
+    <div class="body">
+      <pluto:render/>
+    </div>
+  </div>
+
+</pluto:portlet>
+

Propchange: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/index.jsp Thu Jul 26 14:22:10 2007
@@ -1,19 +1,19 @@
-<%--
+<%--
   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.
---%>
+  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.
+--%>
 <%
   // Redirect to the portal driver servlet.
   response.sendRedirect("portal");

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

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.js
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.js?view=diff&rev=559986&r1=559985&r2=559986
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.js (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/pluto.js Thu Jul 26 14:22:10 2007
@@ -1,38 +1,38 @@
-/*
+/*
  * 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.
- */
-toggleNavigation = function() {
-    if (document.getElementById) {
-        navigationRoot = document.getElementById("navigation");
-        if (navigationRoot) {
-            navigationList = navigationRoot.getElementsByTagName("ul")[0];
-            if (navigationList) {
-                navigationList.style.visibility = "hidden";
-                navigationRoot.onmouseover = function() {
-                    navigationList.style.visibility = "visible";
-                }
-                navigationRoot.onmouseout = function() {
-                    navigationList.style.visibility = "hidden";
-                }
-            }
-        }
-    }
-}
-
-window.onload = toggleNavigation;
-
-
-
+ * 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.
+ */
+toggleNavigation = function() {
+    if (document.getElementById) {
+        navigationRoot = document.getElementById("navigation");
+        if (navigationRoot) {
+            navigationList = navigationRoot.getElementsByTagName("ul")[0];
+            if (navigationList) {
+                navigationList.style.visibility = "hidden";
+                navigationRoot.onmouseover = function() {
+                    navigationList.style.visibility = "visible";
+                }
+                navigationRoot.onmouseout = function() {
+                    navigationList.style.visibility = "hidden";
+                }
+            }
+        }
+    }
+}
+
+window.onload = toggleNavigation;
+
+
+

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



Mime
View raw message