Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 71764 invoked from network); 24 Feb 2007 06:27:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2007 06:27:22 -0000 Received: (qmail 58374 invoked by uid 500); 24 Feb 2007 06:27:29 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 58346 invoked by uid 500); 24 Feb 2007 06:27:29 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 58335 invoked by uid 99); 24 Feb 2007 06:27:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Feb 2007 22:27:29 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Feb 2007 22:27:18 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id B5FEC1A981A; Fri, 23 Feb 2007 22:26:58 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070224062658.B5FEC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - - @@ -78,8 +76,6 @@ - - @@ -179,10 +175,6 @@ value="${org.apache.portals.bridges.jpetstore.version}"/> - - - - - - - - org.apache.portals.bridges jsf-demo - war - - - org.apache.portals.bridges - perl - war - - - org.apache.portals.bridges - php war 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 @@ - - @@ -73,8 +71,6 @@ - - @@ -357,16 +353,12 @@ - - - - @@ -450,16 +442,6 @@ - - - - - - - - - - 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 @@ +

SSO Demo Helper

+

Here are the credentials you need to enter for the two demos on this page:

+ + + + + + + + + + + + + + + + +
Demo PortletSSO CredentialSSO Principal
SSO IFrame Demo007secret-password
SSO Web Content Demojetspeed_test0jetspeed
\ 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 @@ sso.type url + + sso.url.Principal + sso-principal + + + sso.url.Credential + sso-credential + @@ -1065,7 +1073,34 @@ - + + + SSO Demo help information, contains credentials for SSO demo portlets. + SSODemoHelp + SSO Demo Help + org.apache.portals.gems.file.FilePortlet + + portlet-icon + folder-remote.png + + + text/html + VIEW + + en + + SSO Demo Help + SSO Help + SSO,demo,help + + + + file + /_content/sso-demo.html + + + + a Custom Print Mode print 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 @@ -

SSO IFrame Demo Help

-
-To use the SSO IFrame Demo with URL-based authentication, you will need to enter the following SSO
-URL preferences for the URL parameter names (principal, credential) to work with the /demo/sso-demo site:
-
-
+

SSO IFrame Help

+

+The following preferences can be used with the SSO IFrame Portlet in addition to the standard IFrame preferences +

+

- - + + - - + + + + + + + + + + -
sso.url.Principalsso.url.CrendentialPreferenceUsage
sso-principalsso-credentialsso.typeThe type of Single signon authentication. Valid values: form | basic | basic.preemptive | url | url.base64
sso.url.CredentialThe name of the credential input field or parameter
sso.url.PrincipalThe name of the user name input field or parameter
-

-

-To use the SSO IFrame Demo with URL-based authentication, you will need to enter the following SSO
-Principal and Credential for the /demo/sso-demo site as the demo will take the authenticated principal
-currently logged in as the SSO Principal, and *always* require the SSO Credential listed below
-If a user is not authenticated, you must supply the SSO Principal name 'guest'.
-

-IGNORE ABOVE for now !!! Just enter the credentials shown below for now ... having a problem with Tomcat 5
-

-
-
- - - + + - - + +
SSO PrincipalSSO CredentialSSO PrincipalThe actual user name
007secret-passwordSSO CredentialThe actual crendential value
+

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 @@ User Registration admin,password,register,signup,user + + + SendEmail + false + + @@ -1499,6 +1505,31 @@ Tracking admin,tracking,out of service + + + + Welcome to Jetspeed + WelcomeToJetspeed + Welcome to Jetspeed + org.apache.portals.gems.file.FilePortlet + -1 + + text/html + VIEW + + en + + + Welcome to Jetspeed + Welcome + welcome + + + + file + /info/welcome.html + + 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")
#if($registeredUserMsg) +

$registeredUserMsg

Click here to start registration...

#else
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 @@ 1.0 war - - org.apache.portals.bridges - perl - 1.0 - war - - - org.apache.portals.bridges - php - 1.0 - war - @@ -124,16 +112,6 @@ jsf-demo /jsf-demo - - org.apache.portals.bridges - perl - /perl - - - org.apache.portals.bridges - php - /php - ${pom.groupId} jetspeed-api 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 @@ - - - - - - - - - - @@ -573,8 +563,6 @@ - - @@ -583,8 +571,6 @@ - - @@ -603,10 +589,6 @@ - - - - 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 @@ 1.0.1-dev 1.0.1-dev 1.0.1-dev - 1.0.1-dev - 1.0.1-dev 1.0.1-dev 1.0.1-dev 2.0.7 @@ -909,18 +907,6 @@ jsf-demo war ${org.apache.portals.bridges.jsf-demo.version} - - - org.apache.portals.bridges - perl - war - ${org.apache.portals.bridges.perl.version} - - - org.apache.portals.bridges - php - war - ${org.apache.portals.bridges.php.version} 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 @@ - - - My Second PSML page - PSML ページ 2 - Mi 2ª página PSML - Otra página - A második PSML oldalam - 第二个PSML页面 - 第二個PSML頁面 - - - - - - users - + + + SSO Demo + PSML ページ 2 + Mi 2ª página PSML + Otra página + + A második PSML oldalam + + 第二个PSML页面 + 第二個PSML頁面 + + + + + + + + + + + + + + + + + + public-edit + 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 @@ - * + user view, edit --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org