portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdore...@apache.org
Subject svn commit: r586842 - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-portal: ./ src/assemble/ src/assemble/config/ src/main/resources/ src/main/webapp/ src/main/webapp/WEB-INF/ src/main/webapp/WEB-INF/classes/ src/main/webapp/WEB-INF/fragments/ab...
Date Sun, 21 Oct 2007 03:25:23 GMT
Author: cdoremus
Date: Sat Oct 20 20:25:20 2007
New Revision: 586842

URL: http://svn.apache.org/viewvc?rev=586842&view=rev
Log:
Merged from trunk.

Modified:
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/bin.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/config/pluto-docs.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/pluto.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/server.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/pluto.tld
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/portlet.tld
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/web.xml
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/index.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/login.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.css
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.js
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/test_session.jsp
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/apt/getting-started.apt
    portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/site.xml

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/pom.xml Sat Oct 20 20:25:20 2007
@@ -29,91 +29,131 @@
     <packaging>war</packaging>
     <name>Pluto Portal</name>
 
-    <dependencies>
+  <dependencies>
+    
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+      <version>${commons-logging.version}</version>
+      <scope>compile</scope>
+    </dependency>
+
+
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver</artifactId>
+      <version>${pom.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-portal-driver-impl</artifactId>
+      <version>${pom.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>jsp-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal-driver</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jsp-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal-driver-impl</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jsp-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>xml-apis</groupId>
-                    <artifactId>xml-apis</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <artifactId>junit</artifactId>
-            <groupId>junit</groupId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
+  </dependencies>
 
 
     <build>
         <finalName>pluto-portal</finalName>
 
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <configuration>
-                    <tasks>
-                        <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz"
-                             dest="target/tomcat.tar.gz"/>
-                        <gunzip src="target/tomcat.tar.gz"/>
-                        <untar src="target/tomcat.tar"/>
-                    </tasks>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptor>src/assemble/bin.xml</descriptor>
-                    <finalName>pluto-portal-${pom.version}</finalName>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
+    <plugins>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <filtering>true</filtering>
+              <directory>${pom.basedir}/src/main/resources</directory>
+              <includes>
+                <include>pluto-portal-driver-config.xml</include>
+              </includes>
+              <!-- <targetPath> requires version 2.0.2 of maven-war-plugin -->
+              <targetPath>WEB-INF</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.1</version>
+        <configuration>
+          <tasks>
+            <get src="http://archive.apache.org/dist/tomcat/tomcat-5/archive/v5.5.9/bin/jakarta-tomcat-5.5.9.tar.gz" dest="target/tomcat.tar.gz" />
+            <gunzip src="target/tomcat.tar.gz" />
+            <untar src="target/tomcat.tar" />
+          </tasks>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <configuration>
+          <descriptor>src/assemble/bin.xml</descriptor>
+          <finalName>pluto-portal-${pom.version}</finalName>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.0-beta-5</version>
+        <configuration>
+          <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+      </plugin>
+
+    </plugins>
 
     </build>
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/bin.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/bin.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/bin.xml Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 <!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/config/pluto-docs.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/config/pluto-docs.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/config/pluto-docs.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/assemble/config/pluto-docs.xml Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 <!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/pluto.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/pluto.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/pluto.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/pluto.xml Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <!-- 
-Copyright 2004 The Apache Software Foundation.
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/server.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/server.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/server.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/resources/server.xml Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 <!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/castor.properties Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 # 
-# Copyright 2004 The Apache Software Foundation.
-# Licensed  under the  Apache License,  Version 2.0  (the "License");
-# you may not use  this file  except in  compliance with the License.
-# You may obtain a copy of the License at 
+# 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
 # 
@@ -22,5 +24,3 @@
 org.exolab.castor.parser.namespaces=true
 org.exolab.castor.indent=true
 org.exolab.castor.debug=false
-
-

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/logging.properties Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 # 
-# Copyright 2004-2006 The Apache Software Foundation
-# Licensed  under the  Apache License,  Version 2.0  (the "License");
-# you may not use  this file  except in  compliance with the License.
-# You may obtain a copy of the License at 
+# 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
 # 
@@ -26,8 +28,9 @@
 # 
 ############################################################
 
-org.apache.juli.FileHandler.level = ALL
+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
\ No newline at end of file

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties Sat Oct 20 20:25:20 2007
@@ -1,101 +0,0 @@
-# 
-# Copyright 2004-2006 The Apache Software Foundation.
-# Licensed  under the  Apache License,  Version 2.0  (the "License");
-# you may not use  this file  except in  compliance with the License.
-# You may obtain a copy of the License at 
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed  under the  License is distributed on an "AS IS" BASIS,
-# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-# implied.
-#  
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#user-info-attributes.properties
-#
-#This a the file used add user information attributes 
-#defined in PLT.D of the JSR-168 specification. All
-#attributes in this file are prefixed with the name
-#of the authenticated user (returned from PortletRequest.getRemoteUser())
-#followed by a dot. Use the user-info-attributes.properties.template file
-#as a template for adding other users to this file. All users
-#must also be registered in tomcat-users.xml.
-#
-#
-#Please format the user.bdate attribute as mm/dd/yyyy.
-#As noted in PLT.D of the JSR-168 spec, the user.bdate 
-#value returned will be the time in milliseconds 
-#since January 1, 1970, 00:00:00 GMT.
-tomcat.user.bdate=
-tomcat.user.gender=male
-tomcat.user.employer=Sun Microsystems Inc.
-tomcat.user.department=
-tomcat.user.jobtitle=Reference Implementation
-tomcat.user.name.prefix=
-tomcat.user.name.given=Catalina
-tomcat.user.name.family=Tomcat
-tomcat.user.name.middle=
-tomcat.user.name.suffix=
-tomcat.user.name.nickName=Tomcat
-tomcat.user.home-info.postal.name=
-tomcat.user.home-info.postal.street=
-tomcat.user.home-info.postal.city=
-tomcat.user.home-info.postal.stateprov=
-tomcat.user.home-info.postal.postalcode=
-tomcat.user.home-info.postal.country=
-tomcat.user.home-info.postal.organization=
-tomcat.user.home-info.telecom.telephone.intcode=
-tomcat.user.home-info.telecom.telephone.loccode=
-tomcat.user.home-info.telecom.telephone.number=
-tomcat.user.home-info.telecom.telephone.ext=
-tomcat.user.home-info.telecom.telephone.comment=
-tomcat.user.home-info.telecom.fax.intcode=
-tomcat.user.home-info.telecom.fax.loccode=
-tomcat.user.home-info.telecom.fax.number=
-tomcat.user.home-info.telecom.fax.ext=
-tomcat.user.home-info.telecom.fax.comment=
-tomcat.user.home-info.telecom.mobile.intcode=
-tomcat.user.home-info.telecom.mobile.loccode=
-tomcat.user.home-info.telecom.mobile.number=
-tomcat.user.home-info.telecom.mobile.ext=
-tomcat.user.home-info.telecom.mobile.comment=
-tomcat.user.home-info.telecom.pager.intcode=
-tomcat.user.home-info.telecom.pager.loccode=
-tomcat.user.home-info.telecom.pager.number=
-tomcat.user.home-info.telecom.pager.ext=
-tomcat.user.home-info.telecom.pager.comment=
-tomcat.user.home-info.online.email=
-tomcat.user.home-info.online.uri=
-tomcat.user.business-info.postal.name=
-tomcat.user.business-info.postal.street=
-tomcat.user.business-info.postal.city=
-tomcat.user.business-info.postal.stateprov=
-tomcat.user.business-info.postal.postalcode=
-tomcat.user.business-info.postal.country=
-tomcat.user.business-info.postal.organization=
-tomcat.user.business-info.telecom.telephone.intcode=
-tomcat.user.business-info.telecom.telephone.loccode=
-tomcat.user.business-info.telecom.telephone.number=
-tomcat.user.business-info.telecom.telephone.ext=
-tomcat.user.business-info.telecom.telephone.comment=
-tomcat.user.business-info.telecom.fax.intcode=
-tomcat.user.business-info.telecom.fax.loccode=
-tomcat.user.business-info.telecom.fax.number=
-tomcat.user.business-info.telecom.fax.ext=
-tomcat.user.business-info.telecom.fax.comment=
-tomcat.user.business-info.telecom.mobile.intcode=
-tomcat.user.business-info.telecom.mobile.loccode=
-tomcat.user.business-info.telecom.mobile.number=
-tomcat.user.business-info.telecom.mobile.ext=
-tomcat.user.business-info.telecom.mobile.comment=
-tomcat.user.business-info.telecom.pager.intcode=
-tomcat.user.business-info.telecom.pager.loccode=
-tomcat.user.business-info.telecom.pager.number=
-tomcat.user.business-info.telecom.pager.ext=
-tomcat.user.business-info.telecom.pager.comment=
-tomcat.user.business-info.online.email=dev@tomcat.apache.org
-tomcat.user.business-info.online.uri=http://tomcat.apache.org/
\ No newline at end of file

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/classes/user-info-attributes.properties.template Sat Oct 20 20:25:20 2007
@@ -1,107 +0,0 @@
-# 
-# Copyright 2004-2006 The Apache Software Foundation.
-# Licensed  under the  Apache License,  Version 2.0  (the "License");
-# you may not use  this file  except in  compliance with the License.
-# You may obtain a copy of the License at 
-# 
-#   http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed  under the  License is distributed on an "AS IS" BASIS,
-# WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
-# implied.
-#  
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#user-info-attributes.properties.template
-#
-#This a template of all user information attributes 
-#defined in PLT.D of the JSR-168 specification. All
-#attributes in this file are prefixed with the name
-#of the authenticated user (returned from PortletRequest.getRemoteUser()).
-#To use this file, search and replace the 'remoteUser' token with the
-#name of a user you will use to log into the Pluto portal (The user must be 
-#registered in tomcat-users.xml). Then copy all or a selection of the 
-#attributes into the user-info-attributes.properties
-#file and enter the values for each attribute. After restarting
-#Tomcat, you should be able to access the Map of all attributes
-#for your user by calling PortletRequest.getAttribute(PortletRequest.USER_INFO)
-#as explained in PLT.17 of the JSR-168 specification.
-#
-#
-#
-#Please format the user.bdate attribute as mm/dd/yyyy.
-#As noted in PLT.D of the JSR-168 spec, the user.bdate 
-#value returned will be the time in milliseconds 
-#since January 1, 1970, 00:00:00 GMT.
-remoteUser.user.bdate=
-remoteUser.user.gender=
-remoteUser.user.employer=
-remoteUser.user.department=
-remoteUser.user.jobtitle=
-remoteUser.user.name.prefix=
-remoteUser.user.name.given=
-remoteUser.user.name.family=
-remoteUser.user.name.middle=
-remoteUser.user.name.suffix=
-remoteUser.user.name.nickName=
-remoteUser.user.home-info.postal.name=
-remoteUser.user.home-info.postal.street=
-remoteUser.user.home-info.postal.city=
-remoteUser.user.home-info.postal.stateprov=
-remoteUser.user.home-info.postal.postalcode=
-remoteUser.user.home-info.postal.country=
-remoteUser.user.home-info.postal.organization=
-remoteUser.user.home-info.telecom.telephone.intcode=
-remoteUser.user.home-info.telecom.telephone.loccode=
-remoteUser.user.home-info.telecom.telephone.number=
-remoteUser.user.home-info.telecom.telephone.ext=
-remoteUser.user.home-info.telecom.telephone.comment=
-remoteUser.user.home-info.telecom.fax.intcode=
-remoteUser.user.home-info.telecom.fax.loccode=
-remoteUser.user.home-info.telecom.fax.number=
-remoteUser.user.home-info.telecom.fax.ext=
-remoteUser.user.home-info.telecom.fax.comment=
-remoteUser.user.home-info.telecom.mobile.intcode=
-remoteUser.user.home-info.telecom.mobile.loccode=
-remoteUser.user.home-info.telecom.mobile.number=
-remoteUser.user.home-info.telecom.mobile.ext=
-remoteUser.user.home-info.telecom.mobile.comment=
-remoteUser.user.home-info.telecom.pager.intcode=
-remoteUser.user.home-info.telecom.pager.loccode=
-remoteUser.user.home-info.telecom.pager.number=
-remoteUser.user.home-info.telecom.pager.ext=
-remoteUser.user.home-info.telecom.pager.comment=
-remoteUser.user.home-info.online.email=
-remoteUser.user.home-info.online.uri=
-remoteUser.user.business-info.postal.name=
-remoteUser.user.business-info.postal.street=
-remoteUser.user.business-info.postal.city=
-remoteUser.user.business-info.postal.stateprov=
-remoteUser.user.business-info.postal.postalcode=
-remoteUser.user.business-info.postal.country=
-remoteUser.user.business-info.postal.organization=
-remoteUser.user.business-info.telecom.telephone.intcode=
-remoteUser.user.business-info.telecom.telephone.loccode=
-remoteUser.user.business-info.telecom.telephone.number=
-remoteUser.user.business-info.telecom.telephone.ext=
-remoteUser.user.business-info.telecom.telephone.comment=
-remoteUser.user.business-info.telecom.fax.intcode=
-remoteUser.user.business-info.telecom.fax.loccode=
-remoteUser.user.business-info.telecom.fax.number=
-remoteUser.user.business-info.telecom.fax.ext=
-remoteUser.user.business-info.telecom.fax.comment=
-remoteUser.user.business-info.telecom.mobile.intcode=
-remoteUser.user.business-info.telecom.mobile.loccode=
-remoteUser.user.business-info.telecom.mobile.number=
-remoteUser.user.business-info.telecom.mobile.ext=
-remoteUser.user.business-info.telecom.mobile.comment=
-remoteUser.user.business-info.telecom.pager.intcode=
-remoteUser.user.business-info.telecom.pager.loccode=
-remoteUser.user.business-info.telecom.pager.number=
-remoteUser.user.business-info.telecom.pager.ext=
-remoteUser.user.business-info.telecom.pager.comment=
-remoteUser.user.business-info.online.email=
-remoteUser.user.business-info.online.uri=
\ No newline at end of file

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/edit.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/help.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/about/view.jsp Sat Oct 20 20:25:20 2007
@@ -1,10 +1,12 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 
@@ -38,6 +40,14 @@
     <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">
@@ -50,7 +60,9 @@
     <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 server.</i>
+      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>
   

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/edit.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/help.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/fragments/admin/view.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Sat Oct 20 20:25:20 2007
@@ -2,10 +2,12 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN"
         "http://www.springframework.org/dtd/spring-beans.dtd">
 <!-- 
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 
@@ -70,6 +72,7 @@
       <constructor-arg><ref bean="PortletRegistryConfig"/></constructor-arg>
       <constructor-arg><ref bean="RenderConfigService"/></constructor-arg>
       <constructor-arg><ref bean="SupportedModesService"/></constructor-arg>
+      <constructor-arg><ref bean="SupportedWindowStatesService"/></constructor-arg>
 
       <!-- === Container Services === -->
       <constructor-arg><ref bean="PortalCallbackService"/></constructor-arg>
@@ -119,6 +122,12 @@
           singleton="true">
           <constructor-arg><ref bean="PortletRegistryConfig"/></constructor-arg>
           <constructor-arg><ref bean="PropertyConfigService"/></constructor-arg>          
+    </bean>
+
+    <bean id="SupportedWindowStatesService"
+          class="org.apache.pluto.driver.services.impl.resource.SupportedWindowStateServiceImpl"
+          singleton="true">
+          <constructor-arg><ref bean="PropertyConfigService"/></constructor-arg>
     </bean>
 
     <!-- ================================================ -->

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/portlet.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/portlet.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/portlet.xml Sat Oct 20 20:25:20 2007
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 
@@ -53,7 +55,22 @@
       <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>
 
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 
@@ -30,6 +32,7 @@
     <title>Pluto Portal</title>
     <style type="text/css" title="currentStyle" media="screen">
         @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+        @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
     </style>
     <script type="text/javascript"
             src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
@@ -53,29 +56,7 @@
     </div>
 
     <!-- Navigation block: links to portal pages -->
-    <div id="navigation">
-        <h2>Navigation:</h2>
-        <ul>
-            <c:forEach var="page" items="${driverConfig.pages}">
-                <c:choose>
-                    <c:when test="${page == currentPage}">
-                        <li class="selected">
-                            <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
-                                <c:out value="${page.name}"/>
-                            </a>
-                        </li>
-                    </c:when>
-                    <c:otherwise>
-                        <li>
-                            <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'>
-                                <c:out value="${page.name}"/>
-                            </a>
-                        </li>
-                    </c:otherwise>
-                </c:choose>
-            </c:forEach>
-        </ul>
-    </div>
+    <jsp:include page="navigation.jsp"/>
 
     <!-- Content block: portlets are divided into two columns/groups -->
     <div id="content">

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/themes/portlet-skin.jsp Sat Oct 20 20:25:20 2007
@@ -1,8 +1,10 @@
 <%--
-Copyright 2004 The Apache Software Foundation
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at
+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
 
@@ -27,6 +29,9 @@
       <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>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/pluto.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/pluto.tld?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/pluto.tld (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/pluto.tld Sat Oct 20 20:25:20 2007
@@ -4,10 +4,12 @@
   "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
   "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <!-- 
-Copyright 2004 The Apache Software Foundation.
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 
@@ -45,6 +47,17 @@
     <bodycontent>empty</bodycontent>
     <attribute>
       <name>portletMode</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+    </attribute>
+  </tag>
+  
+  <tag>
+    <name>windowStateAnchor</name>
+    <tagclass>org.apache.pluto.driver.tags.PortletWindowStateAnchorTag</tagclass>
+    <bodycontent>empty</bodycontent>
+    <attribute>
+      <name>windowState</name>
       <required>true</required>
       <rtexprvalue>false</rtexprvalue>
     </attribute>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/portlet.tld
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/portlet.tld?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/portlet.tld (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/tld/portlet.tld Sat Oct 20 20:25:20 2007
@@ -3,10 +3,12 @@
   "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
   "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
 <!-- 
-Copyright 2004 The Apache Software Foundation.
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/web.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/web.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/WEB-INF/web.xml Sat Oct 20 20:25:20 2007
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!DOCTYPE web-app PUBLIC
-        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-        "http://java.sun.com/dtd/web-app_2_3.dtd">
+    "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
 <!-- 
-Copyright 2004 The Apache Software Foundation.
-Licensed  under the  Apache License,  Version 2.0  (the "License");
-you may not use  this file  except in  compliance with the License.
-You may obtain a copy of the License at 
+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
 
@@ -29,6 +31,21 @@
         <param-value>/WEB-INF/pluto-portal-driver-services-config.xml</param-value>
     </context-param>
 
+  <filter>
+    <filter-name>plutoPortalDriver</filter-name>
+    <filter-class>org.apache.pluto.driver.PortalDriverFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>plutoPortalDriver</filter-name>
+    <url-pattern>/about.jsp</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>plutoPortalDriver</filter-name>
+    <url-pattern>/about.jsp/*</url-pattern>
+  </filter-mapping>
+
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
@@ -75,15 +92,15 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
 
-    <servlet>
-        <servlet-name>AdminPortlet</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>AdminPortlet</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
+  <servlet>
+    <servlet-name>AdminPortlet</servlet-name>
+    <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+    <init-param>
+      <param-name>portlet-name</param-name>
+      <param-value>AdminPortlet</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
 
 
     <servlet-mapping>
@@ -116,11 +133,21 @@
         <url-pattern>/PlutoInvoker/AdminPortlet</url-pattern>
     </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>PlutoPageAdmin</servlet-name>
+    <url-pattern>/PlutoInvoker/PlutoPageAdmin</url-pattern>
+  </servlet-mapping>
+
 
     <taglib>
         <taglib-uri>http://java.sun.com/portlet</taglib-uri>
         <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
     </taglib>
+
+  <taglib>
+    <taglib-uri>http://portals.apache.org/pluto/portlet-el</taglib-uri>
+    <taglib-location>/WEB-INF/tld/portlet-el.tld</taglib-location>
+  </taglib>
 
     <taglib>
         <taglib-uri>http://portals.apache.org/pluto</taglib-uri>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/index.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/index.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/index.jsp Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 <%--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/login.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/login.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/login.jsp Sat Oct 20 20:25:20 2007
@@ -1,18 +1,19 @@
-<%--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
---%>
+<%--
+  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" %>
 
 <html>
@@ -59,7 +60,7 @@
       </div>
       
       <div id="footer">
-        &copy; 2003-2005 Apache Software Foundation
+        &copy; 2003-2007 Apache Software Foundation
       </div>
       
     </div>

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.css
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.css?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.css (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.css Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 /*
-* Copyright 2005-2005 The Apache Software Foundation
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
+* 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
 *
@@ -19,6 +20,35 @@
   font-size: 95%;
 }
 
+/** 'tooltip' block **/
+
+a.tooltip {
+    position:relative;
+    z-index:24; 
+    background-color:#ccc;
+    color:#000;
+    text-decoration:none;
+}
+
+a.tooltip:hover {
+     z-index:25; 
+     background-color:#ff0;
+}
+
+a.tooltip span.tooltip {
+     display: none;
+}
+
+a.tooltip:hover span.tooltip {
+    display:block;
+    position:float;
+    top:-2em; left:28em; width:5em;
+    border:1px solid #0cf;
+    background-color:#cff; color:#000;
+    text-align: center;
+}
+
+
 /** 'portal' block **/
 
 #portal {
@@ -55,57 +85,10 @@
   font-size:smaller;
 }
 
-/** 'navigation' block **/
-
-#navigation {
-  clear: both;
-}
-
-#navigation h2 {
-  padding: 5px 10px 5px 10px;
-  margin: 0px;
-  color: #6D97BF;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: 100%;
-}
-
-#navigation ul {
-  margin: 0px;
-  padding: 5px 10px 5px 10px;
-  list-style: none;
-  position: absolute;
-  background-color: #F0F0F0;
-  border-width: 0px 1px 1px 1px;
-  border-style: solid;
-  border-color: #000000;
-}
-
-#navigation ul li {
-  color: #888888;
-  font-family: "Trebuchet MS", Trebuchet, Arial, Helvetica, Sans-serif;
-  font-size: smaller;
-}
-
-#navigation ul li a {
-  color: #888888;
-  text-decoration: none;
-}
-
-#navigation ul li a:hover {
-  color: #6D97BF;
-  text-decoration: underline;
-}
-
-#navigation .selected, #navigation .selected a {
-  color: #6D97BF;
-  font-weight: bold;
-}
-
-
 /** 'content' block **/
 
 #content {
-
+  float: top;
 }
 
 /** 'portlet' block **/
@@ -158,15 +141,15 @@
 
 /** 'portlet' block: portlet mode and window state controls **/
 
-.portlet .header span.min {
+.portlet .header span.minimized {
   background: url(images/controls/min.png) no-repeat;
 }
 
-.portlet .header span.max {
+.portlet .header span.maximized {
   background: url(images/controls/max.png) no-repeat;
 }
 
-.portlet .header span.norm {
+.portlet .header span.normal {
   background: url(images/controls/norm.png) no-repeat;
 }
 
@@ -235,7 +218,52 @@
   border-color: #2E6794;
 }
 
+/** navigation block **/
 
+#navigation .selected, #navigation .selected a {
+  /** color: #6D97BF; **/
+  color: #FFFFFF;
+  font-weight: bold;
+}
 
-
-
+#navigation {
+    position: relative;
+    float: top;
+    width: 100%;
+    padding: 0 0 1.75em 1em;
+    margin: 0;
+    list-style: none;
+    line-height: 1em;
+}
+
+#navigation LI {
+    float: left;
+    margin: 0;
+    padding: 0;
+}
+
+#navigation A {
+    display: block;
+    color: #444;
+    text-decoration: none;
+    font-weight: bold;
+    background: #8DB7DF;
+    margin: 0;
+    padding: 0.25em 1em;
+    border-left: 1px solid #fff;
+    border-top: 1px solid #fff;
+    border-right: 1px solid #aaa;
+}
+
+#navigation A:hover,
+#navigation A:active,
+#navigation A.here:link,
+#navigation A.here:visited {
+    background:#bbb;
+}
+
+#navigation A.here:link,
+#navigation A.here:visited {
+    position: relative;
+    z-index: 102;
+}

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.js
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.js?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.js (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/pluto.js Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * 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
  *

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/test_session.jsp
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/test_session.jsp?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/test_session.jsp (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/main/webapp/test_session.jsp Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 <%--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/apt/getting-started.apt?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/apt/getting-started.apt (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/apt/getting-started.apt Sat Oct 20 20:25:20 2007
@@ -1,9 +1,10 @@
 ~~
-~~ Copyright 2005-2006 The Apache Software Foundation.
-~~
-~~ Licensed under the Apache License, Version 2.0 (the "License");
-~~ you may not use this file except in compliance with the License.
-~~ You may obtain a copy of the License at
+~~ 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
 ~~

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/site.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/site.xml?rev=586842&r1=586841&r2=586842&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/site.xml (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-portal/src/site/site.xml Sat Oct 20 20:25:20 2007
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  Copyright 2005-2006 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  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
 
@@ -23,6 +24,13 @@
   <bannerRight>
     <src>http://portals.apache.org/pluto/images/banner.png</src>
   </bannerRight>
+
+  <skin>  
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-site-skin</artifactId>
+      <version>1.2.0-SNAPSHOT</version>
+  </skin> 
+
   <body>
     <links>
       <item name="Pluto Home" href="http://portals.apache.org/pluto"/>
@@ -30,10 +38,7 @@
 	  <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>



Mime
View raw message