gatein SVN: r8291 - portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2012-01-11 16:37:35 -0500 (Wed, 11 Jan 2012)
New Revision: 8291
Modified:
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_en.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_es.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ja.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ko.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ne.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_uk.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh_TW.xml
Log:
GTNPORTAL-2323: fix 'breadcumbs' spelling mistake in the locales files.
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_en.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_en.properties 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_en.properties 2012-01-11 21:37:35 UTC (rev 8291)
@@ -17,4 +17,4 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-javax.portlet.title=Breadcumbs Portlet
+javax.portlet.title=Breadcrumbs Portlet
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_es.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_es.properties 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_es.properties 2012-01-11 21:37:35 UTC (rev 8291)
@@ -17,4 +17,4 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-javax.portlet.title=Portlet Breadcumbs
+javax.portlet.title=Portlet Breadcrumbs
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ja.properties 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ja.properties 2012-01-11 21:37:35 UTC (rev 8291)
@@ -17,4 +17,4 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-javax.portlet.title=Breadcumbs \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
+javax.portlet.title=Breadcrumbs \u30dd\u30fc\u30c8\u30ec\u30c3\u30c8
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ko.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ko.xml 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ko.xml 2012-01-11 21:37:35 UTC (rev 8291)
@@ -2,7 +2,7 @@
<bundle>
<javax>
<portlet>
- <title>Breadcumbs 포틀릿</title>
+ <title>Breadcrumbs 포틀릿</title>
</portlet>
</javax>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ne.properties 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_ne.properties 2012-01-11 21:37:35 UTC (rev 8291)
@@ -17,4 +17,4 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-javax.portlet.title=Breadcumbs \u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
+javax.portlet.title=Breadcrumbs \u092a\u094b\u0930\u094d\u091f\u094d\u0932\u0947\u091f
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_uk.properties 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_uk.properties 2012-01-11 21:37:35 UTC (rev 8291)
@@ -17,4 +17,4 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
#
-javax.portlet.title=Breadcumbs навігація
+javax.portlet.title=Breadcrumbs навігація
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh.xml 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh.xml 2012-01-11 21:37:35 UTC (rev 8291)
@@ -2,7 +2,7 @@
<bundle>
<javax>
<portlet>
- <title>Breadcumbs Portlet</title>
+ <title>Breadcrumbs Portlet</title>
</portlet>
</javax>
-</bundle>
\ No newline at end of file
+</bundle>
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh_TW.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh_TW.xml 2012-01-11 15:55:00 UTC (rev 8290)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/BreadcumbsPortlet_zh_TW.xml 2012-01-11 21:37:35 UTC (rev 8291)
@@ -2,7 +2,7 @@
<bundle>
<javax>
<portlet>
- <title>Breadcumbs Portlet</title>
+ <title>Breadcrumbs Portlet</title>
</portlet>
</javax>
-</bundle>
\ No newline at end of file
+</bundle>
12 years, 11 months
- 1
- 0
gatein SVN: r8290 - in epp/portal/branches/EPP_5_2_Branch: component and 11 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2012-01-11 10:55:00 -0500 (Wed, 11 Jan 2012)
New Revision: 8290
Removed:
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/PortalTemplateConfigOption.java
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/portal/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
JBEPP-1436: EPP-SP Broken portalsite template
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7877,7900,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450,7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7741,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7900,7906,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal
___________________________________________________________________
Modified: svn:mergeinfo
- /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875
/portal/trunk:7451
/portal/trunk/component/portal:7085,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7877,7900,7928,7938,8045,8053,8072
+ /portal/branches/branch-GTNPORTAL-1592/component/portal:4868,4875
/portal/trunk:7451
/portal/trunk/component/portal:7085,7412,7451,7500,7570-7571,7573,7577,7614-7615,7695-7696,7701-7704,7748,7773,7780,7857,7877,7900,7928,7938,8045,8053,8072
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7900,7906,7928,7938,8045,8053,8072
/portal/trunk/src/main/java/org:7451
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
/portal/trunk/src/main/java/org:7451
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2012-01-11 15:55:00 UTC (rev 8290)
@@ -43,7 +43,6 @@
import org.exoplatform.services.organization.Group;
import org.exoplatform.services.organization.OrganizationService;
import org.picocontainer.Startable;
-
import java.util.*;
/**
@@ -624,4 +623,14 @@
{
return newPortalConfigListener_.getDefaultPortal();
}
+
+ public Set<String> getPortalTemplates()
+ {
+ return newPortalConfigListener_.getTemplateConfigs(PortalConfig.PORTAL_TYPE);
+ }
+
+ public PortalConfig getPortalConfigFromTemplate(String templateName)
+ {
+ return newPortalConfigListener_.getPortalConfigFromTemplate(PortalConfig.PORTAL_TYPE, templateName);
+ }
}
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISelector/UIItemSelector/Stylesheet.css 2012-01-11 15:55:00 UTC (rev 8290)
@@ -1,4 +1,3 @@
-
.UIItemSelector {
margin: 2px 0px 2px 2px; /* orientation=lt */
margin: 2px 2px 2px 0px; /* orientation=rt */
@@ -24,7 +23,7 @@
background: url('background/TemplateContainer.jpg') no-repeat center -836px;
}
-.UIItemSelector .ItemDetailList .TemplateContainer .ClassicPortalImage {
+.UIItemSelector .ItemDetailList .TemplateContainer .classicImage {
height: 222px;
background: url('background/TemplateContainer.jpg') no-repeat center -392px;
margin-top: 9px;
@@ -35,13 +34,13 @@
background: url('background/TemplateContainer.jpg') no-repeat center -170px;
margin-top: 9px;
}
-
-.UIItemSelector .ItemDetailList .TemplateContainer .BasicPortalImage {
- height: 222px;
- background: url('background/TemplateContainer.jpg') no-repeat center -1052px;
- margin-top: 9px;
-}
+.UIItemSelector .ItemDetailList .TemplateContainer .basicImage {
+ height: 222px;
+ background: url('background/TemplateContainer.jpg') no-repeat center -1052px;
+ margin-top: 9px;
+}
+
.UIItemSelector .TemplateContainer .DefaultImage {
height: 222px;
background: url('background/TemplateContainer.jpg') no-repeat center -392px;
@@ -138,15 +137,15 @@
margin: 0px 5px 0px 5px;
}
-.UIItemSelector .RightColumnStyle .ItemDetailList .Title {
- width: 300px; overflow: hidden;
-}
-
+.UIItemSelector .RightColumnStyle .ItemDetailList .Title {
+ width: 300px; overflow: hidden;
+}
+
.UIItemSelector .RightColumnStyle .ItemListContainer .Title {
- width: 143px; overflow: hidden;
-}
-
-.UIItemSelector .RightColumnStyle .Title {
+ width: 143px; overflow: hidden;
+}
+
+.UIItemSelector .RightColumnStyle .Title {
line-height: 22px; white-space: nowrap;
font-weight: bold; color: #5c5c5c;
float: left; /* orientation=lt */
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2012-01-11 15:55:00 UTC (rev 8290)
@@ -874,8 +874,8 @@
UIPortalBrowser.msg.Invalid-createPermission=You do not have the right to create a new portal. Contact the administrator.
UIPortalBrowser.deletePortal=Are you sure you want to delete this portal?
SitePortal.label=Site Portal
-ClassicPortal.label=Classic Portal
-BasicPortal.label=Basic Portal
+classic.label=Classic Portal
+basic.label=Basic Portal
############################################################################
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_fr.properties 2012-01-11 15:55:00 UTC (rev 8290)
@@ -809,7 +809,8 @@
UIPortalBrowser.msg.Invalid-createPermission=Vous n'avez pas le droit de créer un nouveau portail. Contactez un administrateur SVP.
UIPortalBrowser.deletePortal=Confirmez-vous la suppression de ce portail ?
SitePortal.label=Portail Site
-ClassicPortal.label=Portal Classique
+classic.label=Portal Classique
+basic.label=Portal Base
############################################################################
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/basic/portal.xml 2012-01-11 15:55:00 UTC (rev 8290)
@@ -25,6 +25,8 @@
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>@owner@</portal-name>
+ <label>Basic Portal</label>
+ <description>This is basic portal template</description>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/template/classic/portal.xml 2012-01-11 15:55:00 UTC (rev 8290)
@@ -25,6 +25,8 @@
xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gatein_objects_1_0"
xmlns="http://www.gatein.org/xml/ns/gatein_objects_1_0">
<portal-name>@owner@</portal-name>
+ <label>Classic Portal</label>
+ <description>This is classic portal template</description>
<locale>en</locale>
<access-permissions>Everyone</access-permissions>
<edit-permission>*:/platform/administrators</edit-permission>
Deleted: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy 2012-01-11 15:55:00 UTC (rev 8290)
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2009 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.
- */
-
-import java.util.List;
-import java.util.ArrayList;
-import org.exoplatform.portal.webui.portal.PortalTemplateConfigOption ;
-import org.exoplatform.webui.core.model.SelectItemCategory;
-
-List options = new ArrayList();
-
- SelectItemCategory basic = new SelectItemCategory("BasicPortal");
- basic.addSelectItemOption(
- new PortalTemplateConfigOption("Basic Portal", "basic", "Basic Portal", "BasicPortal").addGroup("/platform/guest")
- );
- options.add(basic);
-
- SelectItemCategory guest = new SelectItemCategory("ClassicPortal");
- guest.addSelectItemOption(
- //new PortalTemplateConfigOption("", "site", "Site Portal", "SitePortal").addGroup("/guest")
- new PortalTemplateConfigOption("", "classic", "Classic Portal", "ClassicPortal").addGroup("/platform/guests")
- );
- options.add(guest);
-
-return options ;
Deleted: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/PortalTemplateConfigOption.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/PortalTemplateConfigOption.java 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/PortalTemplateConfigOption.java 2012-01-11 15:55:00 UTC (rev 8290)
@@ -1,54 +0,0 @@
-/**
- * Copyright (C) 2009 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.exoplatform.portal.webui.portal;
-
-import org.exoplatform.webui.core.model.SelectItemOption;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by The eXo Platform SARL
- * Author : Pham Dung Ha
- * ha.pham(a)exoplatform.com
- * May 11, 2007
- */
-public class PortalTemplateConfigOption extends SelectItemOption<String>
-{
-
- private List<String> accessGroup_;
-
- public PortalTemplateConfigOption(String label, String value, String desc, String icon) throws Exception
- {
- super(label, value, desc, icon);
- accessGroup_ = new ArrayList<String>();
- }
-
- public List<String> getGroups()
- {
- return accessGroup_;
- }
-
- public PortalTemplateConfigOption addGroup(String accessGroup)
- {
- accessGroup_.add(accessGroup);
- return this;
- }
-}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalForm.java 2012-01-11 15:55:00 UTC (rev 8290)
@@ -17,7 +17,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.exoplatform.portal.webui.portal;
+package org.exoplatform.portal.webui.portal;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
@@ -35,19 +35,14 @@
import org.exoplatform.portal.webui.workspace.UIMaskWorkspace;
import org.exoplatform.portal.webui.workspace.UIPortalApplication;
import org.exoplatform.portal.webui.workspace.UIWorkingWorkspace;
-import org.exoplatform.services.organization.Group;
-import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.services.resources.LocaleConfig;
import org.exoplatform.services.resources.LocaleConfigService;
import org.exoplatform.services.resources.ResourceBundleService;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
-import org.exoplatform.webui.config.InitParams;
-import org.exoplatform.webui.config.Param;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.ComponentConfigs;
import org.exoplatform.webui.config.annotation.EventConfig;
-import org.exoplatform.webui.config.annotation.ParamConfig;
import org.exoplatform.webui.core.UIApplication;
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.core.model.SelectItemCategory;
@@ -78,13 +73,14 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+import java.util.Set;
@ComponentConfigs({
@ComponentConfig(lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = {
@EventConfig(listeners = UIPortalForm.SaveActionListener.class),
@EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIPortalForm.CheckShowActionListener.class)}),
- @ComponentConfig(id = "CreatePortal", lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", initParams = @ParamConfig(name = "PortalTemplateConfigOption", value = "system:/WEB-INF/conf/uiconf/portal/webui/portal/PortalTemplateConfigOption.groovy"), events = {
+ @ComponentConfig(id = "CreatePortal", lifecycle = UIFormLifecycle.class, template = "system:/groovy/webui/form/UIFormTabPane.gtmpl", events = {
@EventConfig(name = "Save", listeners = UIPortalForm.CreateActionListener.class),
@EventConfig(listeners = UIPortalForm.SelectItemOptionActionListener.class, phase = Phase.DECODE),
@EventConfig(listeners = UIMaskWorkspace.CloseActionListener.class, phase = Phase.DECODE)}),
@@ -110,14 +106,11 @@
private List<SelectItemOption<String>> languages = new ArrayList<SelectItemOption<String>>();
- @SuppressWarnings("unchecked")
- public UIPortalForm(InitParams initParams) throws Exception
+ public void initPortalTemplateTab() throws Exception
{
- super("UIPortalForm");
UIFormInputItemSelector uiTemplateInput = new UIFormInputItemSelector("PortalTemplate", null);
addUIFormInput(uiTemplateInput);
setSelectedTab(uiTemplateInput.getId());
- createDefaultItem();
UIFormInputSet uiPortalSetting = this.<UIFormInputSet> getChildById("PortalSetting");
UIFormStringInput uiNameInput = uiPortalSetting.getUIStringInput(FIELD_NAME);
@@ -127,17 +120,19 @@
setActions(new String[]{"Save", "Close"});
- if (initParams == null)
+ UserPortalConfigService configService = this.getApplicationComponent(UserPortalConfigService.class);
+ Set<String> portalTemplates = configService.getPortalTemplates();
+ for (String tempName : portalTemplates)
{
- return;
+ SelectItemCategory category = new SelectItemCategory(tempName);
+ PortalConfig config = configService.getPortalConfigFromTemplate(tempName);
+ if(config != null)
+ {
+ SelectItemOption<String> option = new SelectItemOption<String>(config.getLabel(), tempName, config.getDescription(), tempName);
+ category.addSelectItemOption(option);
+ uiTemplateInput.getItemCategories().add(category);
+ }
}
- WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
- Param param = initParams.getParam("PortalTemplateConfigOption");
- List<SelectItemCategory> portalTemplates = (List<SelectItemCategory>)param.getMapGroovyObject(context);
- for (SelectItemCategory itemCategory : portalTemplates)
- {
- uiTemplateInput.getItemCategories().add(itemCategory);
- }
if (uiTemplateInput.getSelectedItemOption() == null)
{
uiTemplateInput.getItemCategories().get(0).setSelected(true);
@@ -149,7 +144,6 @@
super("UIPortalForm");
createDefaultItem();
setSelectedTab("PortalSetting");
-
}
public void setBindingBean() throws Exception
@@ -414,15 +408,6 @@
UIPortalForm uiForm = event.getSource();
UIFormInputItemSelector templateInput = uiForm.getChild(UIFormInputItemSelector.class);
uiForm.setSelectedTab(templateInput.getId());
- PortalTemplateConfigOption selectItem =
- (PortalTemplateConfigOption)templateInput.getSelectedCategory().getSelectItemOptions().get(0);
- List<String> groupIds = selectItem.getGroups();
- Group[] groups = new Group[groupIds.size()];
- OrganizationService service = uiForm.getApplicationComponent(OrganizationService.class);
- for (int i = 0; i < groupIds.size(); i++)
- {
- groups[i] = service.getGroupHandler().findGroupById(groupIds.get(i));
- }
event.getRequestContext().addUIComponentToUpdateByAjax(uiForm);
}
}
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2012-01-09 23:43:14 UTC (rev 8289)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIMainActionListener.java 2012-01-11 15:55:00 UTC (rev 8290)
@@ -248,6 +248,7 @@
}
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
UIPortalForm uiNewPortal = uiMaskWS.createUIComponent(UIPortalForm.class, "CreatePortal", "UIPortalForm");
+ uiNewPortal.initPortalTemplateTab();
uiMaskWS.setUIComponent(uiNewPortal);
uiMaskWS.setShow(true);
prContext.addUIComponentToUpdateByAjax(uiMaskWS);
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7877,7900,7906,7928,7938,8045,8053,8072
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4868,4875,4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7085,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7330-7334,7359,7367,7412,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7570-7571,7573,7577,7598,7614-7615,7695-7696,7701-7704,7737,7741,7748,7773,7780,7857,7877,7900,7906,7928,7938,8045,8053,8072
12 years, 11 months
- 1
- 0
gatein SVN: r8289 - in epp/docs/branches/5.2/Reference_Guide/en-US: modules/AuthenticationAndIdentity and 3 other directories.
by do-not-reply＠jboss.org
Author: smumford
Date: 2012-01-09 18:43:14 -0500 (Mon, 09 Jan 2012)
New Revision: 8289
Modified:
epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/faq/jcr-faq.xml
epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml
Log:
Version increment and spellcheck edit
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/Book_Info.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -5,11 +5,11 @@
]>
<bookinfo id="book-Reference_Guide-Reference_Guide">
<title>Reference Guide</title>
- <subtitle>An in-depth guide to Enterprise Portal Platform &VZ;</subtitle>
+ <subtitle>An in-depth guide to Enterprise Portal Platform 5.2.0</subtitle>
<productname>JBoss Enterprise Portal Platform</productname>
<productnumber>5.2</productnumber>
- <edition>5.2.0</edition>
- <pubsnumber>100</pubsnumber>
+ <edition>5.2.1</edition>
+ <pubsnumber>5</pubsnumber>
<abstract>
<para>
This Reference Guide is a high-level usage document. It deals with more advanced topics than the Installation and User Guides, adding new content or taking concepts discussed in the earlier documents further. It aims to provide supporting documentation for advanced users of the JBoss Enterprise Portal Platform product. Its primary focus is on advanced use of the product and it assumes an intermediate or advanced knowledge of the technology and terms.
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/Revision_History.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -8,6 +8,20 @@
<simpara>
<revhistory>
<revision>
+ <revnumber>5.2.1-5</revnumber>
+ <date>Mon Jan 09 2012</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email></email>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added new content to Authentication and Identity.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
<revnumber>5.2.0-100</revnumber>
<date>Wed Dec 14 2011</date>
<author>
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/AuthenticationAndIdentity/AuthenticationAuthorizationOverview.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -79,7 +79,7 @@
This means that access to some URLs (such as <ulink type="http" url="http://localhost:8080/portal/dologin">http://localhost:8080/portal/dologin</ulink>) will directly trigger J2EE authentication in the case that the user is not already logged in.
</para>
<para>
- Access to this URL also means that the user needs to be in the JAAS group <emphasis>users</emphasis>, otherwise they can authenticate but will recieve an HTTP error; <emphasis>403 Forbidden</emphasis>, for example.
+ Access to this URL also means that the user needs to be in the JAAS group <emphasis>users</emphasis>, otherwise they can authenticate but will receive an HTTP error; <emphasis>403 Forbidden</emphasis>, for example.
</para>
<para>
@@ -236,7 +236,7 @@
<term>PortalLoginModule</term>
<listitem>
<para>
- This login module is actually used mainly in cluster environments. It uses session replication between cluster nodes. After a successful authentication on cluster <emphasis>node1</emphasis> the <emphasis>commit</emphasis> method adds a flag (with the attribute <emphasis>AUTHENTICATED_CREDENTIALS</emphasis>) to the HTTP session and this flag can then be used to reauthenticate on <emphasis>node2</emphasis> when it executes method <emphasis>login</emphasis>. Refer to <xref linkend="sect-Authentication_Authorization_Intro-ClusterLogin" /> for more information.
+ This login module is actually used mainly in cluster environments. It uses session replication between cluster nodes. After a successful authentication on cluster <emphasis>node1</emphasis> the <emphasis>commit</emphasis> method adds a flag (with the attribute <emphasis>AUTHENTICATED_CREDENTIALS</emphasis>) to the HTTP session and this flag can then be used to re-authenticate on <emphasis>node2</emphasis> when it executes method <emphasis>login</emphasis>. Refer to <xref linkend="sect-Authentication_Authorization_Intro-ClusterLogin" /> for more information.
</para>
</listitem>
</varlistentry>
@@ -339,7 +339,7 @@
<title>Authentication on application server level</title>
<para>
- Application server needs to properly recognize that user is successfuly logged and it has assigned his JAAS roles. Unfortunately this part is not standardized and is specific for each AS. For example in JBoss AS, you need to ensure that JAAS Subject has assigned principal with username (UserPrincipal) and also RolesPrincipal, which has name "Roles" and it contains list of JAAS roles. This part is actually done in <code>JbossLoginModule.commit()</code>. In Tomcat, this flow is little different, which means Tomcat has it is own <literal>TomcatLoginModule</literal>.
+ Application server needs to properly recognize that user is successfully logged and it has assigned his JAAS roles. Unfortunately this part is not standardized and is specific for each AS. For example in JBoss AS, you need to ensure that JAAS Subject has assigned principal with username (UserPrincipal) and also RolesPrincipal, which has name "Roles" and it contains list of JAAS roles. This part is actually done in <code>JbossLoginModule.commit()</code>. In Tomcat, this flow is little different, which means Tomcat has it is own <literal>TomcatLoginModule</literal>.
</para>
</formalpara>
@@ -395,7 +395,7 @@
</para>
<para>
- Method <emphasis>createIdentity</emphasis> is used to create instance of object <emphasis>org.exoplatform.services.security.Identity</emphasis>, which encapsulates all important informations about single user like:
+ Method <emphasis>createIdentity</emphasis> is used to create instance of object <emphasis>org.exoplatform.services.security.Identity</emphasis>, which encapsulates all important information about single user like:
</para>
<itemizedlist>
@@ -407,7 +407,7 @@
<listitem>
<para>
- set of Memberships (MembershipEntry objects) which user belongs to. <emphasis>Membership</emphasis> is object, which contains informations about <emphasis>membershipType</emphasis> (manager, member, validator, ... ) and about <emphasis>group</emphasis> (/platform/users, /platform/administrators, /partners, /organization/management/executiveBoard, ... ).
+ set of Memberships (MembershipEntry objects) which user belongs to. <emphasis>Membership</emphasis> is object, which contains information about <emphasis>membershipType</emphasis> (manager, member, validator, ... ) and about <emphasis>group</emphasis> (/platform/users, /platform/administrators, /partners, /organization/management/executiveBoard, ... ).
</para>
</listitem>
@@ -434,7 +434,7 @@
]]>
</programlisting>
<para>
- Default implementation <emphasis>DefaultRolesExtractorImpl</emphasis> is based on special algorithm, which uses name of role from the root of the group (for example for role "/organization/management/something" we have JAAS role "organization"). Only exception is group "platform" where we use 2nd level as name of group. For example from group "/platform/users" we have JAAS role "users".
+ Default implementation <emphasis>DefaultRolesExtractorImpl</emphasis> is based on special algorithm, which uses name of role from the root of the group (for example for role "/organization/management/something" we have JAAS role "organization"). Only exception is group "platform" where we use second level as name of group. For example from group "/platform/users" we have JAAS role "users".
</para>
<para>
@@ -446,7 +446,7 @@
</para>
<para>
- You can override default implementation of mentioned interfaces Authenticator and RolesExtractor if default behaviour is not suitable for your needs. Consult documentation of <emphasis>eXo kernel</emphasis> for more info.
+ You can override default implementation of mentioned interfaces Authenticator and RolesExtractor if default behavior is not suitable for your needs. Consult documentation of <emphasis>eXo kernel</emphasis> for more info.
</para>
</section>
<!-- Ending section Authenticator and RolesExtractor -->
@@ -459,7 +459,7 @@
<title>RememberMe authentication</title>
<para>
- In default login dialog, you can notice that there is "Remember my login" checkbox, which users can use to persist their login on his workstation. Default validity period of RememberMe cookie is one day (it is configurable), and so user can be logged for whole day before he need to reauthenticate again with his credentials.
+ In default login dialog, you can notice that there is "Remember my login" checkbox, which users can use to persist their login on his workstation. Default validity period of RememberMe cookie is one day (it is configurable), and so user can be logged for whole day before he need to re-authenticate again with his credentials.
</para>
<section id="sect-Authentication_Authorization_Intro-RememberMeAuthentication-howDoesItWork">
@@ -480,7 +480,7 @@
<listitem>
<para>
- Request is processed by PortalLoginController servlet. Servlet obtains instance of <emphasis>RemindPasswordTokenService</emphasis> and save user credentials into JCR. It generates and returns special token (key) for later use. Then it creates cookie called <emphasis>rememberme</emphasis> and use returned token as value of cookie.
+ Request is processed by PortalLoginController servlet. Servlet obtains instance of <emphasis>RemindPasswordTokenService</emphasis> and save user credentials into JCR. It generates and returns special token (key) for later use. Then it creates cookie called <emphasis>RememberMe</emphasis> and use returned token as value of cookie.
</para>
</listitem>
</itemizedlist>
@@ -492,19 +492,19 @@
<itemizedlist>
<listitem>
<para>
- After some time, user wants to reauthenticate. Let's assume that his HTTP Session is already expired but his RememberMe cookie is still active.
+ After some time, user wants to re-authenticate. Let's assume that his HTTP Session is already expired but his RememberMe cookie is still active.
</para>
</listitem>
<listitem>
<para>
- User send HTTP request to some portal page (ie. <filename>http://localhost:8080/portal/classic</filename> ).
+ User send HTTP request to some portal page (<filename>http://localhost:8080/portal/classic</filename> ).
</para>
</listitem>
<listitem>
<para>
- There is special HTTP Filter <emphasis role="bold">RememberMeFilter</emphasis> configured in web.xml, which checks rememberme cookie and then it retrieves credentials of user from RemindPasswordTokenService. Now filter redirects request to PortalLoginController and authentication process goes in same way as for normal FORM based authentication.
+ There is special HTTP Filter <emphasis role="bold">RememberMeFilter</emphasis> configured in web.xml, which checks RememberMe cookie and then it retrieves credentials of user from RemindPasswordTokenService. Now filter redirects request to PortalLoginController and authentication process goes in same way as for normal FORM based authentication.
</para>
</listitem>
</itemizedlist>
@@ -548,7 +548,7 @@
]]>
</programlisting>
<para>
- In this case user will see login dialog from browser instead of JBoss Enterprise Portal Platform login.jsp page. JAAS authentication will be performed with real credentials of user (ie. <emphasis>root</emphasis>/<emphasis>gtn</emphasis>). WCI ticket is not used with BASIC authentication.
+ In this case user will see login dialog from browser instead of JBoss Enterprise Portal Platform login.jsp page. JAAS authentication will be performed with real credentials of user (<emphasis>root</emphasis>/<emphasis>gtn</emphasis>). WCI ticket is not used with BASIC authentication.
</para>
</section>
@@ -615,7 +615,7 @@
</para>
<para>
- In other words, you need to ensure that users, which are logged successfuly through SSO, needs to be also in JBoss Enterprise Portal Platform identity database because SSO server is used only for authentication, but authorization is handled completely by JBoss Enterprise Portal Platform, which assumes that user exists in portal DB. If users are not in DB, Identity object won't be created and you will have 403 Forbidden errors even if you authenticate successfuly. For details about SSO integration, see <xref linkend="sect-Reference_Guide-SSO_Single_Sign_On" />.
+ In other words, you need to ensure that users, which are logged successfully through SSO, needs to be also in JBoss Enterprise Portal Platform identity database because SSO server is used only for authentication, but authorization is handled completely by JBoss Enterprise Portal Platform, which assumes that user exists in portal DB. If users are not in DB, Identity object won't be created and you will have 403 Forbidden errors even if you authenticate successfully. For details about SSO integration, see <xref linkend="sect-Reference_Guide-SSO_Single_Sign_On" />.
</para>
<para>
@@ -660,11 +660,11 @@
<role-name>users</role-name>
</auth-constraint>]]></programlisting>
<para>
- This actually means that our user needs to be in JBoss Enterprise Portal Platform role <emphasis>/platform/users</emphasis> (For details see <xref linkend="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor" />). In other words, if we successfuly authenticate but our user is not in group <emphasis>/platform/users</emphasis>, then it means that he is not in JAAS role <emphasis>users</emphasis>, which in next turn means that he will have authorization error <emphasis role="bold">403 Forbidden</emphasis> thrown by servlet container.
+ This actually means that our user needs to be in JBoss Enterprise Portal Platform role <emphasis>/platform/users</emphasis> (For details see <xref linkend="sect-Authentication_Authorization_Intro-authenticatorAndRolesExtractor" />). In other words, if we successfully authenticate but our user is not in group <emphasis>/platform/users</emphasis>, then it means that he is not in JAAS role <emphasis>users</emphasis>, which in next turn means that he will have authorization error <emphasis role="bold">403 Forbidden</emphasis> thrown by servlet container.
</para>
<para>
- You can change the behaviour and possibly add some more <emphasis>auth-constraint</emphasis> elements into <filename>web.xml</filename>. However this protection of resources based on web.xml is not standard JBoss Enterprise Portal Platform way and it is mentioned here mainly for illustration purposes.
+ You can change the behavior and possibly add some more <emphasis>auth-constraint</emphasis> elements into <filename>web.xml</filename>. However this protection of resources based on web.xml is not standard JBoss Enterprise Portal Platform way and it is mentioned here mainly for illustration purposes.
</para>
</section>
@@ -672,7 +672,7 @@
<title>Portal level authorization</title>
<para>
- Second round of authorization is based on component <emphasis role="bold">UserACL</emphasis> (See <xref linkend="chap-Reference_Guide-Portal_Default_Permission_Configuration" />). We can declare access and edit permissions for portals, pages and/or portlets. UserACL is then used to check if our user has particular permissions to access or edit specified resource. Important object with informations about roles of our user is mentioned <emphasis>Identity</emphasis> object created during JAAS authentication.
+ Second round of authorization is based on component <emphasis role="bold">UserACL</emphasis> (See <xref linkend="chap-Reference_Guide-Portal_Default_Permission_Configuration" />). We can declare access and edit permissions for portals, pages and/or portlets. UserACL is then used to check if our user has particular permissions to access or edit specified resource. Important object with information about roles of our user is mentioned <emphasis>Identity</emphasis> object created during JAAS authentication.
</para>
<para>
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/PortalDevelopment/XMLResourceBundles.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -13,7 +13,7 @@
<itemizedlist>
<listitem>
<para>
- The XML format declares the encoding of the file. This avoids use of the <literal>native2ascii</literal> program which can interfere with encoding.
+ The XML format declares the encoding of the file. This avoids use of the <literal>native2ASCII</literal> program which can interfere with encoding.
</para>
</listitem>
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/faq/jcr-faq.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/faq/jcr-faq.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/faq/jcr-faq.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -70,7 +70,7 @@
JCR Observation's a way to listen on persistence changes of a Repository. It provides several options to configure the listener for an interesting only changes. To use properly, it's important to understand concept of events filtering for a registered EventListener.
</para>
<para>
- An often confusing part is the <emphasis role="bold">absPath</emphasis>, it is an associated parent of a location you want to observe events on. That is to say it is a parent of child node(s) or this parent property(ies); if <emphasis role="bold">isDeep</emphasis> is true then you'll get events of all the subtree of child nodes also. The same actual for <emphasis role="bold">uuid</emphasis> and <emphasis role="bold">nodeTypeName</emphasis> parameters of ObservationManager.addEventListener() method.
+ An often confusing part is the <emphasis role="bold">absPath</emphasis>, it is an associated parent of a location you want to observe events on. That is to say it is a parent of child node(s) or this parent properties; if <emphasis role="bold">isDeep</emphasis> is true then you'll get events of all the subtree of child nodes also. The same actual for <emphasis role="bold">uuid</emphasis> and <emphasis role="bold">nodeTypeName</emphasis> parameters of ObservationManager.addEventListener() method.
</para>
</listitem>
Modified: epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml
===================================================================
--- epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml 2012-01-09 20:09:39 UTC (rev 8288)
+++ epp/docs/branches/5.2/Reference_Guide/en-US/modules/eXoJCR/ws/groovy-scripts-as-rest-services.xml 2012-01-09 23:43:14 UTC (rev 8289)
@@ -4,63 +4,63 @@
%BOOK_ENTITIES;
]>
<chapter id="chap-Reference_Guide-Groovy_Scripts_as_REST_Services">
- <title>Groovy Scripts as REST Services</title>
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Overview">
- <title>Overview</title>
- <para>
- This article describes how to use Groovy scripts as REST services. We are going to consider these operations:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Load script and save it in JCR.
- </para>
+ <title>Groovy Scripts as REST Services</title>
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Overview">
+ <title>Overview</title>
+ <para>
+ This article describes how to use Groovy scripts as REST services. We are going to consider these operations:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Load script and save it in JCR.
+ </para>
- </listitem>
- <listitem>
- <para>
- Instantiate script
- </para>
+ </listitem>
+ <listitem>
+ <para>
+ Instantiate script
+ </para>
- </listitem>
- <listitem>
- <para>
- Deploy newly created Class as RESTful service.
- </para>
+ </listitem>
+ <listitem>
+ <para>
+ Deploy newly created Class as RESTful service.
+ </para>
- </listitem>
- <listitem>
- <para>
- Script Lifecycle Management.
- </para>
+ </listitem>
+ <listitem>
+ <para>
+ Script Lifecycle Management.
+ </para>
- </listitem>
- <listitem>
- <para>
- And finally we will discover simple example which can get JCR node UUID
- </para>
+ </listitem>
+ <listitem>
+ <para>
+ And finally we will discover simple example which can get JCR node UUID
+ </para>
- </listitem>
+ </listitem>
- </itemizedlist>
- <para>
- In this article, we consider RESTful service compatible with JSR-311 specification. Currently last feature available in version 1.11-SNAPSHOT of JCR, 2.0-SNAPSHOT of WS and version 2.1.4-SNAPSHOT of core.
- </para>
+ </itemizedlist>
+ <para>
+ In this article, we consider RESTful service compatible with JSR-311 specification. Currently last feature available in version 1.11-SNAPSHOT of JCR, 2.0-SNAPSHOT of WS and version 2.1.4-SNAPSHOT of core.
+ </para>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Loading_script_and_save_it_in_JCR">
- <title>Loading script and save it in JCR</title>
- <para>
- There are two ways to save a script in JCR. The first way is to save it at server startup time by using configuration.xml and the second way is to upload the script via HTTP.
- </para>
- <para>
- <command>Load script at startup time</command>
- </para>
- <para>
- This way can be used for load prepared scripts, to use this way. we must configure org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoaderPlugin. This is simple configuration example.
- </para>
-
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Loading_script_and_save_it_in_JCR">
+ <title>Loading script and save it in JCR</title>
+ <para>
+ There are two ways to save a script in JCR. The first way is to save it at server startup time by using configuration.xml and the second way is to upload the script via HTTP.
+ </para>
+ <para>
+ <command>Load script at startup time</command>
+ </para>
+ <para>
+ This way can be used for load prepared scripts, to use this way. we must configure org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoaderPlugin. This is simple configuration example.
+ </para>
+
<programlisting language="XML" role="XML"><external-component-plugins>
<target-component>org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader</target-component>
<component-plugin>
@@ -88,54 +88,54 @@
</init-params>
</component-plugin>
</external-component-plugins></programlisting>
- <para>
- The first is value-param sets JCR repository, the second is value-param sets workspace and the third one is sets JCR node where scripts from plugin will be stored. If specified node does not exist, then it will be created. List of scripts is set by properties-params. Name of each properties-param will be used as node name for stored script, property autoload says to deploy this script at startup time, property path sets the source of script to be loaded. In this example we try to load single script from local file /home/andrew/JcrGroovyTest.groovy.
- </para>
- <para>
- <command>Load script via HTTP</command>
- </para>
- <para>
- This is samples of HTTP requests. In this example, we will upload script from file with name test.groovy.
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ The first is value-param sets JCR repository, the second is value-param sets workspace and the third one is sets JCR node where scripts from plugin will be stored. If specified node does not exist, then it will be created. List of scripts is set by properties-params. Name of each properties-param will be used as node name for stored script, property autoload says to deploy this script at startup time, property path sets the source of script to be loaded. In this example we try to load single script from local file /home/andrew/JcrGroovyTest.groovy.
+ </para>
+ <para>
+ <command>Load script via HTTP</command>
+ </para>
+ <para>
+ This is samples of HTTP requests. In this example, we will upload script from file with name test.groovy.
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X POST \
-H 'Content-type:script/groovy' \
--data-binary @test.groovy \
http://localhost:8080/rest/script/groovy/add/repository/production/script...</programlisting>
- <para>
- This example imitate sending data with HTML form ('multipart/form-data'). Parameter autoload is optional. If parameter autoload=true then script will be instantiate and deploy script immediately.
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ This example imitate sending data with HTML form ('multipart/form-data'). Parameter autoload is optional. If parameter autoload=true then script will be instantiate and deploy script immediately.
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X POST \
-F "file=(a)test.groovy;name=test" \
-F "autoload=true" \
http://localhost:8080/rest/script/groovy/add/repository/production/script...</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Instantiation">
- <title>Instantiation</title>
- <para>
- org.exoplatform.services.script.groovy.GroovyScriptInstantiator is part of project exo.core.component.script.groovy. GroovyScriptInstantiator can load script from specified URL and parse stream that contains Groovy source code. It has possibility inject component from Container in Groovy Class constructor. Configuration example:
- </para>
-
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Instantiation">
+ <title>Instantiation</title>
+ <para>
+ org.exoplatform.services.script.groovy.GroovyScriptInstantiator is part of project exo.core.component.script.groovy. GroovyScriptInstantiator can load script from specified URL and parse stream that contains Groovy source code. It has possibility inject component from Container in Groovy Class constructor. Configuration example:
+ </para>
+
<programlisting language="XML" role="XML"><component>
<type>org.exoplatform.services.script.groovy.GroovyScriptInstantiator</type>
</component></programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Deploying_newly_created_Class_as_RESTful_service">
- <title>Deploying newly created Class as RESTful service</title>
- <para>
- To deploy script automatically at server startup time, its property exo:autoload must be set as true. org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader check JCR workspaces which were specified in configuration and deploy all auto-loadable scripts.
- </para>
- <para>
- Example of configuration.
- </para>
-
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Deploying_newly_created_Class_as_RESTful_service">
+ <title>Deploying newly created Class as RESTful service</title>
+ <para>
+ To deploy script automatically at server startup time, its property exo:autoload must be set as true. org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader check JCR workspaces which were specified in configuration and deploy all auto-loadable scripts.
+ </para>
+ <para>
+ Example of configuration.
+ </para>
+
<programlisting language="XML" role="XML"><component>
<type>org.exoplatform.services.jcr.ext.script.groovy.GroovyScript2RestLoader</type>
<init-params>
@@ -156,92 +156,92 @@
</object-param>
</init-params>
</component></programlisting>
- <para>
- In example above JCR workspace "production" will be checked for autoload scripts. At once, this workspace will be listened for changes script's source code (property jcr:data).
- </para>
+ <para>
+ In example above JCR workspace "production" will be checked for autoload scripts. At once, this workspace will be listened for changes script's source code (property jcr:data).
+ </para>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Script_Lifecycle_Management">
- <title>Script Lifecycle Management</title>
- <para>
- If GroovyScript2RestLoader configured as was decribed in the previous section, then all "autoload" scripts deployed. In the first section, we added script from file /home/andrew/JcrGroovyTest.groovy to JCR node /script/groovy/JcrGroovyTest.groovy, repository repository, workspace production. In section "Load script via HTTP", it was referred about load scripts via HTTP, there is an opportunity to manage the life cycle of script.
- </para>
- <para>
- Undeploy script, which is already deployed:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Script_Lifecycle_Management">
+ <title>Script Lifecycle Management</title>
+ <para>
+ If GroovyScript2RestLoader configured as was decribed in the previous section, then all "autoload" scripts deployed. In the first section, we added script from file /home/andrew/JcrGroovyTest.groovy to JCR node /script/groovy/JcrGroovyTest.groovy, repository repository, workspace production. In section "Load script via HTTP", it was referred about load scripts via HTTP, there is an opportunity to manage the life cycle of script.
+ </para>
+ <para>
+ Undeploy script, which is already deployed:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/load/repository/production/scrip...</programlisting>
- <para>
- Then deploy it again:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Then deploy it again:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/load/repository/production/scrip...</programlisting>
- <para>
- or even more simple:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ or even more simple:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/load/repository/production/scrip...</programlisting>
- <para>
- Disable scripts autoloading, NOTE it does not change current state:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Disable scripts autoloading, NOTE it does not change current state:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/repository/production/script/gro...</programlisting>
- <para>
- Enable it again:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Enable it again:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/autoload/repository/production/s...</programlisting>
- <para>
- and again more simple variant:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ and again more simple variant:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/autoload/repository/production/s...</programlisting>
- <para>
- Change script source code:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Change script source code:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X POST \
-H 'Content-type:script/groovy' \
--data-binary @JcrGroovyTest.groovy \
http://localhost:8080/rest/script/groovy/update/repository/production/scr...</programlisting>
- <para>
- This example imitates sending data with HTML form ('multipart/form-data').
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ This example imitates sending data with HTML form ('multipart/form-data').
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X POST \
-F "file=(a)JcrGroovyTest.groovy;name=test" \
http://localhost:8080/rest/script/groovy/update/repository/production/scr...</programlisting>
- <para>
- Remove script from JCR:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Remove script from JCR:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X GET \
http://localhost:8080/rest/script/groovy/delete/repository/production/scr...</programlisting>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Getting_node_UUID_example">
- <title>Getting node UUID example</title>
- <para>
- Now we are going to try simple example of Groovy RESTfull service. There is one limitation, even if we use groovy, we should use Java style code and decline to use dynamic types, but of course we can use it in private methods and fields. Create file JcrGroovyTest.groovy, in this example I save it in my home directory /home/andrew/JcrGroovyTest.groovy. Then, configure GroovyScript2RestLoaderPlugin as described in section Load script at startup time.
- </para>
-
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Getting_node_UUID_example">
+ <title>Getting node UUID example</title>
+ <para>
+ Now we are going to try simple example of Groovy RESTfull service. There is one limitation, even if we use groovy, we should use Java style code and decline to use dynamic types, but of course we can use it in private methods and fields. Create file JcrGroovyTest.groovy, in this example I save it in my home directory /home/andrew/JcrGroovyTest.groovy. Then, configure GroovyScript2RestLoaderPlugin as described in section Load script at startup time.
+ </para>
+
<programlisting language="Java" role="Java">import javax.jcr.Node
import javax.jcr.Session
import javax.ws.rs.GET
@@ -277,28 +277,28 @@
ses.logout()
}
}</programlisting>
- <para>
- After configuration is done, start the server. If configuration is correct and script does not have syntax error, you should see next:
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/eXoJCR/groovy-console1.png" width="444" />
- </imageobject>
+ <para>
+ After configuration is done, start the server. If configuration is correct and script does not have syntax error, you should see next:
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/eXoJCR/groovy-console1.png" width="444" />
+ </imageobject>
- </mediaobject>
- <para>
- In the screenshot, we can see the service deployed.
- </para>
- <para>
- First, create a folder via WebDAV in the repository production, folder name 'test'. Now, we can try access this service. Open another console and type command:
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ </mediaobject>
+ <para>
+ In the screenshot, we can see the service deployed.
+ </para>
+ <para>
+ First, create a folder via WebDAV in the repository production, folder name 'test'. Now, we can try access this service. Open another console and type command:
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
http://localhost:8080/rest/groovy/test/repository/production/test</programlisting>
- <para>
- When you try to execute this command, you should have exception, because JCR node '/test' is not referenceable and has not UUID. We can try add mixin mix:referenceable. To do this, add one more method in script. Open script from local source code /home/andrew/JcrGroovyTest.groovy, add following code and save file.
- </para>
-
+ <para>
+ When you try to execute this command, you should have exception, because JCR node '/test' is not referenceable and has not UUID. We can try add mixin mix:referenceable. To do this, add one more method in script. Open script from local source code /home/andrew/JcrGroovyTest.groovy, add following code and save file.
+ </para>
+
<programlisting language="Java" role="Java">@POST
@Path("{path:.*}")
public void addReferenceableMixin(@PathParam("repository") String repository,
@@ -315,66 +315,66 @@
ses.logout()
}
}</programlisting>
- <para>
- Now we can try to change script deployed on the server without server restart. Type in console next command:
- </para>
-
-<programlisting>andrew@ossl:~> curl -i -v -u root:exo \
+ <para>
+ Now we can try to change script deployed on the server without server restart. Type in console next command:
+ </para>
+
+<programlisting>user@host:~> curl -i -v -u root:exo \
-X POST \
--data-binary @JcrGroovyTest.groovy \
-H 'Content-type:script/groovy' \
http://localhost:8080/rest/script/groovy/update/repository/production/scr...</programlisting>
- <para>
- Node '/script/groovy/JcrGroovyTest.groovy' has property exo:autoload=true so script will be re-deployed automatically when script source code changed.
- </para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/eXoJCR/groovy-console2.png" width="444" />
- </imageobject>
+ <para>
+ Node '/script/groovy/JcrGroovyTest.groovy' has property exo:autoload=true so script will be re-deployed automatically when script source code changed.
+ </para>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/eXoJCR/groovy-console2.png" width="444" />
+ </imageobject>
- </mediaobject>
- <para>
- Script was redeployed, now try to access a newly created method.
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ </mediaobject>
+ <para>
+ Script was redeployed, now try to access a newly created method.
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
-X POST \
http://localhost:8080/rest/groovy/test/repository/production/test</programlisting>
- <para>
- Method execution should be quiet, without output, traces, etc. Then we can try again get node UUID.
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Method execution should be quiet, without output, traces, etc. Then we can try again get node UUID.
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
http://localhost:8080/rest/groovy/test/repository/production/test
1b8c88d37f0000020084433d3af4941f</programlisting>
- <para>
- Node UUID: 1b8c88d37f0000020084433d3af4941f
- </para>
- <para>
- We don't need this scripts any more, so remove it from JCR.
- </para>
-
-<programlisting>andrew@ossl:~> curl -u root:exo \
+ <para>
+ Node UUID: 1b8c88d37f0000020084433d3af4941f
+ </para>
+ <para>
+ We don't need this scripts any more, so remove it from JCR.
+ </para>
+
+<programlisting>user@host:~> curl -u root:exo \
http://localhost:8080/rest/script/groovy/delete/repository/production/scr...</programlisting>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/eXoJCR/groovy-console3.png" width="444" />
- </imageobject>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/eXoJCR/groovy-console3.png" width="444" />
+ </imageobject>
- </mediaobject>
+ </mediaobject>
- </section>
-
- <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Groovy_script_restrictions">
- <title>Groovy script restrictions</title>
- <para>
- You should keep one class per one groovy file. The same actually for interface and it implementation. It's limitation of groovy parser that does not have type Class[] parseClass(InputStream) or Collection parseClass(InputStream) but only Class parseClass(InputStream) instead.
- </para>
- <para>
- That is all.
- </para>
+ </section>
+
+ <section id="sect-Reference_Guide-Groovy_Scripts_as_REST_Services-Groovy_script_restrictions">
+ <title>Groovy script restrictions</title>
+ <para>
+ You should keep one class per one groovy file. The same actually for interface and it implementation. It's limitation of groovy parser that does not have type Class[] parseClass(InputStream) or Collection parseClass(InputStream) but only Class parseClass(InputStream) instead.
+ </para>
+ <para>
+ That is all.
+ </para>
- </section>
+ </section>
</chapter>
12 years, 11 months
- 1
- 0
gatein SVN: r8288 - in components/sso/trunk/josso/gatein-josso-portal/src/main: resources and 3 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 15:09:39 -0500 (Mon, 09 Jan 2012)
New Revision: 8288
Added:
components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/
components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/lib/
components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/lib/josso-gateway-config.xml
Modified:
components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml
Log:
GTNSSO-1 josso gateway configuration also needs to be different among josso-181 and josso-182
Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 15:44:53 UTC (rev 8287)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 20:09:39 UTC (rev 8288)
@@ -7,23 +7,34 @@
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory></outputDirectory>
+ <directory>src/main/resources/gatein.ear</directory>
+ <outputDirectory>josso-181/gatein.ear</outputDirectory>
</fileSet>
<fileSet>
<directory>src/main/resources/gatein.ear</directory>
- <outputDirectory>gatein.ear-josso182</outputDirectory>
+ <outputDirectory>josso-182/gatein.ear</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/main/resources/gatein.ear</directory>
- <outputDirectory>gatein.ear-josso182</outputDirectory>
+ <directory>src/main/resources/plugin</directory>
+ <outputDirectory>josso-181/plugin</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources/plugin</directory>
+ <outputDirectory>josso-182/plugin</outputDirectory>
+ <excludes>
+ <exclude>lib/josso-gateway-config.xml</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/plugin-182/lib</directory>
+ <outputDirectory>josso-182/plugin/lib</outputDirectory>
+ </fileSet>
<!-- We need to use old josso libraries for josso 1.8.1 packaging. Libraries are included in dependencies of project gatein-agent-josso181
and downloaded thanks to maven-dependency-plugin declared in pom.xml of gatein-agent-josso181 module. -->
<fileSet>
<directory>../gatein-agent-josso181/target/dependency</directory>
- <outputDirectory>gatein.ear/lib</outputDirectory>
+ <outputDirectory>josso-181/gatein.ear/lib</outputDirectory>
<includes>
<include>josso-agents-bin-1.8.0.jar</include>
<include>josso-agent-shared-1.8.1.jar</include>
@@ -34,7 +45,7 @@
<dependencySets>
<dependencySet>
- <outputDirectory>gatein.ear/lib</outputDirectory>
+ <outputDirectory>josso-181/gatein.ear/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -51,7 +62,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>gatein.ear-josso182/lib</outputDirectory>
+ <outputDirectory>josso-182/gatein.ear/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -70,7 +81,7 @@
</dependencySet>
<dependencySet>
- <outputDirectory>plugin/webapps/josso/WEB-INF/lib</outputDirectory>
+ <outputDirectory>josso-181/plugin/webapps/josso/WEB-INF/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
@@ -81,6 +92,18 @@
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>josso-182/plugin/webapps/josso/WEB-INF/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.gatein.sso:sso-josso-plugin</include>
+ <include>apache-log4j:log4j</include>
+ </includes>
+ </dependencySet>
+
</dependencySets>
</assembly>
\ No newline at end of file
Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml 2012-01-09 15:44:53 UTC (rev 8287)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml 2012-01-09 20:09:39 UTC (rev 8288)
@@ -305,8 +305,10 @@
<!-- ===================================================================== -->
<!-- SSO Certificate key adapter used for strong authentication -->
<!-- ===================================================================== -->
- <certificate-key-adapter id="josso-certificate-key-adapter"/>
+ <!-- Marker: Certificate key adapter can't be enabled for JOSSO 1.8.1 -->
+ <!-- <certificate-key-adapter id="josso-certificate-key-adapter"/> -->
+
<!-- ===================================================================== -->
<!-- Spring Mail Sender bean. Configure mail delivery settings here -->
<!-- ===================================================================== -->
Added: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/lib/josso-gateway-config.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/lib/josso-gateway-config.xml (rev 0)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin-182/lib/josso-gateway-config.xml 2012-01-09 20:09:39 UTC (rev 8288)
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ ~ JOSSO: Java Open Single Sign-On
+ ~
+ ~ Copyright 2004-2009, Atricore, Inc.
+ ~
+ ~ 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.
+ ~
+ -->
+
+<s:beans xmlns:s="http://www.springframework.org/schema/beans"
+ xmlns="urn:org:josso:core"
+ xmlns:def-sdselector="urn:org:josso:default:secdomainselector"
+ xmlns:def-sdregistry="urn:org:josso:default:secdomainregistry"
+ xmlns:simple-sdmatcher="urn:org:josso:simple:secdomainmatcher"
+ xmlns:vhost-sdmatcher="urn:org:josso:vhost:secdomainmatcher"
+ xmlns:appcxt-sdmatcher="urn:org:josso:appctx:secdomainmatcher"
+ xmlns:def-auth="urn:org:josso:default:authenticator"
+ xmlns:basic-authscheme="urn:org:josso:basic:authscheme"
+ xmlns:bind-authscheme="urn:org:josso:bind:authscheme"
+ xmlns:ntlm-authscheme="urn:org:josso:ntlm:authscheme"
+ xmlns:strong-authscheme="urn:org:josso:strong:authscheme"
+ xmlns:memory-istore="urn:org:josso:memory:identitystore"
+ xmlns:def-identitymgr="urn:org:josso:default:identitymgr"
+ xmlns:def-identityprv="urn:org:josso:default:identityprovider"
+ xmlns:def-sessionmgr="urn:org:josso:default:sessionmgr"
+ xmlns:memory-sstore="urn:org:josso:memory:sessionstore"
+ xmlns:def-sidgen="urn:org:josso:default:sessionidgen"
+ xmlns:def-assertionmgr="urn:org:josso:default:assertionmgr"
+ xmlns:memory-astore="urn:org:josso:memory:assertionstore"
+ xmlns:def-aidgen="urn:org:josso:default:assertionidgen"
+ xmlns:def-auditmgr="urn:org:josso:default:auditmgr"
+ xmlns:logger-atrailhandler="urn:org:josso:logger:audittrailhandler"
+ xmlns:def-eventmgr="urn:org:josso:default:eventmgr"
+ xmlns:def-pwdmgr="urn:org:josso:default:passwordmgr"
+ xmlns:def-pwdgen="urn:org:josso:default:passwordgenerator"
+ xmlns:email-pwddist="urn:org:josso:email:passworddistributor"
+ xmlns:simple-lostpwd="urn:org:josso:simple:lostpasswordprocess"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ urn:org:josso:core http://www.josso.org/schema/josso-core.xsd
+ urn:org:josso:default:secdomainselector http://www.josso.org/schema/josso-default-secdomainselector.xsd
+ urn:org:josso:default:secdomainregistry http://www.josso.org/schema/josso-default-secdomainregistry.xsd
+ urn:org:josso:simple:secdomainmatcher http://www.josso.org/schema/josso-simple-secdomainmatcher.xsd
+ urn:org:josso:vhost:secdomainmatcher http://www.josso.org/schema/josso-vhost-secdomainmatcher.xsd
+ urn:org:josso:appctx:secdomainmatcher http://www.josso.org/schema/josso-appctx-secdomainmatcher.xsd
+ urn:org:josso:default:authenticator http://www.josso.org/schema/josso-default-authenticator.xsd
+ urn:org:josso:basic:authscheme http://www.josso.org/schema/josso-basic-authscheme.xsd
+ urn:org:josso:bind:authscheme http://www.josso.org/schema/josso-bind-authscheme.xsd
+ urn:org:josso:ntlm:authscheme http://www.josso.org/schema/josso-ntlm-authscheme.xsd
+ urn:org:josso:strong:authscheme http://www.josso.org/schema/josso-strong-authscheme.xsd
+ urn:org:josso:memory:identitystore http://www.josso.org/schema/josso-memory-identitystore.xsd
+ urn:org:josso:default:identitymgr http://www.josso.org/schema/josso-default-identitymgr.xsd
+ urn:org:josso:default:identityprovider http://www.josso.org/schema/josso-default-identityprovider.xsd
+ urn:org:josso:default:sessionmgr http://www.josso.org/schema/josso-default-sessionmgr.xsd
+ urn:org:josso:memory:sessionstore http://www.josso.org/schema/josso-memory-sessionstore.xsd
+ urn:org:josso:default:sessionidgen http://www.josso.org/schema/josso-default-sessionidgen.xsd
+ urn:org:josso:default:assertionmgr http://www.josso.org/schema/josso-default-assertionmgr.xsd
+ urn:org:josso:memory:assertionstore http://www.josso.org/schema/josso-memory-assertionstore.xsd
+ urn:org:josso:default:assertionidgen http://www.josso.org/schema/josso-default-assertionidgen.xsd
+ urn:org:josso:default:auditmgr http://www.josso.org/schema/josso-default-auditmgr.xsd
+ urn:org:josso:logger:audittrailhandler http://www.josso.org/schema/josso-logger-audittrailhandler.xsd
+ urn:org:josso:default:eventmgr http://www.josso.org/schema/josso-default-eventmgr.xsd
+ urn:org:josso:default:passwordmgr http://www.josso.org/schema/josso-default-passwordmanager.xsd
+ urn:org:josso:default:passwordgenerator http://www.josso.org/schema/josso-default-passwordgenerator.xsd
+ urn:org:josso:email:passworddistributor http://www.josso.org/schema/josso-email-passworddistributor.xsd
+ urn:org:josso:simple:lostpasswordprocess http://www.josso.org/schema/josso-simple-lostpasswordprocess.xsd">
+
+ <!-- ================================================================== -->
+ <!-- JOSSO Gateway Configuration using Spring + XBean -->
+ <!-- -->
+ <!-- since JOSSO 1.8 -->
+ <!-- ================================================================== -->
+
+ <!-- To keep things organized when using multiple security domains, prepend the domain name
+ to component ids, in our case all componetes use the 'josso' prefix -->
+
+ <!-- ================================================================== -->
+ <!-- Some components are configured in different files to make -->
+ <!-- configuraiton easier -->
+ <!-- ================================================================== -->
+
+ <!-- Authentication schemes configuration -->
+ <s:import resource="josso-gateway-auth.xml"/>
+
+ <!-- SSO Self services configuration -->
+ <s:import resource="josso-gateway-selfservices.xml"/>
+
+ <!-- Identity, Session and Assertion Stores configuration -->
+ <!--
+ Marker: GateIn customization
+ <s:import resource="josso-gateway-stores.xml" />
+ -->
+ <s:import resource="josso-gateway-gatein-stores.xml" />
+
+ <!-- Web configuration (login form, etc) -->
+ <s:import resource="josso-gateway-web.xml" />
+
+ <!-- JMX, used internally -->
+ <s:import resource="josso-gateway-jmx.xml" />
+
+ <!-- ================================================================== -->
+ <!-- Here we define gateway core structure -->
+ <!-- ================================================================== -->
+ <gateway>
+
+ <sso-domain-selector>
+ <def-sdselector:default-domain-selector/>
+ </sso-domain-selector>
+
+ <sso-domains-registry>
+ <def-sdregistry:default-domains-registry/>
+ </sso-domains-registry>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Security Domains, here we have only one domain configured : josso -->
+ <!-- Most components are configured elsewhere and referenced here to make -->
+ <!-- configuration easier. -->
+ <!-- -->
+ <!-- Unless you have multimple security domains, you will not need to -->
+ <!-- change this part -->
+ <!-- ===================================================================== -->
+ <domains>
+ <s:ref bean="josso"/>
+ </domains>
+
+ </gateway>
+
+
+ <!-- JOSSO Default security domain -->
+ <domain name="josso" type="web">
+
+ <sso-web-configuration>
+ <s:ref bean="josso-web-configuraiton"/>
+ </sso-web-configuration>
+
+ <matchers>
+ <simple-sdmatcher:simple-matcher/>
+ </matchers>
+
+ <authenticator>
+ <s:ref bean="josso-authenticator"/>
+ </authenticator>
+
+ <identity-manager>
+ <s:ref bean="josso-identity-manager"/>
+ </identity-manager>
+
+ <session-manager>
+ <s:ref bean="josso-session-manager"/>
+ </session-manager>
+
+ <assertion-manager>
+ <s:ref bean="josso-assertion-manager"/>
+ </assertion-manager>
+
+ <identity-provider>
+ <s:ref bean="josso-identity-provider"/>
+ </identity-provider>
+
+ <audit-manager>
+ <s:ref bean="josso-audit-manager"/>
+ </audit-manager>
+
+ <event-manager>
+ <s:ref bean="josso-event-manager"/>
+ </event-manager>
+
+ <!-- Only needed when using NTLM -->
+ <protocol-manager>
+ <s:ref bean="josso-protocol-manager"/>
+ </protocol-manager>
+
+ <!-- Only neede for self-services (lost password, etc). -->
+ <password-manager>
+ <s:ref bean="josso-password-manager"/>
+ </password-manager>
+
+ </domain>
+
+
+ <!-- ===================================================================== -->
+ <!-- SSO Authenticator, all authentication schemes must be configured here -->
+ <!-- ===================================================================== -->
+ <def-auth:authenticator id="josso-authenticator">
+ <!--
+ <def-auth:schemes>
+ <s:ref bean="josso-basic-authentication"/>
+ <s:ref bean="josso-strong-authentication"/>
+ <s:ref bean="josso-rememberme-authentication"/>
+ </def-auth:schemes>
+ -->
+
+ <!-- Marker: GateIn customization -->
+ <def-auth:schemes>
+ <s:ref bean="josso-bind-authentication"/>
+ </def-auth:schemes>
+ </def-auth:authenticator>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Identity manager, referencing identity store -->
+ <!-- ===================================================================== -->
+ <def-identitymgr:identity-manager id="josso-identity-manager">
+
+ <def-identitymgr:identityStore>
+ <s:ref bean="josso-identity-store"/>
+ </def-identitymgr:identityStore>
+
+ <def-identitymgr:identityStoreKeyAdapter>
+ <s:ref bean="josso-simple-key-adapter"/>
+ </def-identitymgr:identityStoreKeyAdapter>
+
+ </def-identitymgr:identity-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Identity provider -->
+ <!-- ===================================================================== -->
+ <def-identityprv:identity-provider id="josso-identity-provider"/>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Session manager, referencing session store -->
+ <!-- ===================================================================== -->
+ <def-sessionmgr:session-manager id="josso-session-manager"
+ maxInactiveInterval="30"
+ maxSessionsPerUser="-1"
+ invalidateExceedingSessions="false"
+ sessionMonitorInterval="10000">
+
+ <def-sessionmgr:session-id-generator>
+ <def-sidgen:id-generator algorithm="MD5"/>
+ </def-sessionmgr:session-id-generator>
+
+ <def-sessionmgr:session-store>
+ <s:ref bean="josso-session-store"/>
+ </def-sessionmgr:session-store>
+
+ </def-sessionmgr:session-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Assertion anager, referencing assertion store -->
+ <!-- ===================================================================== -->
+ <def-assertionmgr:assertion-manager id="josso-assertion-manager">
+
+ <def-assertionmgr:assertion-id-generator>
+ <def-aidgen:id-generator/>
+ </def-assertionmgr:assertion-id-generator>
+
+ <def-assertionmgr:assertion-store>
+ <s:ref bean="josso-assertion-store"/>
+ </def-assertionmgr:assertion-store>
+
+ </def-assertionmgr:assertion-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Audit Manager with audit trail handlers -->
+ <!-- ===================================================================== -->
+ <def-auditmgr:audit-manager id="josso-audit-manager">
+
+ <!-- Audit Trail Handlers list -->
+ <def-auditmgr:handlers>
+ <logger-atrailhandler:audittrail-logger category="org.josso.AUDIT"/>
+ </def-auditmgr:handlers>
+
+ </def-auditmgr:audit-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Protocol Manager with handlers -->
+ <!-- ===================================================================== -->
+ <default-protocol-manager id="josso-protocol-manager">
+ <!-- To enable NTLM, uncomment this :
+ <handlers>
+ <ntlm-authscheme:ntlm-protocol-handler/>
+ </handlers>
+ -->
+ </default-protocol-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Event manager, based on spring jmx -->
+ <!-- ===================================================================== -->
+ <def-eventmgr:springjmx-event-manager id="josso-event-manager">
+ <def-eventmgr:listeners>
+ <s:ref bean="josso-audit-manager"/>
+ </def-eventmgr:listeners>
+ </def-eventmgr:springjmx-event-manager>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Simple key addapter used in several components -->
+ <!-- ===================================================================== -->
+ <simple-key-adapter id="josso-simple-key-adapter"/>
+
+ <!-- ===================================================================== -->
+ <!-- SSO Certificate key adapter used for strong authentication -->
+ <!-- ===================================================================== -->
+ <certificate-key-adapter id="josso-certificate-key-adapter"/>
+
+ <!-- ===================================================================== -->
+ <!-- Spring Mail Sender bean. Configure mail delivery settings here -->
+ <!-- ===================================================================== -->
+ <s:bean id="josso-spring-mailsender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
+ <!-- Spring JavaMaileSender properties :
+ protocol, host, port, username, password -->
+ <s:property name="host" value="mail.mycompany.com"/>
+ </s:bean>
+
+</s:beans>
12 years, 11 months
- 1
- 0
gatein SVN: r8287 - components/sso/trunk/josso/gatein-josso-portal/src/main/assembly.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 10:44:53 -0500 (Mon, 09 Jan 2012)
New Revision: 8287
Modified:
components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
Log:
GTNSSO-1 Adding josso modules into packaging
Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 15:29:23 UTC (rev 8286)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 15:44:53 UTC (rev 8287)
@@ -46,6 +46,7 @@
<include>org.apache.xbean:xbean-spring</include>
<include>org.gatein.sso:sso-agent</include>
<include>org.gatein.sso:sso-auth-callback</include>
+ <include>org.gatein.sso:sso-agent-josso181</include>
</includes>
</dependencySet>
@@ -64,6 +65,7 @@
<include>org.apache.xbean:xbean-spring</include>
<include>org.gatein.sso:sso-agent</include>
<include>org.gatein.sso:sso-auth-callback</include>
+ <include>org.gatein.sso:sso-agent-josso182</include>
</includes>
</dependencySet>
12 years, 11 months
- 1
- 0
gatein SVN: r8286 - in components/sso/trunk/agent/src/main/java/org/gatein/sso/agent: cas and 2 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 10:29:23 -0500 (Mon, 09 Jan 2012)
New Revision: 8286
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericAgent.java
Modified:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java
Log:
GTNSSO-3 Port some common functionality into generic agent superclass
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericAgent.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/GenericAgent.java 2012-01-09 15:29:23 UTC (rev 8286)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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 org.apache.log4j.Logger;
+import org.gatein.wci.security.Credentials;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public abstract class GenericAgent
+{
+ private static Logger log = Logger.getLogger(GenericAgent.class);
+
+ protected void saveSSOCredentials(String username, HttpServletRequest httpRequest)
+ {
+ //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(username, "");
+
+ httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
+ httpRequest.getSession().setAttribute("username", username);
+
+ // This is needed for using default login module stack instead of SSOLoginModule. In this case, GateIn authentication is done thanks to PortalLoginModule.
+ httpRequest.getSession().setAttribute("authenticatedCredentials", credentials);
+
+ log.debug("Credentials of user " + username + " saved into HTTP session.");
+ }
+
+}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2012-01-09 14:52:42 UTC (rev 8285)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/cas/CASAgent.java 2012-01-09 15:29:23 UTC (rev 8286)
@@ -25,6 +25,7 @@
import javax.servlet.http.HttpServletRequest;
+import org.gatein.sso.agent.GenericAgent;
import org.gatein.wci.security.Credentials;
import org.jasig.cas.client.validation.Cas20ProxyTicketValidator;
import org.jasig.cas.client.validation.Assertion;
@@ -32,7 +33,7 @@
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class CASAgent
+public class CASAgent extends GenericAgent
{
private static Logger log = Logger.getLogger(CASAgent.class);
private static CASAgent singleton;
@@ -86,14 +87,8 @@
log.debug("Service: "+this.casServiceUrl);
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(Credentials.CREDENTIALS, credentials);
- httpRequest.getSession().setAttribute("username", principal);
+ this.saveSSOCredentials(principal, httpRequest);
}
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2012-01-09 14:52:42 UTC (rev 8285)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2012-01-09 15:29:23 UTC (rev 8286)
@@ -26,6 +26,7 @@
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
+import org.gatein.sso.agent.GenericAgent;
import org.gatein.wci.security.Credentials;
import org.josso.agent.Lookup;
@@ -36,7 +37,7 @@
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class JOSSOAgent
+public class JOSSOAgent extends GenericAgent
{
private static Logger log = LoggerFactory.getLogger(JOSSOAgent.class);
private static JOSSOAgent singleton;
@@ -101,12 +102,7 @@
log.debug("Principal: " + principal);
log.debug("-----------------------------------------------------------");
- Credentials credentials = new Credentials(principal, "");
- httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
- httpRequest.getSession().setAttribute("username", principal);
-
- // TODO: this is needed for using default login module stack instead of SSOLoginModule. Should be moved to some abstract superclass instead.
- httpRequest.getSession().setAttribute("authenticatedCredentials", credentials);
+ this.saveSSOCredentials(principal, httpRequest);
}
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2012-01-09 14:52:42 UTC (rev 8285)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/opensso/OpenSSOAgent.java 2012-01-09 15:29:23 UTC (rev 8286)
@@ -32,12 +32,13 @@
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.methods.PostMethod;
+import org.gatein.sso.agent.GenericAgent;
import org.gatein.wci.security.Credentials;
/**
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class OpenSSOAgent
+public class OpenSSOAgent extends GenericAgent
{
private static Logger log = Logger.getLogger(OpenSSOAgent.class);
private static OpenSSOAgent singleton;
@@ -101,9 +102,7 @@
String subject = this.getSubject(token);
if(subject != null)
{
- Credentials credentials = new Credentials(subject, "");
- httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
- httpRequest.getSession().setAttribute("username", subject);
+ this.saveSSOCredentials(subject, httpRequest);
}
}
}
12 years, 11 months
- 1
- 0
gatein SVN: r8285 - in components/sso/trunk: agent and 12 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 09:52:42 -0500 (Mon, 09 Jan 2012)
New Revision: 8285
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/cas/gatein-cas-plugin/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/cas/pom.xml
components/sso/trunk/josso/gatein-agent-josso181/pom.xml
components/sso/trunk/josso/gatein-agent-josso182/pom.xml
components/sso/trunk/josso/gatein-josso-plugin/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/opensso/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
components/sso/trunk/spnego/pom.xml
Log:
GTNSSO-2 Packaging improvements
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/agent/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -77,7 +77,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -85,7 +84,6 @@
<plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
- <version>${version.xbean}</version>
<executions>
<execution>
<configuration>
@@ -112,7 +110,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -39,7 +39,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
@@ -58,7 +57,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -2,6 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
+ <relativePath>../pom.xml</relativePath>
<version>1.1.1-CR01-SNAPSHOT</version>
</parent>
@@ -14,7 +15,6 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-plugin</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -23,17 +23,14 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-client-core</artifactId>
- <version>${version.cas.client}</version>
</dependency>
</dependencies>
@@ -41,7 +38,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
Modified: components/sso/trunk/cas/pom.xml
===================================================================
--- components/sso/trunk/cas/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/cas/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -9,6 +9,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<name>GateIn SSO - CAS</name>
Modified: components/sso/trunk/josso/gatein-agent-josso181/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -4,6 +4,7 @@
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-agent-josso182/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -4,6 +4,7 @@
<artifactId>sso-josso-parent</artifactId>
<groupId>org.gatein.sso</groupId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -3,6 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +38,6 @@
<plugin>
<groupId>org.apache.xbean</groupId>
<artifactId>maven-xbean-plugin</artifactId>
- <version>${version.xbean}</version>
<executions>
<execution>
<configuration>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -3,6 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -83,7 +84,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/josso/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -9,6 +9,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -3,6 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +15,6 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-plugin</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -23,17 +23,14 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${version.commons-logging}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -41,7 +38,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
Modified: components/sso/trunk/opensso/pom.xml
===================================================================
--- components/sso/trunk/opensso/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/opensso/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -9,6 +9,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/packaging/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -3,6 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<version>1.1.1-CR01-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,12 +15,10 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>spnego</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
@@ -32,7 +31,6 @@
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/src.xml</descriptor>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -105,6 +105,11 @@
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
+ <artifactId>sso-cas-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-plugin</artifactId>
<version>${project.version}</version>
</dependency>
@@ -118,6 +123,16 @@
<artifactId>sso-agent-josso182</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-opensso-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>spnego</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- junit -->
<dependency>
@@ -227,6 +242,11 @@
<artifactId>log4j</artifactId>
<version>${version.log4j}</version>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${version.commons-logging}</version>
+ </dependency>
<!-- httpclient -->
<dependency>
@@ -348,9 +368,24 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.2</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>maven-xbean-plugin</artifactId>
+ <version>${version.xbean}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: components/sso/trunk/spnego/pom.xml
===================================================================
--- components/sso/trunk/spnego/pom.xml 2012-01-09 14:00:39 UTC (rev 8284)
+++ components/sso/trunk/spnego/pom.xml 2012-01-09 14:52:42 UTC (rev 8285)
@@ -28,7 +28,6 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
@@ -47,7 +46,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3.1</version>
<configuration>
<skip>true</skip>
</configuration>
12 years, 11 months
- 1
- 0
gatein SVN: r8284 - components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 09:00:39 -0500 (Mon, 09 Jan 2012)
New Revision: 8284
Added:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAuthenticationDelegate.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInJOSSOAgentFactory.java
Log:
GTNSSO-1 Support for JOSSO 1.8.2 and newer
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAuthenticationDelegate.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAuthenticationDelegate.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAuthenticationDelegate.java 2012-01-09 14:00:39 UTC (rev 8284)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso;
+
+import org.josso.agent.SSOAgentRequest;
+import org.josso.gateway.identity.service.SSOIdentityManagerService;
+
+import java.security.Principal;
+
+/**
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public interface GateInAuthenticationDelegate
+{
+
+ /**
+ * Authenticate against JOSSO Identity Manager. Implementation may be different for various version of JOSSO.
+ *
+ * @param identityManager
+ * @param request
+ * @return principal, which is result of successful agent authentication
+ */
+ public Principal authenticate(SSOIdentityManagerService identityManager, SSOAgentRequest request);
+
+}
Added: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInJOSSOAgentFactory.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInJOSSOAgentFactory.java (rev 0)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInJOSSOAgentFactory.java 2012-01-09 14:00:39 UTC (rev 8284)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+import org.josso.agent.SSOAgentRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Abstraction of factory, where concrete implementation of factory can be different for various josso versions.
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public abstract class GateInJOSSOAgentFactory
+{
+ private static AtomicReference<GateInJOSSOAgentFactory> INSTANCE = new AtomicReference<GateInJOSSOAgentFactory>();
+
+ private static final Logger log = LoggerFactory.getLogger(GateInJOSSOAgentFactory.class);
+
+ public static GateInJOSSOAgentFactory getInstance()
+ {
+ GateInJOSSOAgentFactory result = INSTANCE.get();
+
+ if (result == null)
+ {
+ INSTANCE.compareAndSet(null, createInstance());
+ result = INSTANCE.get();
+ }
+
+ return result;
+ }
+
+ /**
+ * @return Concrete factory, where the factory implementation can be different according to josso version.
+ */
+ private static GateInJOSSOAgentFactory createInstance()
+ {
+ try
+ {
+ Class<?> factoryClass = Thread.currentThread().getContextClassLoader().loadClass("org.gatein.sso.agent.josso.impl.GateInJOSSOAgentFactoryImpl");
+ return (GateInJOSSOAgentFactory)factoryClass.newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public abstract SSOAgentRequest getSSOAgentRequest(String requester, int action, String sessionId, String assertionId,
+ HttpServletRequest hreq, HttpServletResponse hres);
+
+
+ public abstract GateInAuthenticationDelegate getAuthenticationDelegate();
+
+
+}
12 years, 11 months
- 1
- 0
gatein SVN: r8283 - in components/sso/trunk: agent and 27 other directories.
by do-not-reply＠jboss.org
Author: mposolda
Date: 2012-01-09 08:56:26 -0500 (Mon, 09 Jan 2012)
New Revision: 8283
Added:
components/sso/trunk/josso/gatein-agent-josso181/
components/sso/trunk/josso/gatein-agent-josso181/pom.xml
components/sso/trunk/josso/gatein-agent-josso181/src/
components/sso/trunk/josso/gatein-agent-josso181/src/main/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java
components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java
components/sso/trunk/josso/gatein-agent-josso181/src/test/
components/sso/trunk/josso/gatein-agent-josso182/
components/sso/trunk/josso/gatein-agent-josso182/pom.xml
components/sso/trunk/josso/gatein-agent-josso182/src/
components/sso/trunk/josso/gatein-agent-josso182/src/main/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java
components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java
components/sso/trunk/josso/gatein-agent-josso182/src/test/
Removed:
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAgentRequest.java
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInLocalSession.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInSSOAgent.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java
components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/LocalSessionImpl.java
components/sso/trunk/agent/src/test/java/org/gatein/sso/agent/josso/TestAssertionValidation.java
components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/pom.xml
Log:
GTNSSO-1 Support for JOSSO 1.8.2 and newer
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -20,7 +20,6 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Deleted: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAgentRequest.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAgentRequest.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInAgentRequest.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -1,59 +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.josso;
-
-import org.josso.agent.LocalSession;
-
-import org.josso.agent.http.HttpSSOAgentRequest;
-import org.josso.agent.http.JOSSOSecurityContext;
-
-/**
- *
- * @author <a href="mailto:sgonzalez@josso.org">Sebastian Gonzalez Oyuela</a>
- */
-public class GateInAgentRequest extends HttpSSOAgentRequest
-{
- private JOSSOSecurityContext ctx;
-
- public GateInAgentRequest(int action, String sessionId, LocalSession session,
- String assertionId)
- {
- super(action, sessionId, session, assertionId);
- }
-
- public GateInAgentRequest(int action, String sessionId, LocalSession session)
- {
- super(action, sessionId, session);
- }
-
- public void setSecurityContext(JOSSOSecurityContext ctx)
- {
- this.ctx = ctx;
- }
-
- public JOSSOSecurityContext getSecurityContext()
- {
- return this.ctx;
- }
-
-}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInLocalSession.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInLocalSession.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInLocalSession.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -23,10 +23,11 @@
package org.gatein.sso.agent.josso;
import javax.servlet.http.HttpSession;
-import org.josso.agent.http.JOSSOSecurityContext;
-import org.josso.agent.http.WebAccessControlUtil;
/**
+ * Forked class {@link org.josso.servlet.agent.GenericServletLocalSession} . We don't want dependency
+ * on josso-servlet-agent library because we need our own agent {@link GateInSSOAgent} to be used instead of
+ * {@link org.josso.servlet.agent.GenericServletSSOAgent} from josso-servlet-agent
*
* @author <a href="mailto:sgonzalez@josso.org">Sebastian Gonzalez Oyuela</a>
*/
@@ -39,12 +40,6 @@
setWrapped(httpSession);
setMaxInactiveInterval(httpSession.getMaxInactiveInterval());
-
}
- public void setSecurityContext(JOSSOSecurityContext ctx)
- {
- HttpSession session = (HttpSession) getWrapped();
- session.setAttribute(WebAccessControlUtil.KEY_JOSSO_SECURITY_CONTEXT, ctx);
- }
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInSSOAgent.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/GateInSSOAgent.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -21,11 +21,13 @@
*/
package org.gatein.sso.agent.josso;
-import org.apache.log4j.Logger;
-
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.josso.agent.SSOAgentRequest;
import org.josso.agent.http.HttpSSOAgent;
+import org.josso.gateway.identity.service.SSOIdentityManagerService;
+import java.lang.reflect.Method;
import java.security.Principal;
/**
@@ -34,22 +36,15 @@
*
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*/
-public class GateInSSOAgent extends HttpSSOAgent
+public class GateInSSOAgent extends HttpSSOAgent
{
- private static final Logger log = Logger.getLogger(GateInSSOAgent.class);
+ private static final Logger log = LoggerFactory.getLogger(GateInSSOAgent.class);
protected Principal authenticate(SSOAgentRequest request)
{
- try
- {
- String ssoSessionId = request.getSessionId();
- return this.getSSOIdentityManager().findUserInSession(ssoSessionId);
- }
- catch(Exception e)
- {
- throw new RuntimeException(e);
- }
+ GateInAuthenticationDelegate authDelegate = GateInJOSSOAgentFactory.getInstance().getAuthenticationDelegate();
+ return authDelegate.authenticate(this.getSSOIdentityManager(), request);
}
protected boolean isAuthenticationAlwaysRequired()
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/JOSSOAgent.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -24,8 +24,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
-
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.wci.security.Credentials;
import org.josso.agent.Lookup;
@@ -38,10 +38,10 @@
*/
public class JOSSOAgent
{
- private static Logger log = Logger.getLogger(Logger.class);
- private static JOSSOAgent singleton;
+ private static Logger log = LoggerFactory.getLogger(JOSSOAgent.class);
+ private static JOSSOAgent singleton;
- private HttpSSOAgent httpAgent;
+ private HttpSSOAgent httpAgent;
private JOSSOAgent()
{
@@ -75,14 +75,16 @@
}
return JOSSOAgent.singleton;
}
-
- public void validateTicket(HttpServletRequest httpRequest,HttpServletResponse httpResponse) throws Exception
+
+ public void validateTicket(HttpServletRequest httpRequest,HttpServletResponse httpResponse) throws Exception
{
String ticket = httpRequest.getParameter("josso_assertion_id");
- log.debug("Trying to validate the following Ticket: "+ticket);
+ log.debug("Trying to validate the following Ticket: " + ticket);
+ String requester = httpRequest.getContextPath().substring(1);
+
//Use the JOSSO Client Library to validate the token and extract the subject that was authenticated
- SSOAgentRequest agentRequest = this.doMakeSSOAgentRequest(SSOAgentRequest.ACTION_RELAY,
+ SSOAgentRequest agentRequest = this.doMakeSSOAgentRequest(requester, SSOAgentRequest.ACTION_RELAY,
null, ticket, httpRequest, httpResponse);
SingleSignOnEntry entry = this.httpAgent.processRequest(agentRequest);
@@ -94,25 +96,23 @@
String principal = entry.principal.getName();
log.debug("-----------------------------------------------------------");
- log.debug("SessionId: "+sessionId);
- log.debug("AssertionId: "+assertionId);
- log.debug("Principal: "+principal);
+ log.debug("SessionId: " + sessionId);
+ log.debug("AssertionId: " + assertionId);
+ log.debug("Principal: " + principal);
log.debug("-----------------------------------------------------------");
Credentials credentials = new Credentials(principal, "");
httpRequest.getSession().setAttribute(Credentials.CREDENTIALS, credentials);
httpRequest.getSession().setAttribute("username", principal);
+
+ // TODO: this is needed for using default login module stack instead of SSOLoginModule. Should be moved to some abstract superclass instead.
+ httpRequest.getSession().setAttribute("authenticatedCredentials", credentials);
}
}
- protected SSOAgentRequest doMakeSSOAgentRequest(int action, String sessionId, String assertionId,
+ protected SSOAgentRequest doMakeSSOAgentRequest(String requester, int action, String sessionId, String assertionId,
HttpServletRequest hreq, HttpServletResponse hres)
{
- GateInAgentRequest r = new GateInAgentRequest(action, sessionId, new GateInLocalSession(hreq.getSession()), assertionId);
- r.setRequest(hreq);
- r.setResponse(hres);
-
- return r;
-
- }
+ return GateInJOSSOAgentFactory.getInstance().getSSOAgentRequest(requester, action, sessionId,assertionId, hreq, hres);
+ }
}
Modified: components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/LocalSessionImpl.java
===================================================================
--- components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/LocalSessionImpl.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/main/java/org/gatein/sso/agent/josso/LocalSessionImpl.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -31,7 +31,10 @@
import java.util.Iterator;
/**
- *
+ * Forked class {@link org.josso.servlet.agent.LocalSessionImpl} . We don't want dependency
+ * on josso-servlet-agent library because we need our own agent {@link GateInSSOAgent} to be used instead of
+ * {@link org.josso.servlet.agent.GenericServletSSOAgent} from josso-servlet-agent
+ *
* @author <a href="mailto:sgonzalez@josso.org">Sebastian Gonzalez Oyuela</a>
*/
public class LocalSessionImpl implements LocalSession
Modified: components/sso/trunk/agent/src/test/java/org/gatein/sso/agent/josso/TestAssertionValidation.java
===================================================================
--- components/sso/trunk/agent/src/test/java/org/gatein/sso/agent/josso/TestAssertionValidation.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/agent/src/test/java/org/gatein/sso/agent/josso/TestAssertionValidation.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -28,7 +28,6 @@
import org.josso.agent.SSOAgent;
import org.josso.agent.Lookup;
import org.josso.agent.SSOAgentRequest;
-import org.josso.agent.LocalSession;
import org.josso.agent.SingleSignOnEntry;
import org.josso.servlet.agent.GenericServletSSOAgentRequest;
@@ -65,7 +64,7 @@
String assertionId = "";
- SSOAgentRequest request = new GenericServletSSOAgentRequest(SSOAgentRequest.ACTION_RELAY,
+ SSOAgentRequest request = new GenericServletSSOAgentRequest("portal", SSOAgentRequest.ACTION_RELAY,
null,
new GenericServletLocalSession(null),
assertionId);
Added: components/sso/trunk/josso/gatein-agent-josso181/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/pom.xml (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso181/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,71 @@
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>sso-josso-parent</artifactId>
+ <groupId>org.gatein.sso</groupId>
+ <version>1.1.1-CR01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>sso-agent-josso181</artifactId>
+ <packaging>jar</packaging>
+
+ <name>GateIn JOSSO agent for JOSSO 1.8.1 and older</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-agent</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-core</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-agent</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-agent-shared</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-agents-bin</artifactId>
+ <version>1.8.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-deps-to-lib</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso.impl;
+
+import org.gatein.sso.agent.josso.GateInAuthenticationDelegate;
+import org.josso.agent.SSOAgentRequest;
+import org.josso.gateway.identity.exceptions.SSOIdentityException;
+import org.josso.gateway.identity.service.SSOIdentityManagerService;
+
+import java.security.Principal;
+
+/**
+ * Implementation for josso 1.8.1 and older
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class GateInAuthenticationDelegateImpl implements GateInAuthenticationDelegate
+{
+
+ public Principal authenticate(SSOIdentityManagerService identityManager, SSOAgentRequest request)
+ {
+ try
+ {
+ return identityManager.findUserInSession(request.getSessionId());
+ }
+ catch (SSOIdentityException se)
+ {
+ throw new RuntimeException(se);
+ }
+ }
+
+}
Added: components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso181/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso.impl;
+
+import org.gatein.sso.agent.josso.GateInAuthenticationDelegate;
+import org.gatein.sso.agent.josso.GateInJOSSOAgentFactory;
+import org.gatein.sso.agent.josso.GateInLocalSession;
+import org.josso.agent.SSOAgentRequest;
+import org.josso.agent.http.HttpSSOAgentRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Implementation for josso 1.8.1 and older
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class GateInJOSSOAgentFactoryImpl extends GateInJOSSOAgentFactory
+{
+ private GateInAuthenticationDelegate authDelegate = new GateInAuthenticationDelegateImpl();
+
+ @Override
+ public SSOAgentRequest getSSOAgentRequest(String requester, int action, String sessionId, String assertionId, HttpServletRequest hreq, HttpServletResponse hres)
+ {
+ HttpSSOAgentRequest agentRequest = new HttpSSOAgentRequest(action, sessionId,
+ new GateInLocalSession(hreq.getSession()), assertionId);
+ agentRequest.setRequest(hreq);
+ agentRequest.setResponse(hres);
+
+ return agentRequest;
+ }
+
+ @Override
+ public GateInAuthenticationDelegate getAuthenticationDelegate()
+ {
+ return authDelegate;
+ }
+}
Added: components/sso/trunk/josso/gatein-agent-josso182/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/pom.xml (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso182/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,21 @@
+<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/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>sso-josso-parent</artifactId>
+ <groupId>org.gatein.sso</groupId>
+ <version>1.1.1-CR01-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>sso-agent-josso182</artifactId>
+ <packaging>jar</packaging>
+
+ <name>GateIn JOSSO agent for JOSSO 1.8.2 and newer</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Added: components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInAuthenticationDelegateImpl.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso.impl;
+
+import org.gatein.sso.agent.josso.GateInAuthenticationDelegate;
+import org.josso.agent.SSOAgentRequest;
+import org.josso.gateway.identity.exceptions.SSOIdentityException;
+import org.josso.gateway.identity.service.SSOIdentityManagerService;
+
+import java.security.Principal;
+
+/**
+ * Implementation for josso 1.8.2 and newer
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class GateInAuthenticationDelegateImpl implements GateInAuthenticationDelegate
+{
+
+ public Principal authenticate(SSOIdentityManagerService identityManager, SSOAgentRequest request)
+ {
+ try
+ {
+ return identityManager.findUserInSession(request.getRequester(), request.getSessionId());
+ }
+ catch (SSOIdentityException se)
+ {
+ throw new RuntimeException(se);
+ }
+ }
+
+}
Added: components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java
===================================================================
--- components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java (rev 0)
+++ components/sso/trunk/josso/gatein-agent-josso182/src/main/java/org/gatein/sso/agent/josso/impl/GateInJOSSOAgentFactoryImpl.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2012, 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.josso.impl;
+
+import org.gatein.sso.agent.josso.GateInAuthenticationDelegate;
+import org.gatein.sso.agent.josso.GateInJOSSOAgentFactory;
+import org.gatein.sso.agent.josso.GateInLocalSession;
+import org.josso.agent.SSOAgentRequest;
+import org.josso.agent.http.HttpSSOAgentRequest;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Implementation for josso 1.8.2 and newer
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class GateInJOSSOAgentFactoryImpl extends GateInJOSSOAgentFactory
+{
+
+ private GateInAuthenticationDelegate authDelegate = new GateInAuthenticationDelegateImpl();
+
+ @Override
+ public SSOAgentRequest getSSOAgentRequest(String requester, int action, String sessionId, String assertionId,
+ HttpServletRequest hreq, HttpServletResponse hres)
+ {
+ HttpSSOAgentRequest agentRequest = new HttpSSOAgentRequest(requester, action, sessionId,
+ new GateInLocalSession(hreq.getSession()), assertionId);
+ agentRequest.setRequest(hreq);
+ agentRequest.setResponse(hres);
+
+ return agentRequest;
+ }
+
+ @Override
+ public GateInAuthenticationDelegate getAuthenticationDelegate()
+ {
+ return authDelegate;
+ }
+
+}
Modified: components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/josso/gatein-josso-plugin/src/main/java/org/gatein/sso/josso/plugin/GateinIdentityPlugin.java 2012-01-09 13:56:26 UTC (rev 8283)
@@ -148,8 +148,9 @@
public BaseRole[] findRolesByUserKey(UserKey userKey)
throws SSOIdentityException
- {
- return null;
+ {
+ // Return empty role set for now. We may think about extending auth-callback for obtain GateIn roles via REST.
+ return new BaseRole[] {};
}
public BaseUser loadUser(UserKey userKey) throws NoSuchUserException,
@@ -172,6 +173,11 @@
return null;
}
+ public String loadUID(CredentialKey key, CredentialProvider cp) throws SSOIdentityException
+ {
+ return null;
+ }
+
public boolean bind(String username, String password)
throws SSOAuthenticationException
{
@@ -179,8 +185,7 @@
{
// return this.portalIdentityService.authenticate(username, password);
log.debug("Performing Authentication........................");
- log.debug("Username: "+username);
- log.debug("Password: "+password);
+ log.debug("Username: " + username);
StringBuilder urlBuffer = new StringBuilder();
urlBuffer.append("http://" + this.gateInHost + ":" + this.gateInPort + "/"
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -14,52 +14,42 @@
<dependency>
<groupId>org.josso</groupId>
<artifactId>josso-agents-bin</artifactId>
- <version>1.8.0</version>
</dependency>
<dependency>
<groupId>org.josso</groupId>
<artifactId>josso-agent-shared</artifactId>
- <version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>2.5.5</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>2.5.5</version>
</dependency>
<dependency>
<groupId>commons-discovery</groupId>
<artifactId>commons-discovery</artifactId>
- <version>0.2</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
- <version>1.4</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>3.4.3</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
@@ -74,8 +64,15 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-plugin</artifactId>
- <version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent-josso181</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent-josso182</artifactId>
+ </dependency>
<dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/assembly/src.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -7,10 +7,28 @@
<fileSets>
<fileSet>
-
<directory>src/main/resources</directory>
<outputDirectory></outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/main/resources/gatein.ear</directory>
+ <outputDirectory>gatein.ear-josso182</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/gatein.ear</directory>
+ <outputDirectory>gatein.ear-josso182</outputDirectory>
+ </fileSet>
+
+ <!-- We need to use old josso libraries for josso 1.8.1 packaging. Libraries are included in dependencies of project gatein-agent-josso181
+ and downloaded thanks to maven-dependency-plugin declared in pom.xml of gatein-agent-josso181 module. -->
+ <fileSet>
+ <directory>../gatein-agent-josso181/target/dependency</directory>
+ <outputDirectory>gatein.ear/lib</outputDirectory>
+ <includes>
+ <include>josso-agents-bin-1.8.0.jar</include>
+ <include>josso-agent-shared-1.8.1.jar</include>
+ </includes>
+ </fileSet>
</fileSets>
<dependencySets>
@@ -20,8 +38,6 @@
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveDependencies>false</useTransitiveDependencies>
<includes>
- <include>org.josso:josso-agents-bin</include>
- <include>org.josso:josso-agent-shared</include>
<include>org.springframework:spring-beans</include>
<include>org.springframework:spring-context</include>
<include>org.springframework:spring-core</include>
@@ -33,6 +49,24 @@
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>gatein.ear-josso182/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>org.josso:josso-agents-bin</include>
+ <include>org.josso:josso-agent-shared</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-core</include>
+ <include>commons-discovery:commons-discovery</include>
+ <include>org.apache.axis:axis</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ <include>org.gatein.sso:sso-agent</include>
+ <include>org.gatein.sso:sso-auth-callback</include>
+ </includes>
+ </dependencySet>
+
<dependencySet>
<outputDirectory>plugin/webapps/josso/WEB-INF/lib</outputDirectory>
<useProjectArtifact>false</useProjectArtifact>
Modified: components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/josso/gatein-josso-portal/src/main/resources/plugin/lib/josso-gateway-config.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -303,6 +303,11 @@
<simple-key-adapter id="josso-simple-key-adapter"/>
<!-- ===================================================================== -->
+ <!-- SSO Certificate key adapter used for strong authentication -->
+ <!-- ===================================================================== -->
+ <certificate-key-adapter id="josso-certificate-key-adapter"/>
+
+ <!-- ===================================================================== -->
<!-- Spring Mail Sender bean. Configure mail delivery settings here -->
<!-- ===================================================================== -->
<s:bean id="josso-spring-mailsender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/josso/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -15,8 +15,10 @@
<name>GateIn SSO - JOSSO</name>
<modules>
+ <module>gatein-agent-josso181</module>
+ <module>gatein-agent-josso182</module>
<module>gatein-josso-portal</module>
<module>gatein-josso-plugin</module>
- </modules>
+ </modules>
</project>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2012-01-09 04:11:01 UTC (rev 8282)
+++ components/sso/trunk/pom.xml 2012-01-09 13:56:26 UTC (rev 8283)
@@ -61,12 +61,20 @@
<version.cas.client>3.1.9</version.cas.client>
<!-- josso -->
- <version.josso>1.8.1</version.josso>
+ <version.josso>1.8.2</version.josso>
<!-- xbean -->
<version.xbean>3.4.3</version.xbean>
+ <!-- spring -->
+ <version.spring>2.5.5</version.spring>
+ <!-- commons discovery -->
+ <version.commons.discovery>0.2</version.commons.discovery>
+
+ <!-- apache axis -->
+ <version.axis>1.4</version.axis>
+
<!-- exo -->
<org.exoplatform.core.version>2.4.3-GA</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.3-GA</org.exoplatform.ws.version>
@@ -84,6 +92,33 @@
<dependencyManagement>
<dependencies>
+ <!-- internal -->
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-auth-callback</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-josso-plugin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent-josso181</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.gatein.sso</groupId>
+ <artifactId>sso-agent-josso182</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- junit -->
<dependency>
<groupId>junit</groupId>
@@ -124,6 +159,11 @@
<artifactId>josso-agent-shared</artifactId>
<version>${version.josso}</version>
</dependency>
+ <dependency>
+ <groupId>org.josso</groupId>
+ <artifactId>josso-agents-bin</artifactId>
+ <version>${version.josso}</version>
+ </dependency>
<dependency>
<groupId>org.josso</groupId>
<artifactId>josso-servlet-agent</artifactId>
@@ -152,6 +192,35 @@
</exclusions>
</dependency>
+ <!-- Spring (needed for JOSSO -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${version.spring}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-discovery</groupId>
+ <artifactId>commons-discovery</artifactId>
+ <version>${version.commons.discovery}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${version.axis}</version>
+ </dependency>
+
<!-- logging -->
<dependency>
<groupId>apache-log4j</groupId>
@@ -274,6 +343,16 @@
<build>
+ <!-- Set plugin versions here -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
12 years, 11 months
- 1
- 0
gatein SVN: r8282 - epp/docs/branches/5.2/User_Guide/en-US.
by do-not-reply＠jboss.org
Author: jaredmorgs
Date: 2012-01-08 23:11:01 -0500 (Sun, 08 Jan 2012)
New Revision: 8282
Modified:
epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml
Log:
Rebrewed on behalf of smumford
Modified: epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-01-09 01:32:31 UTC (rev 8281)
+++ epp/docs/branches/5.2/User_Guide/en-US/Book_Info.xml 2012-01-09 04:11:01 UTC (rev 8282)
@@ -1,28 +1,29 @@
-<?xml version="1.0" ?><!DOCTYPE bookinfo PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd' [
-<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
%BOOK_ENTITIES;
-]><bookinfo id="book-User_Guide-User_Guide">
- <title>User Guide</title>
- <subtitle>A User Guide for Enterprise Portal Platform &VZ;</subtitle>
- <productname>JBoss Enterprise Portal Platform</productname>
- <productnumber>5.2</productnumber>
- <edition>5.2.1</edition>
- <pubsnumber>1</pubsnumber>
- <abstract>
- <para>
+]>
+<bookinfo id="book-User_Guide-User_Guide">
+ <title>User Guide</title>
+ <subtitle>A User Guide for Enterprise Portal Platform &VZ;</subtitle>
+ <productname>JBoss Enterprise Portal Platform</productname>
+ <productnumber>5.2</productnumber>
+ <edition>5.2.1</edition>
+ <pubsnumber>2</pubsnumber>
+ <abstract>
+ <para>
This document provides an easy to follow guide to the functions and
options available in JBoss Enterprise Portal Platform. It is intended to
be accessible and useful to both experienced and novice portal
users.
</para>
- </abstract>
- <corpauthor>
- <inlinemediaobject>
- <imageobject>
- <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
- </imageobject>
- </inlinemediaobject>
- </corpauthor>
- <xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="Author_Group.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ </abstract>
+ <corpauthor>
+ <inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="Common_Content/images/title_logo.svg" format="SVG"/>
+ </imageobject>
+ </inlinemediaobject>
+ </corpauthor>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Common_Content/Legal_Notice.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
</bookinfo>
Modified: epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-01-09 01:32:31 UTC (rev 8281)
+++ epp/docs/branches/5.2/User_Guide/en-US/Revision_History.xml 2012-01-09 04:11:01 UTC (rev 8282)
@@ -1,55 +1,55 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
%BOOK_ENTITIES;
]>
<appendix id="appe-Release_Notes-Revision_History">
- <title>Revision History</title>
- <simpara>
- <revhistory>
- <revision>
- <revnumber>5.2.1-1</revnumber>
- <date>Mon Jan 09 2012</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Removing inappropriate videos link from Introduction.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-100</revnumber>
- <date>Wed Dec 14 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Publication build.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-12</revnumber>
- <date>Tue Dec 13 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>JBEPP-1455: Actioning QA feedback.</member>
- </simplelist>
- </revdescription>
- </revision>
- <!--<revision>
+ <title>Revision History</title>
+ <simpara>
+ <revhistory>
+ <revision>
+ <revnumber>5.2.1-2</revnumber>
+ <date>Mon Jan 09 2012</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Removing inappropriate videos link from Introduction.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-100</revnumber>
+ <date>Wed Dec 14 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Publication build.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-12</revnumber>
+ <date>Tue Dec 13 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>JBEPP-1455: Actioning QA feedback.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+<!--<revision>
<revnumber>5.2.0-11</revnumber>
<date>Mon Dec 12 2011</date>
<author>
@@ -90,49 +90,48 @@
<member>Action QA feedback.</member>
</simplelist>
</revdescription>
- </revision> -->
- <revision>
- <revnumber>5.2.0-6</revnumber>
- <date>Tue Nov 15 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added admonition about gadget whitelist to 'Adding Gadgets' section.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-4</revnumber>
- <date>Mon Sep 12 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Added warning to Publication Date text.</member>
- </simplelist>
- </revdescription>
- </revision>
- <revision>
- <revnumber>5.2.0-1</revnumber>
- <date>Mon Aug 29 2011</date>
- <author>
- <firstname>Scott</firstname>
- <surname>Mumford</surname>
- <email></email>
- </author>
- <revdescription>
- <simplelist>
- <member>Updating version and resetting pubs/ed numbers.</member>
- </simplelist>
- </revdescription>
- </revision>
- </revhistory>
- </simpara>
-</appendix>
\ No newline at end of file
+ </revision> --> <revision>
+ <revnumber>5.2.0-6</revnumber>
+ <date>Tue Nov 15 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added admonition about gadget whitelist to 'Adding Gadgets' section.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-4</revnumber>
+ <date>Mon Sep 12 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Added warning to Publication Date text.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ <revision>
+ <revnumber>5.2.0-1</revnumber>
+ <date>Mon Aug 29 2011</date>
+ <author>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <email/>
+ </author>
+ <revdescription>
+ <simplelist>
+ <member>Updating version and resetting pubs/ed numbers.</member>
+ </simplelist>
+ </revdescription>
+ </revision>
+ </revhistory>
+ </simpara>
+</appendix>
Modified: epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml
===================================================================
--- epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml 2012-01-09 01:32:31 UTC (rev 8281)
+++ epp/docs/branches/5.2/User_Guide/en-US/User_Guide.xml 2012-01-09 04:11:01 UTC (rev 8282)
@@ -1,21 +1,21 @@
-<?xml version='1.0' encoding='utf-8' ?>
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. -->
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
%BOOK_ENTITIES;
]>
<book>
- <xi:include href="Book_Info.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Supported_Browsers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Terms.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/PortletsUser.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Account.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Portal.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Language.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/GadgetsAdmin.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="modules/Further_Documentation.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <index />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Book_Info.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Preface.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Supported_Browsers.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Terms.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/PortletsUser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Account.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Portal.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Language.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/GadgetsAdmin.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Further_Documentation.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Revision_History.xml"/>
+ <index/>
</book>
-
12 years, 11 months
- 1
- 0