You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2009/04/13 23:55:07 UTC
svn commit: r764631 - in /portals/jetspeed-2/applications/j2-admin/trunk: ./
src/main/java/org/apache/jetspeed/portlets/sso/ src/webapp/WEB-INF/
Author: taylor
Date: Mon Apr 13 21:55:06 2009
New Revision: 764631
URL: http://svn.apache.org/viewvc?rev=764631&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-966
Added:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java (contents, props changed)
- copied, changed from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java (contents, props changed)
- copied, changed from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOPortletUtil.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java (contents, props changed)
- copied, changed from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java (contents, props changed)
- copied, changed from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOTicketPortlet.java
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java (contents, props changed)
- copied, changed from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
Modified: portals/jetspeed-2/applications/j2-admin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/pom.xml?rev=764631&r1=764630&r2=764631&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/pom.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/pom.xml Mon Apr 13 21:55:06 2009
@@ -87,7 +87,8 @@
<org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
<org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
<org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
-
+ <org.apache.portals.applications.webcontent.version>1.0-SNAPSHOT</org.apache.portals.applications.webcontent.version>
+
<!-- Project Dependency Version Properties -->
<aopalliance.version>1.0</aopalliance.version>
<aspectj.version>1.5.3</aspectj.version>
@@ -377,6 +378,12 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.portals.applications</groupId>
+ <artifactId>apa-webcontent-jar</artifactId>
+ <version>${org.apache.portals.applications.webcontent.version}</version>
+ </dependency>
+
</dependencies>
<distributionManagement>
Copied: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java (from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java?p2=portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java&r1=764085&r2=764631&rev=764631&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOIFramePortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java Mon Apr 13 21:55:06 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jetspeed.portlet;
+package org.apache.jetspeed.portlets.sso;
import java.io.IOException;
@@ -29,12 +29,12 @@
import javax.portlet.RenderResponse;
import org.apache.commons.codec.binary.Base64;
-import org.apache.jetspeed.portlet.sso.SSOPortletUtil;
import org.apache.jetspeed.security.PasswordCredential;
import org.apache.jetspeed.sso.SSOException;
import org.apache.jetspeed.sso.SSOManager;
import org.apache.jetspeed.sso.SSOSite;
import org.apache.jetspeed.sso.SSOUser;
+import org.apache.portals.applications.webcontent.portlet.IFrameGenericPortlet;
/**
* SSOIFramePortlet
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOIFramePortlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java (from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOPortletUtil.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java?p2=portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOPortletUtil.java&r1=764085&r2=764631&rev=764631&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOPortletUtil.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java Mon Apr 13 21:55:06 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jetspeed.portlet.sso;
+package org.apache.jetspeed.portlets.sso;
import java.security.AccessControlContext;
import java.security.AccessController;
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOPortletUtil.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java (from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java?p2=portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java&r1=764085&r2=764631&rev=764631&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/sso/SSOProxyPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java Mon Apr 13 21:55:06 2009
@@ -14,10 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-/*Created on: Dec 5, 2005 */
-
-package org.apache.jetspeed.portlet.sso;
+package org.apache.jetspeed.portlets.sso;
import java.io.IOException;
import java.security.AccessControlContext;
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOProxyPortlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java (from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOTicketPortlet.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java?p2=portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOTicketPortlet.java&r1=764085&r2=764631&rev=764631&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOTicketPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java Mon Apr 13 21:55:06 2009
@@ -1,4 +1,20 @@
-package org.apache.jetspeed.portlet;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.jetspeed.portlets.sso;
import java.io.IOException;
import java.io.InputStreamReader;
@@ -13,10 +29,10 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethodBase;
import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.jetspeed.rewriter.ParserAdaptor;
-import org.apache.jetspeed.rewriter.RewriterException;
-import org.apache.jetspeed.rewriter.TicketParamRewriter;
-import org.apache.jetspeed.rewriter.html.SwingParserAdaptor;
+import org.apache.portals.applications.webcontent.rewriter.ParserAdaptor;
+import org.apache.portals.applications.webcontent.rewriter.RewriterException;
+import org.apache.portals.applications.webcontent.rewriter.TicketParamRewriter;
+import org.apache.portals.applications.webcontent.rewriter.html.SwingParserAdaptor;
public class SSOTicketPortlet extends SSOWebContentPortlet
{
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOTicketPortlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java (from r764085, portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java)
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java?p2=portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java&p1=portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java&r1=764085&r2=764631&rev=764631&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-web-content/src/main/java/org/apache/jetspeed/portlet/SSOWebContentPortlet.java (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java Mon Apr 13 21:55:06 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jetspeed.portlet;
+package org.apache.jetspeed.portlets.sso;
import java.io.IOException;
import java.security.AccessControlContext;
@@ -45,8 +45,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.CommonPortletServices;
-import org.apache.jetspeed.portlet.sso.SSOPortletUtil;
-import org.apache.jetspeed.rewriter.WebContentRewriter;
+import org.apache.portals.applications.webcontent.portlet.WebContentPortlet;
+import org.apache.portals.applications.webcontent.rewriter.WebContentRewriter;
import org.apache.jetspeed.security.JSSubject;
import org.apache.jetspeed.security.JetspeedPrincipal;
import org.apache.jetspeed.security.PasswordCredential;
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/sso/SSOWebContentPortlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml?rev=764631&r1=764630&r2=764631&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/webapp/WEB-INF/portlet.xml Mon Apr 13 21:55:06 2009
@@ -2150,6 +2150,132 @@
<keywords>admin,schema,data,import,export,serializer</keywords>
</portlet-info>
</portlet>
+
+ <portlet id="SSOIFrame">
+ <description>Places an HTML IFrame inside a portlet for easily hosting other web application within a portlet. Sizes of both normal and maximized modes are configurable in edit mode. Additional Single-Signon Support to automatically log on this portlet to other web sites.</description>
+ <portlet-name>SSOIFramePortlet</portlet-name>
+ <display-name>SSO IFrame Portlet</display-name>
+ <portlet-class>org.apache.jetspeed.portlet.SSOIFramePortlet</portlet-class>
+ <init-param>
+ <name>EditPage</name>
+ <value>/WEB-INF/view/sso-edit-prefs.vm</value>
+ </init-param>
+ <init-param>
+ <name>HelpPage</name>
+ <value>/WEB-INF/view/iframe-help.html</value>
+ </init-param>
+ <init-param>
+ <name>portlet-icon</name>
+ <value>system-software-update.png</value>
+ </init-param>
+ <expiration-cache>300</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>SSO IFrame</title>
+ <short-title>SSO</short-title>
+ <keywords>frame,tool,iframe,SSO,single,sign-on,security,web,content,host</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <preference>
+ <name>SRC</name>
+ <value>/demo/sso-demo</value>
+ </preference>
+ <preference>
+ <name>HEIGHT</name>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <name>WIDTH</name>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <name>MAX-HEIGHT</name>
+ <value>800</value>
+ </preference>
+ <preference>
+ <name>MAX-WIDTH</name>
+ <value>100%</value>
+ </preference>
+ <preference>
+ <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>
+
+ <portlet id="SSOWebContent">
+ <description>Includes the content of another website inside the portal without using frames. All links are rewritten back to the portal to attempt to proxy all content through the portal. Additional Single-Signon Support to automatically log on this portlet to other web sites and manage sessions.</description>
+ <portlet-name>SSOWebContentPortlet</portlet-name>
+ <display-name>SSO WebContent Portlet</display-name>
+ <portlet-class>org.apache.jetspeed.portlet.SSOWebContentPortlet</portlet-class>
+ <init-param>
+ <name>EditPage</name>
+ <value>/WEB-INF/view/sso-edit-prefs.vm</value>
+ </init-param>
+ <init-param>
+ <name>HelpPage</name>
+ <value>/WEB-INF/view/sso-webcontent-help.vm</value>
+ </init-param>
+ <init-param>
+ <name>portlet-icon</name>
+ <value>system-software-update.png</value>
+ </init-param>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>EDIT</portlet-mode>
+ <portlet-mode>VIEW</portlet-mode>
+ <portlet-mode>HELP</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>SSO Web Content</title>
+ <short-title>SSO Content</short-title>
+ <keywords>web,content,webnav,bridge,proxy,rewrite,SSO,single,sign-on</keywords>
+ </portlet-info>
+ <portlet-preferences>
+ <!-- NY TIMES EXAMPLE, user ID is 'jetspeed_test0' and password is 'jetspeed' -->
+ <preference>
+ <name>SRC</name>
+ <value>http://www.nytimes.com</value>
+ </preference>
+ <preference>
+ <name>sso.type</name>
+ <value>form</value>
+ </preference>
+ <preference>
+ <name>sso.form.Action</name>
+ <value>http://www.nytimes.com/auth/login</value>
+ </preference>
+ <preference>
+ <name>sso.form.Principal</name>
+ <value>USERID</value>
+ </preference>
+ <preference>
+ <name>sso.form.Credential</name>
+ <value>PASSWORD</value>
+ </preference>
+ <preference>
+ <name>sso.form.Args</name>
+ <value>Submit2=Log In;OP=;OQ=;is_continue=false</value>
+ </preference>
+ </portlet-preferences>
+ </portlet>
+
<custom-portlet-mode>
<description>a Custom Edit_defaults Mode</description>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org