November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r5085 - in portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui: page and 1 other directory.

by do-not-reply＠jboss.org

Author: ndkhoiits Date: 2010-11-14 23:37:32 -0500 (Sun, 14 Nov 2010) New Revision: 5085 Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java Log: GTNPORTAL-1631 Navigation drop down menu is not updated when a page is deleted. Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-11-15 00:32:28 UTC (rev 5084) +++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java 2010-11-15 04:37:32 UTC (rev 5085) @@ -367,6 +367,12 @@ } PageNode cloneStartNode = startNode.clone(); + + // Check if page reference isn't existing, page reference value of node is setted null too. + if (pageReference != null && userService.getPage(pageReference) == null) + { + cloneStartNode.setPageReference(null); + } ArrayList<PageNode> filteredChildren = new ArrayList<PageNode>(); List<PageNode> children = startNode.getChildren(); Modified: portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-11-15 00:32:28 UTC (rev 5084) +++ portal/branches/branch-GTNPORTAL-1643/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageBrowser.java 2010-11-15 04:37:32 UTC (rev 5085) @@ -309,6 +309,12 @@ if(page.getOwnerType().equals(PortalConfig.USER_TYPE)){ removePageNode(page, event); } + + UIWorkingWorkspace uiWorkingWorkspace = uiPortalApp.getChild(UIWorkingWorkspace.class); + uiWorkingWorkspace.updatePortletsByName("UserToolbarSitePortlet"); + uiWorkingWorkspace.updatePortletsByName("UserToolbarGroupPortlet"); + uiWorkingWorkspace.updatePortletsByName("UserToolbarDashboardPortlet"); + uiWorkingWorkspace.updatePortletsByName("NavigationPortlet"); } /**

15 years, 5 months

1
0
0 / 0

gatein SVN: r5084 - epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-11-14 19:32:28 -0500 (Sun, 14 Nov 2010) New Revision: 5084 Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml Log: JBEPP-603: Updated component list Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-11-14 07:03:43 UTC (rev 5083) +++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/5.1.0_Release_Notes.xml 2010-11-15 00:32:28 UTC (rev 5084) @@ -70,9 +70,7 @@ <entry> Version </entry> - </row> - </thead> <tbody> <row> @@ -82,126 +80,135 @@ <entry> 5.0.1-GA </entry> - </row> <row> <entry> - JBoss Cache + eXo Kernel </entry> <entry> - 3.2.6 + 2.2.6.CR01 </entry> - </row> - <row> + <row> + <entry> + eXo Core + </entry> + <entry> + 2.3.6-CR01 + </entry> + </row> + <row> + <entry> + eXo WS + </entry> + <entry> + 2.1.6-CR01 + </entry> + </row> + <row> <entry> - GateIn Common + eXo JCR </entry> <entry> - 2.0.3-GA + 1.12.6.CR01 </entry> - - </row> - <row> + </row> + <row> <entry> - GateIn WCI + JBoss Cache </entry> <entry> - 2.0.2-GA + 3.2.6 </entry> - </row> - <row> + <row> <entry> - GateIn PC + Apache Shindig </entry> <entry> - 2.2.0-CR01 + 1.0-r790473-Patch04 </entry> - </row> - <row> + <row> + <entry> + Simple Captcha + </entry> + <entry> + 1.1.1-GA-Patch01 + </entry> + </row> + <row> <entry> - GateIn WSRP + GateIn Common </entry> <entry> - 2.0.0-Beta05 + 2.0.3-GA </entry> - </row> - <row> + <row> <entry> - GateIn MOP + GateIn WCI </entry> <entry> - 1.0.3-GA + 2.0.2-GA </entry> - </row> - <row> + <row> <entry> - GateIn SSO + GateIn PC </entry> <entry> - 1.0.0-epp + 2.2.0-CR02 </entry> - </row> - <row> + <row> <entry> - PicketLink IDM + GateIn WSRP </entry> <entry> - 1.1.6.GA + 2.0.0.CR02 </entry> - </row> - <row> + <row> <entry> - eXo JCR + GateIn MOP </entry> <entry> - 1.12.5-GA + 1.0.3-GA </entry> - </row> - <row> + <row> <entry> - eXo Kernel + PicketLink IDM </entry> <entry> - 2.2.5-GA + 1.1.7.CR01 </entry> - </row> - <row> + <row> <entry> - Portlet Bridge + Chromattic </entry> <entry> - 2.1.0-CR01 + 1.0.3 </entry> - </row> - <row> + <row> <entry> - Chromattic + Portlet Bridge </entry> <entry> - 1.0.3 + 2.1.0-CR01 </entry> - </row> - <row> + <row> <entry> - Apache Shindig + GateIn SSO </entry> <entry> - 1.0-r790473-Patch04 + 1.0.0-epp </entry> - </row> - </tbody> </tgroup> @@ -443,6 +450,17 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-562"></ulink></term> + <listitem> + <para> + A <emphasis role="bold">NullPointerException</emphasis> was be seen in a server log stacktrace after a user authenticated with the SPNEGO Single Sign-On method was automatically evicted after the set time-out period has elapsed. + </para> + <para> + This issue did not produce any other effects and has been resolved with a change in the code in <filename>SPNEGORolesModule.java</filename>. + </para> + </listitem> + </varlistentry> </variablelist>  <variablelist> @@ -507,6 +525,19 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-521"></ulink></term> + <listitem> + <para> + New text has been added to the startup log to identify which version of the product is being run. + </para> + <para> + The new output will appear similar to the example below: + </para> +<screen>11:05:34,923 INFO [VersionDisplayer] JBoss Enterprise Portal Platform [5.1.0-epp-ER04-SNAPSHOT] +</screen> + </listitem> + </varlistentry> </variablelist>  <variablelist> @@ -566,17 +597,6 @@ </para> </listitem> </varlistentry> - <varlistentry> - <term><ulink type="http" url="https://jira.jboss.org/browse/JBEPP-562"></ulink></term> - <listitem> - <para> - A <emphasis role="bold">NullPointerException</emphasis> can be seen in a server log stacktrace after a user authenticated with the SPNEGO Single Sign-On method is automatically evicted after the set time-out period has elapsed. - </para> - <para> - This issue does not produce any other effects. - </para> - </listitem> - </varlistentry> </variablelist> </section>  Modified: epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2010-11-14 07:03:43 UTC (rev 5083) +++ epp/docs/branches/EPP_5_1_Branch/Release_Notes/en-US/Revision_History.xml 2010-11-15 00:32:28 UTC (rev 5084) @@ -9,7 +9,7 @@ <revhistory> <revision> <revnumber>1-1.3</revnumber> - <date>Tue Nov 09 2010</date> + <date>Wed Nov 10 2010</date> <author> <firstname>Scott</firstname> <surname>Mumford</surname> @@ -17,7 +17,8 @@ </author> <revdescription> <simplelist> - <member>Added more JIRA descriptions. Split 'Issues Fixed' into Product, Upstream and New Features lists</member> + <member>Added more JIRA descriptions.</member> + <member>Split 'Issues Fixed' into Product, Upstream and New Features lists</member> </simplelist> </revdescription> </revision>

15 years, 5 months

1
0
0 / 0

gatein SVN: r5083 - epp/examples/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-14 02:03:43 -0500 (Sun, 14 Nov 2010) New Revision: 5083 Added: epp/examples/tags/EPP_5_1_0_ER04/ Removed: epp/examples/tags/EPP_5_1_0_GA/ Log: oups Copied: epp/examples/tags/EPP_5_1_0_ER04 (from rev 5082, epp/examples/tags/EPP_5_1_0_GA)

15 years, 5 months

1
0
0 / 0

gatein SVN: r5082 - in portal/branches/branch-GTNPORTAL-1643/component/portal/src: main/java/org/exoplatform/portal/pom/config and 1 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-13 17:25:56 -0500 (Sat, 13 Nov 2010) New Revision: 5082 Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java portal/branches/branch-GTNPORTAL-1643/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java Log: GTNPORTAL-1512 : Always show message "This page name already exists. " after delete group Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-11-13 12:50:52 UTC (rev 5081) +++ portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/Page.java 2010-11-13 22:25:56 UTC (rev 5082) @@ -50,6 +50,13 @@ { } + public Page(String ownerType, String ownerId, String name) + { + this.ownerType = ownerType; + this.ownerId = ownerId; + this.name = name; + } + public Page(PageData data) { super(data); Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2010-11-13 12:50:52 UTC (rev 5081) +++ portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/config/model/PortalConfig.java 2010-11-13 22:25:56 UTC (rev 5082) @@ -78,7 +78,13 @@ public PortalConfig(String type) { + this(type, null); + } + + public PortalConfig(String type, String ownerId) + { this.type = type; + this.name = ownerId; // setPortalLayout(new Container()); @@ -99,14 +105,6 @@ this.portalLayout = new Container(data.getPortalLayout()); } - PortalConfig(String storageId, String type) - { - super(storageId); - - // - this.type = type; - } - public String getType() { return type; Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java 2010-11-13 12:50:52 UTC (rev 5081) +++ portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/GlobalKey.java 2010-11-13 22:25:56 UTC (rev 5082) @@ -55,6 +55,16 @@ this.localKey = localKey; } + public String getRepositoryId() + { + return repositoryId; + } + + public Serializable getLocalKey() + { + return localKey; + } + @Override public int hashCode() { Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2010-11-13 12:50:52 UTC (rev 5081) +++ portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSessionManager.java 2010-11-13 22:25:56 UTC (rev 5082) @@ -23,8 +23,12 @@ import org.exoplatform.commons.chromattic.ChromatticManager; import org.exoplatform.commons.chromattic.SessionContext; import org.exoplatform.portal.pom.config.cache.DataCache; +import org.exoplatform.portal.pom.data.OwnerKey; +import org.exoplatform.portal.pom.data.PortalKey; import org.exoplatform.services.cache.CacheService; +import org.exoplatform.services.cache.CachedObjectSelector; import org.exoplatform.services.cache.ExoCache; +import org.exoplatform.services.cache.ObjectCacheInfo; import org.exoplatform.services.jcr.RepositoryService; import org.gatein.common.logging.Logger; import org.gatein.common.logging.LoggerFactory; @@ -105,7 +109,7 @@ public void cacheRemove(Serializable key) { - GlobalKey globalKey = GlobalKey.wrap(configurator.getRepositoryName(), key); + final GlobalKey globalKey = GlobalKey.wrap(configurator.getRepositoryName(), key); // if (log.isTraceEnabled()) @@ -114,7 +118,47 @@ } // - cache.remove(globalKey); + if (key instanceof PortalKey) + { + // This code seems complex but actually it tries to find all objects in cache that have the same + // owner key than the portal key, for instance if we remove (portal,classic) then all pages + // related to (portal,classic) are also evicted + final PortalKey portalKey = (PortalKey)key; + try + { + cache.select(new CachedObjectSelector<GlobalKey, Object>() + { + public boolean select(GlobalKey selectedGlobalKey, ObjectCacheInfo<?> ocinfo) + { + if (globalKey.getRepositoryId().equals(selectedGlobalKey.getRepositoryId())) + { + Serializable selectedLocalKey = selectedGlobalKey.getLocalKey(); + if (selectedLocalKey instanceof OwnerKey) + { + OwnerKey selectedOwnerKey = (OwnerKey)selectedLocalKey; + if (selectedOwnerKey.getType().equals(portalKey.getType()) && selectedOwnerKey.getId().equals(portalKey.getId())) + { + return true; + } + } + } + return false; + } + public void onSelect(ExoCache<? extends GlobalKey, ?> exoCache, GlobalKey key, ObjectCacheInfo<?> ocinfo) throws Exception + { + cache.remove(key); + } + }); + } + catch (Exception e) + { + log.error("Unexpected error when clearing pom cache", e); + } + } + else + { + cache.remove(globalKey); + } } public void start() Modified: portal/branches/branch-GTNPORTAL-1643/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java =================================================================== --- portal/branches/branch-GTNPORTAL-1643/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2010-11-13 12:50:52 UTC (rev 5081) +++ portal/branches/branch-GTNPORTAL-1643/component/portal/src/test/java/org/exoplatform/portal/config/TestCache.java 2010-11-13 22:25:56 UTC (rev 5082) @@ -20,9 +20,9 @@ import org.exoplatform.container.PortalContainer; import org.exoplatform.portal.config.model.Page; +import org.exoplatform.portal.config.model.PortalConfig; import org.exoplatform.portal.pom.config.POMSession; import org.exoplatform.portal.pom.config.POMSessionManager; - import java.util.concurrent.atomic.AtomicBoolean; /** @@ -128,4 +128,48 @@ // end(); } + + public void testGetPageFromRemovedPortal() throws Exception + { + // Create what we need for the test + begin(); + session = mgr.openSession(); + PortalConfig portalConfig = new PortalConfig("portal", "testGetPageFromRemovedPortal"); + storage_.create(portalConfig); + storage_.create(new Page("portal", "testGetPageFromRemovedPortal", "home")); + end(true); + + // Clear cache + mgr.clearCache(); + + // The first transaction + begin(); + session = mgr.openSession(); + + // Get page from JCR and it should be stored in cache + Page page = storage_.getPage("portal::testGetPageFromRemovedPortal::home"); + assertNotNull(page); + + // Now remove the portal + PortalConfig portal = storage_.getPortalConfig("portal", "testGetPageFromRemovedPortal"); + storage_.remove(portal); + + // Terminate the first transaction + end(true); + + // The second transaction + begin(); + session = mgr.openSession(); + + // The portal should be null + portal = storage_.getPortalConfig("portal", "testGetPageFromRemovedPortal"); + assertNull(portal); + + // The portal home page should also be null + page = storage_.getPage("portal::testGetPageFromRemovedPortal::home"); + assertNull(page); + + // End second transaction + end(true); + } }

15 years, 5 months

1
0
0 / 0

gatein SVN: r5081 - epp/examples/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-13 07:50:52 -0500 (Sat, 13 Nov 2010) New Revision: 5081 Added: epp/examples/tags/EPP_5_1_0_GA/ Log: Tagging examples Copied: epp/examples/tags/EPP_5_1_0_GA (from rev 5080, epp/examples/branches/EPP_5_1_Branch)

15 years, 5 months

1
0
0 / 0

gatein SVN: r5080 - epp/examples/branches/EPP_5_1_Branch/portlets/prpapi.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-13 07:50:11 -0500 (Sat, 13 Nov 2010) New Revision: 5080 Modified: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml Log: oups Modified: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml 2010-11-13 12:48:27 UTC (rev 5079) +++ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml 2010-11-13 12:50:11 UTC (rev 5080) @@ -25,6 +25,7 @@ <dependency> <groupId>javax.portlet</groupId> <artifactId>portlet-api</artifactId> + <version>2.0</version> <scope>provided</scope> </dependency> </dependencies>

15 years, 5 months

1
0
0 / 0

gatein SVN: r5079 - in epp/examples/branches/EPP_5_1_Branch/portlets: idmhelloworld and 12 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-13 07:48:27 -0500 (Sat, 13 Nov 2010) New Revision: 5079 Added: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/api/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/api/PRPPortlet.java epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/resources/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/portlet.xml epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/web.xml Modified: epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml epp/examples/branches/EPP_5_1_Branch/portlets/pom.xml Log: Addind PRP API example Modified: epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml 2010-11-12 23:59:48 UTC (rev 5078) +++ epp/examples/branches/EPP_5_1_Branch/portlets/idmhelloworld/pom.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.portal.examples.portlets</groupId> - <version>1.0.0-GA-SNAPSHOT</version> + <version>1.0.1-GA-SNAPSHOT</version> <artifactId>gatein-idm-helloworld</artifactId> <packaging>war</packaging> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml 2010-11-12 23:59:48 UTC (rev 5078) +++ epp/examples/branches/EPP_5_1_Branch/portlets/jsphellouser/pom.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -2,7 +2,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>org.gatein.portal.examples.ortlets</groupId> + <groupId>org.gatein.portal.examples.portlets</groupId> <version>1.0.1-GA-SNAPSHOT</version> <artifactId>gatein-jsp-hellouser</artifactId> <packaging>war</packaging> Modified: epp/examples/branches/EPP_5_1_Branch/portlets/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/pom.xml 2010-11-12 23:59:48 UTC (rev 5078) +++ epp/examples/branches/EPP_5_1_Branch/portlets/pom.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -13,6 +13,7 @@ <module>jsfhellouser</module> <module>jsphellouser</module> <module>simplesthelloworld</module> + <module>prpapi</module> </modules> </project> Added: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml (rev 0) +++ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/pom.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.gatein.portal.examples.portlets</groupId> + <version>1.0.0-GA-SNAPSHOT</version> + <artifactId>gatein-prp-api</artifactId> + <packaging>war</packaging> + <name>EPP Portlets Examples - Public Render Parameters API example Portlet</name> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> +</project> Added: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/api/PRPPortlet.java =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/api/PRPPortlet.java (rev 0) +++ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/java/org/gatein/portal/samples/api/PRPPortlet.java 2010-11-13 12:48:27 UTC (rev 5079) @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.gatein.portal.samples.api; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Map; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class PRPPortlet extends GenericPortlet +{ + + @Override + protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, IOException + { + resp.setContentType("text/html"); + PrintWriter writer = resp.getWriter(); + + // + writer.println("Public Render Parameters<br/>"); + writer.println("<table>"); + for (Map.Entry<String, String[]> entry : req.getParameterMap().entrySet()) + { + writer.print("<tr>"); + writer.print("<td>"); + writer.print(entry.getKey()); + writer.print("</td>"); + writer.print("<td>"); + writer.print(entry.getValue()[0]); + writer.print("</td>"); + writer.print("</tr>"); + } + writer.println("</table>"); + + // + writer.close(); + } +} Added: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/portlet.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/portlet.xml (rev 0) +++ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/portlet.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" version="1.0"> + + <portlet> + <description xml:lang="EN">Public Render Parameter API Portlet</description> + <portlet-name>PRPAPIPortlet</portlet-name> + <display-name xml:lang="EN">Public Render Parameter API Portlet</display-name> + <portlet-class>org.gatein.portal.samples.api.PRPPortlet</portlet-class> + + <supports> + <mime-type>text/html</mime-type> + </supports> + + <portlet-info> + <title>PRP Portlet</title> + <short-title>PRP Portlet</short-title> + <keywords>Sample</keywords> + </portlet-info> + + <supported-public-render-parameter>navigation_uri</supported-public-render-parameter> + <supported-public-render-parameter>page_name</supported-public-render-parameter> + <supported-public-render-parameter>site_type</supported-public-render-parameter> + <supported-public-render-parameter>site_name</supported-public-render-parameter> + <supported-public-render-parameter>window_width</supported-public-render-parameter> + <supported-public-render-parameter>window_height</supported-public-render-parameter> + <supported-public-render-parameter>window_show_info_bar</supported-public-render-parameter> + + </portlet> + + <public-render-parameter> + <identifier>navigation_uri</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:navigation_uri</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>page_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:page_name</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>site_type</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_type</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>site_name</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:site_name</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_width</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_width</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_height</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_height</qname> + </public-render-parameter> + <public-render-parameter> + <identifier>window_show_info_bar</identifier> + <qname xmlns:prp='http://www.gatein.org/xml/ns/prp_1_0'>prp:window_show_info_bar</qname> + </public-render-parameter> + +</portlet-app> Added: epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/web.xml =================================================================== --- epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/web.xml (rev 0) +++ epp/examples/branches/EPP_5_1_Branch/portlets/prpapi/src/main/webapp/WEB-INF/web.xml 2010-11-13 12:48:27 UTC (rev 5079) @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.5"> + + <servlet> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class> + <load-on-startup>0</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>GateInServlet</servlet-name> + <url-pattern>/gateinservlet</url-pattern> + </servlet-mapping> + +</web-app>

15 years, 5 months

1
0
0 / 0

gatein SVN: r5078 - in components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent: cas and 3 other directories.

by do-not-reply＠jboss.org

Author: sohil.shah(a)jboss.com Date: 2010-11-12 18:59:48 -0500 (Fri, 12 Nov 2010) New Revision: 5078 Added: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/filter/InitiateLoginFilter.java Removed: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java Log: removing dependency on the InitiateLoginServlet from the portal Deleted: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-11-12 21:16:39 UTC (rev 5077) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/GenericSSOAgent.java 2010-11-12 23:59:48 UTC (rev 5078) @@ -1,129 +0,0 @@ -/* - * JBoss, a division of Red Hat - * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.gatein.sso.agent; - -import java.io.IOException; - -import org.apache.log4j.Logger; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.exoplatform.web.login.InitiateLoginServlet; - -import org.gatein.sso.agent.cas.CASAgent; -import org.gatein.sso.agent.josso.JOSSOAgent; -import org.gatein.sso.agent.opensso.OpenSSOAgent; - -/** - * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> - */ -public class GenericSSOAgent extends InitiateLoginServlet -{ - private static final long serialVersionUID = 6330639010812906309L; - - private static Logger log = Logger.getLogger(GenericSSOAgent.class); - - private String ssoServerUrl; - private String ssoCookieName; - private boolean casRenewTicket; - - - @Override - public void init() throws ServletException - { - super.init(); - - this.ssoServerUrl = this.getServletConfig().getInitParameter("ssoServerUrl"); - this.ssoCookieName = this.getServletConfig().getInitParameter("ssoCookieName"); - - String casRenewTicketConfig = this.getServletConfig().getInitParameter("casRenewTicket"); - if(casRenewTicketConfig != null) - { - this.casRenewTicket = Boolean.parseBoolean(casRenewTicketConfig); - } - } - - @Override - protected void doGet(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException - { - try - { - this.processSSOToken(req,resp); - - String portalContext = req.getContextPath(); - if(req.getAttribute("abort") != null) - { - String ssoRedirect = portalContext + "/sso"; - resp.sendRedirect(ssoRedirect); - return; - } - - super.doGet(req, resp); - } - catch(Exception e) - { - log.error(this, e); - throw new ServletException(e); - } - } - - @Override - protected void doPost(HttpServletRequest req, HttpServletResponse resp) - throws ServletException, IOException - { - this.doGet(req, resp); - } - - private void processSSOToken(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws Exception - { - String ticket = httpRequest.getParameter("ticket"); - String jossoAssertion = httpRequest.getParameter("josso_assertion_id"); - - if (ticket != null && ticket.trim().length() > 0) - { - CASAgent casagent = CASAgent.getInstance(this.ssoServerUrl); - casagent.setRenewTicket(this.casRenewTicket); - casagent.validateTicket(httpRequest, ticket); - } - else if (jossoAssertion != null && jossoAssertion.trim().length() > 0) - { - //the JOSSO Agent. This will need to the new client side JOSSO stack that can run on 5.1.0.GA - JOSSOAgent.getInstance().validateTicket(httpRequest,httpResponse); - } - else - { - try - { - //See if an OpenSSO Token was used - OpenSSOAgent.getInstance(this.ssoServerUrl, this.ssoCookieName).validateTicket(httpRequest); - } - catch(IllegalStateException ilse) - { - //somehow cookie failed validation, retry by starting the opensso login process again - httpRequest.setAttribute("abort", Boolean.TRUE); - } - } - } -} Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-11-12 21:16:39 UTC (rev 5077) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-11-12 23:59:48 UTC (rev 5078) @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest; -import org.gatein.sso.agent.GenericSSOAgent; import org.gatein.wci.security.Credentials; import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; import org.jasig.cas.client.validation.Assertion; @@ -92,7 +91,7 @@ //better security String principal = assertion.getPrincipal().getName(); Credentials credentials = new Credentials(principal, ""); - httpRequest.getSession().setAttribute(GenericSSOAgent.CREDENTIALS, credentials); + httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials); httpRequest.getSession().setAttribute("username", principal); } } Added: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/filter/InitiateLoginFilter.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/filter/InitiateLoginFilter.java (rev 0) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/filter/InitiateLoginFilter.java 2010-11-12 23:59:48 UTC (rev 5078) @@ -0,0 +1,103 @@ +/** + * + */ +package org.gatein.sso.agent.filter; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.gatein.sso.agent.cas.CASAgent; +import org.gatein.sso.agent.josso.JOSSOAgent; +import org.gatein.sso.agent.opensso.OpenSSOAgent; + +/** + * @author soshah + * + */ +public class InitiateLoginFilter implements Filter +{ + private String ssoServerUrl; + private String ssoCookieName; + private boolean casRenewTicket; + + public void init(FilterConfig filterConfig) throws ServletException + { + this.ssoServerUrl = filterConfig.getInitParameter("ssoServerUrl"); + this.ssoCookieName = filterConfig.getInitParameter("ssoCookieName"); + + String casRenewTicketConfig = filterConfig.getInitParameter("casRenewTicket"); + if(casRenewTicketConfig != null) + { + this.casRenewTicket = Boolean.parseBoolean(casRenewTicketConfig); + } + } + + public void doFilter(ServletRequest request, ServletResponse response, + FilterChain chain) throws IOException, ServletException + { + try + { + HttpServletRequest req = (HttpServletRequest)request; + HttpServletResponse resp = (HttpServletResponse)response; + + this.processSSOToken(req,resp); + + String portalContext = req.getContextPath(); + if(req.getAttribute("abort") != null) + { + String ssoRedirect = portalContext + "/sso"; + resp.sendRedirect(ssoRedirect); + return; + } + + chain.doFilter(request, response); + } + catch(Exception e) + { + throw new ServletException(e); + } + } + + public void destroy() + { + } + + private void processSSOToken(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws Exception + { + String ticket = httpRequest.getParameter("ticket"); + String jossoAssertion = httpRequest.getParameter("josso_assertion_id"); + + if (ticket != null && ticket.trim().length() > 0) + { + CASAgent casagent = CASAgent.getInstance(this.ssoServerUrl); + casagent.setRenewTicket(this.casRenewTicket); + casagent.validateTicket(httpRequest, ticket); + } + else if (jossoAssertion != null && jossoAssertion.trim().length() > 0) + { + //the JOSSO Agent. This will need to the new client side JOSSO stack that can run on 5.1.0.GA + JOSSOAgent.getInstance().validateTicket(httpRequest,httpResponse); + } + else + { + try + { + //See if an OpenSSO Token was used + OpenSSOAgent.getInstance(this.ssoServerUrl, this.ssoCookieName).validateTicket(httpRequest); + } + catch(IllegalStateException ilse) + { + //somehow cookie failed validation, retry by starting the opensso login process again + httpRequest.setAttribute("abort", Boolean.TRUE); + } + } + } +} Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2010-11-12 21:16:39 UTC (rev 5077) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2010-11-12 23:59:48 UTC (rev 5078) @@ -27,7 +27,6 @@ import org.apache.log4j.Logger; import org.gatein.wci.security.Credentials; -import org.gatein.sso.agent.GenericSSOAgent; import org.josso.agent.Lookup; import org.josso.agent.SSOAgentRequest; @@ -101,7 +100,7 @@ log.debug("-----------------------------------------------------------"); Credentials credentials = new Credentials(principal, ""); - httpRequest.getSession().setAttribute(GenericSSOAgent.CREDENTIALS, credentials); + httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials); } } Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2010-11-12 21:16:39 UTC (rev 5077) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2010-11-12 23:59:48 UTC (rev 5078) @@ -33,7 +33,6 @@ import org.apache.commons.httpclient.methods.PostMethod; import org.gatein.wci.security.Credentials; -import org.gatein.sso.agent.GenericSSOAgent; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> @@ -98,7 +97,7 @@ if(subject != null) { Credentials credentials = new Credentials(subject, ""); - httpRequest.getSession().setAttribute(GenericSSOAgent.CREDENTIALS, credentials); + httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials); } } }

15 years, 5 months

1
0
0 / 0

gatein SVN: r5077 - in epp/sso/tags/1.0.1-epp-GA: agent and 12 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-11-12 16:16:39 -0500 (Fri, 12 Nov 2010) New Revision: 5077 Modified: epp/sso/tags/1.0.1-epp-GA/agent/pom.xml epp/sso/tags/1.0.1-epp-GA/auth-callback/pom.xml epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-plugin/pom.xml epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-portal/pom.xml epp/sso/tags/1.0.1-epp-GA/cas/pom.xml epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-plugin/pom.xml epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-portal/pom.xml epp/sso/tags/1.0.1-epp-GA/josso/pom.xml epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-plugin/pom.xml epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-portal/pom.xml epp/sso/tags/1.0.1-epp-GA/opensso/pom.xml epp/sso/tags/1.0.1-epp-GA/packaging/pom.xml epp/sso/tags/1.0.1-epp-GA/pom.xml epp/sso/tags/1.0.1-epp-GA/spnego/pom.xml Log: oups Modified: epp/sso/tags/1.0.1-epp-GA/agent/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/agent/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/agent/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/sso/tags/1.0.1-epp-GA/auth-callback/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/auth-callback/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/auth-callback/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-plugin/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-plugin/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-plugin/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-portal/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-portal/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/cas/gatein-cas-portal/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-plugin</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -23,12 +23,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.jasig.cas</groupId> Modified: epp/sso/tags/1.0.1-epp-GA/cas/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/cas/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/cas/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-cas-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <name>GateIn SSO - CAS</name> Modified: epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-plugin/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-plugin/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-plugin/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-portal/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-portal/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/josso/gatein-josso-portal/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -54,12 +54,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> @@ -74,7 +74,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-plugin</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>apache-log4j</groupId> Modified: epp/sso/tags/1.0.1-epp-GA/josso/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/josso/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/josso/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-josso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> Modified: epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-plugin/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-plugin/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-plugin/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-portal/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-portal/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/opensso/gatein-opensso-portal/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,7 +14,7 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-plugin</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>commons-httpclient</groupId> @@ -28,12 +28,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-auth-callback</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> </dependencies> Modified: epp/sso/tags/1.0.1-epp-GA/opensso/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/opensso/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/opensso/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-opensso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> <packaging>pom</packaging> <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> Modified: epp/sso/tags/1.0.1-epp-GA/packaging/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/packaging/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/packaging/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -2,7 +2,7 @@ <parent> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -14,12 +14,12 @@ <dependency> <groupId>org.gatein.sso</groupId> <artifactId>sso-agent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.gatein.sso</groupId> <artifactId>spnego</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </dependency> <dependency> <groupId>org.jboss.security</groupId> Modified: epp/sso/tags/1.0.1-epp-GA/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -10,7 +10,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> <packaging>pom</packaging> <parent> Modified: epp/sso/tags/1.0.1-epp-GA/spnego/pom.xml =================================================================== --- epp/sso/tags/1.0.1-epp-GA/spnego/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) +++ epp/sso/tags/1.0.1-epp-GA/spnego/pom.xml 2010-11-12 21:16:39 UTC (rev 5077) @@ -3,7 +3,7 @@ <groupId>org.gatein.sso</groupId> <artifactId>sso-parent</artifactId> <relativePath>../pom.xml</relativePath> - <version>1.0.2-GA-SNAPSHOT</version> + <version>1.0.1-epp-GA</version> </parent> <modelVersion>4.0.0</modelVersion>

15 years, 5 months

1
0
0 / 0

gatein SVN: r5076 - in components/sso/branches/sso-wci: agent and 4 other directories.

by do-not-reply＠jboss.org

Author: sohil.shah(a)jboss.com Date: 2010-11-12 15:36:12 -0500 (Fri, 12 Nov 2010) New Revision: 5076 Modified: components/sso/branches/sso-wci/agent/pom.xml components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/login/SSOLoginModule.java components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java components/sso/branches/sso-wci/pom.xml Log: working CAS Modified: components/sso/branches/sso-wci/agent/pom.xml =================================================================== --- components/sso/branches/sso-wci/agent/pom.xml 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/agent/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) @@ -13,7 +13,7 @@ <properties>  - <gatein.location>/home/soshah/projects/gatein/portal/trunk/packaging/pkg/target/jboss/server/gatein-spnego</gatein.location> + <gatein.location>/home/soshah/projects/gatein/modules/gatein-wci-branch/packaging/pkg/target/jboss/server/gatein-cas</gatein.location> </properties> <dependencies> @@ -35,6 +35,10 @@ <groupId>org.exoplatform.core</groupId> <artifactId>exo.core.component.organization.api</artifactId> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + </dependency> <dependency> <groupId>commons-httpclient</groupId> Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2010-11-12 20:36:12 UTC (rev 5076) @@ -25,13 +25,11 @@ import javax.servlet.http.HttpServletRequest; +import org.gatein.sso.agent.GenericSSOAgent; +import org.gatein.wci.security.Credentials; import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; import org.jasig.cas.client.validation.Assertion; -import org.exoplatform.web.security.Credentials; - -import org.gatein.sso.agent.GenericSSOAgent; - /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> */ @@ -77,22 +75,24 @@ public void validateTicket(HttpServletRequest httpRequest, String ticket) throws Exception { Cas20ProxyTicketValidator ticketValidator = new Cas20ProxyTicketValidator(casServerUrl); - ticketValidator.setRenew(this.renewTicket); - - String serviceUrl = "http://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() + - httpRequest.getContextPath() +"/private/classic"; - Assertion assertion = ticketValidator.validate(ticket, serviceUrl); - - log.debug("------------------------------------------------------------------------------------"); - log.debug("Service: "+serviceUrl); - log.debug("Principal: "+assertion.getPrincipal().getName()); - log.debug("------------------------------------------------------------------------------------"); - - - //Use empty password....it shouldn't be needed...this is a SSO login. The password has - //already been presented with the SSO server. It should not be passed around for - //better security - Credentials credentials = new Credentials(assertion.getPrincipal().getName(), ""); - httpRequest.getSession().setAttribute(GenericSSOAgent.CREDENTIALS, credentials); + ticketValidator.setRenew(this.renewTicket); + + String serviceUrl = "http://"+ httpRequest.getServerName() +":" + httpRequest.getServerPort() + + httpRequest.getContextPath() +"/private/classic"; + Assertion assertion = ticketValidator.validate(ticket, serviceUrl); + + log.debug("------------------------------------------------------------------------------------"); + log.debug("Service: "+serviceUrl); + log.debug("Principal: "+assertion.getPrincipal().getName()); + log.debug("------------------------------------------------------------------------------------"); + + + //Use empty password....it shouldn't be needed...this is a SSO login. The password has + //already been presented with the SSO server. It should not be passed around for + //better security + String principal = assertion.getPrincipal().getName(); + Credentials credentials = new Credentials(principal, ""); + httpRequest.getSession().setAttribute(GenericSSOAgent.CREDENTIALS, credentials); + httpRequest.getSession().setAttribute("username", principal); } } Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2010-11-12 20:36:12 UTC (rev 5076) @@ -26,7 +26,7 @@ import org.apache.log4j.Logger; -import org.exoplatform.web.security.Credentials; +import org.gatein.wci.security.Credentials; import org.gatein.sso.agent.GenericSSOAgent; import org.josso.agent.Lookup; Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/login/SSOLoginModule.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/login/SSOLoginModule.java 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/login/SSOLoginModule.java 2010-11-12 20:36:12 UTC (rev 5076) @@ -21,35 +21,49 @@ */ package org.gatein.sso.agent.login; +import java.lang.reflect.Method; + import javax.security.auth.callback.Callback; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; import javax.security.auth.login.LoginException; +import javax.servlet.http.HttpServletRequest; -import org.exoplatform.container.ExoContainer; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.exoplatform.services.security.Authenticator; import org.exoplatform.services.security.Identity; import org.exoplatform.services.security.UsernameCredential; import org.exoplatform.services.security.jaas.AbstractLoginModule; -import org.exoplatform.web.security.Credentials; -import org.exoplatform.web.security.security.CookieTokenService; -import org.exoplatform.web.security.security.TransientTokenService; /** * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> */ public final class SSOLoginModule extends AbstractLoginModule { - private static final Log LOG = ExoLogger.getLogger(SSOLoginModule.class + private static final Log log = ExoLogger.getLogger(SSOLoginModule.class .getName()); + + /** JACC get context method. */ + private static Method getContextMethod; - protected Log getLogger() - { - return LOG; - } - + static + { + try + { + Class<?> policyContextClass = Thread.currentThread().getContextClassLoader().loadClass("javax.security.jacc.PolicyContext"); + getContextMethod = policyContextClass.getDeclaredMethod("getContext", String.class); + } + catch (ClassNotFoundException ignore) + { + log.debug("JACC not found ignoring it", ignore); + } + catch (Exception e) + { + log.error("Could not obtain JACC get context method", e); + } + } + public boolean login() throws LoginException { try @@ -61,33 +75,37 @@ String password = new String(((PasswordCallback) callbacks[1]) .getPassword()); - - ExoContainer container = getContainer(); - Object o = ((TransientTokenService) container - .getComponentInstanceOfType(TransientTokenService.class)) - .validateToken(password, true); - if (o == null) - o = ((CookieTokenService) container - .getComponentInstanceOfType(CookieTokenService.class)) - .validateToken(password, false); - String username = null; - if (o instanceof Credentials) - { - Credentials wc = (Credentials)o; - username = wc.getUsername(); - } - + // + // For clustered config check credentials stored and propagated in session. This won't work in tomcat because + // of lack of JACC PolicyContext so the code must be a bit defensive + String username = null; + if (getContextMethod != null && password.startsWith("wci-ticket")) + { + HttpServletRequest request; + try + { + request = (HttpServletRequest)getContextMethod.invoke(null, "javax.servlet.http.HttpServletRequest"); + username = (String)request.getSession().getAttribute("username"); + } + catch(Throwable e) + { + log.error(this,e); + log.error("LoginModule error. Turn off session credentials checking with proper configuration option of " + + "LoginModule set to false"); + } + } + if (username == null) { - //SSO token could not be validated...hence a user id cannot be found - LOG.error("---------------------------------------------------------"); - LOG.error("SSOLogin Failed. Credential Not Found!!"); - LOG.error("---------------------------------------------------------"); - return false; + //SSO token could not be validated...hence a user id cannot be found + log.error("---------------------------------------------------------"); + log.error("SSOLogin Failed. Credential Not Found!!"); + log.error("---------------------------------------------------------"); + return false; } - + //Perform authentication by setting up the proper Application State Authenticator authenticator = (Authenticator) getContainer() .getComponentInstanceOfType(Authenticator.class); @@ -125,4 +143,10 @@ { return true; } -} + + @Override + protected Log getLogger() + { + return log; + } +} \ No newline at end of file Modified: components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java =================================================================== --- components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2010-11-12 20:36:12 UTC (rev 5076) @@ -31,7 +31,8 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.methods.PostMethod; -import org.exoplatform.web.security.Credentials; + +import org.gatein.wci.security.Credentials; import org.gatein.sso.agent.GenericSSOAgent; /** @@ -70,6 +71,11 @@ { String token = null; Cookie[] cookies = httpRequest.getCookies(); + if(cookies == null) + { + return; + } + for(Cookie cookie: cookies) { if(cookie.getName().equals(this.cookieName)) Modified: components/sso/branches/sso-wci/pom.xml =================================================================== --- components/sso/branches/sso-wci/pom.xml 2010-11-12 19:33:09 UTC (rev 5075) +++ components/sso/branches/sso-wci/pom.xml 2010-11-12 20:36:12 UTC (rev 5076) @@ -70,7 +70,11 @@  <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version> <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version> +  + <org.exoplatform.portal.version>3.2.0-Beta01-SNAPSHOT</org.exoplatform.portal.version> + <org.gatein.wci.version>2.1.0-Alpha01-SNAPSHOT</org.gatein.wci.version>  <version.javax.ws.rs>1.0</version.javax.ws.rs> @@ -194,6 +198,11 @@ <artifactId>exo.portal.component.web</artifactId> <version>${org.exoplatform.portal.version}</version> </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency>

15 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010