portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r511224 - in /portals/jetspeed-2/trunk: ./ app-servers/ applications/demo/src/java/org/apache/jetspeed/demo/servlet/ applications/demo/src/webapp/WEB-INF/ applications/demo/src/webapp/WEB-INF/_content/ applications/demo/src/webapp/WEB-INF/v...
Date Sat, 24 Feb 2007 06:26:57 GMT
Author: taylor
Date: Fri Feb 23 22:26:55 2007
New Revision: 511224

URL: http://svn.apache.org/viewvc?view=rev&rev=511224
Log:
- bug fixes in registration
- allow option for registration without required email (good for demos)
- sso help improvements
- sso demo bug fixes
- removal of all old SQL scripts
- remove Perl portlet app from both Maven-1 and Maven-2 builds and plugins
- start of new 2.1 site re-org (PSML, not completed)

Added:
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/_content/sso-demo.html
Removed:
    portals/jetspeed-2/trunk/etc/sql/db2/
    portals/jetspeed-2/trunk/etc/sql/derby/
    portals/jetspeed-2/trunk/etc/sql/hsql/
    portals/jetspeed-2/trunk/etc/sql/mssql/
    portals/jetspeed-2/trunk/etc/sql/mysql/
    portals/jetspeed-2/trunk/etc/sql/oracle/
    portals/jetspeed-2/trunk/etc/sql/populate-db-default.sql
    portals/jetspeed-2/trunk/etc/sql/populate-userinfo-for-default-psml.sql
    portals/jetspeed-2/trunk/etc/sql/postgres/
    portals/jetspeed-2/trunk/etc/sql/sandbox/
    portals/jetspeed-2/trunk/etc/sql/xml/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/non-java/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/testsuite.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/third-party/
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/wip/
Modified:
    portals/jetspeed-2/trunk/app-servers/build.xml
    portals/jetspeed-2/trunk/app-servers/pom.xml
    portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
    portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/iframe-help.html
    portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
    portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
    portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
    portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
    portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
    portals/jetspeed-2/trunk/pom.xml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security

Modified: portals/jetspeed-2/trunk/app-servers/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/build.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/build.xml Fri Feb 23 22:26:55 2007
@@ -38,8 +38,6 @@
     <property name="org.apache.portals.bridges.common.version" value=""/>
     <property name="org.apache.portals.bridges.jpetstore.version" value=""/>
     <property name="org.apache.portals.bridges.jsf-demo.version" value=""/>
-    <property name="org.apache.portals.bridges.perl.version" value=""/>
-    <property name="org.apache.portals.bridges.php.version" value=""/>
     <property name="org.apache.pluto.version" value=""/>
     <property name="portlet-api.version" value=""/>
     <property name="org.apache.derby.version" value=""/>
@@ -78,8 +76,6 @@
         <echo message="    org.apache.portals.bridges.common.version=${org.apache.portals.bridges.common.version}"/>
         <echo message="    org.apache.portals.bridges.jpetstore.version=${org.apache.portals.bridges.jpetstore.version}"/>
         <echo message="    org.apache.portals.bridges.jsf-demo.version=${org.apache.portals.bridges.jsf-demo.version}"/>
-        <echo message="    org.apache.portals.bridges.perl.version=${org.apache.portals.bridges.perl.version}"/>
-        <echo message="    org.apache.portals.bridges.php.version=${org.apache.portals.bridges.php.version}"/>
         <echo message="    org.apache.pluto.version=${org.apache.pluto.version}"/>
         <echo message="    portlet-api.version=${portlet-api.version}"/>
         <echo message="    org.apache.derby.version=${org.apache.derby.version}"/>
@@ -179,10 +175,6 @@
                       value="${org.apache.portals.bridges.jpetstore.version}"/>
             <property name="org.apache.portals.bridges.jsf-demo.version"
                       value="${org.apache.portals.bridges.jsf-demo.version}"/>
-            <property name="org.apache.portals.bridges.perl.version"
-                      value="${org.apache.portals.bridges.perl.version}"/>
-            <property name="org.apache.portals.bridges.php.version"
-                      value="${org.apache.portals.bridges.php.version}"/>
             <property name="org.apache.pluto.version"
                       value="${org.apache.pluto.version}"/>
             <property name="portlet-api.version"
@@ -212,10 +204,6 @@
                       value="${org.apache.portals.bridges.jpetstore.version}"/>
             <property name="org.apache.portals.bridges.jsf-demo.version"
                       value="${org.apache.portals.bridges.jsf-demo.version}"/>
-            <property name="org.apache.portals.bridges.perl.version"
-                      value="${org.apache.portals.bridges.perl.version}"/>
-            <property name="org.apache.portals.bridges.php.version"
-                      value="${org.apache.portals.bridges.php.version}"/>
             <property name="org.apache.pluto.version"
                       value="${org.apache.pluto.version}"/>
             <property name="portlet-api.version"

Modified: portals/jetspeed-2/trunk/app-servers/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/pom.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/pom.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/pom.xml Fri Feb 23 22:26:55 2007
@@ -92,10 +92,6 @@
                                               value="${org.apache.portals.bridges.jpetstore.version}"/>
                                     <property name="org.apache.portals.bridges.jsf-demo.version"
                                               value="${org.apache.portals.bridges.jsf-demo.version}"/>
-                                    <property name="org.apache.portals.bridges.perl.version"
-                                              value="${org.apache.portals.bridges.perl.version}"/>
-                                    <property name="org.apache.portals.bridges.php.version"
-                                              value="${org.apache.portals.bridges.php.version}"/>
                                     <property name="org.apache.pluto.version"
                                               value="${org.apache.pluto.version}"/>
                                     <property name="portlet-api.version"
@@ -128,10 +124,6 @@
                                               value="${org.apache.portals.bridges.jpetstore.version}"/>
                                     <property name="org.apache.portals.bridges.jsf-demo.version"
                                               value="${org.apache.portals.bridges.jsf-demo.version}"/>
-                                    <property name="org.apache.portals.bridges.perl.version"
-                                              value="${org.apache.portals.bridges.perl.version}"/>
-                                    <property name="org.apache.portals.bridges.php.version"
-                                              value="${org.apache.portals.bridges.php.version}"/>
                                     <property name="org.apache.pluto.version"
                                               value="${org.apache.pluto.version}"/>
                                     <property name="portlet-api.version"
@@ -214,16 +206,6 @@
         <dependency>
             <groupId>org.apache.portals.bridges</groupId>
             <artifactId>jsf-demo</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>perl</artifactId>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>php</artifactId>
             <type>war</type>
         </dependency>
 

Modified: portals/jetspeed-2/trunk/app-servers/tomcat-build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/app-servers/tomcat-build.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/app-servers/tomcat-build.xml (original)
+++ portals/jetspeed-2/trunk/app-servers/tomcat-build.xml Fri Feb 23 22:26:55 2007
@@ -35,8 +35,6 @@
     <property name="org.apache.portals.bridges.common.version" value=""/>
     <property name="org.apache.portals.bridges.jpetstore.version" value=""/>
     <property name="org.apache.portals.bridges.jsf-demo.version" value=""/>
-    <property name="org.apache.portals.bridges.perl.version" value=""/>
-    <property name="org.apache.portals.bridges.php.version" value=""/>
     <property name="org.apache.pluto.version" value=""/>
     <property name="portlet-api.version" value=""/>
     <property name="org.apache.derby.version" value=""/>
@@ -73,8 +71,6 @@
         <echo message="    org.apache.portals.bridges.common.version=${org.apache.portals.bridges.common.version}"/>
         <echo message="    org.apache.portals.bridges.jpetstore.version=${org.apache.portals.bridges.jpetstore.version}"/>
         <echo message="    org.apache.portals.bridges.jsf-demo.version=${org.apache.portals.bridges.jsf-demo.version}"/>
-        <echo message="    org.apache.portals.bridges.perl.version=${org.apache.portals.bridges.perl.version}"/>
-        <echo message="    org.apache.portals.bridges.php.version=${org.apache.portals.bridges.php.version}"/>
         <echo message="    org.apache.pluto.version=${org.apache.pluto.version}"/>
         <echo message="    portlet-api.version=${portlet-api.version}"/>
         <echo message="    org.apache.derby.version=${org.apache.derby.version}"/>
@@ -357,16 +353,12 @@
         <delete dir="${org.apache.jetspeed.server.home}/webapps/demo"/>
         <delete dir="${org.apache.jetspeed.server.home}/webapps/jpetstore"/>
         <delete dir="${org.apache.jetspeed.server.home}/webapps/jsf-demo"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/perl"/>
-        <delete dir="${org.apache.jetspeed.server.home}/webapps/php"/>
         <delete dir="${org.apache.jetspeed.server.home}/webapps/rss"/>
         <delete>
             <fileset dir="${org.apache.jetspeed.server.home}/webapps">
                 <include name="demo.war"/>
                 <include name="jpetstore.war"/>
                 <include name="jsf-demo.war"/>
-                <include name="perl.war"/>
-                <include name="php.war"/>
                 <include name="rss.war"/>
             </fileset>
         </delete>
@@ -450,16 +442,6 @@
             <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
             <param name="org.apache.jetspeed.deploy.artifactid" value="jsf-demo"/>
             <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.jsf-demo.version}"/>
-        </antcall>
-        <antcall target="hot-deploy-war">
-            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
-            <param name="org.apache.jetspeed.deploy.artifactid" value="perl"/>
-            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.perl.version}"/>
-        </antcall>
-        <antcall target="hot-deploy-war">
-            <param name="org.apache.jetspeed.deploy.groupid" value="org.apache.portals.bridges"/>
-            <param name="org.apache.jetspeed.deploy.artifactid" value="php"/>
-            <param name="org.apache.jetspeed.deploy.version" value="${org.apache.portals.bridges.php.version}"/>
         </antcall>
         <antcall target="hot-deploy-war">
             <param name="org.apache.jetspeed.deploy.groupid" value="${org.apache.jetspeed.groupid}"/>

Modified: portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
(original)
+++ portals/jetspeed-2/trunk/applications/demo/src/java/org/apache/jetspeed/demo/servlet/SSODemoServlet.java
Fri Feb 23 22:26:55 2007
@@ -16,6 +16,7 @@
 package org.apache.jetspeed.demo.servlet;
 
 import java.io.IOException;
+import java.security.Principal;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -47,7 +48,6 @@
         
         /*
          * this is not working on Tomcat 5.0.30
-         
         Principal userPrincipal = request.getUserPrincipal();
         if (userPrincipal == null)
         {
@@ -57,7 +57,7 @@
         {
             authenticatedPrincipal = userPrincipal.toString();
         }
-        */
+ */       
         if (principal == null)
         {
             error403(request, response, "SSO Principal is not valid. Please provide a valid
SSO principal.");

Added: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/_content/sso-demo.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/_content/sso-demo.html?view=auto&rev=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/_content/sso-demo.html (added)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/_content/sso-demo.html Fri
Feb 23 22:26:55 2007
@@ -0,0 +1,19 @@
+<h3>SSO Demo Helper</h3>
+<p>Here are the credentials you need to enter for the two demos on this page:</p>
+<table border="1" cellspacing="1" cellpadding="3">
+<tr>
+<th class="portlet-section-header">Demo Portlet</th>	
+<th class="portlet-section-header">SSO Credential</th>
+<th class="portlet-section-header">SSO Principal</th>	
+</tr>
+<tr>
+<td class='portlet-section-body'>SSO IFrame Demo</td>
+<td class='portlet-section-body'>007</td>	
+<td class='portlet-section-body'>secret-password</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>SSO Web Content Demo</td>
+<td class='portlet-section-body'>jetspeed_test0</td>	
+<td class='portlet-section-body'>jetspeed</td>
+</tr>
+</table>	
\ No newline at end of file

Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml Fri Feb 23 22:26:55
2007
@@ -640,6 +640,14 @@
                 <name>sso.type</name>
                 <value>url</value>
             </preference>
+            <preference>
+                <name>sso.url.Principal</name>
+                <value>sso-principal</value>
+            </preference>
+            <preference>
+                <name>sso.url.Credential</name>
+                <value>sso-credential</value>
+            </preference>            
         </portlet-preferences>
     </portlet>
     
@@ -1065,7 +1073,34 @@
             </preference>
         </portlet-preferences>
     </portlet>
-    
+
+    <portlet>
+        <description>SSO Demo help information, contains credentials for SSO demo portlets.</description>
+        <portlet-name>SSODemoHelp</portlet-name>
+        <display-name>SSO Demo Help</display-name>
+        <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>
+        <init-param>
+            <name>portlet-icon</name>
+            <value>folder-remote.png</value>
+        </init-param>                                        
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>SSO Demo Help</title>
+            <short-title>SSO Help</short-title>
+            <keywords>SSO,demo,help</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>file</name>
+                <value>/_content/sso-demo.html</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+
     <custom-portlet-mode>
         <description>a Custom Print Mode</description>            
         <portlet-mode>print</portlet-mode>

Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/iframe-help.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/iframe-help.html?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/iframe-help.html (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/view/iframe-help.html Fri
Feb 23 22:26:55 2007
@@ -1,37 +1,32 @@
-<h1>SSO IFrame Demo Help</h1>
-<div class="portlet-msg-info">
-To use the SSO IFrame Demo with URL-based authentication, you will need to enter the following
SSO<br/>
-URL preferences for the URL parameter names (principal, credential) to work with the  <b>/demo/sso-demo</b>
site:<br/>
-</div>
-<br/>
+<h1>SSO IFrame Help</h1>
+<p>
+The following preferences can be used with the SSO IFrame Portlet in addition to the standard
IFrame preferences 
+</p>
+<p>
 <table border="1" cellspacing="1" cellpadding="3">
 <tr>
-<th class="portlet-section-header">sso.url.Principal</th>	
-<th class="portlet-section-header">sso.url.Crendential</th>
+<th class="portlet-section-body">Preference</th>	
+<th class="portlet-section-body">Usage</th>
 </tr>
 <tr>
-<td class='portlet-section-body'>sso-principal</td>	
-<td class='portlet-section-body'>sso-credential</td>
+<td class='portlet-section-body'>sso.type</td>	
+<td class='portlet-section-body'>The type of Single signon authentication. Valid values:
form | basic | basic.preemptive | url | url.base64</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>sso.url.Credential</td>	
+<td class='portlet-section-body'>The name of the credential input field or parameter</td>
+</tr>
+<tr>
+<td class='portlet-section-body'>sso.url.Principal</td>	
+<td class='portlet-section-body'>The name of the user name input field or parameter</td>
 </tr>
-</table>
-<br/><br/>	
-<div class="portlet-msg-info">
-To use the SSO IFrame Demo with URL-based authentication, you will need to enter the following
SSO<br/>
-Principal and Credential for the <b>/demo/sso-demo</b> site as the demo will
take the authenticated principal <br/>
-currently logged in as the SSO Principal, and *always* require the SSO Credential listed
below<br/>
-If a user is not authenticated, you must supply the SSO Principal name <b>'guest'</b>.<br/>
-<p class='portlet-msg-alert'>
-IGNORE ABOVE for now !!! Just enter the credentials shown below for now ... having a problem
with Tomcat 5<br/>
-</p>
-</div>
-<br/>
-<table border="1" cellspacing="1" cellpadding="3">
 <tr>
-<th class="portlet-section-header">SSO Principal</th>	
-<th class="portlet-section-header">SSO Credential</th>
+<td class='portlet-section-body'>SSO Principal</td>	
+<td class='portlet-section-body'>The actual user name</td>
 </tr>
 <tr>
-<td class='portlet-section-body'>007</td>	
-<td class='portlet-section-body'>secret-password</td>
+<td class='portlet-section-body'>SSO Credential</td>	
+<td class='portlet-section-body'>The actual crendential value</td>
 </tr>
 </table>	
+</p>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/java/org/apache/jetspeed/portlets/registration/UserRegistrationPortlet.java
Fri Feb 23 22:26:55 2007
@@ -33,6 +33,7 @@
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletConfig;
 import javax.portlet.PortletException;
+import javax.portlet.PortletPreferences;
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletResponse;
 import javax.portlet.RenderRequest;
@@ -670,10 +671,15 @@
                 if (templ == null) { throw new Exception(
                         "email template not available"); }
 
-                admin.sendEmail(getPortletConfig(), (String) userInfo
-                        .get(USER_ATTRIBUTE_EMAIL),
-                        getEmailSubject(actionRequest), templ, userInfo);
-
+                PortletPreferences prefs = actionRequest.getPreferences();
+                boolean sendEmail = prefs.getValue("SendEmail", "true").equals("true");
+                if (sendEmail)
+                {
+                    admin.sendEmail(getPortletConfig(), (String) userInfo
+                            .get(USER_ATTRIBUTE_EMAIL),
+                            getEmailSubject(actionRequest), templ, userInfo);
+                }
+                
                 if ((this.optionForceEmailAsUsername)
                         || (this.optionForceGeneratedPasswords))
                 {

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/portlet.xml Fri Feb
23 22:26:55 2007
@@ -1141,6 +1141,12 @@
         <short-title>User Registration</short-title>
         <keywords>admin,password,register,signup,user</keywords>
     </portlet-info>
+	<portlet-preferences>
+        <preference>
+            <name>SendEmail</name>
+            <value>false</value>
+        </preference>    
+    </portlet-preferences>
  </portlet>
     
 <portlet id="PortalLoginPortlet">    
@@ -1499,6 +1505,31 @@
       <short-title>Tracking</short-title>
       <keywords>admin,tracking,out of service</keywords>
     </portlet-info>
+  </portlet>
+
+ <portlet>
+    <description>Welcome to Jetspeed</description>
+    <portlet-name>WelcomeToJetspeed</portlet-name>
+    <display-name>Welcome to Jetspeed</display-name>
+    <portlet-class>org.apache.portals.gems.file.FilePortlet</portlet-class>
+    <expiration-cache>-1</expiration-cache>
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>VIEW</portlet-mode>
+    </supports>
+    <supported-locale>en</supported-locale>
+    <!-- resource-bundle></resource-bundle -->
+    <portlet-info>
+      <title>Welcome to Jetspeed</title>
+      <short-title>Welcome</short-title>
+      <keywords>welcome</keywords>
+    </portlet-info>
+    <portlet-preferences>
+         <preference>
+             <name>file</name>
+             <value>/info/welcome.html</value>
+         </preference>
+     </portlet-preferences>   
   </portlet>
 
 </portlet-app>

Modified: portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
(original)
+++ portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/userreg/userRegistration.vm
Fri Feb 23 22:26:55 2007
@@ -1,8 +1,11 @@
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($refreshLink = $renderResponse.createRenderURL())
+$refreshLink.setParameter("reset", "true")
 <div id="UserRegistration"  class="portlet-section-text"> 
 	#if($registeredUserMsg)
 		<table >
 			<tr><td colspan="2" ><p class="portlet-msg-success" >$registeredUserMsg</p></td></tr>
+			<tr><td colspan="2" ><p class="portlet-msg-success"><a href="$refreshLink">Click
here to start registration...</a></p></td></tr>
 		</table>
 	#else
 	<form name="userRegistrationForm" action="$renderResponse.createActionURL()" method="post"
>

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
Fri Feb 23 22:26:55 2007
@@ -259,6 +259,9 @@
                              // in the new user's folder tree
                             Folder source = innerPageManager.getFolder(innerFolderTemplate);
                           
                             innerPageManager.deepCopyFolder(source, Folder.USER_FOLDER +
innerUserName, innerUser);
+                            Folder newFolder = pageManager.getFolder(Folder.USER_FOLDER +
innerUserName);                            
+                            newFolder.setTitle("Home Folder");
+                            newFolder.setShortTitle("Home");
                              
                             return null;
                         }

Modified: portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
(original)
+++ portals/jetspeed-2/trunk/components/web-content/src/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
Fri Feb 23 22:26:55 2007
@@ -29,6 +29,7 @@
 import javax.portlet.RenderResponse;
 import javax.security.auth.Subject;
 
+import org.apache.commons.codec.binary.Base64;
 import org.apache.jetspeed.security.JSSubject;
 import org.apache.jetspeed.sso.SSOContext;
 import org.apache.jetspeed.sso.SSOException;
@@ -183,7 +184,7 @@
     {
         String baseSource = super.getURLSource(request, response, prefs);
         String type = prefs.getValue(SSO_TYPE, SSO_TYPE_URL);
-        if (type.equals(SSO_TYPE_URL))
+        if (type.equals(SSO_TYPE_URL) || type.equals(SSO_TYPE_URL_BASE64))
         {
             String userNameParam = prefs.getValue(SSO_TYPE_URL_USERNAME, "user");
             String passwordParam = prefs.getValue(SSO_TYPE_URL_PASSWORD, "password");
@@ -203,6 +204,13 @@
             if (userName == null) userName = "";
             String password = (String)request.getAttribute(SSO_REQUEST_ATTRIBUTE_PASSWORD);
             if (password == null) password = "";
+
+            if (type.equals(SSO_TYPE_URL_BASE64))
+            {
+                Base64 encoder = new Base64() ;
+                userName = new String(encoder.encode(userName.getBytes()));
+                password = new String(encoder.encode(password.getBytes()));
+            }            
             
             source.append(userName);
             source.append("&");

Modified: portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml (original)
+++ portals/jetspeed-2/trunk/enterprise/ear-full/pom.xml Fri Feb 23 22:26:55 2007
@@ -73,18 +73,6 @@
             <version>1.0</version>            
  		    <type>war</type>
         </dependency>        
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>perl</artifactId>
-            <version>1.0</version>            
- 		    <type>war</type>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.portals.bridges</groupId>
-            <artifactId>php</artifactId>
-            <version>1.0</version>            
- 		    <type>war</type>
-        </dependency>                
     </dependencies>
 
 	 <build>
@@ -124,16 +112,6 @@
 		               <artifactId>jsf-demo</artifactId>
 		               <contextRoot>/jsf-demo</contextRoot>
 		             </webModule>                       
-		             <webModule>
-		               <groupId>org.apache.portals.bridges</groupId>
-		               <artifactId>perl</artifactId>
-		               <contextRoot>/perl</contextRoot>
-		             </webModule>      
-		             <webModule>
-		               <groupId>org.apache.portals.bridges</groupId>
-		               <artifactId>php</artifactId>
-		               <contextRoot>/php</contextRoot>
-		             </webModule>                                                       
                              
   				   <javaModule>
                       <groupId>${pom.groupId}</groupId>
                       <artifactId>jetspeed-api</artifactId>

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Fri Feb 23 22:26:55 2007
@@ -446,16 +446,6 @@
     <attainGoal name="j2:deploy"/>
   </goal>
 
-  <goal name="j2:pam.phpdeploy">
-    <j:set var="maven.war.final.name" value="php"/>
-    <attainGoal name="j2:deploybridgewar"/>
-  </goal>
-
-  <goal name="j2:pam.perldeploy">
-    <j:set var="maven.war.final.name" value="perl"/>
-    <attainGoal name="j2:deploybridgewar"/>
-  </goal>
-
   <goal name="j2:pam.rssdeploy">
     <j:set var="maven.war.final.name" value="rss"/>
     <attainGoal name="j2:deploy"/>
@@ -573,8 +563,6 @@
       <attainGoal name="j2:minDeploy"/>
       <attainGoal name="j2:pam.demodeploy"/>
       <attainGoal name="j2:pam.jsfdeploy"/>
-      <attainGoal name="j2:pam.phpdeploy"/>
-      <attainGoal name="j2:pam.perldeploy"/>
       <attainGoal name="j2:pam.rssdeploy"/>
       <attainGoal name="j2:pam.jpetstoredeploy"/>
   </goal>
@@ -583,8 +571,6 @@
       <attainGoal name="j2:nodbMinDeploy"/>
       <attainGoal name="j2:pam.demodeploy"/>
       <attainGoal name="j2:pam.jsfdeploy"/>
-      <attainGoal name="j2:pam.phpdeploy"/>
-      <attainGoal name="j2:pam.perldeploy"/>
       <attainGoal name="j2:pam.rssdeploy"/>
       <attainGoal name="j2:pam.jpetstoredeploy"/>
   </goal>
@@ -603,10 +589,6 @@
       <delete file="${org.apache.jetspeed.deploy.war.dir}/j2-admin.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jsf-demo"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/jsf-demo.war"/>
-      <delete dir="${org.apache.jetspeed.deploy.war.dir}/php"/>
-      <delete file="${org.apache.jetspeed.deploy.war.dir}/php.war"/>
-      <delete dir="${org.apache.jetspeed.deploy.war.dir}/perl"/>
-      <delete file="${org.apache.jetspeed.deploy.war.dir}/perl.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/rss"/>
       <delete file="${org.apache.jetspeed.deploy.war.dir}/rss.war"/>
       <delete dir="${org.apache.jetspeed.deploy.war.dir}/jpetstore"/>

Modified: portals/jetspeed-2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/pom.xml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/pom.xml (original)
+++ portals/jetspeed-2/trunk/pom.xml Fri Feb 23 22:26:55 2007
@@ -186,8 +186,6 @@
         <org.apache.portals.bridges.jpetstore.version>1.0.1-dev</org.apache.portals.bridges.jpetstore.version>
         <org.apache.portals.bridges.jsf-demo.version>1.0.1-dev</org.apache.portals.bridges.jsf-demo.version>
         <org.apache.portals.bridges.jsf.version>1.0.1-dev</org.apache.portals.bridges.jsf.version>
-        <org.apache.portals.bridges.perl.version>1.0.1-dev</org.apache.portals.bridges.perl.version>
-        <org.apache.portals.bridges.php.version>1.0.1-dev</org.apache.portals.bridges.php.version>
         <org.apache.portals.bridges.velocity.version>1.0.1-dev</org.apache.portals.bridges.velocity.version>
         <org.apache.portals.bridges.portletfilter.version>1.0.1-dev</org.apache.portals.bridges.portletfilter.version>
         <oro.version>2.0.7</oro.version>
@@ -909,18 +907,6 @@
                 <artifactId>jsf-demo</artifactId>
                 <type>war</type>
                 <version>${org.apache.portals.bridges.jsf-demo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>perl</artifactId>
-                <type>war</type>
-                <version>${org.apache.portals.bridges.perl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>php</artifactId>
-                <type>war</type>
-                <version>${org.apache.portals.bridges.php.version}</version>
             </dependency>
 
             <!-- MyFaces -->

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/p002.psml Fri Feb 23 22:26:55 2007
@@ -1,40 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2007 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.
+	Copyright 2007 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.
 -->
-<page id="p002" 
-    xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
-  <defaults
-     skin="blue"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
-  />
-  <title>My Second PSML page</title>
-  <metadata name="title" xml:lang="ja">PSML ページ 2</metadata>
-  <metadata name="title" xml:lang="es">Mi 2ª página PSML</metadata>
-  <metadata name="short-title" xml:lang="es">Otra página</metadata>
-  <metadata name="title" xml:lang="hu">A második PSML oldalam</metadata>
-  <metadata name="title" xml:lang="zh">第二个PSML页面</metadata>
-  <metadata name="title" xml:lang="zh-TW">第二個PSML頁面</metadata>
-  <fragment id="xx2.0" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="xx2.1" type="portlet" name="demo::SSOIFramePortlet"/>
-    <fragment id="wcp2.0" type="portlet" name="demo::SSOWebContentPortlet"/>
-  </fragment>
-  <security-constraints>
-    <security-constraints-ref>users</security-constraints-ref>
-  </security-constraints>
+<page id="p002" xmlns="http://portals.apache.org/jetspeed"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
+	<defaults skin="blue" layout-decorator="tigris"
+		portlet-decorator="tigris" />
+	<title>SSO Demo</title>
+	<metadata name="title" xml:lang="ja">PSML ページ 2</metadata>
+	<metadata name="title" xml:lang="es">Mi 2ª página PSML</metadata>
+	<metadata name="short-title" xml:lang="es">Otra página</metadata>
+	<metadata name="title" xml:lang="hu">
+		A második PSML oldalam
+	</metadata>
+	<metadata name="title" xml:lang="zh">第二个PSML页面</metadata>
+	<metadata name="title" xml:lang="zh-TW">第二個PSML頁面</metadata>
+	<fragment id="xx2.0" type="layout"
+		name="jetspeed-layouts::VelocityOneColumn">
+		<fragment id="xx2.3" type="portlet" name="demo::SSODemoHelp">
+			<property layout="OneColumn" name="row" value="0" />
+		</fragment>
+		<fragment id="xx2.4" type="layout"
+			name="jetspeed-layouts::VelocityTwoColumns">
+			<property layout="OneColumn" name="sizes" value="30%,70%" />
+			<fragment id="xx2.1" type="portlet"
+				name="demo::SSOIFramePortlet">
+				<property layout="TwoColumns" name="row" value="0" />
+				<property layout="TwoColumns" name="column" value="0" />
+			</fragment>
+			<fragment id="wcp2.0" type="portlet"
+				name="demo::SSOWebContentPortlet">
+				<property layout="TwoColumns" name="row" value="0" />
+				<property layout="TwoColumns" name="column" value="1" />
+			</fragment>
+		</fragment>
+	</fragment>
+	<security-constraints>
+		<security-constraints-ref>public-edit</security-constraints-ref>
+	</security-constraints>
 </page>

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security?view=diff&rev=511224&r1=511223&r2=511224
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/page.security Fri Feb 23 22:26:55 2007
@@ -52,7 +52,7 @@
   </security-constraints-def>
   <security-constraints-def name="public-edit">
     <security-constraint>
-      <users>*</users>
+      <roles>user</roles>
       <permissions>view, edit</permissions>
     </security-constraint>
   </security-constraints-def>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message