svn commit: r1635956 - in /portals/jetspeed-2/portal/trunk: applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml

[email protected]
Newsgroups gmane.comp.jakarta.jetspeed.devel
Message-ID <[email protected]>
Author: woonsan
Date: Sat Nov  1 14:27:44 2014
New Revision: 1635956

URL: http://svn.apache.org/r1635956
Log:
JS2-1302, JS2-1303, JS2-1304, JS2-1305

Adding sso related portlets in SSODemo page;
Adding example sso credentials for admin/manager.

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml
    portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml?rev=1635956&r1=1635955&r2=1635956&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml (original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/pages/p002.psml Sat Nov  1 14:27:44 2014
@@ -1,54 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version 2.0
-	(the "License"); you may not use this file except in compliance with
-	the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
+    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.
 -->
 <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.2/schemas/psml.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.2/schemas/psml.xsd">
 
-	<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="j2-admin::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="j2-admin::SSOIFramePortlet">
-				<property layout="TwoColumns" name="row" value="0" />
-				<property layout="TwoColumns" name="column" value="0" />
-			</fragment>
-			<fragment id="wcp2.0" type="portlet"
-				name="j2-admin::SSOWebContentPortlet">
-				<property layout="TwoColumns" name="row" value="0" />
-				<property layout="TwoColumns" name="column" value="1" />
-			</fragment>
-		</fragment>
-	</fragment>
-	<security-constraints>
-		<security-constraints-ref>user-edit</security-constraints-ref>
-	</security-constraints>
+    <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="sso-demo-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+        <fragment id="sso-demo-11" type="portlet" name="j2-admin::SSODemoHelp">
+            <property layout="OneColumn" name="row" value="0" />
+        </fragment>
+        <fragment id="sso-demo-21" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+            <property layout="OneColumn" name="sizes" value="30%,70%" />
+            <fragment id="sso-demo-2111" type="portlet" name="j2-admin::SSOIFramePortlet">
+                <property layout="TwoColumns" name="row" value="0" />
+                <property layout="TwoColumns" name="column" value="0" />
+            </fragment>
+            <fragment id="sso-demo-2112" type="portlet" name="j2-admin::SSOWebContentPortlet">
+                <property layout="TwoColumns" name="row" value="0" />
+                <property layout="TwoColumns" name="column" value="1" />
+            </fragment>
+            <fragment id="sso-demo-2121" type="portlet" name="j2-admin::SSOReverseProxyIFramePortlet">
+                <property layout="TwoColumns" name="row" value="1" />
+                <property layout="TwoColumns" name="column" value="0" />
+            </fragment>
+            <fragment id="sso-demo-2122" type="portlet" name="j2-admin::SSOFormBasedAuthReverseProxyIFramePortlet">
+                <property layout="TwoColumns" name="row" value="1" />
+                <property layout="TwoColumns" name="column" value="1" />
+            </fragment>
+        </fragment>
+    </fragment>
+    <security-constraints>
+        <security-constraints-ref>user-edit</security-constraints-ref>
+    </security-constraints>
 </page>

Modified: portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml?rev=1635956&r1=1635955&r2=1635956&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-portal-resources/src/main/resources/seed/j2-seed.xml Sat Nov  1 14:27:44 2014
@@ -949,4 +949,32 @@
 		
 	</ProfilingRules>
 
+  <SSOSites>
+    <Site
+      name="Localhost Example Basic Auth"
+      siteURL="http://localhost:8080/j2-admin/examples/basicauth.jsp"
+      allowUserSet="true"
+      challengeResponseAuthentication="true"
+      formAuthentication="false"
+      realm="ExampleBasicAuthJSP">
+      <RemoteUsers>
+        <RemoteUser principalName="admin" principalType="user" name="admin" password="KwEeHR0="/>
+        <RemoteUser principalName="manager" principalType="user" name="manager" password="JwQdFRQVFw=="/>
+      </RemoteUsers>
+    </Site>
+    <Site
+      name="Localhost Example Form Auth"
+      siteURL="http://localhost:8080/j2-admin/examples/formauth.jsp"
+      allowUserSet="true"
+      challengeResponseAuthentication="false"
+      formAuthentication="true"
+      formUserField="user"
+      formPwdField="pass">
+      <RemoteUsers>
+        <RemoteUser principalName="admin" principalType="user" name="admin" password="KwEeHR0="/>
+        <RemoteUser principalName="manager" principalType="user" name="manager" password="JwQdFRQVFw=="/>
+      </RemoteUsers>
+    </Site>
+  </SSOSites>
+
 </Snapshot>
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.