November 2010 - gatein-commits - Jboss List Archives

gatein SVN: r4954 - in portal/trunk: packaging/tomcat/pkg and 1 other directory.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-11-05 04:19:51 -0400 (Fri, 05 Nov 2010) New Revision: 4954 Modified: portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/pom.xml Log: Add the simple skin war to be deployed by default Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2010-11-05 04:29:35 UTC (rev 4953) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2010-11-05 08:19:51 UTC (rev 4954) @@ -823,7 +823,15 @@ <artifactId>exo.portal.web.eXoResources</artifactId> <type>war</type> </dependency> + <dependency> + <?rename gatein-sample-skin.war?> + <groupId>org.gatein.portal.examples.skins</groupId> + <artifactId>gatein-sample-skin</artifactId> + <type>war</type> + </dependency> + + <dependency> <?rename dashboard.war?> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.dashboard</artifactId> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-11-05 04:29:35 UTC (rev 4953) +++ portal/trunk/pom.xml 2010-11-05 08:19:51 UTC (rev 4954) @@ -765,11 +765,6 @@ </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> - <artifactId>exo.portal.server.tomcat.plugin</artifactId> - <version>3.2.0-Beta01-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web.portal</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version> <type>war</type> @@ -811,6 +806,12 @@ <type>war</type> </dependency> <dependency> + <groupId>org.gatein.portal.examples.skins</groupId> + <artifactId>gatein-sample-skin</artifactId> + <version>3.2.0-Beta01-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet.dashboard</artifactId> <version>3.2.0-Beta01-SNAPSHOT</version>

15 years, 6 months

1
0
0 / 0

gatein SVN: r4953 - portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2010-11-05 00:29:35 -0400 (Fri, 05 Nov 2010) New Revision: 4953 Added: portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/exokey.pem portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/oauthkey.pem Log: GTNPORTAL-1536 An exception occurs with the OAuth gadgets Added: portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/exokey.pem =================================================================== --- portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/exokey.pem (rev 0) +++ portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/exokey.pem 2010-11-05 04:29:35 UTC (rev 4953) @@ -0,0 +1,29 @@ +-----BEGIN RSA PRIVATE KEY----- +MIICXAIBAAKBgQDMYzu2ZJb6Mt89RxjYcPb01clMna7PJTm+UneDYELKjG6EZ4Nu ++v8Di7e2PxpNlW4cCwUiEkiWBrZH8S1caz4CYIAG+VmKXZXBgmNCINgRVzNtj0/E +4xi5Yz+G1uGCkaB+1mheJWke1rO6SgL6tJ5LmEYCGGu0mj+vxD8W2i4nBwIDAQAB +AoGAJS1zwiSf9djlFI9nLI+3zCdLG32fO5zI2R7FEIek/pT20WzG0pwjYPC8NRFb +Zntk8QLsJxtuSqPj6kgreSEkwRR/YGVIo/xIr46vwl/WydMLKJljvu+E7Y4yjYHb +X4+FDRSL+huOMNNrHgnMy8WnplvtuW5LNV4kD3izU37jxQECQQD15re+8J3C8O6m +wt8+5Ed6a+1+BIdFggFFpV4oC2AKE11+dnwxD5ZyB77sg6sCbcWbLTXOyp/CCAY8 +bkp9ZbOBAkEA1MgP7ZKUUrtrIIg0VYaTTH24iMWTOsPbgNWg9DlLzmIagHHmmmLC +O6gFT05bsNPcFv5a25m+jT1yfvjuKLN+hwJBAJHD544/UjWZ3s5p3C6K4bg3PDwk +cQ+KBjkD0zHHtHGkkxqBIBNxGwyTfOD1GC1DZw0amrfvsw4w9YljE7ML04ECQHrX +IPLrm3uDvZ3jZCs37RPMxNsZDR1w8ukW67vy1APK+TfMCfB5MV8VajNVrnOQa9BO +eY+r26lYnyAUgBG5RkMCQHW5qFDYmgJjb38+uwxd53zGy6m+Jd7kdnGms9V4pPd1 +b21WA/5ncxrpFaz5OFPLtv2zrKYVBAj0tros5hs8Fwk= +-----END RSA PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIICGzCCAYSgAwIBAgIJAJ/PJcjrAB25MA0GCSqGSIb3DQEBBAUAMBQxEjAQBgNV +BAMTCW15dGVzdGtleTAeFw0wOTAxMDgwNzUwMjlaFw0xMDAxMDgwNzUwMjlaMBQx +EjAQBgNVBAMTCW15dGVzdGtleTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA +zGM7tmSW+jLfPUcY2HD29NXJTJ2uzyU5vlJ3g2BCyoxuhGeDbvr/A4u3tj8aTZVu +HAsFIhJIlga2R/EtXGs+AmCABvlZil2VwYJjQiDYEVczbY9PxOMYuWM/htbhgpGg +ftZoXiVpHtazukoC+rSeS5hGAhhrtJo/r8Q/FtouJwcCAwEAAaN1MHMwHQYDVR0O +BBYEFB6QdOIZawuedUjT4F+bK9RG8+sMMEQGA1UdIwQ9MDuAFB6QdOIZawuedUjT +4F+bK9RG8+sMoRikFjAUMRIwEAYDVQQDEwlteXRlc3RrZXmCCQCfzyXI6wAduTAM +BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAAE/6mmd8/mMyzzFozblp04e +TonwNrUB7TldXj+0WnYP04u0hNJuFJ/KD29gHdMnYDdOiVdmK/WS6a7Mn+7HVDT7 +wytizzu/Jfvlrr3yMQYCZssvNIbXPTmr+MjLErjkRxYi4quAnkankTNCDxa4mxN3 +WNlNt2SavfSi3d60wd5o +-----END CERTIFICATE----- Added: portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/oauthkey.pem =================================================================== --- portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/oauthkey.pem (rev 0) +++ portal/branches/branch-GTNPORTAL-1592/server/jboss/patch-ear/src/main/jboss/bin/oauthkey.pem 2010-11-05 04:29:35 UTC (rev 4953) @@ -0,0 +1,16 @@ +-----BEGIN PRIVATE KEY----- +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMxjO7Zklvoy3z1H +GNhw9vTVyUydrs8lOb5Sd4NgQsqMboRng276/wOLt7Y/Gk2VbhwLBSISSJYGtkfx +LVxrPgJggAb5WYpdlcGCY0Ig2BFXM22PT8TjGLljP4bW4YKRoH7WaF4laR7Ws7pK +Avq0nkuYRgIYa7SaP6/EPxbaLicHAgMBAAECgYAlLXPCJJ/12OUUj2csj7fMJ0sb +fZ87nMjZHsUQh6T+lPbRbMbSnCNg8Lw1EVtme2TxAuwnG25Ko+PqSCt5ISTBFH9g +ZUij/Eivjq/CX9bJ0wsomWO+74TtjjKNgdtfj4UNFIv6G44w02seCczLxaemW+25 +bks1XiQPeLNTfuPFAQJBAPXmt77wncLw7qbC3z7kR3pr7X4Eh0WCAUWlXigLYAoT +XX52fDEPlnIHvuyDqwJtxZstNc7Kn8IIBjxuSn1ls4ECQQDUyA/tkpRSu2sgiDRV +hpNMfbiIxZM6w9uA1aD0OUvOYhqAceaaYsI7qAVPTluw09wW/lrbmb6NPXJ++O4o +s36HAkEAkcPnjj9SNZnezmncLorhuDc8PCRxD4oGOQPTMce0caSTGoEgE3EbDJN8 +4PUYLUNnDRqat++zDjD1iWMTswvTgQJAetcg8uube4O9neNkKzftE8zE2xkNHXDy +6Rbru/LUA8r5N8wJ8HkxXxVqM1Wuc5Br0E55j6vbqVifIBSAEblGQwJAdbmoUNia +AmNvfz67DF3nfMbLqb4l3uR2caaz1Xik93VvbVYD/mdzGukVrPk4U8u2/bOsphUE +CPS2uizmGzwXCQ== +-----END PRIVATE KEY-----

15 years, 6 months

1
0
0 / 0

gatein SVN: r4952 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US: extras/Advanced_Development_JCR_Configuration and 34 other directories.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-11-05 00:26:28 -0400 (Fri, 05 Nov 2010) New Revision: 4952 Removed: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default63.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.orig Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default3.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default5.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default6.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default7.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default8.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default23.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default24.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default25.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default12.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default13.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default15.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default20.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default21.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default26.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default28.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default34.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default38.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default43.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default44.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default45.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default47.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default48.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default49.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default51.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default52.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default54.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default56.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default57.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default58.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default61.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default69.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default71.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default74.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default75.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default76.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default77.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default78.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default79.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default80.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default81.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default82.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default88.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default89.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default100.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default98.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default102.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default103.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default105.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default108.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default110.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default111.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default114.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default116.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default117.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default118.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default121.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default123.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default125.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default126.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default127.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default139.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalConfiguration/default143.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/gadgets.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/navigation.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/pages.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/portal.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/subpage.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default145.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default146.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default148.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default149.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default150.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default151.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_JavascriptInterApplicationCommunication/default157.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default160.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default161.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_RTLFramework/default176.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default180.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default181.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default182.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default183.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default186.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default189.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default190.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default191.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default193.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default194.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_XMLResourceBundles/default196.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_GettingStarted/default219.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default245.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default252.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default253.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default254.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default255.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default256.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default257.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default259.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml Log: JBEPP-517: Removed Configuration, External Storage, Configuration Persister, Clustering, JBoss Cache and Lock Manager sections for JCR chapter. Also fixed code snippet formatting from r4513 Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <configuration -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd -http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<component> -<key>org.exoplatform.services.database.HibernateService</key> -<type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> -... -</component> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd + http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + + ... + + </component> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default1.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,20 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd -http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<external-component-plugins> -<target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> -<component-plugin> - -<name>Add PortalContainer Definitions</name> - -<set-method>registerPlugin</set-method> - -<type>org.exoplatform.container.definition.PortalContainerDefinitionPlugin</type> -... -</component-plugin> -</external-component-plugins> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd + http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <external-component-plugins> + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + <component-plugin> +  + <name>Add PortalContainer Definitions</name> + +  + <set-method>registerPlugin</set-method> + +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionPlugin</type> + + ... + + </component-plugin> + </external-component-plugins> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default2.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,9 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd -http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import> -<import>war:/conf/sample-ext/portal/portal-configuration.xml</import> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd + http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <import>war:/conf/sample-ext/jcr/jcr-configuration.xml</import> + <import>war:/conf/sample-ext/portal/portal-configuration.xml</import> + </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default3.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default3.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default3.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,31 +1,32 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <configuration -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd -http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<component> -<key>org.exoplatform.services.database.HibernateService</key> -<jmx-name>database:type=HibernateService</jmx-name> -<type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> -<init-params> -<properties-param> -<name>hibernate.properties</name> -<description>Default Hibernate Service</description> -<property name="hibernate.show_sql" value="false" /> -<property name="hibernate.cglib.use_reflection_optimizer" value="true" /> -<property name="hibernate.connection.url" -value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}" /> -<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> -<property name="hibernate.connection.autocommit" value="true" /> -<property name="hibernate.connection.username" value="sa" /> -<property name="hibernate.connection.password" value="" /> -<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> -<property name="hibernate.c3p0.min_size" value="5" /> -<property name="hibernate.c3p0.max_size" value="20" /> -<property name="hibernate.c3p0.timeout" value="1800" /> -<property name="hibernate.c3p0.max_statements" value="50" /> -</properties-param> -</init-params> -</component> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd + http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.database.HibernateService</key> + <jmx-name>database:type=HibernateService</jmx-name> + <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type> + <init-params> + <properties-param> + <name>hibernate.properties</name> + <description>Default Hibernate Service</description> + <property name="hibernate.show_sql" value="false" /> + <property name="hibernate.cglib.use_reflection_optimizer" value="true" /> + <property name="hibernate.connection.url" + value="jdbc:hsqldb:file:../temp/data/exodb${container.name.suffix}" /> + <property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" /> + <property name="hibernate.connection.autocommit" value="true" /> + <property name="hibernate.connection.username" value="sa" /> + <property name="hibernate.connection.password" value="" /> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> + <property name="hibernate.c3p0.min_size" value="5" /> + <property name="hibernate.c3p0.max_size" value="20" /> + <property name="hibernate.c3p0.timeout" value="1800" /> + <property name="hibernate.c3p0.max_statements" value="50" /> + </properties-param> + </init-params> + </component> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default4.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <component> -<key>org.exoplatform.services.naming.InitialContextInitializer</key> -<type>org.exoplatform.services.naming.InitialContextInitializer</type> -<init-params> -<properties-param> -<name>default-properties</name> -<description>Default initial context properties</description> -<property name="java.naming.factory.initial" -value="org.exoplatform.services.naming.SimpleContextFactory" /> -</properties-param> -</init-params> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + <init-params> + <properties-param> + <name>default-properties</name> + <description>Default initial context properties</description> + <property name="java.naming.factory.initial" + value="org.exoplatform.services.naming.SimpleContextFactory" /> + </properties-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default5.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default5.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default5.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,23 +1,25 @@ <component> -<key>org.exoplatform.services.resources.ResourceBundleService</key> -<type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> -<init-params> -<values-param> -<name>classpath.resources</name> -<description>The resources that start with the following package name should be load from file system</description> -<value>locale.portlet</value> -</values-param> -<values-param> -<name>init.resources</name> -<description>Store the following resources into the db for the first launch </description> -<value>locale.test.resources.test</value> -</values-param> -<values-param> -<name>portal.resource.names</name> -<description>The properties files of the portal , those file will be merged -into one ResourceBundle properties </description> -<value>local.portal.portal</value> -<value>local.portal.custom</value> -</values-param> -</init-params> + <key>org.exoplatform.services.resources.ResourceBundleService</key> + <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> + <init-params> + <values-param> + <name>classpath.resources</name> + <description>The resources that start with the following package name should be load from file system</description> + <value>locale.portlet</value> + </values-param> + + <values-param> + <name>init.resources</name> + <description>Store the following resources into the db for the first launch </description> + <value>locale.test.resources.test</value> + </values-param> + + <values-param> + <name>portal.resource.names</name> + <description>The properties files of the portal , those file will be merged + into one ResourceBundle properties </description> + <value>local.portal.portal</value> + <value>local.portal.custom</value> + </values-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default6.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default6.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default6.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,28 +1,28 @@ <component> -<key>org.exoplatform.services.cache.CacheService</key> -<jmx-name>cache:type=CacheService</jmx-name> -<type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> -<init-params> -<object-param> -<name>cache.config.default</name> -<description>The default cache configuration</description> -<object type="org.exoplatform.services.cache.ExoCacheConfig"> -<field name="name"> -<string>default</string> -</field> -<field name="maxSize"> -<int>300</int> -</field> -<field name="liveTime"> -<long>300</long> -</field> -<field name="distributed"> -<boolean>false</boolean> -</field> -<field name="implementation"> -<string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> -</field> -</object> -</object-param> -</init-params> + <key>org.exoplatform.services.cache.CacheService</key> + <jmx-name>cache:type=CacheService</jmx-name> + <type>org.exoplatform.services.cache.impl.CacheServiceImpl</type> + <init-params> + <object-param> + <name>cache.config.default</name> + <description>The default cache configuration</description> + <object type="org.exoplatform.services.cache.ExoCacheConfig"> + <field name="name"> + <string>default</string> + </field> + <field name="maxSize"> + <int>300</int> + </field> + <field name="liveTime"> + <long>300</long> + </field> + <field name="distributed"> + <boolean>false</boolean> + </field> + <field name="implementation"> + <string>org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache</string> + </field> + </object> + </object-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default7.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default7.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default7.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,70 +1,78 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd -http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<external-component-plugins> - -<target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> -<component-plugin> - -<name>Add PortalContainer Definitions</name> - -<set-method>registerPlugin</set-method> - -<type>org.exoplatform.container.definition.PortalContainerDefinitionPlugin</type> -<init-params> -<object-param> -<name>portal</name> -<object type="org.exoplatform.container.definition.PortalContainerDefinition"> - -<field name="name"><string>portal</string></field> - -<field name="restContextName"><string>rest</string></field> - -<field name="realmName"><string>exo-domain</string></field> - -<field name="dependencies"> -<collection type="java.util.ArrayList"> -<value> -<string>eXoResources</string> -</value> -<value> -<string>portal</string> -</value> -<value> -<string>dashboard</string> -</value> -<value> -<string>exoadmin</string> -</value> -<value> -<string>eXoGadgets</string> -</value> -<value> -<string>eXoGadgetServer</string> -</value> -<value> -<string>rest</string> -</value> -<value> -<string>web</string> -</value> -<value> -<string>wsrp-producer</string> -</value> - -<value> -<string>sample-ext</string> -</value> -</collection> -</field> -</object> -</object-param> -</init-params> -</component-plugin> -</external-component-plugins> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd + http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <external-component-plugins> +  + <target-component>org.exoplatform.container.definition.PortalContainerConfig</target-component> + + <component-plugin> +  + <name>Add PortalContainer Definitions</name> + +  + <set-method>registerPlugin</set-method> + +  + <type>org.exoplatform.container.definition.PortalContainerDefinitionPlugin</type> + + <init-params> + <object-param> + <name>portal</name> + <object type="org.exoplatform.container.definition.PortalContainerDefinition"> +  + <field name="name"><string>portal</string></field> + +  + <field name="restContextName"><string>rest</string></field> + +  + <field name="realmName"><string>exo-domain</string></field> + +  + <field name="dependencies"> + <collection type="java.util.ArrayList"> + <value> + <string>eXoResources</string> + </value> + <value> + <string>portal</string> + </value> + <value> + <string>dashboard</string> + </value> + <value> + <string>exoadmin</string> + </value> + <value> + <string>eXoGadgets</string> + </value> + <value> + <string>eXoGadgetServer</string> + </value> + <value> + <string>rest</string> + </value> + <value> + <string>web</string> + </value> + <value> + <string>wsrp-producer</string> + </value> +  + <value> + <string>sample-ext</string> + </value> + </collection> + </field> + </object> + </object-param> + </init-params> + </component-plugin> + </external-component-plugins> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default8.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default8.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_Foundations/default8.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE web-app PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN -http://java.sun.com/dtd/web-app_2_3.dtd> + http://java.sun.com/dtd/web-app_2_3.dtd> <web-app> -<display-name>sample-ext</display-name> -<listener> -<listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> -</listener> -... + + <display-name>sample-ext</display-name> + + <listener> + <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class> + </listener> + + ... + </web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default23.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default23.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default23.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,22 @@ <component> -<key>org.exoplatform.services.jcr.RepositoryService</key> -<type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> -</component> -<component> -<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> -<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> -<init-params> -<value-param> -<name>conf-path</name> -<description>JCR repositories configuration file</description> -<value>jar:/conf/standalone/exo-jcr-config.xml</value> -</value-param> -<properties-param> -<name>working-conf</name> -<description>working-conf</description> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="hsqldb" /> -<property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> -</properties-param> -</init-params> -</component> + <key>org.exoplatform.services.jcr.RepositoryService</key> + <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> + </component> + <component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR repositories configuration file</description> + <value>jar:/conf/standalone/exo-jcr-config.xml</value> + </value-param> + <properties-param> + <name>working-conf</name> + <description>working-conf</description> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="hsqldb" /> + <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> + </properties-param> + </init-params> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default24.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default24.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default24.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,54 +1,54 @@ <repository-service default-repository="repository"> -<repositories> -<repository name="db1" system-workspace="ws" default-workspace="ws"> -<security-domain>exo-domain</security-domain> -<access-control>optional</access-control> -<session-max-age>1h</session-max-age> -<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> -<workspaces> -<workspace name="production"> - -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="multi-db" value="false" /> -<property name="update-storage" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="../temp/swap/production" /> -</properties> -<value-storages> -<value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="../temp/values/production" /> -</properties> -<filters> -<filter property-type="Binary" /> -</filters> -</value-storage> -</value-storages> -</container> -<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> -<properties> -<property name="root-nodetype" value="nt:unstructured" /> -</properties> -</initializer> -<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> -<properties> -<property name="max-size" value="10k" /> -<property name="live-time" value="1h" /> -</properties> -</cache> -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="index-dir" value="../temp/jcrlucenedb/production" /> -</properties> -</query-handler> -<lock-manager> -<time-out>15m</time-out> -<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> -<properties> -<property name="path" value="../temp/lock/system" /> -</properties> -</persister> -</lock-manager> -</workspace> + <repositories> + <repository name="db1" system-workspace="ws" default-workspace="ws"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <session-max-age>1h</session-max-age> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="production"> +  + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="../temp/swap/production" /> + </properties> + <value-storages> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="../temp/values/production" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="../temp/jcrlucenedb/production" /> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="../temp/lock/system" /> + </properties> + </persister> + </lock-manager> + </workspace> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default25.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default25.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/default25.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,41 +1,41 @@ -<workspace name="backup"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="multi-db" value="false" /> -<property name="update-storage" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="../temp/swap/backup" /> -</properties> -<value-storages> -<value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="../temp/values/backup" /> -</properties> -<filters> -<filter property-type="Binary" /> -</filters> -</value-storage> -</value-storages> -</container> -<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> -<properties> -<property name="root-nodetype" value="nt:unstructured" /> -</properties> -</initializer> -<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> -<properties> -<property name="max-size" value="10k" /> -<property name="live-time" value="1h" /> -</properties> -</cache> -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="index-dir" value="../temp/jcrlucenedb/backup" /> -</properties> -</query-handler> -</workspace> -</workspaces> -</repository> -</repositories> + <workspace name="backup"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="../temp/swap/backup" /> + </properties> + <value-storages> + <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="../temp/values/backup" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl"> + <properties> + <property name="max-size" value="10k" /> + <property name="live-time" value="1h" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="../temp/jcrlucenedb/backup" /> + </properties> + </query-handler> + </workspace> + </workspaces> + </repository> + </repositories> </repository-service> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default12.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default12.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default12.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,5 +1,5 @@ <application-policy name="exo-domain"> -<authentication> -<login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"></login-module> -</authentication> + <authentication> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"></login-module> + </authentication> </application-policy> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default13.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default13.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default13.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,15 @@ <component> -<key>org.jboss.cache.transaction.TransactionManagerLookup</key> -<type>org.jboss.cache.GenericTransactionManagerLookup</type>^ + <key>org.jboss.cache.transaction.TransactionManagerLookup</key> + <type>org.jboss.cache.GenericTransactionManagerLookup</type>^ </component> + <component> -<key>org.exoplatform.services.transaction.TransactionService</key> -<type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> -<init-params> -<value-param> -<name>timeout</name> -<value>300</value> -</value-param> -</init-params> + <key>org.exoplatform.services.transaction.TransactionService</key> + <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> + <init-params> + <value-param> + <name>timeout</name> + <value>300</value> + </value-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default14.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,42 +1,42 @@ <repository-service default-repository="repository1"> -<repositories> -<repository name="repository1" system-workspace="ws1" default-workspace="ws1"> -<security-domain>exo-domain</security-domain> -<access-control>optional</access-control> -<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> -<workspaces> -<workspace name="ws1"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="oracle" /> -<property name="multi-db" value="false" /> -<property name="update-storage" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="../temp/swap/production" /> -</properties> -<value-storages> -</value-storages> -</container> -<initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> -<properties> -<property name="root-nodetype" value="nt:unstructured" /> -</properties> -</initializer> -<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> -</cache> -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -</query-handler> -<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> -</lock-manager> -</workspace> -<workspace name="ws2"> -... -</workspace> -<workspace name="wsN"> -... -</workspace> -</workspaces> -</repository> -</repositories> + <repositories> + <repository name="repository1" system-workspace="ws1" default-workspace="ws1"> + <security-domain>exo-domain</security-domain> + <access-control>optional</access-control> + <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> + <workspaces> + <workspace name="ws1"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="oracle" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="../temp/swap/production" /> + </properties> + <value-storages> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + </query-handler> + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + </lock-manager> + </workspace> + <workspace name="ws2"> + ... + </workspace> + <workspace name="wsN"> + ... + </workspace> + </workspaces> + </repository> + </repositories> </repository-service> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default15.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default15.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default15.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <component> -<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> -<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> -<init-params> -<value-param> -<name>conf-path</name> -<description>JCR configuration file</description> -<value>exo-jcr-configuration.xml</value> -</value-param> -</init-params> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>exo-jcr-configuration.xml</value> + </value-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default16.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <value-storages> -<value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="/mnt/tornado/temp/values/production" /> - -</properties> -<filters> -<filter property-type="Binary" /> -</filters> -</value-storage> + <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="/mnt/tornado/temp/values/production" /> +  + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> </value-storages> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default17.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> -<properties> -<property name="jbosscache-configuration" -value="jar:/conf/portal/test-jbosscache-data.xml"/> -<property name="jgroups-configuration" -value="jar:/conf/portal/udp-mux.xml"/> -<property name="jbosscache-cluster-name" -value="JCR_Cluster_cache_production"/> -<property name="jgroups-multiplexer-stack" -value="true" /> -</properties> + <properties> + <property name="jbosscache-configuration" + value="jar:/conf/portal/test-jbosscache-data.xml"/> + <property name="jgroups-configuration" + value="jar:/conf/portal/udp-mux.xml"/> + <property name="jbosscache-cluster-name" + value="JCR_Cluster_cache_production"/> + <property name="jgroups-multiplexer-stack" + value="true" /> + </properties> </cache> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default18.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,14 @@ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> -<property name="index-dir" value="/mnt/tornado/temp/jcrlucenedb/production" /> - -<property name="jbosscache-configuration" value="jar:/conf/portal/test-jbosscache-indexer.xml" /> - -<property name="jgroups-configuration" value="jar:/conf/portal/udp-mux.xml" /> - -<property name="jbosscache-cluster-name" value="JCR_Cluster_indexer_production" /> - -<property name="jgroups-multiplexer-stack" value="true" /> -</properties> + <properties> + <property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="index-dir" value="/mnt/tornado/temp/jcrlucenedb/production" /> +  + <property name="jbosscache-configuration" value="jar:/conf/portal/test-jbosscache-indexer.xml" /> +  + <property name="jgroups-configuration" value="jar:/conf/portal/udp-mux.xml" /> +  + <property name="jbosscache-cluster-name" value="JCR_Cluster_indexer_production" /> +  + <property name="jgroups-multiplexer-stack" value="true" /> + </properties> </query-handler> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_cluster-config/default19.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,21 +1,21 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> -<properties> -<property name="time-out" value="15m" /> -<property name="jbosscache-configuration" value="jar:/conf/portal/test-jbosscache-lock.xml" /> - -<property name="jgroups-configuration" value="jar:/conf/portal/udp-mux.xml" /> - -<property name="jgroups-multiplexer-stack" value="true" /> -<property name="jbosscache-cluster-name" value="JCR_Cluster_lock_production" /> - -<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_production"/> - -<property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> -<property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> -<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_production_pk"/> -<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> -<property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> -<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> -<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/> -</properties> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="jar:/conf/portal/test-jbosscache-lock.xml" /> +  + <property name="jgroups-configuration" value="jar:/conf/portal/udp-mux.xml" /> +  + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="JCR_Cluster_lock_production" /> +  + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_production"/> +  + <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_production_pk"/> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent"/> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr"/> + </properties> </lock-manager> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default20.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default20.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default20.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <component> -<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> -<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> -<init-params> -<value-param> -<name>conf-path</name> -<description>JCR configuration file</description> -<value>/conf/standalone/exo-jcr-config.xml</value> -</value-param> -</init-params> -</component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>/conf/standalone/exo-jcr-config.xml</value> + </value-param> + </init-params> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default21.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default21.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_configuration-persister/default21.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,18 +1,18 @@ <component> -<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> -<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> -<init-params> -<value-param> -<name>conf-path</name> -<description>JCR configuration file</description> -<value>/conf/standalone/exo-jcr-config.xml</value> -</value-param> -<properties-param> -<name>working-conf</name> -<description>working-conf</description> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="mysql" /> -<property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> -</properties-param> -</init-params> -</component> + <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> + <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> + <init-params> + <value-param> + <name>conf-path</name> + <description>JCR configuration file</description> + <value>/conf/standalone/exo-jcr-config.xml</value> + </value-param> + <properties-param> + <name>working-conf</name> + <description>working-conf</description> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="mysql" /> + <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister" /> + </properties-param> + </init-params> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default25.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="data/values"/> -</properties> -<filters> -<filter property-type="Binary" min-value-size="1M"/> -</filters> + <properties> + <property name="path" value="data/values"/> + </properties> + <filters> + <filter property-type="Binary" min-value-size="1M"/> + </filters> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default26.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default26.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default26.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,18 +1,18 @@ <value-storages> -<value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="data/20Mvalues"/> -</properties> -<filters> -<filter property-type="Binary" min-value-size="20M"/> -</filters> -<value-storage> -<value-storage id="Storage #2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> -<properties> -<property name="path" value="data/values"/> -</properties> -<filters> -<filter property-type="Binary" min-value-size="1M"/> -</filters> -<value-storage> + <value-storage id="Storage #1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="data/20Mvalues"/> + </properties> + <filters> + <filter property-type="Binary" min-value-size="20M"/> + </filters> + <value-storage> + <value-storage id="Storage #2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="data/values"/> + </properties> + <filters> + <filter property-type="Binary" min-value-size="1M"/> + </filters> + <value-storage> <value-storages> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default28.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default28.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_external-value-storages/default28.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,26 +1,26 @@ <workspaces> -<workspace name="ws"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr"/> -<property name="dialect" value="oracle"/> -<property name="multi-db" value="false"/> -<property name="update-storage" value="false"/> -<property name="max-buffer-size" value="200k"/> -<property name="swap-directory" value="target/temp/swap/ws"/> -</properties> -<value-storages> + <workspace name="ws"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr"/> + <property name="dialect" value="oracle"/> + <property name="multi-db" value="false"/> + <property name="update-storage" value="false"/> + <property name="max-buffer-size" value="200k"/> + <property name="swap-directory" value="target/temp/swap/ws"/> + </properties> + <value-storages>  -<value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> -<properties> -<property name="path" value="target/temp/values/ws"/> -<property name="digest-algo" value="MD5"/> -<property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl"/> -<property name="jdbc-source-name" value="jdbcjcr"/> -<property name="jdbc-dialect" value="oracle"/> -</properties> -<filters> -<filter property-type="Binary"/> -</filters> -</value-storage> -</value-storages> + <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws"/> + <property name="digest-algo" value="MD5"/> + <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl"/> + <property name="jdbc-source-name" value="jdbcjcr"/> + <property name="jdbc-dialect" value="oracle"/> + </properties> + <filters> + <filter property-type="Binary"/> + </filters> + </value-storage> + </value-storages> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default30.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ ... <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> ... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default34.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default34.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default34.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,19 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" -lockAcquisitionTimeout="20000" /> -<clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> -<jgroupsConfig multiplexerStack="jcr.stack" /> -<sync /> -</clustering> - -<eviction wakeUpInterval="5000"> -<default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" -actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" -eventQueueSize="1000000"> -<property name="maxNodes" value="1000000" /> -<property name="timeToLive" value="120000" /> -</default> -</eviction> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + +  + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" + eventQueueSize="1000000"> + <property name="maxNodes" value="1000000" /> + <property name="timeToLive" value="120000" /> + </default> + </eviction> </jbosscache> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default35.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,28 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> -<clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> -<jgroupsConfig multiplexerStack="jcr.stack" /> -<sync /> -</clustering> -<loaders passivation="false" shared="true"> -<preload> -<node fqn="/" /> -</preload> -<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> -<properties> -cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} -cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} -cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} -cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} -cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} -cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} -cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} -cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} -cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} -cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} -</properties> -</loader> -</loaders> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000"/> + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} + cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} + cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} + cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} + cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} + cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} + cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} + cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} + cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} + cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} + </properties> + </loader> + </loaders> </jbosscache> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" -lockAcquisitionTimeout="20000" /> -<clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> -<jgroupsConfig multiplexerStack="jcr.stack" /> -<sync /> -</clustering> - -<eviction wakeUpInterval="5000"> -<default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> -<property name="maxNodes" value="10000" /> -<property name="minTimeToLive" value="60000" /> -</default> -</eviction> + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> +  + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> + <property name="maxNodes" value="10000" /> + <property name="minTimeToLive" value="60000" /> + </default> + </eviction> </jbosscache> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <component> -<key>org.exoplatform.services.transaction.TransactionService</key> -<type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> -<init-params> -<value-param> -<name>timeout</name> -<value>3000</value> -</value-param> -</init-params> -</component> + <key>org.exoplatform.services.transaction.TransactionService</key> + <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> + <init-params> + <value-param> + <name>timeout</name> + <value>3000</value> + </value-param> + </init-params> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default38.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default38.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default38.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,69 +1,69 @@ <component> -<key>org.exoplatform.services.naming.InitialContextInitializer</key> -<type>org.exoplatform.services.naming.InitialContextInitializer</type> -<component-plugins> -<component-plugin> -<name>bind.datasource</name> -<set-method>addPlugin</set-method> -<type>org.exoplatform.services.naming.BindReferencePlugin</type> -<init-params> -<value-param> -<name>bind-name</name> -<value>jdbcjcr</value> -</value-param> -<value-param> -<name>class-name</name> -<value>javax.sql.DataSource</value> -</value-param> -<value-param> -<name>factory</name> -<value>org.apache.commons.dbcp.BasicDataSourceFactory</value> -</value-param> -<properties-param> -<name>ref-addresses</name> -<description>ref-addresses</description> -<property name="driverClassName" value="org.hsqldb.jdbcDriver"/> -<property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> -<property name="username" value="sa"/> -<property name="password" value=""/> -</properties-param> -</init-params> -</component-plugin> -<component-plugin> -<name>bind.datasource</name> -<set-method>addPlugin</set-method> -<type>org.exoplatform.services.naming.BindReferencePlugin</type> -<init-params> -<value-param> -<name>bind-name</name> -<value>jdbcjcr1</value> -</value-param> -<value-param> -<name>class-name</name> -<value>javax.sql.DataSource</value> -</value-param> -<value-param> -<name>factory</name> -<value>org.apache.commons.dbcp.BasicDataSourceFactory</value> -</value-param> -<properties-param> -<name>ref-addresses</name> -<description>ref-addresses</description> -<property name="driverClassName" value="com.mysql.jdbc.Driver"/> -<property name="url" value="jdbc:mysql://exoua.dnsalias.net/jcr"/> -<property name="username" value="exoadmin"/> -<property name="password" value="exo12321"/> -<property name="maxActive" value="50"/> -<property name="maxIdle" value="5"/> -<property name="initialSize" value="5"/> -</properties-param> -</init-params> -</component-plugin> -<component-plugins> -<init-params> -<value-param> -<name>default-context-factory</name> -<value>org.exoplatform.services.naming.SimpleContextFactory</value> -</value-param> -</init-params> -</component> + <key>org.exoplatform.services.naming.InitialContextInitializer</key> + <type>org.exoplatform.services.naming.InitialContextInitializer</type> + <component-plugins> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> + <property name="username" value="sa"/> + <property name="password" value=""/> + </properties-param> + </init-params> + </component-plugin> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr1</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="com.mysql.jdbc.Driver"/> + <property name="url" value="jdbc:mysql://exoua.dnsalias.net/jcr"/> + <property name="username" value="exoadmin"/> + <property name="password" value="exo12321"/> + <property name="maxActive" value="50"/> + <property name="maxIdle" value="5"/> + <property name="initialSize" value="5"/> + </properties-param> + </init-params> + </component-plugin> + <component-plugins> + <init-params> + <value-param> + <name>default-context-factory</name> + <value>org.exoplatform.services.naming.SimpleContextFactory</value> + </value-param> + </init-params> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,33 +1,33 @@ <external-component-plugins> -<target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> -<component-plugin> -<name>bind.datasource</name> -<set-method>addPlugin</set-method> -<type>org.exoplatform.services.naming.BindReferencePlugin</type> -<init-params> -<value-param> -<name>bind-name</name> -<value>jdbcjcr</value> -</value-param> -<value-param> -<name>class-name</name> -<value>javax.sql.DataSource</value> -</value-param> -<value-param> -<name>factory</name> -<value>org.apache.commons.dbcp.BasicDataSourceFactory</value> -</value-param> -<properties-param> -<name>ref-addresses</name> -<description>ref-addresses</description> -<property name="driverClassName" value="org.postgresql.Driver"/> -<property name="url" value="jdbc:postgresql://exoua.dnsalias.net/portal"/> -<property name="username" value="exoadmin"/> -<property name="password" value="exo12321"/> -<property name="maxActive" value="50"/> -<property name="maxIdle" value="5"/> -<property name="initialSize" value="5"/> -</properties-param> -</init-params> -</component-plugin> -</external-component-plugins> + <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> + <component-plugin> + <name>bind.datasource</name> + <set-method>addPlugin</set-method> + <type>org.exoplatform.services.naming.BindReferencePlugin</type> + <init-params> + <value-param> + <name>bind-name</name> + <value>jdbcjcr</value> + </value-param> + <value-param> + <name>class-name</name> + <value>javax.sql.DataSource</value> + </value-param> + <value-param> + <name>factory</name> + <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> + </value-param> + <properties-param> + <name>ref-addresses</name> + <description>ref-addresses</description> + <property name="driverClassName" value="org.postgresql.Driver"/> + <property name="url" value="jdbc:postgresql://exoua.dnsalias.net/portal"/> + <property name="username" value="exoadmin"/> + <property name="password" value="exo12321"/> + <property name="maxActive" value="50"/> + <property name="maxIdle" value="5"/> + <property name="initialSize" value="5"/> + </properties-param> + </init-params> + </component-plugin> + </external-component-plugins> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,57 +1,57 @@ <workspaces> -<workspace name="ws" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr"/> -<property name="dialect" value="pgsql"/> -<property name="multi-db" value="false"/> -<property name="max-buffer-size" value="200K"/> -<property name="swap-directory" value="target/temp/swap/ws"/> -</properties> -</container> -<cache enabled="true"> -<properties> -<property name="max-size" value="10K"/> -<property name="live-time" value="30m"/> -</properties> -</cache> -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="index-dir" value="../temp/index"/> -</properties> -</query-handler> -<lock-manager> -<time-out>15m</time-out> -<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> -<properties> -<property name="path" value="target/temp/lock/ws"/> -</properties> -</persister> -</lock-manager> -</workspace> -<workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr"/> -<property name="dialect" value="pgsql"/> -<property name="multi-db" value="false"/> -<property name="max-buffer-size" value="200K"/> -<property name="swap-directory" value="target/temp/swap/ws1"/> -</properties> -</container> -<cache enabled="true"> -<properties> -<property name="max-size" value="10K"/> -<property name="live-time" value="5m"/> -</properties> -</cache> -<lock-manager> -<time-out>15m</time-out> -<persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> -<properties> -<property name="path" value="target/temp/lock/ws1"/> -</properties> -</persister> -</lock-manager> -</workspace> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr"/> + <property name="dialect" value="pgsql"/> + <property name="multi-db" value="false"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/> + <property name="live-time" value="30m"/> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="../temp/index"/> + </properties> + </query-handler> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws"/> + </properties> + </persister> + </lock-manager> + </workspace> + <workspace name="ws1" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr"/> + <property name="dialect" value="pgsql"/> + <property name="multi-db" value="false"/> + <property name="max-buffer-size" value="200K"/> + <property name="swap-directory" value="target/temp/swap/ws1"/> + </properties> + </container> + <cache enabled="true"> + <properties> + <property name="max-size" value="10K"/> + <property name="live-time" value="5m"/> + </properties> + </cache> + <lock-manager> + <time-out>15m</time-out> + <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> + <properties> + <property name="path" value="target/temp/lock/ws1"/> + </properties> + </persister> + </lock-manager> + </workspace> </workspaces> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="dialect" value="hsqldb"/> -<property name="driverClassName" value="org.hsqldb.jdbcDriver"/> -<property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> -<property name="username" value="su"/> -<property name="password" value=""/> -...... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="dialect" value="hsqldb"/> + <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal"/> + <property name="username" value="su"/> + <property name="password" value=""/> + ...... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default43.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default43.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default43.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ <workspaces> -<workspace name="ws" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -... -</workspace> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + ... + </workspace> </worksapces> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default44.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default44.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default44.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ <workspaces> -<workspace name="ws" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> -... -</workspace> + <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + ... + </workspace> </worksapces> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default45.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default45.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jdbc-data-container-config/default45.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ <workspace name="ws" auto-init-root-nodetype="nt:unstructured"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="dialect" value="oracle"/> -<property name="force.query.hints" value="true" /> -...... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="dialect" value="oracle"/> + <property name="force.query.hints" value="true" /> + ...... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default47.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default47.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default47.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <workspace name="ws"> -... -<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> -<properties> -<property name="time-out" value="15m" /> -... -</properties> -</lock-manager> -... + ... + <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> + <properties> + <property name="time-out" value="15m" /> + ... + </properties> + </lock-manager> + ... </workspace> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default48.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default48.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default48.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <properties> -<property name="time-out" value="10m" /> -... + <property name="time-out" value="10m" /> + ... </properties> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default49.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default49.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default49.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> -<properties> -<property name="time-out" value="15m" /> -<property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-lock-config.xml" /> -</properties> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="conf/standalone/cluster/test-jbosscache-lock-config.xml" /> + </properties> </lock-manager> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,47 +1,56 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.2"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> -<clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_Name"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" /> -<jgroupsConfig> -<TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true" -max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300" -skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25" -thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run" -oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000" -oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" /> -<MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> -<MERGE2 max_interval="30000" min_interval="10000" /> -<FD_SOCK /> -<FD max_tries="5" shun="true" timeout="10000" /> -<VERIFY_SUSPECT timeout="1500" /> -<pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" /> -<UNICAST timeout="300,600,1200,2400,3600" /> -<pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" /> -<pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" /> -<FRAG2 frag_size="60000" /> -<pbcast.STREAMING_STATE_TRANSFER /> -<pbcast.FLUSH timeout="0" /> -</jgroupsConfig -<sync /> -</clustering> -<loaders passivation="false" shared="true"> -<preload> -<node fqn="/" /> -</preload> -<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> -<properties> -cache.jdbc.table.name=jcrlocks_ws -cache.jdbc.table.create=true -cache.jdbc.table.drop=false -cache.jdbc.table.primarykey=jcrlocks_ws_pk -cache.jdbc.fqn.column=fqn -cache.jdbc.fqn.type=VARCHAR(512) -cache.jdbc.node.column=node -cache.jdbc.node.type=<BLOB> -cache.jdbc.parent.column=parent -cache.jdbc.datasource=jdbcjcr -</properties> -</loader> -</loaders> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="JBoss-Cache-Lock-Cluster_Name"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" /> + <jgroupsConfig> + + <TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true" + max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300" + skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25" + thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run" + oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="run" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34540" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + + <MERGE2 max_interval="30000" min_interval="10000" /> + <FD_SOCK /> + <FD max_tries="5" shun="true" timeout="10000" /> + <VERIFY_SUSPECT timeout="1500" /> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" /> + <UNICAST timeout="300,600,1200,2400,3600" /> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" /> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" /> + <FRAG2 frag_size="60000" /> + <pbcast.STREAMING_STATE_TRANSFER /> + <pbcast.FLUSH timeout="0" /> + + </jgroupsConfig + + <sync /> + </clustering> + + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/" /> + </preload> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jcrlocks_ws + cache.jdbc.table.create=true + cache.jdbc.table.drop=false + cache.jdbc.table.primarykey=jcrlocks_ws_pk + cache.jdbc.fqn.column=fqn + cache.jdbc.fqn.type=VARCHAR(512) + cache.jdbc.node.column=node + cache.jdbc.node.type=<BLOB> + cache.jdbc.parent.column=parent + cache.jdbc.datasource=jdbcjcr + </properties> + </loader> + + </loaders> + </jbosscache> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default51.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default51.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default51.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,19 +1,19 @@ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> -<properties> -<property name="time-out" value="15m" /> -<property name="jbosscache-configuration" value="test-jbosscache-lock.xml" /> -<property name="jgroups-configuration" value="udp-mux.xml" /> -<property name="jgroups-multiplexer-stack" value="true" /> -<property name="jbosscache-cluster-name" value="JCR-cluster-locks-ws" /> -<property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_ws" /> -<property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> -<property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> -<property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_ws_pk" /> -<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> -<property name="jbosscache-cl-cache.jdbc.fqn.type" value="AUTO"/> -<property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> -<property name="jbosscache-cl-cache.jdbc.node.type" value="AUTO"/> -<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> -<property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> -</properties> + <properties> + <property name="time-out" value="15m" /> + <property name="jbosscache-configuration" value="test-jbosscache-lock.xml" /> + <property name="jgroups-configuration" value="udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="JCR-cluster-locks-ws" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_ws" /> + <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="jcrlocks_ws_pk" /> + <property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" /> + <property name="jbosscache-cl-cache.jdbc.fqn.type" value="AUTO"/> + <property name="jbosscache-cl-cache.jdbc.node.column" value="node" /> + <property name="jbosscache-cl-cache.jdbc.node.type" value="AUTO"/> + <property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" /> + <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> + </properties> </lock-manager> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default52.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default52.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default52.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,32 +1,33 @@ <protocol_stacks> -<stack name="jcr.stack"> -<config> -<UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000" -ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" -discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" -use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true" enable_diagnostics="true" -thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2" -thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true" -thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" -oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000" -oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="Run" /> -<PING timeout="2000" num_initial_members="3" /> -<MERGE2 max_interval="30000" min_interval="10000" /> -<FD_SOCK /> -<FD timeout="10000" max_tries="5" shun="true" /> -<VERIFY_SUSPECT timeout="1500" /> -<BARRIER /> -<pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true" -gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" /> -<UNICAST timeout="300,600,1200" /> -<pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" /> -<VIEW_SYNC avg_send_interval="60000" /> -<pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" /> -<FC max_credits="500000" min_threshold="0.20" /> -<FRAG2 frag_size="60000" /> - -<pbcast.STATE_TRANSFER /> - -</config> -</stack> + <stack name="jcr.stack"> + <config> + <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" + discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" + use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true" enable_diagnostics="true" + thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true" + thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="100" oob_thread_pool.rejection_policy="Run" /> + + <PING timeout="2000" num_initial_members="3" /> + <MERGE2 max_interval="30000" min_interval="10000" /> + <FD_SOCK /> + <FD timeout="10000" max_tries="5" shun="true" /> + <VERIFY_SUSPECT timeout="1500" /> + <BARRIER /> + <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true" + gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" /> + <UNICAST timeout="300,600,1200" /> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" /> + <VIEW_SYNC avg_send_interval="60000" /> + <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" /> + <FC max_credits="500000" min_threshold="0.20" /> + <FRAG2 frag_size="60000" /> +  + <pbcast.STATE_TRANSFER /> +  + </config> + </stack> </protocol_stacks> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,35 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" -lockAcquisitionTimeout="20000" /> -<clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> -<jgroupsConfig multiplexerStack="jcr.stack" /> -<sync /> -</clustering> -<loaders passivation="false" shared="true"> - -<preload> -<node fqn="/" /> -</preload> - -<loader class="org.jboss.cache.loader.JDBCCacheLoader" async=q"false" fetchPersistentState="false" -ignoreModifications="false" purgeOnStartup="false"> -<properties> -cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} -cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} -cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} -cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} -cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} -cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} -cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} -cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} -cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} -cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} -</properties> -</loader> -</loaders> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> + + <loaders passivation="false" shared="true"> +  + <preload> + <node fqn="/" /> + </preload> +  + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async=q"false" fetchPersistentState="false" + ignoreModifications="false" purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name} + cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} + cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} + cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} + cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} + cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} + cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} + cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} + cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} + cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} + </properties> + </loader> + </loaders> </jbosscache> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default54.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default54.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default54.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <workspace name="collaboration"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="oracle" /> -<property name="multi-db" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="target/temp/swap/ws" /> -</properties> -..... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="oracle" /> + <property name="multi-db" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws" /> + </properties> + ..... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default56.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default56.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default56.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <workspace name="collaboration"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="db2" /> -<property name="multi-db" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="target/temp/swap/ws" /> -</properties> -..... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="db2" /> + <property name="multi-db" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws" /> + </properties> + ..... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default57.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default57.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default57.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <workspace name="collaboration"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="mysql-utf8" /> -<property name="multi-db" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="target/temp/swap/ws" /> -</properties> -..... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="mysql-utf8" /> + <property name="multi-db" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws" /> + </properties> + ..... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default58.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default58.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_multilanguage-support/default58.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <workspace name="collaboration"> -<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> -<properties> -<property name="source-name" value="jdbcjcr" /> -<property name="dialect" value="pgsql" /> -<property name="multi-db" value="false" /> -<property name="max-buffer-size" value="200k" /> -<property name="swap-directory" value="target/temp/swap/ws" /> -</properties> -..... + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="pgsql" /> + <property name="multi-db" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws" /> + </properties> + ..... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,14 @@ <workspace name="ws"> -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="index-dir" value="shareddir/index/db1/ws" /> -<property name="changesfilter-class" -value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"/> -<property name="jbosscache-configuration" value="jbosscache-indexer.xml" /> -<property name="jgroups-configuration" value="udp-mux.xml" /> -<property name="jgroups-multiplexer-stack" value="true" /> -<property name="jbosscache-cluster-name" value="JCR-cluster-indexer-ws" /> -<property name="max-volatile-time" value="60" /> -</properties> -</query-handler> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="shareddir/index/db1/ws" /> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"/> + <property name="jbosscache-configuration" value="jbosscache-indexer.xml" /> + <property name="jgroups-configuration" value="udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-ws" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> </workspace> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,19 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> -<locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" -lockAcquisitionTimeout="20000" /> - -<transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> -<clustering mode="replication" clusterName="${jbosscache-cluster-name}"> -<stateRetrieval timeout="20000" fetchInMemoryState="false" /> -<jgroupsConfig multiplexerStack="jcr.stack" /> -<sync /> -</clustering> - -<eviction wakeUpInterval="5000"> -<default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> -<property name="maxNodes" value="10000" /> -<property name="minTimeToLive" value="60000" /> -</default> -</eviction> + + <locking useLockStriping="false" concurrencyLevel="50000" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> +  + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <clustering mode="replication" clusterName="${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig multiplexerStack="jcr.stack" /> + <sync /> + </clustering> +  + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> + <property name="maxNodes" value="10000" /> + <property name="minTimeToLive" value="60000" /> + </default> + </eviction> + </jbosscache> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default61.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default61.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default61.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,22 @@ <repository-service default-repository="db1"> -<repositories> -<repository name="db1" system-workspace="ws" default-workspace="ws"> -.... -<workspaces> -<workspace name="ws"> -.... -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -<property name="index-dir" value="${java.io.tmpdir}/temp/index/db1/ws" /> -<property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> -<property name="synonymprovider-config-path" value="/synonyms.properties" /> -<property name="indexing-config-path" value="/indexing-configuration.xml" /> -<property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> -</properties> -</query-handler> -... -</workspace> -</workspaces> -</repository> -</repositories> + <repositories> + <repository name="db1" system-workspace="ws" default-workspace="ws"> + .... + <workspaces> + <workspace name="ws"> + .... + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${java.io.tmpdir}/temp/index/db1/ws" /> + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <property name="synonymprovider-config-path" value="/synonyms.properties" /> + <property name="indexing-config-path" value="/indexing-configuration.xml" /> + <property name="query-class" value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" /> + </properties> + </query-handler> + ... + </workspace> + </workspaces> + </repository> + </repositories> </repository-service> Deleted: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default63.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default63.java 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default63.java 2010-11-05 04:26:28 UTC (rev 4952) @@ -1 +0,0 @@ -<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default69.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default69.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default69.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> -<properties> -... -<property name="analyzer" value="org.exoplatform.services.jcr.impl.core.MyAnalyzer"/> -... -</properties> + <properties> + ... + <property name="analyzer" value="org.exoplatform.services.jcr.impl.core.MyAnalyzer"/> + ... + </properties> </query-handler> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default71.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default71.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default71.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured"> -<property>Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured"> + <property>Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default72.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured" -boost="2.0"> -<property>Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured" + boost="2.0"> + <property>Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default73.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured"> -<property boost="3.0">Title</property> -<property boost="1.5">Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured"> + <property boost="3.0">Title</property> + <property boost="1.5">Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default74.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default74.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default74.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured" -boost="2.0" -condition="@priority = 'high'"> -<property>Text</property> -</index-rule> -<index-rule nodeType="nt:unstructured"> -<property>Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured" + boost="2.0" + condition="@priority = 'high'"> + <property>Text</property> + </index-rule> + <index-rule nodeType="nt:unstructured"> + <property>Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default75.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default75.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default75.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured" -boost="2.0" -condition="ancestor::*/@priority = 'high'"> -<property>Text</property> -</index-rule> -<index-rule nodeType="nt:unstructured" -boost="0.5" -condition="parent::foo/@priority = 'low'"> -<property>Text</property> -</index-rule> -<index-rule nodeType="nt:unstructured" -boost="1.5" -condition="bar/@priority = 'medium'"> -<property>Text</property> -</index-rule> -<index-rule nodeType="nt:unstructured"> -<property>Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured" + boost="2.0" + condition="ancestor::*/@priority = 'high'"> + <property>Text</property> + </index-rule> + <index-rule nodeType="nt:unstructured" + boost="0.5" + condition="parent::foo/@priority = 'low'"> + <property>Text</property> + </index-rule> + <index-rule nodeType="nt:unstructured" + boost="1.5" + condition="bar/@priority = 'medium'"> + <property>Text</property> + </index-rule> + <index-rule nodeType="nt:unstructured"> + <property>Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default76.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default76.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default76.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured" -boost="2.0" -condition="element(*, nt:unstructured)/@priority = 'high'"> -<property>Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured" + boost="2.0" + condition="element(*, nt:unstructured)/@priority = 'high'"> + <property>Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default77.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default77.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default77.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<index-rule nodeType="nt:unstructured"> -<property nodeScopeIndex="false">Text</property> -</index-rule> + <index-rule nodeType="nt:unstructured"> + <property nodeScopeIndex="false">Text</property> + </index-rule> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default78.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default78.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default78.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:jcr="http://www.jcp.org/jcr/1.0" -xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<aggregate primaryType="nt:file"> -<include>jcr:content</include> -</aggregate> + xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> + <aggregate primaryType="nt:file"> + <include>jcr:content</include> + </aggregate> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default79.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default79.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default79.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:jcr="http://www.jcp.org/jcr/1.0" -xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<aggregate primaryType="nt:file"> -<include primaryType="nt:resource">jcr:content</include> -</aggregate> + xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> + <aggregate primaryType="nt:file"> + <include primaryType="nt:resource">jcr:content</include> + </aggregate> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default80.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default80.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default80.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:jcr="http://www.jcp.org/jcr/1.0" -xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<aggregate primaryType="nt:file">http://wiki.exoplatform.com/xwiki/bin/edit/JCR/Search+Configuration -<include primaryType="nt:resource">*</include> -</aggregate> + xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> + <aggregate primaryType="nt:file">http://wiki.exoplatform.com/xwiki/bin/edit/JCR/Search+Configuration + <include primaryType="nt:resource">*</include> + </aggregate> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default81.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default81.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default81.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:jcr="http://www.jcp.org/jcr/1.0" -xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<aggregate primaryType="nt:file"> -<include>*</include> -<include>*/*</include> -<include>*/*/*</include> -</aggregate> + xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> + <aggregate primaryType="nt:file"> + <include>*</include> + <include>*/*</include> + <include>*/*/*</include> + </aggregate> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default82.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default82.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_search-configuration/default82.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE configuration SYSTEM "http://www.exoplatform.org/dtd/indexing-configuration-1.0.dtd"> <configuration xmlns:nt="http://www.jcp.org/jcr/nt/1.0"> -<analyzers> -<analyzer class="org.apache.lucene.analysis.KeywordAnalyzer"> -<property>mytext</property> -</analyzer> -<analyzer class="org.apache.lucene.analysis.WhitespaceAnalyzer"> -<property>mytext2</property> -</analyzer> -</analyzers> + <analyzers> + <analyzer class="org.apache.lucene.analysis.KeywordAnalyzer"> + <property>mytext</property> + </analyzer> + <analyzer class="org.apache.lucene.analysis.WhitespaceAnalyzer"> + <property>mytext2</property> + </analyzer> + </analyzers> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default88.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default88.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default88.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,15 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<component> -<type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type> -<init-params> -<values-param> -<name>targetInterfaces</name> -<value>org.exoplatform.services.jcr.core.ExtendedSession</value> -<value>org.exoplatform.services.jcr.core.ExtendedNode</value> -<value>javax.jcr.Property</value> -</values-param> -</init-params> -</component> + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <type>org.exoplatform.services.jcr.statistics.JCRAPIAspectConfig</type> + <init-params> + <values-param> + <name>targetInterfaces</name> + <value>org.exoplatform.services.jcr.core.ExtendedSession</value> + <value>org.exoplatform.services.jcr.core.ExtendedNode</value> + <value>javax.jcr.Property</value> + </values-param> + </init-params> + </component> </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default89.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default89.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_statistics/default89.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <aspectj> -<aspects> -<concrete-aspect name="org.exoplatform.services.jcr.statistics.JCRAPIAspectImpl" extends="org.exoplatform.services.jcr.statistics.JCRAPIAspect"> -<pointcut name="JCRAPIPointcut" -expression="(target(org.exoplatform.services.jcr.core.ExtendedSession) || target(org.exoplatform.services.jcr.core.ExtendedNode) || target(javax.jcr.Property)) && call(public * *(..))" /> -</concrete-aspect> -</aspects> -<weaver options="-XnoInline"> -<include within="org.exoplatform..*" /> -</weaver> + <aspects> + <concrete-aspect name="org.exoplatform.services.jcr.statistics.JCRAPIAspectImpl" extends="org.exoplatform.services.jcr.statistics.JCRAPIAspect"> + <pointcut name="JCRAPIPointcut" + expression="(target(org.exoplatform.services.jcr.core.ExtendedSession) || target(org.exoplatform.services.jcr.core.ExtendedNode) || target(javax.jcr.Property)) && call(public * *(..))" /> + </concrete-aspect> + </aspects> + <weaver options="-XnoInline"> + <include within="org.exoplatform..*" /> + </weaver> </aspectj> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_transaction-manager-lookup/default90.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ -<component> -<key>org.jboss.cache.transaction.TransactionManagerLookup</key> -<type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> -</component> + <component> + <key>org.jboss.cache.transaction.TransactionManagerLookup</key> + <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_AuthenticationTokenConfiguration/default95.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <component> -<key>org.exoplatform.web.security.security.CookieTokenService</key> -<type>org.exoplatform.web.security.security.CookieTokenService</type> -<init-params> -<values-param> -<name>service.configuration</name> -<value>jcr-token</value> -<value>7</value> -<value>DAY</value> -</values-param> -</init-params> + <key>org.exoplatform.web.security.security.CookieTokenService</key> + <type>org.exoplatform.web.security.security.CookieTokenService</type> + <init-params> + <values-param> + <name>service.configuration</name> + <value>jcr-token</value> + <value>7</value> + <value>DAY</value> + </values-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default96.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,66 +1,80 @@ <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" -xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> -<component> -<key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> -<type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> -<init-params> -<value-param> -<name>config</name> -<value>war:/conf/organization/idm-config.xml</value> -</value-param> -<value-param> -<name>portalRealm</name> -<value>realm${container.name.suffix}</value> -</value-param> -</init-params> -</component> -<component> -<key>org.exoplatform.services.organization.OrganizationService</key> -<type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> -<init-params> -<object-param> -<name>configuration</name> -<object type="org.exoplatform.services.organization.idm.Config"> -<field name="useParentIdAsGroupType"> -<boolean>true</boolean> -</field> -<field name="forceMembershipOfMappedTypes"> -<boolean>true</boolean> -</field> -<field name="pathSeparator"> -<string>.</string> -</field> -<field name="rootGroupName"> -<string>GTN_ROOT_GROUP</string> -</field> -<field name="groupTypeMappings"> -<map type="java.util.HashMap"> -<entry> -<key><string>/</string></key> -<value><string>root_type</string></value> -</entry> - - -</map> -</field> -<field name="associationMembershipType"> -<string>member</string> -</field> -<field name="ignoreMappedMembershipType"> -<boolean>false</boolean> -</field> -</object> -</object-param> -</init-params> -</component> + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> + + <component> + <key>org.exoplatform.services.organization.idm.PicketLinkIDMService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMServiceImpl</type> + <init-params> + <value-param> + <name>config</name> + <value>war:/conf/organization/idm-config.xml</value> + </value-param> + <value-param> + <name>portalRealm</name> + <value>realm${container.name.suffix}</value> + </value-param> + </init-params> + </component> + + + <component> + <key>org.exoplatform.services.organization.OrganizationService</key> + <type>org.exoplatform.services.organization.idm.PicketLinkIDMOrganizationServiceImpl</type> + <init-params> + <object-param> + <name>configuration</name> + <object type="org.exoplatform.services.organization.idm.Config"> + <field name="useParentIdAsGroupType"> + <boolean>true</boolean> + </field> + + <field name="forceMembershipOfMappedTypes"> + <boolean>true</boolean> + </field> + + <field name="pathSeparator"> + <string>.</string> + </field> + + <field name="rootGroupName"> + <string>GTN_ROOT_GROUP</string> + </field> + + <field name="groupTypeMappings"> + <map type="java.util.HashMap"> + <entry> + <key><string>/</string></key> + <value><string>root_type</string></value> + </entry> + +  +  + + </map> + </field> + + <field name="associationMembershipType"> + <string>member</string> + </field> + + <field name="ignoreMappedMembershipType"> + <boolean>false</boolean> + </field> + </object> + </object-param> + </init-params> + + + </component> + </configuration> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_BackendConfiguration/default97.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,73 +1,73 @@ <jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_beta" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> -<realms> -<realm> -<id>PortalRealm</id> -<repository-id-ref>PortalRepository</repository-id-ref> -<identity-type-mappings> -<user-mapping>USER</user-mapping> -</identity-type-mappings> -</realm> -</realms> -<repositories> -<repository> -<id>PortalRepository</id> -<class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> -<external-config/> -<default-identity-store-id>HibernateStore</default-identity-store-id> -<default-attribute-store-id>HibernateStore</default-attribute-store-id> -</repository> -</repositories> -<stores> -<attribute-stores/> -<identity-stores> -<identity-store> -<id>HibernateStore</id> -<class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> -<external-config/> -<supported-relationship-types> -<relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> -<relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> -</supported-relationship-types> -<supported-identity-object-types> -<identity-object-type> -<name>USER</name> -<relationships/> -<credentials> -<credential-type>PASSWORD</credential-type> -</credentials> -<attributes/> -<options/> -</identity-object-type> -</supported-identity-object-types> -<options> -<option> -<name>hibernateSessionFactoryRegistryName</name> -<value>hibernateSessionFactory</value> -</option> -<option> -<name>allowNotDefinedIdentityObjectTypes</name> -<value>true</value> -</option> -<option> -<name>populateRelationshipTypes</name> -<value>true</value> -</option> -<option> -<name>populateIdentityObjectTypes</name> -<value>true</value> -</option> -<option> -<name>allowNotDefinedAttributes</name> -<value>true</value> -</option> -<option> -<name>isRealmAware</name> -<value>true</value> -</option> -</options> -</identity-store> -</identity-stores> -</stores> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd"> + <realms> + <realm> + <id>PortalRealm</id> + <repository-id-ref>PortalRepository</repository-id-ref> + <identity-type-mappings> + <user-mapping>USER</user-mapping> + </identity-type-mappings> + </realm> + </realms> + <repositories> + <repository> + <id>PortalRepository</id> + <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class> + <external-config/> + <default-identity-store-id>HibernateStore</default-identity-store-id> + <default-attribute-store-id>HibernateStore</default-attribute-store-id> + </repository> + </repositories> + <stores> + <attribute-stores/> + <identity-stores> + <identity-store> + <id>HibernateStore</id> + <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class> + <external-config/> + <supported-relationship-types> + <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type> + <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type> + </supported-relationship-types> + <supported-identity-object-types> + <identity-object-type> + <name>USER</name> + <relationships/> + <credentials> + <credential-type>PASSWORD</credential-type> + </credentials> + <attributes/> + <options/> + </identity-object-type> + </supported-identity-object-types> + <options> + <option> + <name>hibernateSessionFactoryRegistryName</name> + <value>hibernateSessionFactory</value> + </option> + <option> + <name>allowNotDefinedIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>populateRelationshipTypes</name> + <value>true</value> + </option> + <option> + <name>populateIdentityObjectTypes</name> + <value>true</value> + </option> + <option> + <name>allowNotDefinedAttributes</name> + <value>true</value> + </option> + <option> + <name>isRealmAware</name> + <value>true</value> + </option> + </options> + </identity-store> + </identity-stores> + </stores> </jboss-identity> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default100.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default100.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default100.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,25 +1,25 @@ <field name="user"> -<collection type="java.util.ArrayList"> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$User"> -<field name="userName"><string>root</string></field> -<field name="password"><string>exo</string></field> -<field name="firstName"><string>root</string></field> -<field name="lastName"><string>root</string></field> -<field name="email"><string>exoadmin@localhost</string></field> -<field name="groups"><string>member:/admin,member:/user,owner:/portal/admin</string></field> -</object> -</value> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$User"> -<field name="userName"><string>exo</string></field> -<field name="password"><string>exo</string></field> -<field name="firstName"><string>site</string></field> -<field name="lastName"><string>site</string></field> -<field name="email"><string>exo@localhost</string></field> -<field name="groups"><string>member:/user</string></field> -</object> -</value> -... -</collection> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>root</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>root</string></field> + <field name="lastName"><string>root</string></field> + <field name="email"><string>exoadmin@localhost</string></field> + <field name="groups"><string>member:/admin,member:/user,owner:/portal/admin</string></field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$User"> + <field name="userName"><string>exo</string></field> + <field name="password"><string>exo</string></field> + <field name="firstName"><string>site</string></field> + <field name="lastName"><string>site</string></field> + <field name="email"><string>exo@localhost</string></field> + <field name="groups"><string>member:/user</string></field> + </object> + </value> + ... + </collection> </field> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default101.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,32 +1,32 @@ <component-plugin> -<name>new.user.event.listener</name> -<set-method>addListenerPlugin</set-method> -<type>org.exoplatform.services.organization.impl.NewUserEventListener</type> -<description>this listener assign group and membership to a new created user</description> -<init-params> -<object-param> -<name>configuration</name> -<description>description</description> -<object type="org.exoplatform.services.organization.impl.NewUserConfig"> -<field name="group"> -<collection type="java.util.ArrayList"> -<value> -<object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> -<field name="groupId"><string>/user</string></field> -<field name="membership"><string>member</string></field> -</object> -</value> -</collection> -</field> -<field name="ignoredUser"> -<collection type="java.util.HashSet"> -<value><string>exo</string></value> -<value><string>root</string></value> -<value><string>company</string></value> -<value><string>community</string></value> -</collection> -</field> -</object> -</object-param> -</init-params> + <name>new.user.event.listener</name> + <set-method>addListenerPlugin</set-method> + <type>org.exoplatform.services.organization.impl.NewUserEventListener</type> + <description>this listener assign group and membership to a new created user</description> + <init-params> + <object-param> + <name>configuration</name> + <description>description</description> + <object type="org.exoplatform.services.organization.impl.NewUserConfig"> + <field name="group"> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.impl.NewUserConfig$JoinGroup"> + <field name="groupId"><string>/user</string></field> + <field name="membership"><string>member</string></field> + </object> + </value> + </collection> + </field> + <field name="ignoredUser"> + <collection type="java.util.HashSet"> + <value><string>exo</string></value> + <value><string>root</string></value> + <value><string>company</string></value> + <value><string>community</string></value> + </collection> + </field> + </object> + </object-param> + </init-params> </component-plugin> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default98.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default98.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default98.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,34 +1,34 @@ <field name="membershipType"> -<collection type="java.util.ArrayList"> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> -<field name="type"> -<string>member</string> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>member</string> + </field> + <field name="description"> + <string>member membership type</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>owner</string> + </field> + <field name="description"> + <string>owner membership type</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> + <field name="type"> + <string>validator</string> + </field> + <field name="description"> + <string>validator membership type</string> + </field> + </object> + </value> + </collection> </field> -<field name="description"> -<string>member membership type</string> -</field> -</object> -</value> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> -<field name="type"> -<string>owner</string> -</field> -<field name="description"> -<string>owner membership type</string> -</field> -</object> -</value> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$MembershipType"> -<field name="type"> -<string>validator</string> -</field> -<field name="description"> -<string>validator membership type</string> -</field> -</object> -</value> -</collection> -</field> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_PredefinedUserConfiguration/default99.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,37 +1,37 @@ <field name="group"> -<collection type="java.util.ArrayList"> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$Group"> -<field name="name"> -<string>portal</string> + <collection type="java.util.ArrayList"> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>portal</string> + </field> + <field name="parentId"> + <string></string> + </field> + <field name="type"> + <string>hierachy</string> + </field> + <field name="description"> + <string>the /portal group</string> + </field> + </object> + </value> + <value> + <object type="org.exoplatform.services.organization.OrganizationConfig$Group"> + <field name="name"> + <string>community</string> + </field> + <field name="parentId"> + <string>/portal</string> + </field> + <field name="type"> + <string>hierachy</string> + </field> + <field name="description"> + <string>the /portal/community group</string> + </field> + </object> + </value> + ... + </collection> </field> -<field name="parentId"> -<string></string> -</field> -<field name="type"> -<string>hierachy</string> -</field> -<field name="description"> -<string>the /portal group</string> -</field> -</object> -</value> -<value> -<object type="org.exoplatform.services.organization.OrganizationConfig$Group"> -<field name="name"> -<string>community</string> -</field> -<field name="parentId"> -<string>/portal</string> -</field> -<field name="type"> -<string>hierachy</string> -</field> -<field name="description"> -<string>the /portal/community group</string> -</field> -</object> -</value> -... -</collection> -</field> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default102.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default102.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default102.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,25 +1,25 @@  -<property name="authenticationHandlers"> -<list> - -<bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" -p:httpClient-ref="httpClient" /> - -<bean -class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" /> -</list> -</property> + | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate, + | AuthenticationHandlers actually authenticate credentials. Here e declare the AuthenticationHandlers that + | authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn + | until it finds one that both supports the Credentials presented and succeeds in authenticating. + +--> + <property name="authenticationHandlers"> + <list> +  + <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" + p:httpClient-ref="httpClient" /> +  + <bean + class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" /> + </list> + </property> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default103.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default103.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default103.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,33 +1,33 @@  -<property name="authenticationHandlers"> -<list> - -<bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" -p:httpClient-ref="httpClient" /> - - - -<bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin"> -<property name="gateInHost"><value>localhost</value></property> -<property name="gateInPort"><value>8080</value></property> -<property name="gateInContext"><value>portal</value></property> -</bean> -</list> -</property> + | Whereas CredentialsToPrincipalResolvers identify who it is some Credentials might authenticate, + | AuthenticationHandlers actually authenticate credentials. Here we declare the AuthenticationHandlers that + | authenticate the Principals that the CredentialsToPrincipalResolvers identified. CAS will try these handlers in turn + | until it finds one that both supports the Credentials presented and succeeds in authenticating. + +--> + <property name="authenticationHandlers"> + <list> +  + <bean class="org.jasig.cas.authentication.handler.support.HttpBasedServiceCredentialsAuthenticationHandler" + p:httpClient-ref="httpClient" /> +  +  +  + <bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin"> + <property name="gateInHost"><value>localhost</value></property> + <property name="gateInPort"><value>8080</value></property> + <property name="gateInContext"><value>portal</value></property> + </bean> + </list> + </property> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default105.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default105.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default105.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <authentication> -<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> -</login-module> -<login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> -<module-option name="portalContainerName">portal</module-option> -<module-option name="realmName">gatein-domain</module-option> -</login-module> + <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> + </login-module> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> </authentication> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default108.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default108.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default108.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <html> -<head> -<script type="text/javascript"> -window.location = '/portal/sso'; -</script> -</head> -<body> -</body> + <head> + <script type="text/javascript"> + window.location = '/portal/sso'; + </script> + </head> + <body> + </body> </html> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default109.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,30 +1,30 @@ <filter> -<filter-name>LoginRedirectFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> -<init-param> - -<param-name>LOGIN_URL</param-name> - -<param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...</param-value> - - -</init-param> -</filter> -<filter> -<filter-name>CASLogoutFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class> -<init-param> - -<param-name>LOGOUT_URL</param-name> -<param-value>http://localhost:8888/cas/logout</param-value> -</init-param> -</filter> - -<filter-mapping> -<filter-name>LoginRedirectFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> -<filter-mapping> -<filter-name>CASLogoutFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> \ No newline at end of file + <filter-name>LoginRedirectFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> + <init-param> +  + <param-name>LOGIN_URL</param-name> +  + <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...</param-value> +  +  + </init-param> + </filter> + <filter> + <filter-name>CASLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.CASLogoutFilter</filter-class> + <init-param> +  + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/cas/logout</param-value> + </init-param> + </filter> +  + <filter-mapping> + <filter-name>LoginRedirectFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>CASLogoutFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default110.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default110.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default110.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <servlet> -<servlet-name>InitiateLoginServlet</servlet-name> -<servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> -<init-param> -<param-name>ssoServerUrl</param-name> -<param-value>http://localhost:8888/cas</param-value> -</init-param> -<init-param> -<param-name>casRenewTicket</param-name> -<param-value>false</param-value> -</init-param> + <servlet-name>InitiateLoginServlet</servlet-name> + <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> + <init-param> + <param-name>ssoServerUrl</param-name> + <param-value>http://localhost:8888/cas</param-value> + </init-param> + <init-param> + <param-name>casRenewTicket</param-name> + <param-value>false</param-value> + </init-param> </servlet> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default111.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default111.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default111.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <authentication> -<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> -</login-module> -<login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> -<module-option name="portalContainerName">portal</module-option> -<module-option name="realmName">gatein-domain</module-option> -</login-module> + <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> + </login-module> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> </authentication> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default114.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default114.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default114.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <html> -<head> -<script type="text/javascript"> -window.location = '/portal/sso'; -</script> -</head> -<body> -</body> + <head> + <script type="text/javascript"> + window.location = '/portal/sso'; + </script> + </head> + <body> + </body> </html> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default115.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,27 +1,27 @@ -<filter> -<filter-name>LoginRedirectFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> -<init-param> - -<param-name>LOGIN_URL</param-name> -<param-value>http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhos...</param-value> -</init-param> -</filter> -<filter> -<filter-name>JOSSOLogoutFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class> -<init-param> - -<param-name>LOGOUT_URL</param-name> -<param-value>http://localhost:8888/josso/signon/logout.do</param-value> -</init-param> -</filter> - -<filter-mapping> -<filter-name>LoginRedirectFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> -<filter-mapping> -<filter-name>JOSSOLogoutFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> \ No newline at end of file + <filter> + <filter-name>LoginRedirectFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> + <init-param> +  + <param-name>LOGIN_URL</param-name> + <param-value>http://localhost:8888/josso/signon/login.do?josso_back_to=http://localhos...</param-value> + </init-param> + </filter> + <filter> + <filter-name>JOSSOLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.JOSSOLogoutFilter</filter-class> + <init-param> +  + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/josso/signon/logout.do</param-value> + </init-param> + </filter> +  + <filter-mapping> + <filter-name>LoginRedirectFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>JOSSOLogoutFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default116.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default116.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default116.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <servlet> -<servlet-name>InitiateLoginServlet</servlet-name> -<servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> -<init-param> -<param-name>ssoServerUrl</param-name> -<param-value>http://localhost:8888/josso/signon/login.do</param-value> -</init-param> + <servlet-name>InitiateLoginServlet</servlet-name> + <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> + <init-param> + <param-name>ssoServerUrl</param-name> + <param-value>http://localhost:8888/josso/signon/login.do</param-value> + </init-param> </servlet> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default117.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default117.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default117.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,18 +1,20 @@ <?xml version='1.0' encoding="UTF-8"?> + <!DOCTYPE ModuleProperties PUBLIC "=//iPlanet//Authentication Module Properties XML Interface 1.0 DTD//EN" -"jar://com/sun/identity/authentication/Auth_Module_Properties.dtd"> + "jar://com/sun/identity/authentication/Auth_Module_Properties.dtd"> + <ModuleProperties moduleName="AuthenticationPlugin" version="1.0" > -<Callbacks length="2" order="1" timeout="60" -header="GateIn OpenSSO Login" > -<NameCallback> -<Prompt> -Username -</Prompt> -</NameCallback> -<PasswordCallback echoPassword="false" > -<Prompt> -Password -</Prompt> -</PasswordCallback> -</Callbacks> + <Callbacks length="2" order="1" timeout="60" + header="GateIn OpenSSO Login" > + <NameCallback> + <Prompt> + Username + </Prompt> + </NameCallback> + <PasswordCallback echoPassword="false" > + <Prompt> + Password + </Prompt> + </PasswordCallback> + </Callbacks> </ModuleProperties> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default118.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default118.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default118.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <authentication> -<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> -</login-module> -<login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> -<module-option name="portalContainerName">portal</module-option> -<module-option name="realmName">gatein-domain</module-option> -</login-module> + <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"> + </login-module> + <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required"> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> </authentication> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default121.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default121.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default121.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <html> -<head> -<script type="text/javascript"> -window.location = '/portal/sso'; -</script> -</head> -<body> -</body> + <head> + <script type="text/javascript"> + window.location = '/portal/sso'; + </script> + </head> + <body> + </body> </html> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default122.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,27 +1,27 @@ -<filter> -<filter-name>LoginRedirectFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> -<init-param> - -<param-name>LOGIN_URL</param-name> -<param-value>http://localhost:8888/opensso/UI/Login?realm=gatein&amp;goto=http://l...</param-value> -</init-param> -</filter> -<filter> -<filter-name>OpenSSOLogoutFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class> -<init-param> - -<param-name>LOGOUT_URL</param-name> -<param-value>http://localhost:8888/opensso/UI/Logout</param-value> -</init-param> -</filter> - -<filter-mapping> -<filter-name>LoginRedirectFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> -<filter-mapping> -<filter-name>OpenSSOLogoutFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> \ No newline at end of file + <filter> + <filter-name>LoginRedirectFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> + <init-param> +  + <param-name>LOGIN_URL</param-name> + <param-value>http://localhost:8888/opensso/UI/Login?realm=gatein&amp;goto=http://l...</param-value> + </init-param> + </filter> + <filter> + <filter-name>OpenSSOLogoutFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.OpenSSOLogoutFilter</filter-class> + <init-param> +  + <param-name>LOGOUT_URL</param-name> + <param-value>http://localhost:8888/opensso/UI/Logout</param-value> + </init-param> + </filter> +  + <filter-mapping> + <filter-name>LoginRedirectFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>OpenSSOLogoutFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default123.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default123.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default123.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,12 @@ <servlet> -<servlet-name>InitiateLoginServlet</servlet-name> -<servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> -<init-param> -<param-name>ssoServerUrl</param-name> -<param-value>http://localhost:8888/opensso</param-value> -</init-param> -<init-param> -<param-name>ssoCookieName</param-name> -<param-value>iPlanetDirectoryPro</param-value> -</init-param> + <servlet-name>InitiateLoginServlet</servlet-name> + <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class> + <init-param> + <param-name>ssoServerUrl</param-name> + <param-value>http://localhost:8888/opensso</param-value> + </init-param> + <init-param> + <param-name>ssoCookieName</param-name> + <param-value>iPlanetDirectoryPro</param-value> + </init-param> </servlet> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default124.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,13 +1,13 @@  -<application-policy name="host"> -<authentication> -<login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required"> -<module-option name="storeKey">true</module-option> -<module-option name="useKeyTab">true</module-option> -<module-option name="principal">HTTP/server.local.network(a)LOCAL.NETWORK</module-option> -<module-option name="keyTab">/home/user/krb5keytabs/jboss.keytab</module-option> -<module-option name="doNotPrompt">true</module-option> -<module-option name="debug">true</module-option> -</login-module> -</authentication> -</application-policy> \ No newline at end of file + <application-policy name="host"> + <authentication> + <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required"> + <module-option name="storeKey">true</module-option> + <module-option name="useKeyTab">true</module-option> + <module-option name="principal">HTTP/server.local.network(a)LOCAL.NETWORK</module-option> + <module-option name="keyTab">/home/user/krb5keytabs/jboss.keytab</module-option> + <module-option name="doNotPrompt">true</module-option> + <module-option name="debug">true</module-option> + </login-module> + </authentication> + </application-policy> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default125.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default125.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default125.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,29 +1,30 @@ <property name="authenticators"> -<map keyClass="java.lang.String" valueClass="java.lang.String"> -<entry> -<key>BASIC</key> -<value>org.apache.catalina.authenticator.BasicAuthenticator</value> -</entry> -<entry> -<key>CLIENT-CERT</key> -<value>org.apache.catalina.authenticator.SSLAuthenticator</value> -</entry> -<entry> -<key>DIGEST</key> -<value>org.apache.catalina.authenticator.DigestAuthenticator</value> -</entry> -<entry> -<key>FORM</key> -<value>org.apache.catalina.authenticator.FormAuthenticator</value> -</entry> -<entry> -<key>NONE</key> -<value>org.apache.catalina.authenticator.NonLoginAuthenticator</value> -</entry> - -<entry> -<key>SPNEGO</key> -<value>org.jboss.security.negotiation.NegotiationAuthenticator</value> -</entry> -</map> -</property> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry> + <key>BASIC</key> + <value>org.apache.catalina.authenticator.BasicAuthenticator</value> + </entry> + <entry> + <key>CLIENT-CERT</key> + <value>org.apache.catalina.authenticator.SSLAuthenticator</value> + </entry> + <entry> + <key>DIGEST</key> + <value>org.apache.catalina.authenticator.DigestAuthenticator</value> + </entry> + <entry> + <key>FORM</key> + <value>org.apache.catalina.authenticator.FormAuthenticator</value> + </entry> + <entry> + <key>NONE</key> + <value>org.apache.catalina.authenticator.NonLoginAuthenticator</value> + </entry> + +  + <entry> + <key>SPNEGO</key> + <value>org.jboss.security.negotiation.NegotiationAuthenticator</value> + </entry> + </map> + </property> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default126.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default126.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default126.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,20 +1,20 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> -<application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain"> - -<authentication> -<login-module -code="org.gatein.sso.spnego.SPNEGOLoginModule" -flag="requisite"> -<module-option name="password-stacking">useFirstPass</module-option> -<module-option name="serverSecurityDomain">host</module-option> -</login-module> -<login-module -code="org.gatein.sso.agent.login.SPNEGORolesModule" -flag="required"> -<module-option name="password-stacking">useFirstPass</module-option> -<module-option name="portalContainerName">portal</module-option> -<module-option name="realmName">gatein-domain</module-option> -</login-module> -</authentication> -</application-policy> + <application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain"> +  + <authentication> + <login-module + code="org.gatein.sso.spnego.SPNEGOLoginModule" + flag="requisite"> + <module-option name="password-stacking">useFirstPass</module-option> + <module-option name="serverSecurityDomain">host</module-option> + </login-module> + <login-module + code="org.gatein.sso.agent.login.SPNEGORolesModule" + flag="required"> + <module-option name="password-stacking">useFirstPass</module-option> + <module-option name="portalContainerName">portal</module-option> + <module-option name="realmName">gatein-domain</module-option> + </login-module> + </authentication> + </application-policy> </deployment> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default127.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default127.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default127.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,14 @@ - -<login-config> -<auth-method>SPNEGO</auth-method> -<realm-name>SPNEGO</realm-name> -</login-config> +  + <login-config> + <auth-method>SPNEGO</auth-method> + <realm-name>SPNEGO</realm-name> + </login-config> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Authentication_Identity_SSO/default128.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,20 +1,20 @@ -<filter> -<filter-name>LoginRedirectFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> -<init-param> - -<param-name>LOGIN_URL</param-name> -<param-value>/portal/private/classic</param-value> -</filter> -<filter> -<filter-name>SPNEGOFilter</filter-name> -<filter-class>org.gatein.sso.agent.filter.SPNEGOFilter</filter-class> -</filter> -<filter-mapping> -<filter-name>LoginRedirectFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> -<filter-mapping> -<filter-name>SPNEGOFilter</filter-name> -<url-pattern>/*</url-pattern> -</filter-mapping> \ No newline at end of file + <filter> + <filter-name>LoginRedirectFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.LoginRedirectFilter</filter-class> + <init-param> +  + <param-name>LOGIN_URL</param-name> + <param-value>/portal/private/classic</param-value> + </filter> + <filter> + <filter-name>SPNEGOFilter</filter-name> + <filter-class>org.gatein.sso.agent.filter.SPNEGOFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>LoginRedirectFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>SPNEGOFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default139.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default139.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Gadget_Development_SetupGadgetServer/default139.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <component> -<key>org.exoplatform.application.gadget.GadgetRegistryService</key> -<type>org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl</type> -<init-params> -<value-param> -<name>gadgets.hostName</name> -<description>Gadget server url</description> -<value>http://localhost:8080/GateInGadgetServer/gadgets/</value> -</value-param> -</init-params> + <key>org.exoplatform.application.gadget.GadgetRegistryService</key> + <type>org.exoplatform.application.gadget.impl.GadgetRegistryServiceImpl</type> + <init-params> + <value-param> + <name>gadgets.hostName</name> + <description>Gadget server url</description> + <value>http://localhost:8080/GateInGadgetServer/gadgets/</value> + </value-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalConfiguration/default143.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalConfiguration/default143.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalConfiguration/default143.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,20 +1,20 @@ <component> -<key>org.exoplatform.portal.config.UserPortalConfigService</key> -<type>org.exoplatform.portal.config.UserPortalConfigService</type> -<component-plugins> -<component-plugin> -<name>new.portal.config.user.listener</name> -<set-method>initListener</set-method> -<type>org.exoplatform.portal.config.NewPortalConfigListener</type> -<description>this listener init the portal configuration</description> -<init-params> -<value-param> -<name>default.portal</name> -<description>The default portal for checking db is empty or not</description> -<value>classic</value> -</value-param> -... -</init-params> -</component-plugin> -</component-plugins> -</component> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + ... + </init-params> + </component-plugin> + </component-plugins> + </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/default144.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,100 +1,100 @@ <component> -<key>org.exoplatform.portal.config.UserPortalConfigService</key> -<type>org.exoplatform.portal.config.UserPortalConfigService</type> -<component-plugins> -<component-plugin> -<name>new.portal.config.user.listener</name> -<set-method>initListener</set-method> -<type>org.exoplatform.portal.config.NewPortalConfigListener</type> -<description>this listener init the portal configuration</description> -<init-params> -<value-param> -<name>default.portal</name> -<description>The default portal for checking db is empty or not</description> -<value>classic</value> -</value-param> -<value-param> -<name>page.templates.location</name> -<description>the path to the location that contains Page templates</description> -<value>war:/conf/portal/template/pages</value> -</value-param> -<object-param> -<name>site.templates.location</name> -<description>description</description> -<object type="org.exoplatform.portal.config.SiteConfigTemplate"> -<field name="location"> -<string>war:/conf/portal</string> -</field> -<field name="portalTemplates"> -<collection type="java.util.HashSet"> -<value> -<string>classic</string> -</value> -</collection> -</field> -<field name="groupTemplates"> -<collection type="java.util.HashSet"> -<value> -<string>group</string> -</value> -</collection> -</field> -<field name="userTemplates"> -<collection type="java.util.HashSet"> -<value> -<string>user</string> -</value> -</collection> -</field> -</object> -</object-param> -<object-param> -<name>portal.configuration</name> -<description>description</description> -<object type="org.exoplatform.portal.config.NewPortalConfig"> -<field name="predefinedOwner"> -<collection type="java.util.HashSet"> -<value><string>classic</string></value> -</collection> -</field> -<field name="ownerType"><string>portal</string></field> -<field name="templateLocation"><string>war:/conf/portal/</string></field> -</object> -</object-param> -<object-param> -<name>group.configuration</name> -<description>description</description> -<object type="org.exoplatform.portal.config.NewPortalConfig"> -<field name="predefinedOwner"> -<collection type="java.util.HashSet"> -<value><string>/platform/administrators</string></value> -<value><string>/platform/users</string></value> -<value><string>/platform/guests</string></value> -<value><string>/organization/management/executive-board</string></value> -</collection> -</field> -<field name="ownerType"><string>group</string></field> -<field name="templateLocation"><string>war:/conf/portal</string></field> -</object> -</object-param> -<object-param> -<name>user.configuration</name> -<description>description</description> -<object type="org.exoplatform.portal.config.NewPortalConfig"> -<field name="predefinedOwner"> -<collection type="java.util.HashSet"> -<value><string>root</string></value> -<value><string>john</string></value> -<value><string>mary</string></value> -<value><string>demo</string></value> -<value><string>user</string></value> -</collection> -</field> -<field name="ownerType"><string>user</string></field> -<field name="templateLocation"><string>war:/conf/portal</string></field> -</object> -</object-param> -</init-params> -</component-plugin> -</component-plugins> + <key>org.exoplatform.portal.config.UserPortalConfigService</key> + <type>org.exoplatform.portal.config.UserPortalConfigService</type> + <component-plugins> + <component-plugin> + <name>new.portal.config.user.listener</name> + <set-method>initListener</set-method> + <type>org.exoplatform.portal.config.NewPortalConfigListener</type> + <description>this listener init the portal configuration</description> + <init-params> + <value-param> + <name>default.portal</name> + <description>The default portal for checking db is empty or not</description> + <value>classic</value> + </value-param> + <value-param> + <name>page.templates.location</name> + <description>the path to the location that contains Page templates</description> + <value>war:/conf/portal/template/pages</value> + </value-param> + <object-param> + <name>site.templates.location</name> + <description>description</description> + <object type="org.exoplatform.portal.config.SiteConfigTemplate"> + <field name="location"> + <string>war:/conf/portal</string> + </field> + <field name="portalTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>classic</string> + </value> + </collection> + </field> + <field name="groupTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>group</string> + </value> + </collection> + </field> + <field name="userTemplates"> + <collection type="java.util.HashSet"> + <value> + <string>user</string> + </value> + </collection> + </field> + </object> + </object-param> + <object-param> + <name>portal.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>classic</string></value> + </collection> + </field> + <field name="ownerType"><string>portal</string></field> + <field name="templateLocation"><string>war:/conf/portal/</string></field> + </object> + </object-param> + <object-param> + <name>group.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>/platform/administrators</string></value> + <value><string>/platform/users</string></value> + <value><string>/platform/guests</string></value> + <value><string>/organization/management/executive-board</string></value> + </collection> + </field> + <field name="ownerType"><string>group</string></field> + <field name="templateLocation"><string>war:/conf/portal</string></field> + </object> + </object-param> + <object-param> + <name>user.configuration</name> + <description>description</description> + <object type="org.exoplatform.portal.config.NewPortalConfig"> + <field name="predefinedOwner"> + <collection type="java.util.HashSet"> + <value><string>root</string></value> + <value><string>john</string></value> + <value><string>mary</string></value> + <value><string>demo</string></value> + <value><string>user</string></value> + </collection> + </field> + <field name="ownerType"><string>user</string></field> + <field name="templateLocation"><string>war:/conf/portal</string></field> + </object> + </object-param> + </init-params> + </component-plugin> + </component-plugins> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/gadgets.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/gadgets.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/gadgets.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,21 +1,26 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <gadgets -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0" -xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> -<gadget name="Todo"> -<path>/gadgets/Todo/Todo.xml</path> -</gadget> -<gadget name="Calendar"> -<path>/gadgets/Calendar/Calendar.xml</path> -</gadget> -<gadget name="Calculator"> -<path>/gadgets/Calculator/Calculator.xml</path> -</gadget> -<gadget name="rssAggregator"> -<path>/gadgets/rssAggregator/rssAggregator.xml</path> -</gadget> -<gadget name="Currency"> -<url>http://www.donalobrien.net/apps/google/currency.xml</url> -</gadget> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_objects_1_0 http://www.gatein.org/xml/ns/gadgets_1_0" + xmlns="http://www.gatein.org/xml/ns/gadgets_1_0"> + + <gadget name="Todo"> + <path>/gadgets/Todo/Todo.xml</path> + </gadget> + + <gadget name="Calendar"> + <path>/gadgets/Calendar/Calendar.xml</path> + </gadget> + + <gadget name="Calculator"> + <path>/gadgets/Calculator/Calculator.xml</path> + </gadget> + + <gadget name="rssAggregator"> + <path>/gadgets/rssAggregator/rssAggregator.xml</path> + </gadget> + + <gadget name="Currency"> + <url>http://www.donalobrien.net/apps/google/currency.xml</url> + </gadget> </gadgets> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/navigation.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/navigation.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/navigation.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <node-navigation -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -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"> -<priority>1</priority> -<page-nodes> -<node> -<uri>home</uri> -<name>home</name> -<label>#{portal.classic.home}</label> -<page-reference>portal::classic::homepage</page-reference> -</node> -<node> -<uri>sitemap</uri> -<name>sitemap</name> -<label>#{portal.classic.sitemap}</label> -<visibility>DISPLAYED</visibility> -<page-reference>portal::classic::sitemap</page-reference> -</node> -</page-nodes> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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"> + <priority>1</priority> + <page-nodes> + <node> + <uri>home</uri> + <name>home</name> + <label>#{portal.classic.home}</label> + <page-reference>portal::classic::homepage</page-reference> + </node> + <node> + <uri>sitemap</uri> + <name>sitemap</name> + <label>#{portal.classic.sitemap}</label> + <visibility>DISPLAYED</visibility> + <page-reference>portal::classic::sitemap</page-reference> + </node> + </page-nodes> </node-navigation> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/pages.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/pages.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/pages.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,45 +1,46 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <page-set -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -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"> -<page> -<name>homepage</name> -<title>Home Page</title> -<access-permissions>Everyone</access-permissions> -<edit-permission>*:/platform/administrators</edit-permission> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>HomePagePortlet</portlet-ref> -<preferences> -<preference> -<name>template</name> -<value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value> -<read-only>false</read-only> -</preference> -</preferences> -</portlet> -<title>Home Page portlet</title> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -<show-application-state>false</show-application-state> -<show-application-mode>false</show-application-mode> -</portlet-application> -</page> -<page> -<name>sitemap</name> -<title>Site Map</title> -<access-permissions>Everyone</access-permissions> -<edit-permission>*:/platform/administrators</edit-permission> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>SiteMapPortlet</portlet-ref> -</portlet> -<title>SiteMap</title> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -</portlet-application> -</page> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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"> + + <page> + <name>homepage</name> + <title>Home Page</title> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>HomePagePortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>system:/templates/groovy/webui/component/UIHomePagePortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <title>Home Page portlet</title> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + <show-application-state>false</show-application-state> + <show-application-mode>false</show-application-mode> + </portlet-application> + </page> + <page> + <name>sitemap</name> + <title>Site Map</title> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>SiteMapPortlet</portlet-ref> + </portlet> + <title>SiteMap</title> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + </page> </page-set> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/portal.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/portal.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/portal.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,63 +1,70 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <portal-config -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -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>classic</portal-name> -<locale>en</locale> -<access-permissions>Everyone</access-permissions> -<edit-permission>*:/platform/administrators</edit-permission> -<skin>NewSkin</skin> -<properties> -<entry key="sessionAlive">onDemand</entry> -</properties> -<portal-layout> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>BannerPortlet</portlet-ref> -<preferences> -<preference> -<name>template</name> -<value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value> -<read-only>false</read-only> -</preference> -</preferences> -</portlet> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -</portlet-application> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>NavigationPortlet</portlet-ref> -</portlet> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -</portlet-application> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>BreadcumbsPortlet</portlet-ref> -</portlet> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -</portlet-application> -<page-body> </page-body> -<portlet-application> -<portlet> -<application-ref>web</application-ref> -<portlet-ref>FooterPortlet</portlet-ref> -<preferences> -<preference> -<name>template</name> -<value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value> -<read-only>false</read-only> -</preference> -</preferences> -</portlet> -<access-permissions>Everyone</access-permissions> -<show-info-bar>false</show-info-bar> -</portlet-application> -</portal-layout> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <skin>NewSkin</skin> + <properties> + <entry key="sessionAlive">onDemand</entry> + </properties> + + <portal-layout> + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>BannerPortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>par:/groovy/groovy/webui/component/UIBannerPortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>NavigationPortlet</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>BreadcumbsPortlet</portlet-ref> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + <page-body> </page-body> + + <portlet-application> + <portlet> + <application-ref>web</application-ref> + <portlet-ref>FooterPortlet</portlet-ref> + <preferences> + <preference> + <name>template</name> + <value>par:/groovy/groovy/webui/component/UIFooterPortlet.gtmpl</value> + <read-only>false</read-only> + </preference> + </preferences> + </portlet> + <access-permissions>Everyone</access-permissions> + <show-info-bar>false</show-info-bar> + </portlet-application> + + </portal-layout> + </portal-config> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/subpage.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/subpage.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalNavigationConfiguration/subpage.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <node> -<uri>page</uri> -<name>page</name> -<label>Page</label> -<visibility>DISPLAYED</visibility> -<page-reference>portal::classic::page</page-reference> -<node> -<uri>page/subpage</uri> -<name>subpage</name> -<label>Sub-page</label> -<visibility>DISPLAYED</visibility> -<page-reference>portal::classic::subpage</page-reference> -</node> + <uri>page</uri> + <name>page</name> + <label>Page</label> + <visibility>DISPLAYED</visibility> + <page-reference>portal::classic::page</page-reference> + <node> + <uri>page/subpage</uri> + <name>subpage</name> + <label>Sub-page</label> + <visibility>DISPLAYED</visibility> + <page-reference>portal::classic::subpage</page-reference> + </node> </node> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default145.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default145.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default145.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,31 +1,33 @@ <component> -<key>org.exoplatform.portal.config.UserACL</key> -<type>org.exoplatform.portal.config.UserACL</type> -<init-params> -<value-param> -<name>super.user</name> -<description>administrator</description> -<value>root</value> -</value-param> -<value-param> -<name>portal.creator.groups</name> -<description>groups with membership type have permission to manage portal</description> -<value>*:/platform/administrators,*:/organization/management/executive-board</value> -</value-param> -<value-param> -<name>navigation.creator.membership.type</name> -<description>specific membership type have full permission with group navigation</description> -<value>manager</value> -</value-param> -<value-param> -<name>guests.group</name> -<description>guests group</description> -<value>/platform/guests</value> -</value-param> -<value-param> -<name>access.control.workspace</name> -<description>groups with memberships that have the right to access the User Control Workspace</description> -<value>*:/platform/administrators,*:/organization/management/executive-board</value> -</value-param> -</init-params> + <key>org.exoplatform.portal.config.UserACL</key> + <type>org.exoplatform.portal.config.UserACL</type> + <init-params> + <value-param> + <name>super.user</name> + <description>administrator</description> + <value>root</value> + </value-param> + + <value-param> + <name>portal.creator.groups</name> + <description>groups with membership type have permission to manage portal</description> + <value>*:/platform/administrators,*:/organization/management/executive-board</value> + </value-param> + + <value-param> + <name>navigation.creator.membership.type</name> + <description>specific membership type have full permission with group navigation</description> + <value>manager</value> + </value-param> + <value-param> + <name>guests.group</name> + <description>guests group</description> + <value>/platform/guests</value> + </value-param> + <value-param> + <name>access.control.workspace</name> + <description>groups with memberships that have the right to access the User Control Workspace</description> + <value>*:/platform/administrators,*:/organization/management/executive-board</value> + </value-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default146.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default146.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_DefaultPortalPermissionConfiguration/default146.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,21 +1,21 @@ <external-component-plugins> -<target-component>org.exoplatform.portal.config.UserACL</target-component> -<component-plugin> -<name>addPortalACLPlugin</name> -<set-method>addPortalACLPlugin</set-method> -<type>org.exoplatform.portal.config.PortalACLPlugin</type> -<description>setting some permission for portal</description> -<init-params> -<values-param> -<name>access.control.workspace.roles</name> -<value>*:/platform/administrators</value> -<value>*:/organization/management/executive-board</value> -</values-param> -<values-param> -<name>portal.creation.roles</name> -<value>*:/platform/administrators</value> -<value>*:/organization/management/executive-board</value> -</values-param> -</init-params> -</component-plugin> -</external-component-plugins> + <target-component>org.exoplatform.portal.config.UserACL</target-component> + <component-plugin> + <name>addPortalACLPlugin</name> + <set-method>addPortalACLPlugin</set-method> + <type>org.exoplatform.portal.config.PortalACLPlugin</type> + <description>setting some permission for portal</description> + <init-params> + <values-param> + <name>access.control.workspace.roles</name> + <value>*:/platform/administrators</value> + <value>*:/organization/management/executive-board</value> + </values-param> + <values-param> + <name>portal.creation.roles</name> + <value>*:/platform/administrators</value> + <value>*:/organization/management/executive-board</value> + </values-param> + </init-params> + </component-plugin> + </external-component-plugins> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default148.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default148.java 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default148.java 2010-11-05 04:26:28 UTC (rev 4952) @@ -1 +1 @@ -javax.portlet.title=Portlet de Navegaci\u00f3n \ No newline at end of file +javax.portlet.title=Portlet Navigation Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default149.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default149.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default149.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ <component> -<key>org.exoplatform.services.resources.LocaleConfigService</key> -<type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type> -<init-params> -<value-param> -<name>locale.config.file</name> -<value>war:/conf/common/locales-config.xml</value> -</value-param> -</init-params> + <key>org.exoplatform.services.resources.LocaleConfigService</key> + <type>org.exoplatform.services.resources.impl.LocaleConfigServiceImpl</type> + <init-params> + <value-param> + <name>locale.config.file</name> + <value>war:/conf/common/locales-config.xml</value> + </value-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default150.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default150.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default150.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <locales-config> -<locale-config> -<locale>en</locale> -<output-encoding>UTF-8</output-encoding> -<input-encoding>UTF-8</input-encoding> -<description>Default configuration for english locale</description> -</locale-config> -<locale-config> -<locale>fr</locale> -<output-encoding>UTF-8</output-encoding> -<input-encoding>UTF-8</input-encoding> -<description>Default configuration for the french locale</description> -</locale-config> -<locale-config> -<locale>ar</locale> -<output-encoding>UTF-8</output-encoding> -<input-encoding>UTF-8</input-encoding> -<description>Default configuration for the arabic locale</description> -<orientation>rt</orientation> -</locale-config> + <locale-config> + <locale>en</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for english locale</description> + </locale-config> + + <locale-config> + <locale>fr</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the french locale</description> + </locale-config> + + <locale-config> + <locale>ar</locale> + <output-encoding>UTF-8</output-encoding> + <input-encoding>UTF-8</input-encoding> + <description>Default configuration for the arabic locale</description> + <orientation>rt</orientation> + </locale-config> </locales-config> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default151.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default151.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_InternationalizationConfiguration/default151.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,33 +1,33 @@ <component> -<key>org.exoplatform.services.resources.ResourceBundleService</key> -<type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> -<init-params> -<values-param> -<name>classpath.resources</name> -<description>The resources that start with the following package name should be load from file system</description> -<value>locale.portlet</value> -</values-param> -<values-param> -<name>init.resources</name> -<description>Initiate the following resources during the first launch</description> -<value>locale.portal.expression</value> -<value>locale.portal.services</value> -<value>locale.portal.webui</value> -<value>locale.portal.custom</value> -<value>locale.navigation.portal.classic</value> -<value>locale.navigation.group.platform.administrators</value> -<value>locale.navigation.group.platform.users</value> -<value>locale.navigation.group.platform.guests</value> -<value>locale.navigation.group.organization.management.executive-board</value> -</values-param> -<values-param> -<name>portal.resource.names</name> -<description>The properties files of the portal , those file will be merged -into one ResoruceBundle properties </description> -<value>locale.portal.expression</value> -<value>locale.portal.services</value> -<value>locale.portal.webui</value> -<value>locale.portal.custom</value> -</values-param> -</init-params> + <key>org.exoplatform.services.resources.ResourceBundleService</key> + <type>org.exoplatform.services.resources.impl.SimpleResourceBundleService</type> + <init-params> + <values-param> + <name>classpath.resources</name> + <description>The resources that start with the following package name should be load from file system</description> + <value>locale.portlet</value> + </values-param> + <values-param> + <name>init.resources</name> + <description>Initiate the following resources during the first launch</description> + <value>locale.portal.expression</value> + <value>locale.portal.services</value> + <value>locale.portal.webui</value> + <value>locale.portal.custom</value> + <value>locale.navigation.portal.classic</value> + <value>locale.navigation.group.platform.administrators</value> + <value>locale.navigation.group.platform.users</value> + <value>locale.navigation.group.platform.guests</value> + <value>locale.navigation.group.organization.management.executive-board</value> + </values-param> + <values-param> + <name>portal.resource.names</name> + <description>The properties files of the portal , those file will be merged + into one ResoruceBundle properties </description> + <value>locale.portal.expression</value> + <value>locale.portal.services</value> + <value>locale.portal.webui</value> + <value>locale.portal.custom</value> + </values-param> + </init-params> </component> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_JavascriptInterApplicationCommunication/default157.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_JavascriptInterApplicationCommunication/default157.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_JavascriptInterApplicationCommunication/default157.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,37 +1,47 @@ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> <portlet:defineObjects/> <div> -<p> -Received messages: -<div id="received_<portlet:namespace/>"> + <p> + Received messages: + <div id="received_<portlet:namespace/>"> + + </div> + </p> + + <p> + Send message: + <input type="text" id="msg_<portlet:namespace/>"/> <a href="#" onclick="send_<portlet:namespace/>();">send</a> + </p> </div> -</p> -<p> -Send message: -<input type="text" id="msg_<portlet:namespace/>"/> <a href="#" onclick="send_<portlet:namespace/>();">send</a> -</p> -</div> + <script type="text/javascript"> -Function.prototype.bind = function(object) { -var method = this; -return function() { -method.apply(object, arguments); -} -} -function send_<portlet:namespace/>() { -var msg = document.getElementById("msg_<portlet:namespace/>").value; -eXo.core.Topic.publish("<portlet:namespace/>", "/demo", msg); -} -function Listener_<portlet:namespace/>(){ -} -Listener_<portlet:namespace/>.prototype.receiveMsg = function(event) { -document.getElementById("received_<portlet:namespace/>").innerHTML = -document.getElementById("received_<portlet:namespace/>").innerHTML + "<br />* " + -event.senderId + ": " + event.message; -} -function init_<portlet:namespace/>() { -var listener_<portlet:namespace/> = new Listener_<portlet:namespace/>(); -eXo.core.Topic.subscribe("/demo", listener_<portlet:namespace/>.receiveMsg.bind(listener_<portlet:namespace/>)); -} -init_<portlet:namespace/>(); + + Function.prototype.bind = function(object) { + var method = this; + return function() { + method.apply(object, arguments); + } + } + + function send_<portlet:namespace/>() { + var msg = document.getElementById("msg_<portlet:namespace/>").value; + eXo.core.Topic.publish("<portlet:namespace/>", "/demo", msg); + } + + function Listener_<portlet:namespace/>(){ + + } + + Listener_<portlet:namespace/>.prototype.receiveMsg = function(event) { + document.getElementById("received_<portlet:namespace/>").innerHTML = + document.getElementById("received_<portlet:namespace/>").innerHTML + "<br />* " + + event.senderId + ": " + event.message; + } + + function init_<portlet:namespace/>() { + var listener_<portlet:namespace/> = new Listener_<portlet:namespace/>(); + eXo.core.Topic.subscribe("/demo", listener_<portlet:namespace/>.receiveMsg.bind(listener_<portlet:namespace/>)); + } + + init_<portlet:namespace/>(); </script> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default160.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default160.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default160.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,10 @@ <servlet> -<servlet-name>GateInServlet</servlet-name> -<servlet-class>org.gatein.wci.command.CommandServlet</servlet-class> -<load-on-startup>0</load-on-startup> + <servlet-name>GateInServlet</servlet-name> + <servlet-class>org.gatein.wci.command.CommandServlet</servlet-class> + <load-on-startup>0</load-on-startup> </servlet> + <servlet-mapping> -<servlet-name>GateInServlet</servlet-name> -<url-pattern>/gateinservlet</url-pattern> + <servlet-name>GateInServlet</servlet-name> + <url-pattern>/gateinservlet</url-pattern> </servlet-mapping> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default161.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default161.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_PortalLifecycle/default161.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,14 +1,17 @@ <?xml version="1.0"?> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" -version="2.5"> -<filter> -<filter-name>MyFilter</filter-name> -<filter-class>org.example.MyFilter</filter-class> -</filter> -<filter-mapping> -<filter-name>MyFilter</filter-name> -<url-pattern>/gateinservlet</url-pattern> -<dispatcher>INCLUDE</dispatcher> -</filter-mapping> + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.5"> + + <filter> + <filter-name>MyFilter</filter-name> + <filter-class>org.example.MyFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>MyFilter</filter-name> + <url-pattern>/gateinservlet</url-pattern> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + </web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_RTLFramework/default176.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_RTLFramework/default176.java 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_RTLFramework/default176.java 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ color: white; line-height: 24px; padding: 0px 5px 0px 0px; /* orientation=lt */ -padding: 0px 0px 0px 5px; /* orientation=rt */ +padding: 0px 0px 0px 5px; /* >orientation=rt */ Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default180.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default180.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default180.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <portal-config> -<portal-name>classic</portal-name> -<locale>en</locale> -<access-permissions>Everyone</access-permissions> -<edit-permission>*:/platform/administrators</edit-permission> -<skin>MySkin</skin> -... + <portal-name>classic</portal-name> + <locale>en</locale> + <access-permissions>Everyone</access-permissions> + <edit-permission>*:/platform/administrators</edit-permission> + <skin>MySkin</skin> + ... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default181.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default181.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default181.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -2,6 +2,7 @@ ...  <link id="CoreSkin" rel="stylesheet" type="text/CSS" href="/eXoResources/skin/Stylesheet.CSS" /> +  <link id="web_FooterPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UIFooterPortlet/DefaultStylesheet.CSS" /> <link id="web_NavigationPortlet" rel="stylesheet" type="text/CSS" href= "/web/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.CSS" /> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default182.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default182.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default182.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,17 +1,18 @@ <gatein-resources> -<portal-skin> -<skin-name>MySkin</skin-name> -<CSS-path>/skin/myskin.CSS</CSS-path> -<overwrite>false</overwrite> -</portal-skin> + <portal-skin> + <skin-name>MySkin</skin-name> + <CSS-path>/skin/myskin.CSS</CSS-path> + <overwrite>false</overwrite> + </portal-skin> </gatein-resources> - -<window-style> -<style-name>MyThemeCategory</style-name> -<style-theme> -<theme-name>MyThemeBlue</theme-name> -</style-theme> -<style-theme> -<theme-name>MyThemeRed</theme-name> -</style-theme> -... + +  + <window-style> + <style-name>MyThemeCategory</style-name> + <style-theme> + <theme-name>MyThemeBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>MyThemeRed</theme-name> + </style-theme> + ... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default183.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default183.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default183.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,9 @@ <filter> -<filter-name>ResourceRequestFilter</filter-name> -<filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class> -</filter> -<filter-mapping> -<filter-name>ResourceRequestFilter</filter-name> -<url-pattern>*.CSS</url-pattern> -</filter-mapping> + <filter-name>ResourceRequestFilter</filter-name> + <filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>ResourceRequestFilter</filter-name> + <url-pattern>*.CSS</url-pattern> + </filter-mapping> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default186.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default186.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default186.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <gatein-resources> -<portal-skin> -<skin-name>MySkin</skin-name> -<CSS-path>/skin/myskin.CSS</CSS-path> -<overwrite>false</overwrite> -</portal-skin> + <portal-skin> + <skin-name>MySkin</skin-name> + <CSS-path>/skin/myskin.CSS</CSS-path> + <overwrite>false</overwrite> + </portal-skin> </gatein-resources> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default188.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ .UIChangeSkinForm .UIItemSelector .TemplateContainer .MySkinImage -margin: auto; -width: 329px; height:204px; -background: url('background/MySkin.jpg') no-repeat top; -cursor: pointer ; + margin: auto; + width: 329px; height:204px; + background: url('background/MySkin.jpg') no-repeat top; + cursor: pointer ; } Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default189.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default189.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default189.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,9 +1,9 @@ <window-style> -<style-name>MyTheme</style-name> -<style-theme> -<theme-name>MyThemeBlue</theme-name> -</style-theme> -<style-theme> -<theme-name>MyThemeRed</theme-name> -</style-theme> + <style-name>MyTheme</style-name> + <style-theme> + <theme-name>MyThemeBlue</theme-name> + </style-theme> + <style-theme> + <theme-name>MyThemeRed</theme-name> + </style-theme> </window-style> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default190.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default190.java 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default190.java 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,47 +1,47 @@ -/*---- MyThemeRed ----*/ -.MyThemeRed .WindowBarCenter .WindowPortletInfo { +/*---- MyTheme ----*/ +.MyTheme .WindowBarCenter .WindowPortletInfo { margin-right: 80px; /* orientation=lt */ margin-left: 80px; /* orientation=rt */ } -.MyThemeRed .WindowBarCenter .ControlIcon { +.MyTheme .WindowBarCenter .ControlIcon { float: right;/* orientation=lt */ float: left;/* orientation=rt */ width: 24px; height: 17px; cursor: pointer; - background-image: url('background/MyThemeRed.png'); + background-image: url('background/MyTheme.png'); } -.MyThemeRed .ArrowDownIcon { +.MyTheme .ArrowDownIcon { background-position: center 20px; } -.MyThemeRed .OverArrowDownIcon { +.MyTheme .OverArrowDownIcon { background-position: center 116px; } -.MyThemeRed .MinimizedIcon { +.MyTheme .MinimizedIcon { background-position: center 44px; } -.MyThemeRed .OverMinimizedIcon { +.MyTheme .OverMinimizedIcon { background-position: center 140px; } -.MyThemeRed .MaximizedIcon { +.MyTheme .MaximizedIcon { background-position: center 68px; } -.MyThemeRed .OverMaximizedIcon { +.MyTheme .OverMaximizedIcon { background-position: center 164px; } -.MyThemeRed .RestoreIcon { +.MyTheme .RestoreIcon { background-position: center 92px; } -.MyThemeRed .OverRestoreIcon { +.MyTheme .OverRestoreIcon { background-position: center 188px; } -.MyThemeRed .NormalIcon { +.MyTheme .NormalIcon { background-position: center 92px; } -.MyThemeRed .OverNormalIcon { +.MyTheme .OverNormalIcon { background-position: center 188px; } -.UIPageDesktop .MyThemeRed .ResizeArea { +.UIPageDesktop .MyTheme .ResizeArea { float: right;/* orientation=lt */ float: left;/* orientation=rt */ width: 18px; height: 18px; @@ -49,7 +49,7 @@ background: url('background/ResizeArea18x18.gif') no-repeat left top; /* orientation=lt */ background: url('background/ResizeArea18x18-rt.gif') no-repeat right top; /* orientation=rt */ } -.MyThemeRed .Information { +.MyTheme .Information { height: 18px; line-height: 18px; vertical-align: middle; font-size: 10px; padding-left: 5px;/* orientation=lt */ @@ -57,7 +57,7 @@ margin-right: 18px;/* orientation=lt */ margin-left: 18px;/* orientation=rt */ } -.MyThemeRed .WindowBarCenter .WindowPortletIcon { +.MyTheme .WindowBarCenter .WindowPortletIcon { background-position: left top; /* orientation=lt */ background-position: right top; /* orientation=rt */ padding-left: 20px; /* orientation=lt */ @@ -65,62 +65,62 @@ height: 16px; line-height: 16px; } -.MyThemeRed .WindowBarCenter .PortletName { +.MyTheme .WindowBarCenter .PortletName { font-weight: bold; color: #333333; overflow: hidden; white-space: nowrap; width: 100%; } -.MyThemeRed .WindowBarLeft { +.MyTheme .WindowBarLeft { padding-left: 12px; - background-image: url('background/MyThemeRed.png'); + background-image: url('background/MyTheme.png'); background-repeat: no-repeat; background-position: left -148px; } -.MyThemeRed .WindowBarRight { +.MyTheme .WindowBarRight { padding-right: 11px; - background-image: url('background/MyThemeRed.png'); + background-image: url('background/MyTheme.png'); background-repeat: no-repeat; background-position: right -119px; } -.MyThemeRed .WindowBarCenter { - background-image: url('background/MyThemeRed.png'); +.MyTheme .WindowBarCenter { + background-image: url('background/MyTheme.png'); background-repeat: repeat-x; background-position: left -90px; } -.MyThemeRed .WindowBarCenter .FixHeight { +.MyTheme .WindowBarCenter .FixHeight { height: 21px; padding-top: 8px; } -.MyThemeRed .MiddleDecoratorLeft { +.MyTheme .MiddleDecoratorLeft { padding-left: 12px; - background: url('background/MyThemeRed.png') repeat-y left; + background: url('background/MyTheme.png') repeat-y left; } -.MyThemeRed .MiddleDecoratorRight { +.MyTheme .MiddleDecoratorRight { padding-right: 11px; - background: url('background/MyThemeRed.png') repeat-y right; + background: url('background/MyTheme.png') repeat-y right; } -.MyThemeRed .MiddleDecoratorCenter { +.MyTheme .MiddleDecoratorCenter { background: #ffffff; } -.MyThemeRed .BottomDecoratorLeft { - MyThemeRed: 12px; - background-image: url('background/MyThemeRed.png'); +.MyTheme .BottomDecoratorLeft { + MyTheme: 12px; + background-image: url('background/MyTheme.png'); background-repeat: no-repeat; background-position: left -60px; } -.MyThemeRed .BottomDecoratorRight { +.MyTheme .BottomDecoratorRight { padding-right: 11px; - background-image: url('background/MyThemeRed.png'); + background-image: url('background/MyTheme.png'); background-repeat: no-repeat; background-position: right -30px; } -.MyThemeRed .BottomDecoratorCenter { - background-image: url('background/MyThemeRed.png'); +.MyTheme .BottomDecoratorCenter { + background-image: url('background/MyTheme.png'); background-repeat: repeat-x; background-position: left top; } -.MyThemeRed .BottomDecoratorCenter .FixHeight { +.MyTheme .BottomDecoratorCenter .FixHeight { height: 30px; } Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default191.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default191.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default191.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,13 @@ <portlet-skin> -<application-name>portletAppName</application-name> -<portlet-name>PortletName</portlet-name> -<skin-name>Default</skin-name> -<CSS-path>/skin/DefaultStylesheet.CSS</CSS-path> + <application-name>portletAppName</application-name> + <portlet-name>PortletName</portlet-name> + <skin-name>Default</skin-name> + <CSS-path>/skin/DefaultStylesheet.CSS</CSS-path> </portlet-skin> + <portlet-skin> -<application-name>portletAppName</application-name> -<portlet-name>PortletName</portlet-name> -<skin-name>OtherSkin</skin-name> -<CSS-path>/skin/OtherSkinStylesheet.CSS</CSS-path> + <application-name>portletAppName</application-name> + <portlet-name>PortletName</portlet-name> + <skin-name>OtherSkin</skin-name> + <CSS-path>/skin/OtherSkinStylesheet.CSS</CSS-path> </portlet-skin> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default193.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default193.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default193.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,17 +1,17 @@ <div class="Parent"> -<div class="TopLeft"> -<div class="TopRight"> -<div class="TopCenter"><span></span></div> + <div class="TopLeft"> + <div class="TopRight"> + <div class="TopCenter"><span></span></div> + </div> + </div> + <div class="CenterLeft"> + <div class="CenterRight"> + <div class="CenterCenter">BODY</div> + </div> + </div> + <div class="BottomLeft"> + <div class="BottomRight"> + <div class="BottomCenter"><span></span></div> + </div> + <div> </div> -</div> -<div class="CenterLeft"> -<div class="CenterRight"> -<div class="CenterCenter">BODY</div> -</div> -</div> -<div class="BottomLeft"> -<div class="BottomRight"> -<div class="BottomCenter"><span></span></div> -</div> -<div> -</div> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default194.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default194.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_Skinning/default194.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <div class="Parent"> -<div style="float: left; width: 100px"> + <div style="float: left; width: 100px"> + </div> + <div style="margin-left: 105px;"> + <div> + <div style="clear: left"><span></span></div> </div> -<div style="margin-left: 105px;"> -<div> -<div style="clear: left"><span></span></div> -</div> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_XMLResourceBundles/default196.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_XMLResourceBundles/default196.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortalDevelopment_XMLResourceBundles/default196.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,22 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> <bundle> -<UIAccountForm> -<tab> -<label> -<AccountInputSet>...</AccountInputSet> -<UIUserProfileInputSet>...</UIUserProfileInputSet> -</label> -</tab> -<label> -<Profile>...</Profile> -<HomeInfo>...</HomeInfo> -<BusinessInfo>...</BusinessInfo> -<password>...</password> -<Confirmpassword>...</Confirmpassword> -<email>...</email> -</label> -<action> -<Reset>...</Reset> -</action> -</UIAccountForm> + <UIAccountForm> + <tab> + <label> + <AccountInputSet>...</AccountInputSet> + <UIUserProfileInputSet>...</UIUserProfileInputSet> + </label> + </tab> + <label> + <Profile>...</Profile> + <HomeInfo>...</HomeInfo> + <BusinessInfo>...</BusinessInfo> + <password>...</password> + <Confirmpassword>...</Confirmpassword> + <email>...</email> + </label> + <action> + <Reset>...</Reset> + </action> + </UIAccountForm> </bundle> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default197.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,17 +1,20 @@ -<portlet> -<portlet-name>yourPortletName</portlet-name> -<portlet-class> -javax.portlet.faces.GenericFacesPortlet -</portlet-class> -<init-param> -<name>javax.portlet.faces.defaultViewId.view</name> -<value>/welcome.xhtml</value> -</init-param> -<init-param> -<name>javax.portlet.faces.defaultViewId.edit</name> -<value>/jsf/edit.xhtml</value> -</init-param> -<init-param> -<name>javax.portlet.faces.defaultViewId.help</name> -<value>/jsf/help.xhtml</value> -</init-param> + <portlet> + <portlet-name>yourPortletName</portlet-name> + <portlet-class> + javax.portlet.faces.GenericFacesPortlet + </portlet-class> + + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/welcome.xhtml</value> + </init-param> + + <init-param> + <name>javax.portlet.faces.defaultViewId.edit</name> + <value>/jsf/edit.xhtml</value> + </init-param> + + <init-param> + <name>javax.portlet.faces.defaultViewId.help</name> + <value>/jsf/help.xhtml</value> + </init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default198.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ -<init-param> -<name>javax.portlet.faces.preserveActionParams</name> -<value>true</value> -</init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default199.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ -<faces-config> -<application> -<view-handler> -org.jboss.portletbridge.application.PortletViewHandler -</view-handler> -<state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> -</application> -... + <faces-config> + <application> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> + </application> + ... Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default200.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,10 +1,10 @@ -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" -version="2.4"> -... - -<context-param> -<param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> -<param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> -</context-param> + <web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + ... +  + <context-param> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default201.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ -<context-param> -<param-name>javax.portlet.faces.RENDER_POLICY</param-name> -<param-value> -ALWAYS_DELEGATE -</param-value> -</context-param> -... -</web-app> + <context-param> + <param-name>javax.portlet.faces.RENDER_POLICY</param-name> + <param-value> + ALWAYS_DELEGATE + </param-value> + </context-param> + ... + </web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default202.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,13 @@ -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" -version="2.4"> -<context-param> -<param-name>javax.portlet.faces.renderPolicy</param-name> -<param-value> -NEVER_DELEGATE -</param-value> -</context-param> -... -</web-app> + <web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <context-param> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value> + NEVER_DELEGATE + </param-value> + </context-param> + ... + </web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default203.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ -<context-param> -<param-name>javax.portlet.faces.BridgeImplClass</param-name> -<param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value> -</context-param> + <context-param> + <param-name>javax.portlet.faces.BridgeImplClass</param-name> + <param-value>org.apache.myfaces.portlet.faces.bridge.BridgeImpl</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default204.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ -<context-param> -<param-name>org.richfaces.LoadStyleStrategy</param-name> -<param-value>ALL</param-value> -</context-param> -<context-param> -<param-name>org.richfaces.LoadScriptStrategy</param-name> -<param-value>ALL</param-value> -</context-param> + <context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>ALL</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>ALL</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default205.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,3 +1,3 @@ -<script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> -<script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> -<link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript"></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript"></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss"/> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default206.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,18 +1,20 @@ -<context-param> -<param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> -<param-value>rfRes</param-value> -</context-param> -<filter> -<display-name>Ajax4jsf Filter</display-name> -<filter-name>ajax4jsf</filter-name> -<filter-class>org.ajax4jsf.Filter</filter-class> -</filter> -<filter-mapping> -<filter-name>ajax4jsf</filter-name> -<servlet-name>FacesServlet</servlet-name> -<dispatcher>FORWARD</dispatcher> -<dispatcher>REQUEST</dispatcher> -<dispatcher>INCLUDE</dispatcher> -</filter-mapping> -... -</web-app> + <context-param> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> + </context-param> + + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + ... + </web-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default207.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ -<context-param> -<param-name>org.jboss.portletbridge.ExceptionHandler</param-name> -<param-value> -org.jboss.portletbridge.SeamExceptionHandlerImpl -</param-value> -</context-param> + <context-param> + <param-name>org.jboss.portletbridge.ExceptionHandler</param-name> + <param-value> + org.jboss.portletbridge.SeamExceptionHandlerImpl + </param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default208.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ -<context-param> -<param-name>javax.faces.LIFECYCLE_ID</param-name> -<param-value>SEAM_PORTLET</param-value> -</context-param> + <context-param> + <param-name>javax.faces.LIFECYCLE_ID</param-name> + <param-value>SEAM_PORTLET</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default209.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,5 +1,5 @@ -<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd -http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> + <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd + http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default210.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ -<init-param> -<name>javax.portlet.faces.autoDispatchEvents</name> -<value>true</value> -</init-param> -<init-param> -<name>javax.portlet.faces.bridgeEventHandler</name> -<value>org.foo.eventhandler</value> -</init-param> + <init-param> + <name>javax.portlet.faces.autoDispatchEvents</name> + <value>true</value> + </init-param> + <init-param> + <name>javax.portlet.faces.bridgeEventHandler</name> + <value>org.foo.eventhandler</value> + </init-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default212.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,6 +1,6 @@ -<init-param> -<name>javax.portlet.faces.bridgePublicRenderParameterHandler</name> -<value>org.foo.PRPHandler</value> -</init-param> -... -<supported-public-render-parameter>myCoolPRP</supported-public-render-parameter> + <init-param> + <name>javax.portlet.faces.bridgePublicRenderParameterHandler</name> + <value>org.foo.PRPHandler</value> + </init-param> + ... + <supported-public-render-parameter>myCoolPRP</supported-public-render-parameter> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default213.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,15 +1,16 @@ -<managed-bean> -<managed-bean-name>bookingPRP</managed-bean-name> -<managed-bean-class>your.class.Name</managed-bean-class> -<managed-bean-scope>session</managed-bean-scope> -</managed-bean> -<application> -<application-extension> -<bridge:public-parameter-mappings> -<bridge:public-parameter-mapping> -<parameter>"the name of your portlet":hotelName</parameter> -<model-el>#{bookingPRP.hotelName}</model-el> -</bridge:public-parameter-mapping> -</bridge:public-parameter-mappings> -</application-extension> -</application> + <managed-bean> + <managed-bean-name>bookingPRP</managed-bean-name> + <managed-bean-class>your.class.Name</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + + <application> + <application-extension> + <bridge:public-parameter-mappings> + <bridge:public-parameter-mapping> + <parameter>"the name of your portlet":hotelName</parameter> + <model-el>#{bookingPRP.hotelName}</model-el> + </bridge:public-parameter-mapping> + </bridge:public-parameter-mappings> + </application-extension> + </application> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default216.java 2010-11-05 04:26:28 UTC (rev 4952) @@ -1 +1 @@ -#{resource['/images/the-path-to-my-image.png']} + #{resource['/img/the-path-to-my-image.png']} Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Configuration/default217.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,5 +1,5 @@ -<managed-bean> -<managed-bean-name>resource</managed-bean-name> -<managed-bean-class>org.richfaces.demo.common.ResourceBean</managed-bean-class> -<managed-bean-scope>application</managed-bean-scope> -</managed-bean> + <managed-bean> + <managed-bean-name>resource</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.ResourceBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_GettingStarted/default219.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_GettingStarted/default219.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_GettingStarted/default219.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ -<context-param> -<param-name>org.jboss.portletbridge.WRAP_SCRIPTS</param-name> -<param-value>true</param-value> -</context-param> + <context-param> + <param-name>org.jboss.portletbridge.WRAP_SCRIPTS</param-name> + <param-value>true</param-value> + </context-param> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default223.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <application> -<application-extension> -<bridge:excluded-attributes> -<bridge:excluded-attribute>foo.bar</bridge:excluded-attribute> -<bridge:excluded-attribute>foo.baz.*</bridge:excluded-attribute> -</bridge:excluded-attributes> -</application-extension> + <application-extension> + <bridge:excluded-attributes> + <bridge:excluded-attribute>foo.bar</bridge:excluded-attribute> + <bridge:excluded-attribute>foo.baz.*</bridge:excluded-attribute> + </bridge:excluded-attributes> + </application-extension> </application> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default224.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <navigation-rule> -<from-view-id>/register.jspx</from-view-id> -<navigation-case> -<from-outcome>edit</from-outcome> -<to-view-id>/edit.jspx?javax.portlet.faces.PortletMode=edit</to-view-id> -</navigation-case> + <from-view-id>/register.jspx</from-view-id> + <navigation-case> + <from-outcome>edit</from-outcome> + <to-view-id>/edit.jspx?javax.portlet.faces.PortletMode=edit</to-view-id> + </navigation-case> </navigation-rule> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default225.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,7 +1,7 @@ <navigation-rule> -<from-view-id>/edit.jspx*</from-view-id> -<navigation-case> -<from-outcome>view</from-outcome> -<to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id> -</navigation-case> + <from-view-id>/edit.jspx*</from-view-id> + <navigation-case> + <from-outcome>view</from-outcome> + <to-view-id>#{sessionScope['javax.portlet.faces.viewIdHistory.view']}</to-view-id> + </navigation-case> </navigation-rule> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default230.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <init-param> -<name>javax.portlet.faces.extension.resetModeViewId</name> -<value>true</value> + <name>javax.portlet.faces.extension.resetModeViewId</name> + <value>true</value> </init-param> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default231.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <error-page> -<exception-type>javax.servlet.ServletException</exception-type> -<location>/faces/error.xhtml</location> + <exception-type>javax.servlet.ServletException</exception-type> + <location>/faces/error.xhtml</location> </error-page> <error-page> -<exception-type>javax.faces.application.ViewExpiredException</exception-type> -<location>/faces/error.xhtml</location> + <exception-type>javax.faces.application.ViewExpiredException</exception-type> + <location>/faces/error.xhtml</location> </error-page> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default232.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,12 +1,13 @@ <script type="text/javascript"> -A4J.AJAX.onError = function(req,status,message){ -window.alert("Custom onError handler "+message); -} -A4J.AJAX.onExpired = function(loc,expiredMsg){ -if(window.confirm("Custom onExpired handler "+expiredMsg+" for a location: "+loc)){ -return loc; -} else { -return false; -} -} + A4J.AJAX.onError = function(req,status,message){ + window.alert("Custom onError handler "+message); + } + + A4J.AJAX.onExpired = function(loc,expiredMsg){ + if(window.confirm("Custom onExpired handler "+expiredMsg+" for a location: "+loc)){ + return loc; + } else { + return false; + } + } </script> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default233.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <context-param> -<param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> -<param-value>true</param-value> + <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> + <param-value>true</param-value> </context-param> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default238.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/home.xhtml"> -<f:param name="javax.portlet.faces.ViewLink" value="true"/> -navigate to the test page + <f:param name="javax.portlet.faces.ViewLink" value="true"/> + navigate to the test page </h:outputLink> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default239.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <h:commandLink actionListener="#{yourBean.yourListenr}"> -<f:param name="javax.portlet.faces.DirectLink" value="true"/> -navigate to the test page + <f:param name="javax.portlet.faces.DirectLink" value="true"/> + navigate to the test page </h:commandLink> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletBridge_Portlet_Development/default241.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,4 +1,4 @@ <h:form> -<h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" /> -<h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" /> + <h:inputText id="pref" required="true" value="#{mutablePortletPreferencesValues['userName'].value}" /> + <h:commandButton actionListener="#{myBean.savePref}" value="Save Preferences" /> </h:form> \ No newline at end of file Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default245.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default245.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default245.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,17 +1,17 @@ <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0"> -<portlet> -<portlet-name>SimplestHelloWorldPortlet</portlet-name> -<portlet-class> -org.jboss.portal.portlet.samples.SimplestHelloWorldPortlet -</portlet-class> -<supports> -<mime-type>text/html</mime-type> -</supports> -<portlet-info> -<title>Simplest Hello World Portlet</title> -</portlet-info> -</portlet> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> + <portlet-name>SimplestHelloWorldPortlet</portlet-name> + <portlet-class> + org.jboss.portal.portlet.samples.SimplestHelloWorldPortlet + </portlet-class> + <supports> + <mime-type>text/html</mime-type> + </supports> + <portlet-info> + <title>Simplest Hello World Portlet</title> + </portlet-info> + </portlet> </portlet-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default252.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default252.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default252.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,26 +1,36 @@ <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> + <div class="portlet-section-header">Welcome !</div> + <br/> + <div class="portlet-font">Welcome on the JSP Hello User portlet, my name is GateIn Portal. What's yours ?</div> + <br/> + <div class="portlet-font">Method 1: We simply pass the parameter to the render phase:<br/> <a href="<portlet:renderURL><portlet:param name="yourname" value="John Doe"/> -</portlet:renderURL>">John Doe</a></div> + </portlet:renderURL>">John Doe</a></div> + <br/> + <div class="portlet-font">Method 2: We pass the parameter to the render phase, using valid XML: Please check the source code to see the difference with Method 1. <portlet:renderURL var="myRenderURL"> -<portlet:param name="yourname" value='John Doe'/> + <portlet:param name="yourname" value='John Doe'/> </portlet:renderURL> <br/> <a href="<%= myRenderURL %>">John Doe</a></div> + <br/> + <div class="portlet-font">Method 3: We use a form:<br/> + <portlet:actionURL var="myActionURL"/> <form action="<%= myActionURL %>" method="POST"> -<span class="portlet-form-field-label">Name:</span> -<input class="portlet-form-input-field" type="text" name="yourname"/> -<input class="portlet-form-button" type="Submit"/> + <span class="portlet-form-field-label">Name:</span> + <input class="portlet-form-input-field" type="text" name="yourname"/> + <input class="portlet-form-button" type="Submit"/> </form> </div> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default253.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default253.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default253.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,8 +1,8 @@ <faces-config> ... -<application> -<view-handler>org.jboss.portletbridge.application.PortletViewHandler</view-handler> -<state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> -</application> + <application> + <view-handler>org.jboss.portletbridge.application.PortletViewHandler</view-handler> + <state-manager>org.jboss.portletbridge.application.PortletStateManager</state-manager> + </application> ... </faces-config> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default254.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default254.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/PortletDevelopment_Standard/default254.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,31 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0"> -<portlet> -<portlet-name>JSFHelloUserPortlet</portlet-name> -<portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> -<supports> -<mime-type>text/html</mime-type> -<portlet-mode>view</portlet-mode> -<portlet-mode>edit</portlet-mode> -<portlet-mode>help</portlet-mode> -</supports> -<portlet-info> -<title>JSF Hello User Portlet</title> -</portlet-info> -<init-param> -<name>javax.portlet.faces.defaultViewId.view</name> -<value>/jsf/welcome.jsp</value> -</init-param> -<init-param> -<name>javax.portlet.faces.defaultViewId.edit</name> -<value>/jsf/edit.jsp</value> -</init-param> -<init-param> -<name>javax.portlet.faces.defaultViewId.help</name> -<value>/jsf/help.jsp</value> -</init-param> -</portlet> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> + <portlet> + <portlet-name>JSFHelloUserPortlet</portlet-name> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>view</portlet-mode> + <portlet-mode>edit</portlet-mode> + <portlet-mode>help</portlet-mode> + </supports> + <portlet-info> + <title>JSF Hello User Portlet</title> + </portlet-info> + + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/jsf/welcome.jsp</value> + </init-param> + + <init-param> + <name>javax.portlet.faces.defaultViewId.edit</name> + <value>/jsf/edit.jsp</value> + </init-param> + + <init-param> + <name>javax.portlet.faces.defaultViewId.help</name> + <value>/jsf/help.jsp</value> + </init-param> + + </portlet> </portlet-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default255.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default255.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default255.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,15 +1,17 @@ <?xml version="1.0" standalone="yes"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> <portlet-app> -<portlet> -<portlet-name>BasicPortlet</portlet-name> -... -<container-runtime-option> -<name>org.gatein.pc.remotable</name> -<value>true</value> -</container-runtime-option> -</portlet> + <portlet> + <portlet-name>BasicPortlet</portlet-name> + + ... + + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> + </portlet> </portlet-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default256.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default256.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default256.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,23 +1,25 @@ <?xml version="1.0" standalone="yes"?> <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" -version="2.0"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd" + version="2.0"> <portlet-app> -<portlet> -<portlet-name>RemotelyExposedPortlet</portlet-name> -... -</portlet> -<portlet> -<portlet-name>NotRemotelyExposedPortlet</portlet-name> -... -<container-runtime-option> -<name>org.gatein.pc.remotable</name> -<value>false</value> -</container-runtime-option> -</portlet> -<container-runtime-option> -<name>org.gatein.pc.remotable</name> -<value>true</value> -</container-runtime-option> + + <portlet> + <portlet-name>RemotelyExposedPortlet</portlet-name> + ... + </portlet> + <portlet> + <portlet-name>NotRemotelyExposedPortlet</portlet-name> + ... + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>false</value> + </container-runtime-option> + </portlet> + + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> </portlet-app> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default257.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default257.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default257.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,23 +1,23 @@ <?xml version='1.0' encoding='UTF-8' ?> <deployments xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> -<deployment> -<wsrp-producer id="self" expiration-cache="300" ws-timeout="30000"> -<endpoint-wsdl-url>http://localhost:8080/wsrp-producer/MarkupService?wsdl</endpoint-wsdl-url> -<registration-data> -<property> -<name>email</name> -<lang>en</lang> -<value>example(a)example.com</value> -</property> -</registration-data> -</wsrp-producer> -</deployment> -<deployment> -<wsrp-producer id="oracle" expiration-cache="300"> -<endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url> -<registration-data/> -</wsrp-producer> -</deployment> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> + <deployment> + <wsrp-producer id="self" expiration-cache="300" ws-timeout="30000"> + <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/MarkupService?wsdl</endpoint-wsdl-url> + <registration-data> + <property> + <name>email</name> + <lang>en</lang> + <value>example(a)example.com</value> + </property> + </registration-data> + </wsrp-producer> + </deployment> + <deployment> + <wsrp-producer id="oracle" expiration-cache="300"> + <endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url> + <registration-data/> + </wsrp-producer> + </deployment> </deployments> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default258.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,11 +1,11 @@ <?xml version='1.0' encoding='UTF-8' ?> <deployments xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> -<deployment> -<wsrp-producer id="self" expiration-cache="300" ws-timeout="30000"> -<endpoint-wsdl-url>http://localhost:8080/wsrp-producer/MarkupService?wsdl</endpoint-wsdl-url> -<registration-data/> -</wsrp-producer> -</deployment> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> + <deployment> + <wsrp-producer id="self" expiration-cache="300" ws-timeout="30000"> + <endpoint-wsdl-url>http://localhost:8080/wsrp-producer/MarkupService?wsdl</endpoint-wsdl-url> + <registration-data/> + </wsrp-producer> + </deployment> </deployments> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default259.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default259.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/WSRP/default259.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,18 +1,18 @@ <?xml version='1.0' encoding='UTF-8' ?> <deployments xmlns="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0" -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" -xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_wsrp_consumer_1_0 http://www.jboss.org/portal/xsd/gatein_wsrp_consumer_1_0.xsd"> <deployments> -<deployment> -<wsrp-producer id="AnotherProducer" expiration-cache="60"> -<endpoint-wsdl-url>http://example.com/producer/producer?WSDL</endpoint-wsdl-url> -<registration-data> -<property> -<name>property name</name> -<lang>en</lang> -<value>property value</value> -</property> -</registration-data> -</wsrp-producer> -</deployment> + <deployment> + <wsrp-producer id="AnotherProducer" expiration-cache="60"> + <endpoint-wsdl-url>http://example.com/producer/producer?WSDL</endpoint-wsdl-url> + <registration-data> + <property> + <name>property name</name> + <lang>en</lang> + <value>property value</value> + </property> + </registration-data> + </wsrp-producer> + </deployment> </deployments> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -3,12 +3,14 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> + + <section id="sect-Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster"> - <title>Configuring JBoss AS with eXo JCR in cluster</title> + <title>Clustering with JBoss Application Server</title> <formalpara id="form-Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-Deploying_eXo_JCR_to_JBoss_As"> - <title>Deploying eXo JCR to JBoss As</title> + <title>Deploying eXo JCR in JBoss Application Server</title> <para> - To deploy eXo JCR to JBoss As follow these steps: + To deploy eXo JCR in the JBoss Application Server (<emphasis role="bold">AS</emphasis>) follow these steps: </para> </formalpara> <procedure> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration-persister.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -3,6 +3,8 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> + + <section id="sect-Reference_Guide-The_JCR_Configuration_persister"> <title>The JCR Configuration persister</title> <para> @@ -10,17 +12,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_configuration-persister/default20.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + <para> In the example above the Repository Service will read the configuration from the file <filename>/conf/standalone/exo-jcr-config.xml</filename>. </para> @@ -46,33 +38,16 @@ </areaspec> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_configuration-persister/default21.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + <calloutlist> <callout arearefs="area-Reference_Guide-The_JCR_Configuration_persister-source-name"> <para> - The <parameter>source-name</parameter> parameter is the JNDI source name configured in <classname>InitialContextInitializer</classname> component (also known as <parameter>sourceName</parameter> in versions prior to 1.9.). Refer to <xref linkend="sect-Reference_Guide-JCR_configuration" /> for more information. + The <parameter>source-name</parameter> parameter is the JNDI source name configured in <classname>InitialContextInitializer</classname> component (also known as <parameter>sourceName</parameter> in versions prior to 1.9.). </para> </callout> <callout arearefs="area-Reference_Guide-The_JCR_Configuration_persister-dialect"> <para> - The <parameter>dialect</parameter> parameter is the SQL dialect which will be used with the database from <parameter>source-name</parameter>. Refer to <xref linkend="sect-Reference_Guide-JCR_configuration" /> for more information. + The <parameter>dialect</parameter> parameter is the SQL dialect which will be used with the database from <parameter>source-name</parameter>. </para> </callout> <callout arearefs="area-Reference_Guide-The_JCR_Configuration_persister-persister-class-name"> @@ -88,28 +63,7 @@ </para> <programlisting language="Java" role="Java"><xi:include href="../../../extras/Advanced_Development_JCR_configuration-persister/default22.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + <para> The JCR Core implementation contains a persister which stores the repository configuration in the relational database using JDBC calls (<classname>org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister</classname>). </para> Deleted: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.bk 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,522 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> -%BOOK_ENTITIES; -]> -<section id="sect-Reference_Guide-JCR_configuration"> - <title>JCR configuration</title> - <para> - The JCR configuration is defined in an XML file which is constructed as per the DTD below: - </para> - -<programlisting language="Java" role="Java"><xi:include href="../../../extras/Advanced_Development_JCR_Configuration/NMTOKEN.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <para> - To configure the JCR Service; - </para> - <procedure> - <step> - <para> - Familiarize yourself with the DTD file above and the either the example configuration file below or the one in your &PRODUCT; deployment (found at; <filename>/<replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>). - </para> - </step> - <step> - <para> - Replace the element values marked below with those of your deployment environment. - </para> - </step> - <step> - <para> - The repository configuration supports human-readable values. They are not case-sensitive. - </para> - <para> - Complete the appropriate element fields using the following value formats: - </para> - <variablelist> - <varlistentry> - <term>Number formats:</term> - <listitem> - <para> - <itemizedlist> - <listitem> - <para> - <emphasis role="bold">K</emphasis> or <emphasis role="bold">KB</emphasis> for kiloBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">M</emphasis> or <emphasis role="bold">MB</emphasis> for megaBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">G</emphasis> or <emphasis role="bold">GB</emphasis> for gigaBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">T</emphasis> or <emphasis role="bold">TB</emphasis> for terraBytes. - </para> - </listitem> - <listitem> - <para> - Examples: 200k or 200 KBytes; 4m or 4 MBytes; 1.4G or 1.4 GBytes; 10T or 10 TBytes - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>Time formats:</term> - <listitem> - <para> - <itemizedlist> - <listitem> - <para> - <emphasis role="bold">ms</emphasis> for milliseconds. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">s</emphasis> for seconds. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">m</emphasis> for minutes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">h</emphasis> for hours. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">d</emphasis> for days. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">w</emphasis> for weeks. - </para> - </listitem> - <listitem> - <para> - The default time format is seconds if no other format is specified. - </para> - </listitem> - <listitem> - <para> - Examples: 500ms or 500 milliseconds; 20, 20s or 20 seconds; 30m or 30 minutes; 12h or 12 hours; 5d or 5 days; 4w or 4 weeks. - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - </variablelist> - </step> - </procedure> - - <section id="sect-Reference_Guide-JCR_configuration-Repository_Service_Configuration"> - <title>Repository Service Configuration</title> - <para> - Below is an example <filename>repository-configuration.xml</filename> file: - </para> - <note> - <title>Code Samples</title> - <para> - For ease of reference the file below has been broken into two separate code samples, however the file itself is continuous. - </para> - </note> - <formalpara id="form-Reference_Guide-Repository_Service_Configuration-repository_configuration.xml_Part_1"> - <title><filename>repository-configuration.xml</filename> Part 1</title> - <para> -  - <programlistingco> - <areaspec> - <area coords="1 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository" /> - <area coords="2 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories" /> - <area coords="3 80" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name" /> - <area coords="3 85" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace" /> - <area coords="3 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace" /> - <area coords="4 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain" /> - <area coords="5 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control" /> - <area coords="6 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age" /> - <area coords="7 100" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy" /> - <area coords="8 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces" /> - <area coords="9 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name" /> - <area coords="11 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container" /> - <area coords="30 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer" /> - <area coords="35 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache" /> - <area coords="41 100" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler" /> - <area coords="47 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout" /> - <area coords="48 100" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister" /> - <area coords="50 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path" /> - </areaspec> - -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_Configuration/default24.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_1-Repository_Service_configuration"> - <title>Repository Service configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository"> - <para> - The name of a default repository (one returned by RepositoryService.getRepository()) - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories"> - <para> - The list of repositories is configured within the <repositories> element. - </para> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_1-Repository_configuration"> - <title>Repository configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name"> - <para> - The name of the repository being configured. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace"> - <para> - The name of a workspace. This can be obtained using Session's <literal>login()</literal> or <literal>login(Credentials)</literal> methods for workspaces without an explicit name. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace"> - <para> - The name of workspace where /jcr:system node is placed. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain"> - <para> - The name of a security domain for JAAS authentication - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control"> - <para> - The name of an access control policy. There can be three types: - </para> - <variablelist> - <varlistentry> - <term>optional</term> - <listitem> - <para> - AN ACL is created on demand. This is the default policy. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>disable</term> - <listitem> - <para> - Disables access control. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>mandatory</term> - <listitem> - <para> - An ACL is created for each added node. This function is not supported in this release. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age"> - <para> - The amount of time before an idle session will be removed (called logout). If it is not set, the idle session will never be removed. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy"> - <para> - The name of an authentication policy class. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces"> - <para> - The list of workspaces. - </para> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_1-Workspace_configuration"> - <title>Workspace configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"> - <para> - The name of the workspace. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container"> - <para> - Workspace data container (physical storage) configuration. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer"> - <para> - Workspace initializer configuration. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache"> - <para> - Workspace storage cache configuration. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler"> - <para> - Query handler configuration. - </para> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_1-Lock_Manager_configuration"> - <title>Lock Manager configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"> - <para> - The amount of time before the unused global lock is removed. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister"> - <para> - A class for storing lock information for future use. For example; remove lock after restarting JCR. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path"> - <para> - Each workspace has its own lock folder. - </para> - </callout> - </calloutlist> - </programlistingco> - </para> - </formalpara> - <formalpara id="form-Reference_Guide-Repository_Service_Configuration-repository_configuration.xml_Part_2"> - <title><filename>repository-configuration.xml</filename> Part 2</title> - <para> -  - <programlistingco> - <areaspec> - <area coords="2 110" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class" /> - <area coords="3 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties" /> - <area coords="10 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages" /> - <area coords="11 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage" /> - <area coords="11 95" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class" /> - <area coords="12 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties" /> - <area coords="15 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters" /> - <area coords="21 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class" /> - <area coords="22 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties" /> - <area coords="26 90" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled" /> - <area coords="26 95" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class" /> - <area coords="27 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties" /> - <area coords="32 100" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class" /> - <area coords="33 60" id="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties" /> - </areaspec> - -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_Configuration/default25.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_2-Workspace_data_container_configuration"> - <title>Workspace data container configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class"> - <para> - A workspace data container class name. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties"> - <para> - The list of properties (in name-value pairs) for the concrete Workspace data container. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages"> - <para> - The list of value storage plugins. - </para> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_2-Value_storage_plugin_configuration_optional_feature"> - <title>Value storage plugin configuration (optional feature):</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage"> - <para> - <emphasis role="bold">Optional</emphasis>: Value storage plugin definition. If this element is not included, the values will be stored as BLOBs inside the database. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class"> - <para> - A value storage plugin class name (attribute). - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties"> - <para> - The list of properties (in name-value pairs) for a concrete value storage plugin. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters"> - <para> - The list of filters defining conditions when this plugin is applicable. - </para> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_2-Initializer_configuration_optional"> - <title>Initializer configuration (optional):</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class"> - <para> - Initializer implementation class. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties"> - <para> - The list of properties (in name-value pairs). Properties are supported: - </para> - <variablelist> - <varlistentry> - <term>root-nodetype</term> - <listitem> - <para> - The node type for root node initialization. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>root-permissions</term> - <listitem> - <para> - Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities and the type of permission. - </para> - <para> - For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission. - </para> - <para> - Configurable initializer adds a capability to override workspace initial startup procedure. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_2-Cache_configuration"> - <title>Cache configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled"> - <para> - Defines if the workspace cache is enabled. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class"> - <para> - Cache implementation class. This is optional from JCR version 1.9. - </para> - <para> - The default value is <literal>org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl</literal>. - </para> - <para> - The cache can be configured to use concrete implementations of the <literal>WorkspaceStorageCache</literal> interface. - </para> - <para> - The JCR core has two implementations to use: - </para> - <para> - <emphasis role="bold">LinkedWorkspaceStorageCacheImpl</emphasis> - </para> - <para> - The default implementation, with configurable read behavior and statistics. - </para> - <para> - <emphasis role="bold">WorkspaceStorageCacheImpl</emphasis> - </para> - <para> - This implementation is a legacy from pre 1.9 versions of the JCR. However, it can still be used. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties"> - <para> - The list of properties (in name-value pairs) for the workspace cache: - </para> - <variablelist> - <varlistentry> - <term>max-size</term> - <listitem> - <para> - The maximum size of the cache. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>live-time</term> - <listitem> - <para> - Cached item live time. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> - </calloutlist> - <calloutlist id="call-Reference_Guide-repository_configuration.xml_Part_2-Query_Handler_configuration"> - <title>Query Handler configuration:</title> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class"> - <para> - A Query Handler class name. - </para> - </callout> -  - <callout arearefs="area-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties"> - <para> - The list of properties (name-value pairs) for a Query Handler (<literal>indexDir</literal>) properties and advanced features described in <xref linkend="sect-Reference_Guide-Search_Configuration" />. - </para> - </callout> - </calloutlist> - </programlistingco> - </para> - </formalpara> - </section> - - - <section id="sect-Reference_Guide-JCR_configuration-Related_Sections"> - <title>Related Sections</title> - <itemizedlist> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-Search_Configuration" /> - </para> - </listitem> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-JDBC_Data_Container_Config" /> - </para> - </listitem> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-External_Value_Storages" /> - </para> - </listitem> - </itemizedlist> - </section> - -</section> - Deleted: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.orig =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.orig 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.orig 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,495 +0,0 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ -<!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent"> -%BOOK_ENTITIES; -]> -<section id="sect-Reference_Guide-JCR_configuration"> - <title>JCR configuration</title> - <para> - The JCR configuration is defined in an XML file which is constructed as per the DTD below: - </para> - -<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/Advanced_Development_JCR_Configuration/NMTOKEN.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - - <para> - To configure the JCR Service; - </para> - <procedure> - <step> - <para> - Familiarize yourself with the DTD file above and the either the example configuration file below or the one in your &PRODUCT; deployment (found at; <filename>/<replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>). - </para> - </step> - <step> - <para> - Replace the element values marked below with those of your deployment environment. - </para> - </step> - <step> - <para> - The repository configuration supports human-readable values. They are not case-sensitive. - </para> - <para> - Complete the appropriate element fields using the following value formats: - </para> - <variablelist> - <varlistentry> - <term>Number formats:</term> - <listitem> - <para> - <itemizedlist> - <listitem> - <para> - <emphasis role="bold">K</emphasis> or <emphasis role="bold">KB</emphasis> for kiloBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">M</emphasis> or <emphasis role="bold">MB</emphasis> for megaBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">G</emphasis> or <emphasis role="bold">GB</emphasis> for gigaBytes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">T</emphasis> or <emphasis role="bold">TB</emphasis> for terraBytes. - </para> - </listitem> - <listitem> - <para> - Examples: 200k or 200 KBytes; 4m or 4 MBytes; 1.4G or 1.4 GBytes; 10T or 10 TBytes - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>Time formats:</term> - <listitem> - <para> - <itemizedlist> - <listitem> - <para> - <emphasis role="bold">ms</emphasis> for milliseconds. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">s</emphasis> for seconds. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">m</emphasis> for minutes. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">h</emphasis> for hours. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">d</emphasis> for days. - </para> - </listitem> - <listitem> - <para> - <emphasis role="bold">w</emphasis> for weeks. - </para> - </listitem> - <listitem> - <para> - The default time format is seconds if no other format is specified. - </para> - </listitem> - <listitem> - <para> - Examples: 500ms or 500 milliseconds; 20, 20s or 20 seconds; 30m or 30 minutes; 12h or 12 hours; 5d or 5 days; 4w or 4 weeks. - </para> - </listitem> - </itemizedlist> - </para> - </listitem> - </varlistentry> - </variablelist> - </step> - </procedure> - <section id="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration"> - <title>Repository Service Configuration</title> - <programlistingco> - <areaspec> -  - <area coords="1 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository"/> -  - <area coords="2 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories"/> -  - <area coords="3 80" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name"/> -  - <area coords="3 85" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace"/> -  - <area coords="3 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace"/> -  - <area coords="4 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain"/> -  - <area coords="5 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control"/> -  - <area coords="6 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age"/> -  - <area coords="7 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy"/> -  - <area coords="8 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces"/> -  - <area coords="9 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"/> -  - <area coords="11 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container"/> -  - <area coords="30 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer"/> -  - <area coords="35 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache"/> -  - <area coords="41 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler"/> -  - <area coords="47 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"/> -  - <area coords="48 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister"/> -  - <area coords="50 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path"/> -  - <area coords="57 110" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class"/> -  - <area coords="58 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties"/> -  - <area coords="65 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages"/> -  - <area coords="66 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage"/> -  - <area coords="66 95" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class"/> -  - <area coords="67 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties"/> -  - <area coords="70 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters"/> -  - <area coords="76 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class"/> -  - <area coords="77 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties"/> -  - <area coords="81 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled"/> -  - <area coords="81 95" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class"/> -  - <area coords="82 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties"/> -  - <area coords="87 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class"/> -  - <area coords="88 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties"/> - </areaspec> - -<programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/Advanced_Development_JCR_Configuration/default24.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - - <calloutlist> - <title>Repository Service configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository"> - <para> - The name of a default repository (one returned by RepositoryService.getRepository()) - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories"> - <para> - The list of repositories is configured within the <repositories> element. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Repository configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name"> - <para> - The name of the repository being configured. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace"> - <para> - The name of a workspace. This can be obtained using Session's <literal>login()</literal> or <literal>login(Credentials)</literal> methods for workspaces without an explicit name. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace"> - <para> - The name of workspace where /jcr:system node is placed. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain"> - <para> - The name of a security domain for JAAS authentication - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control"> - <para> - The name of an access control policy. There can be three types: - </para> - <variablelist> - <varlistentry> - <term>optional</term> - <listitem> - <para> - AN ACL is created on demand. This is the default policy. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>disable</term> - <listitem> - <para> - Disables access control. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>mandatory</term> - <listitem> - <para> - An ACL is created for each added node. This function is not supported in this release. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age"> - <para> - The amount of time before an idle session will be removed (called logout). If it is not set, the idle session will never be removed. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy"> - <para> - The name of an authentication policy class. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces"> - <para> - The list of workspaces. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Workspace configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"> - <para> - The name of the workspace. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container"> - <para> - Workspace data container (physical storage) configuration. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer"> - <para> - Workspace initializer configuration. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache"> - <para> - Workspace storage cache configuration. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler"> - <para> - Query handler configuration. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Lock Manager configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"> - <para> - The amount of time before the unused global lock is removed. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister"> - <para> - A class for storing lock information for future use. For example; remove lock after restarting JCR. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path"> - <para> - Each workspace has its own lock folder. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Workspace data container configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class"> - <para> - A workspace data container class name. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties"> - <para> - The list of properties (in name-value pairs) for the concrete Workspace data container. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages"> - <para> - The list of value storage plugins. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Value storage plugin configuration (optional feature):</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage"> - <para> - <emphasis role="bold">Optional</emphasis>: Value storage plugin definition. If this element is not included, the values will be stored as BLOBs inside the database. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class"> - <para> - A value storage plugin class name (attribute). - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties"> - <para> - The list of properties (in name-value pairs) for a concrete value storage plugin. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters"> - <para> - The list of filters defining conditions when this plugin is applicable. - </para> - </callout> - </calloutlist> - <calloutlist> - <title>Initializer configuration (optional):</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class"> - <para> - Initializer implementation class. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties"> - <para> - The list of properties (in name-value pairs). Properties are supported: - </para> - <variablelist> - <varlistentry> - <term>root-nodetype</term> - <listitem> - <para> - The node type for root node initialization. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>root-permissions</term> - <listitem> - <para> - Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities and the type of permission. - </para> - <para> - For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission. - </para> - <para> - Configurable initializer adds a capability to override workspace initial startup procedure. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> - </calloutlist> - <calloutlist> - <title>Cache configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled"> - <para> - Defines if the workspace cache is enabled. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class"> - <para> - Cache implementation class. This is optional from JCR version 1.9. - </para> - <para> - The default value is <literal>org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl</literal>. - </para> - <para> - The cache can be configured to use concrete implementations of the <literal>WorkspaceStorageCache</literal> interface. - </para> - <para> - The JCR core has two implementations to use: - </para> - <para> - <emphasis role="bold">LinkedWorkspaceStorageCacheImpl</emphasis> - </para> - <para> - The default implementation, with configurable read behavior and statistics. - </para> - <para> - <emphasis role="bold">WorkspaceStorageCacheImpl</emphasis> - </para> - <para> - This implementation is a legacy from pre 1.9 versions of the JCR. However, it can still be used. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties"> - <para> - The list of properties (in name-value pairs) for the workspace cache: - </para> - <variablelist> - <varlistentry> - <term>max-size</term> - <listitem> - <para> - The maximum size of the cache. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term>live-time</term> - <listitem> - <para> - Cached item live time. - </para> - </listitem> - </varlistentry> - </variablelist> - </callout> - </calloutlist> - <calloutlist> - <title>Query Handler configuration:</title> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class"> - <para> - A Query Handler class name. - </para> - </callout> - <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties"> - <para> - The list of properties (name-value pairs) for a Query Handler (<literal>indexDir</literal>) properties and advanced features described in <xref linkend="sect-Reference_Guide-Search_Configuration"/>. - </para> - </callout> - </calloutlist> - </programlistingco> - - </section> - - <section id="sect-Reference_Guide-JCR_configuration-Related_documents"> - <title>Related Sections</title> - <itemizedlist> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-Search_Configuration"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-JDBC_Data_Container_Config"/> - </para> - </listitem> - <listitem> - <para> - <xref linkend="sect-Reference_Guide-External_Value_Storages"/> - </para> - </listitem> - </itemizedlist> - </section> - -</section> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -3,6 +3,8 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "../../../Reference_Guide.ent"> %BOOK_ENTITIES; ]> + + <section id="sect-Reference_Guide-JCR_configuration"> <title>JCR configuration</title> <para> @@ -121,6 +123,7 @@ </procedure> <section id="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration"> <title>Repository Service Configuration</title> + <programlistingco> <areaspec>  @@ -192,7 +195,7 @@ <programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/Advanced_Development_JCR_Configuration/orig.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <calloutlist> - <title>Repository Service configuration:</title> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository"> <para> The name of a default repository (one returned by RepositoryService.getRepository()) @@ -203,9 +206,9 @@ The list of repositories is configured within the <repositories> element. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name"> <para> The name of the repository being configured. @@ -272,9 +275,9 @@ The list of workspaces. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"> <para> The name of the workspace. @@ -300,9 +303,9 @@ Query handler configuration. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"> <para> The amount of time before the unused global lock is removed. @@ -318,9 +321,9 @@ Each workspace has its own lock folder. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class"> <para> A workspace data container class name. @@ -336,9 +339,9 @@ The list of value storage plugins. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage"> <para> <emphasis role="bold">Optional</emphasis>: Value storage plugin definition. If this element is not included, the values will be stored as BLOBs inside the database. @@ -359,9 +362,9 @@ The list of filters defining conditions when this plugin is applicable. </para> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class"> <para> Initializer implementation class. @@ -396,9 +399,9 @@ </varlistentry> </variablelist> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled"> <para> Defines if the workspace cache is enabled. @@ -453,9 +456,9 @@ </varlistentry> </variablelist> </callout> - </calloutlist> +  <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class"> <para> A Query Handler class name. Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/external-value-storages.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -3,6 +3,8 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> + + <section id="sect-Reference_Guide-External_Value_Storages"> <title>External Value Storages</title> <section id="sect-Reference_Guide-External_Value_Storages-Introduction"> @@ -41,14 +43,7 @@ </areaspec> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_external-value-storages/default25.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + <calloutlist> <callout arearefs="area-Reference_Guide-External_Value_Storages-Tree_File_Value_Storage-id"> <para> @@ -83,27 +78,9 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_external-value-storages/default26.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + </section> -  + <variablelist id="vari-Reference_Guide-Content_Addressable_Value_storage_CAS_support-CAS_Properties"> <title>CAS Properties</title> <varlistentry> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jdbc-data-container-config.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -240,12 +240,77 @@ <para> In &PRODUCT; the JCR is configured in portal web application <filename>portal/WEB-INF/conf/jcr/jcr-configuration.xml</filename> (containing JCR Repository Service and related services) and <filename>repository-configuration.xml</filename> (which contains the repositories configuration). </para> + + </section> + + <section id="sect-Reference_Guide-JDBC_Data_Container_Config-Single_database_configuration"> + <title>Single-database configuration</title> <para> - Refer to <xref linkend="sect-Reference_Guide-JCR_configuration" /> for more information. + Only one naming resource must be set to configure a single database data container. </para> - </section> + <para> + The following example shows the settings for embedded mode for the <parameter>jdbcjcr</parameter> data container: + </para> + +<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <para> + To configure multiple repository workspaces with a single database the "multi-db" parameter must be switched off (set the value to "false"). + </para> + <para> + The following example shows configuration for two workspaces <parameter>ws</parameter> (jdbcjcr) and <parameter>ws1</parameter> (jdbcjcr) which will be persisted in one <application>PostgreSQL</application> database: + </para> + +<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <section id="sect-Reference_Guide-Single_database_configuration-Configuration_without_DataSource"> + <title>Configuration without DataSource</title> + <para> + If you have a dedicated JDBC driver implementation with special features (such as XA transactions and statements/connections pooling) it is possible to configure a repository without using the <classname>javax.sql.DataSource</classname> bound in JNDI. + </para> + <procedure> + <step> + <para> + Remove the configuration in <classname>InitialContextInitializer</classname> for your database and configure a new one directly in the workspace container. + </para> + </step> + <step> + <para> + Remove the "source-name" parameter and include values for a <emphasis role="bold">JDBC driver</emphasis>, <emphasis role="bold">database url</emphasis> and <emphasis role="bold">username</emphasis> instead. + </para> + </step> + </procedure> - +<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <note> + <para> + Ensure the JDBC driver provides connection pooling. Connection pooling is required for use with JCR to prevent a database overload. + </para> + </note> + </section> + +  + + </section> <section id="sect-Reference_Guide-JDBC_Data_Container_Config-Multi_database_Configuration"> <title>Multi-database Configuration</title> <para> @@ -463,83 +528,11 @@ </para> <note> <para> - JCR version 1.9 supports human-readable parameter formats. See <xref linkend="sect-Reference_Guide-JCR_configuration" /> for more information). + JCR version 1.9 supports human-readable parameter formats. </para> </note> </section> - - <section id="sect-Reference_Guide-JDBC_Data_Container_Config-Single_database_configuration"> - <title>Single-database configuration</title> - <para> - Only one naming resource must be set to configure a single database data container. - </para> - <para> - The following example shows the settings for embedded mode for the <parameter>jdbcjcr</parameter> data container: - </para> - -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default40.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <para> - To configure multiple repository workspaces with a single database the "multi-db" parameter must be switched off (set the value to "false"). - </para> - <para> - The following example shows configuration for two workspaces <parameter>ws</parameter> (jdbcjcr) and <parameter>ws1</parameter> (jdbcjcr) which will be persisted in one <application>PostgreSQL</application> database: - </para> - -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default41.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <section id="sect-Reference_Guide-Single_database_configuration-Configuration_without_DataSource"> - <title>Configuration without DataSource</title> - <para> - If you have a dedicated JDBC driver implementation with special features (such as XA transactions and statements/connections pooling) it is possible to configure a repository without using the <classname>javax.sql.DataSource</classname> bound in JNDI. - </para> - <procedure> - <step> - <para> - Remove the configuration in <classname>InitialContextInitializer</classname> for your database and configure a new one directly in the workspace container. - </para> - </step> - <step> - <para> - Remove the "source-name" parameter and include values for a <emphasis role="bold">JDBC driver</emphasis>, <emphasis role="bold">database url</emphasis> and <emphasis role="bold">username</emphasis> instead. - </para> - </step> - </procedure> - - -<programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jdbc-data-container-config/default42.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <note> - <para> - Ensure the JDBC driver provides connection pooling. Connection pooling is required for use with JCR to prevent a database overload. - </para> - </note> - </section> - - - <section id="sect-Reference_Guide-Single_database_configuration-Dynamic_Workspace_Creation"> - <title>Dynamic Workspace Creation</title> - <para> - Workspaces can be added dynamically during runtime. - </para> - <para> - Add new workspaces by: - </para> - <procedure> - <step> - <para> - Registering a new configuration in <literal>RepositoryContainer</literal> and create a WorkspaceContainer (<classname>ManageableRepository.configWorkspace(WorkspaceEntry wsConfig)</classname>). - </para> - </step> - <step> - <para> - Creating a new workspace (<classname>ManageableRepository.createWorkspace(String workspaceName)</classname>). - </para> - </step> - </procedure> - </section> - - </section> - - <section id="sect-Reference_Guide-JDBC_Data_Container_Config-Simple_and_Complex_queries"> <title>Simple and Complex queries</title> <para> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -97,7 +97,7 @@ </callout> <callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration"> <para> - The <parameter>jgroups-configuration</parameter> property is the configuration template for all components (search, cache, locks). Refer to <xref linkend="sect-Reference_Guide-JBoss_Cache_configuration" /> + The <parameter>jgroups-configuration</parameter> property is the configuration template for all components (search, cache, locks). </para> </callout> <callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack"> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/search-configuration.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -19,6 +19,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default61.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <table align="left" id="tabl-Reference_Guide-Search_Configuration-Configuration_parameters" pgwide="1"> <title>Configuration parameters</title>  @@ -62,7 +63,7 @@ </entry> <entry> <para> - The location of the index directory. This parameter is mandatory. It is called "<literal>indexDir</literal>" in versions prior to version 1.9. + The location of the index directory. This parameter is mandatory. It is called "<literal>indexDir</literal>" in versions prior to version 1.9. </para> </entry>  + <calloutlist> <callout arearefs="area-Reference_Guide-Search_Configuration-Global_Search_Index-StandardFilter"> <para> - The first filter (StandardFilter) removes possessive apostrophes (<emphasis role="bold">'s</emphasis>) from the end of words and removes periods (<emphasis role="bold">.</emphasis>) from acronyms. + The first filter (StandardFilter) removes possessive apostrophes (<emphasis role="bold">'s</emphasis>) from the end of words and removes periods (<emphasis role="bold">.</emphasis>) from acronyms. </para> </callout> <callout arearefs="area-Reference_Guide-Search_Configuration-Global_Search_Index-LowerCaseFilter"> @@ -614,12 +608,12 @@ </programlistingco> <para> - The global search index is configured in the <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> configuration file within the "query-handler" tag. + The global search index is configured in the <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> configuration file within the "query-handler" tag. </para> - -<programlisting language="Java" role="Java"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default63.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  + +<programlisting language="XML" role="XML"><![CDATA[<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +]]></programlisting> + <para> The same analyzer should always be used for indexing and for querying in lucene. Results may be unpredictable in other instances. eXo JCR does this automatically. The StandardAnalyzer (configured by default) can, however, be replaced with another. </para> @@ -689,16 +683,18 @@ To configure an application to use a new <literal>SearchIndex</literal>, replace the following code: </para> -<programlisting language="XML" role="XML"><query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> +<programlisting language="XML" role="XML"><![CDATA[<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + ]]> </programlisting> <para> - ...in <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> with the new class + in <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> with the new class: </para> -<programlisting language="XML" role="XML"><query-handler class="mypackage.indexation.MySearchIndex> +<programlisting language="XML" role="XML"><![CDATA[<query-handler class="mypackage.indexation.MySearchIndex> + ]]> </programlisting> <para> - To configure an application to use a new analyzer, add the "<parameter>analyzer</parameter>" parameter to each query-handler configuration in <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename>: + To configure an application to use a new analyzer, add the <parameter>analyzer</parameter> parameter to each query-handler configuration in <filename>portal/WEB-INF/conf/jcr/repository-configuration.xml</filename>: </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default69.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> @@ -720,7 +716,8 @@ To configure the indexing behavior add a parameter to the query-handler element in your configuration file. </para> -<programlisting language="XML" role="XML"><param name="indexing-configuration-path" value="/indexing_configuration.xml"/> +<programlisting language="XML" role="XML"><![CDATA[<param name="indexing-configuration-path" value="/indexing_configuration.xml"/> + ]]> </programlisting> <formalpara id="form-Reference_Guide-IndexingConfiguration-Node_Scope_Limit"> <title>Node Scope Limit</title> @@ -749,6 +746,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default73.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <formalpara id="form-Reference_Guide-IndexingConfiguration-Conditional_Index_Rules"> <title>Conditional Index Rules</title> <para> @@ -758,7 +756,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default74.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - In the above example the first rule only applies if the <parameter>nt:unstructured</parameter> node has a priority property with a value '<parameter>high</parameter>'. The condition syntax only supports the equals operator and a string literal. + In the above example the first rule only applies if the <parameter>nt:unstructured</parameter> node has a priority property with a value <parameter>high</parameter>. The condition syntax only supports the equals operator and a string literal. </para> <para> Properties may also be referenced on the condition that are not on the current node: @@ -770,6 +768,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default76.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <formalpara id="form-Reference_Guide-IndexingConfiguration-Exclusion_from_the_Node_Scope_Index"> <title>Exclusion from the Node Scope Index</title> <para> @@ -777,13 +776,14 @@ </para> </formalpara> <para> - A node scope search normally finds all nodes of an index. That is to say; <literal>jcr:contains(., 'foo')</literal> returns all nodes that have a string property containing the word '<replaceable>foo</replaceable>'. + A node scope search normally finds all nodes of an index. That is to say; <literal>jcr:contains(., 'foo')</literal> returns all nodes that have a string property containing the word '<replaceable>foo</replaceable>'. </para> <para> Properties can be explicitly excluded from the node scope index with: </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default77.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <formalpara id="form-Reference_Guide-IndexingConfiguration-Index_Aggregates"> <title>Index Aggregates</title> <para> @@ -813,6 +813,7 @@ </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default81.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <formalpara id="form-Reference_Guide-IndexingConfiguration-Property_Level_Analyzers"> <title>Property-Level Analyzers</title> <para> @@ -822,7 +823,7 @@ <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_search-configuration/default82.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <para> - The configuration above sets lucene <emphasis role="bold">KeywordAnalyzer</emphasis> to index and search the property "<replaceable>mytext</replaceable>" across the entire workspace while the "<replaceable>mytext2</replaceable>" property is searched with the <emphasis role="bold">WhitespaceAnalyzer</emphasis>. + The configuration above sets lucene <emphasis role="bold">KeywordAnalyzer</emphasis> to index and search the property "<replaceable>mytext</replaceable>" across the entire workspace while the "<replaceable>mytext2</replaceable>" property is searched with the <emphasis role="bold">WhitespaceAnalyzer</emphasis>. </para> <para> The <emphasis role="bold">WhitespaceAnalyzer</emphasis> tokenizes a property, the <emphasis role="bold">KeywordAnalyzer</emphasis> takes the property as a whole. @@ -837,13 +838,13 @@ </para> </formalpara> <para> - For example: the property "<parameter>mytext</parameter>" contains the text; "<emphasis>testing my analyzers</emphasis>" but no analyzers have been configured for this property (and the default analyzer in SearchIndex has not been changed). + For example: the property "<parameter>mytext</parameter>" contains the text; "<emphasis>testing my analyzers</emphasis>" but no analyzers have been configured for this property (and the default analyzer in SearchIndex has not been changed). </para> <para> If the query is: </para> -<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(mytext,'analyzer')]" +<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(mytext,'analyzer')]" </programlisting> <para> The <literal>xpath</literal> does not return a result in the node with the property above and default analyzers. @@ -852,7 +853,7 @@ Also, if a search is done on the node scope as follows: </para> -<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(.,'analyzer')]" +<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(.,'analyzer')]" </programlisting> <para> No result will be returned. @@ -861,24 +862,24 @@ Only specific analyzers can be set on a node property, and the node scope indexing and analyzing is always done with the globally defined analyzer in the SearchIndex element. </para> <para> - If the analyzer used to index the "mytext" property above is changed to: + If the analyzer used to index the "mytext" property above is changed to: </para> -<programlisting language="XML" role="XML"><analyzer class="org.apache.lucene.analysis.Analyzer.GermanAnalyzer"> -<property>mytext</property> -</analyzer> -</programlisting> +<programlisting language="XML" role="XML"><![CDATA[<analyzer class="org.apache.lucene.analysis.Analyzer.GermanAnalyzer"> +<property>mytext</property> +</analyzer> + ]]></programlisting> <para> The search below would return a result because of the word stemming (analyzers - analyzer). </para> -<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(mytext,'analyzer')]" +<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(mytext,'analyzer')]" </programlisting> <para> The second search in the example: </para> -<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(.,'analyzer')]" +<programlisting language="Java" role="JAVA">xpath = "//*[jcr:contains(.,'analyzer')]" </programlisting> <para> Would still not give a result, since the node scope is indexed with the global analyzer, which in this case does not take into account any word stemming. Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -6,17 +6,23 @@ <chapter id="chap-Reference_Guide-eXo_JCR"> <title>eXo JCR</title> <xi:include href="JCR/intro.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +  +  <xi:include href="JCR/jdbc-data-container-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/external-value-storages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +  +  <xi:include href="JCR/search-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/multilanguage-support.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/configuration-persister.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/cluster-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/jbosscache-configuration-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/lock-manager-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +  +  +  +  +  +  +  +  <xi:include href="JCR/query-handler-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/jbossts-transaction-service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/transaction-manager-lookup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="JCR/statistics.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="JCR/statistics.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> </chapter> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,118 +1,153 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" +[ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> <section id="sect-Reference_Guide-Concept"> - <title>Concept</title> - <para> - A gadget is a mini web application, embedded in a web page and running on an application server platform. These small applications help users perform various tasks. - </para> - <section id="sect-Reference_Guide-Concept-Basic_Usage"> - <title>Basic Usage</title> - <para> - &PRODUCT; includes a Todo gadget, Calendar gadget, Calculator gadget and RSS Reader gadget by default. Many other, third-party gadgets are also supported. Refer to the &PRODUCT; User Guide at <ulink type="http" url="http://docs.redhat.com" /> for information about obtaining and installing gadgets. - </para> - </section> - -<section id="sect-Reference_Guide-Gadgets-Existing_Gadgets"> -<title>Existing Gadgets</title> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/Liste.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/Liste.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> + <title>Concept</title> + <para> + A gadget is a mini web application, embedded in a web page and running on an application server platform. These small applications help users perform various tasks. + </para> + <section id="sect-Reference_Guide-Concept-Basic_Usage"> + <title>Basic Usage</title> + <para> + &PRODUCT; includes a Todo gadget, Calendar gadget, Calculator gadget and RSS Reader gadget by default. Many other, third-party gadgets are also supported. Refer to the &PRODUCT; User Guide at <ulink type="http" url="http://docs.redhat.com" />for information about obtaining and installing gadgets. + </para> + </section> + <section id="sect-Reference_Guide-Gadgets-Existing_Gadgets"> + <title>Existing Gadgets</title> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/Liste.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/Liste.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Create_a_new_Gadget"> + <title>Create a new Gadget</title> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/New.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/New.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Remote_Gadget"> + <title>Remote Gadget</title> + <para> + This is the reference to a remote gadget (stock one). + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/Import.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/Import.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Gadget_Importing"> + <title>Gadget Importing</title> + <para> + After referencing the gadget successfully, then import it into the local repository. + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/Imported.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/Imported.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Gadget_Web_Editing"> + <title>Gadget Web Editing</title> + <para> + Edit it from the Web the imported Gadget to modify it: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/EditImportedOnline.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/EditImportedOnline.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Gadget_IDE_Editing"> + <title>Gadget IDE Editing</title> + <para> + Edit it from your IDE thanks to the WebDAV protocol: + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/EditImportedWebDAV.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/EditImportedWebDAV.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> + <section id="sect-Reference_Guide-Gadgets-Dashboard_Viewing"> + <title>Dashboard Viewing</title> + <para> + View it from the Dashboard when you drag and drop the Gadget from listing to the dashboard. + </para> + <mediaobject> + <imageobject role="html"> + <imagedata fileref="images/GadgetDevelopment/Dashboard.png" + format="PNG" + align="center" + scale="130" /> + </imageobject> + <imageobject role="fo"> + <imagedata fileref="images/GadgetDevelopment/Dashboard.png" + format="PNG" + align="center" + contentwidth="150mm" /> + </imageobject> + </mediaobject> + </section> </section> - -<section id="sect-Reference_Guide-Gadgets-Create_a_new_Gadget"> -<title>Create a new Gadget</title> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/New.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/New.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -<section id="sect-Reference_Guide-Gadgets-Remote_Gadget"> -<title>Remote Gadget</title> -<para> -This is the reference to a remote gadget (stock one). -</para> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/Import.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/Import.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -<section id="sect-Reference_Guide-Gadgets-Gadget_Importing"> -<title>Gadget Importing</title> -<para> -After referencing the gadget successfully, then import it into the local repository. -</para> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/Imported.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/Imported.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -<section id="sect-Reference_Guide-Gadgets-Gadget_Web_Editing"> -<title>Gadget Web Editing</title> -<para> -Edit it from the Web the imported Gadget to modify it: -</para> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/EditImportedOnline.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/EditImportedOnline.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -<section id="sect-Reference_Guide-Gadgets-Gadget_IDE_Editing"> -<title>Gadget IDE Editing</title> -<para> -Edit it from your IDE thanks to the WebDAV protocol: -</para> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/EditImportedWebDAV.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/EditImportedWebDAV.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -<section id="sect-Reference_Guide-Gadgets-Dashboard_Viewing"> -<title>Dashboard Viewing</title> -<para> -View it from the Dashboard when you drag and drop the Gadget from listing to the dashboard. -</para> -<mediaobject> -<imageobject role="html"> -<imagedata fileref="images/GadgetDevelopment/Dashboard.png" format="PNG" align="center" scale="130" /> -</imageobject> -<imageobject role="fo"> -<imagedata fileref="images/GadgetDevelopment/Dashboard.png" format="PNG" align="center" contentwidth="150mm" /> -</imageobject> -</mediaobject> -</section> - -</section> - Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2010-11-05 03:34:32 UTC (rev 4951) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/SetupGadgetServer.xml 2010-11-05 04:26:28 UTC (rev 4952) @@ -1,94 +1,66 @@ -<?xml version='1.0' encoding='utf-8' ?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +<?xml version='1.0' encoding='utf-8'?> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" +[ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> <section id="sect-Reference_Guide-Advanced_Gadget_Administration"> - <title>Advanced Gadget Administration</title> - <section id="sect-Reference_Guide-Advanced_Gadget_Administration-Virtual_servers_for_gadget_rendering"> - <title>Virtual servers for gadget rendering</title> - <para> - &PRODUCT; recommends using two virtual hosts for security. If the gadget is running on a different domain than the container, it is unable to interfere with the portal by modifying code or cookies. - </para> - <para> - An example would be hosting the portal from <emphasis role="bold">http://www.sample.com</emphasis> and the gadgets from <emphasis role="bold">http://www.samplemodules.com</emphasis>. - </para> - <para> - To do this, configure the <emphasis>gadgets.hostName</emphasis> parameter in the <filename>server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/portal/application-registry-configuration.xml</filename> file. The value is the <emphasis role="bold">path/to/gadgetServer</emphasis> in <literal>GadgetRegisteryService</literal>: - </para> - -<programlisting language="XML" role="XML"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default139.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  - <para> - It is also possible to have multiple rendering servers. This helps to balance the rendering load across multiple servers. - </para> - <para> - When deploying on the same server ensure the gadget initiates before anything that calls it (for example; the webapp <literal>GateInGadgets</literal> which uses <literal>org.exoplatform.application.gadget.GadgetRegister</literal>). - </para> - </section> + <title>Advanced Gadget Administration</title> + <section id="sect-Reference_Guide-Advanced_Gadget_Administration-Virtual_servers_for_gadget_rendering"> + <title>Virtual servers for gadget rendering</title> + <para> + &PRODUCT; recommends using two virtual hosts for security. If the gadget is running on a different domain than the container, it is unable to interfere with the portal by modifying code or cookies. + </para> + <para> + An example would be hosting the portal from <emphasis role="bold">http://www.sample.com</emphasis> and the gadgets from <emphasis role="bold">http://www.samplemodules.com</emphasis>. + </para> + <para> + To do this, configure the <emphasis>gadgets.hostName</emphasis>parameter in the <filename>server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/portal/application-registry-configuration.xml</filename>file. The value is the <emphasis role="bold">path/to/gadgetServer</emphasis>in <literal>GadgetRegisteryService</literal>: + </para> +<programlisting language="XML" role="XML"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default139.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</programlisting> - - <section id="sect-Reference_Guide-Advanced_Gadget_Administration-Configuration"> - <title>Configuration</title> - <section id="sect-Reference_Guide-Configuration-Security_key"> - <title>Security key</title> - <para> - A specific file called <emphasis role="bold">key.txt</emphasis> has to be generated for each installation of &PRODUCT; to be secure. This file contains a secret key used to encrypt the security token used for authenticating the user. - </para> - <para> - In Linux systems this file can be generated with: - </para> - -<programlisting language="XML" role="XML"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default140.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <para> + It is also possible to have multiple rendering servers. This helps to balance the rendering load across multiple servers. + </para> + <para> + When deploying on the same server ensure the gadget initiates before anything that calls it (for example; the webapp <literal>GateInGadgets</literal>which uses <literal>org.exoplatform.application.gadget.GadgetRegister</literal>). + </para> + </section> + <section id="sect-Reference_Guide-Advanced_Gadget_Administration-Configuration"> + <title>Configuration</title> + <section id="sect-Reference_Guide-Configuration-Security_key"> + <title>Security key</title> + <para> + A specific file called <emphasis role="bold">key.txt</emphasis>has to be generated for each installation of &PRODUCT; to be secure. This file contains a secret key used to encrypt the security token used for authenticating the user. + </para> + <para> + In Linux systems this file can be generated with: + </para> +<programlisting language="XML" role="XML"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default140.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /> +</programlisting> <important> <title><emphasis role="bold">DOCS NOTE: Technical verification required</emphasis></title> <para> - This <filename>key.txt </filename> file should be placed in the <filename>/conf/gatein/gadgets</filename> folder of your profile. + This <filename>key.txt</filename>file should be placed in the <filename>/conf/gatein/gadgets</filename>folder of your profile. </para> </important> - </section> - - - <section id="sect-Reference_Guide-Configuration-Gadget_proxy_and_concat_configuration"> - <title>Gadget proxy and concat configuration</title> - <para> - These servers have to be on the same domain as the gadget server. You can configure the container in <filename>eXoGadgetServer:/WEB-INF/classes/containers/default/container.js</filename>. - </para> - -<programlisting language="Java" role="Java"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default141.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> -  - </section> - - - <section id="sect-Reference_Guide-Configuration-Proxy"> - <title>Proxy</title> - <para> - To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM: - </para> - -<programlisting language="Java" role="Java">-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword + </section> + <section id="sect-Reference_Guide-Configuration-Gadget_proxy_and_concat_configuration"> + <title>Gadget proxy and concat configuration</title> + <para> + These servers have to be on the same domain as the gadget server. You can configure the container in <filename>eXoGadgetServer:/WEB-INF/classes/containers/default/container.js</filename>. + </para> +<programlisting language="Java" role="Java"><xi:include href="../../extras/Gadget_Development_SetupGadgetServer/default141.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /> </programlisting> - </section> - - </section> - + </section> + <section id="sect-Reference_Guide-Configuration-Proxy"> + <title>Proxy</title> + <para> + To allow external gadgets when the server is behind a proxy, add the following code to the beginning of the JVM: + </para> +<programlisting language="Java" role="Java">-Dhttp.proxyHost=proxyhostURL -Dhttp.proxyPort=proxyPortNumber -Dhttp.proxyUser=someUserName -Dhttp.proxyPassword=somePassword</programlisting> + </section> + </section> </section> -

15 years, 6 months

1
0
0 / 0

gatein SVN: r4951 - portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-04 23:34:32 -0400 (Thu, 04 Nov 2010) New Revision: 4951 Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java Log: add testing Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java 2010-11-05 02:54:23 UTC (rev 4950) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/AbstractTestController.java 2010-11-05 03:34:32 UTC (rev 4951) @@ -35,7 +35,7 @@ { public void assertEquals(Map<QualifiedName, String> expectedParameters, Map<QualifiedName, String> parameters) { - assertNotNull(parameters); + assertNotNull("Was not expecting a null parameter set", parameters); Assert.assertEquals(expectedParameters.keySet(), parameters.keySet()); for (Map.Entry<QualifiedName, String> expectedEntry : expectedParameters.entrySet()) { Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-05 02:54:23 UTC (rev 4950) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-05 03:34:32 UTC (rev 4951) @@ -127,6 +127,17 @@ assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/~")); } + public void testPreservePath() throws Exception + { + RouterDescriptor routerMD = new RouterDescriptor(); + routerMD.addRoute(new RouteDescriptor("/{p}").addPathParam(QualifiedName.parse("p"), "[^/]+", EncodingMode.PRESERVE_PATH)); + Router router = new Router(routerMD); + + // + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "~"), router.route("/~")); + assertNull(router.route("//")); + } + public void testSimplePattern() throws Exception { RouterDescriptor routerMD = new RouterDescriptor();

15 years, 6 months

1
0
0 / 0

gatein SVN: r4950 - in portal/branches/navcontroller: component/web/controller/src/main/java/org/exoplatform/web/controller and 5 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-04 22:54:23 -0400 (Thu, 04 Nov 2010) New Revision: 4950 Added: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestQualifiedName.java Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/navigation/NavigationLocator.java Log: fine tune QualifiedName class Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/WebAppController.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -57,7 +57,7 @@ { /** . */ - public static final QualifiedName HANDLER_PARAM = new QualifiedName("gtn", "handler"); + public static final QualifiedName HANDLER_PARAM = QualifiedName.create("gtn", "handler"); /** . */ protected static Logger log = LoggerFactory.getLogger(WebAppController.class); Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -19,77 +19,133 @@ package org.exoplatform.web.controller; +import org.jboss.util.NullArgumentException; + /** - * A qualified name that is a qualifier and a name. It can be seen as a simplified version of an XML QName - * that retains only the prefix (qualifier) and the local name (name) and leaves out the namespace. + * <p>A qualified name that is a qualifier and a name. It can be seen as a simplified version of an XML QName + * that retains only the prefix (qualifier) and the local name (name) and leaves out the namespace.</p> * + * <p>Qualified names have a string representation that is equals to the concatenation of the qualifier + * and name separated by a colon (:) character. When the </p> + * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ */ public class QualifiedName { - public static QualifiedName parse(String qname) + /** + * Parse the string representation of a qname and returns a qualified name. + * + * @param qname the qname to parse + * @return the corresponding qualified name + * @throws NullArgumentException if the qname argument is null + * @throws IllegalArgumentException if the qname argument contains more than one colon character + */ + public static QualifiedName parse(String qname) throws NullArgumentException, IllegalArgumentException { + if (qname == null) + { + throw new NullPointerException("No null argument accepted"); + } if (qname.length() > 0) { int index = qname.indexOf(':'); if (index > -1) { - return new QualifiedName(qname.substring(0, index), qname.substring(index + 1)); + return create(qname.substring(0, index), qname.substring(index + 1)); } } - return new QualifiedName(qname); + return create(qname); } - /** . */ - private final String qualifier; - - /** . */ - private final String name; - /** - * Creates a qualified name with an empty string qualifier. + * Creates a qualified name. * + * @param qualifier the qualifier * @param name the name + * @return the qualified name + * @throws NullPointerException if any argument is null + * @throws IllegalArgumentException if any argument contains a colon character */ - public QualifiedName(String name) + public static QualifiedName create(String qualifier, String name) throws NullPointerException, IllegalArgumentException { - this("", name); + return new QualifiedName(qualifier, name); } /** - * Creates a qualified name. + * Creates a qualified name with an empty string qualifier. * - * @param qualifier the qualifier * @param name the name + * @return the qualified name + * @throws NullPointerException if any argument is null + * @throws IllegalArgumentException if any argument contains a colon character */ - public QualifiedName(String qualifier, String name) + public static QualifiedName create(String name) throws NullPointerException, IllegalArgumentException { + return new QualifiedName(name); + } + + /** The qualifier. */ + private final String qualifier; + + /** The name. */ + private final String name; + + private QualifiedName(String name) throws NullPointerException, IllegalArgumentException + { + this("", name); + } + + private QualifiedName(String qualifier, String name) throws NullPointerException, IllegalArgumentException + { if (qualifier == null) { throw new NullPointerException("No null prefix accepted"); } + if (qualifier.indexOf(':') != -1) + { + throw new IllegalArgumentException("The name '" + qualifier + "' must not contain a colon character"); + } if (name == null) { throw new NullPointerException("No null prefix accepted"); } + if (name.indexOf(':') != -1) + { + throw new IllegalArgumentException("The name '" + name + "' must not contain a colon character"); + } // this.qualifier = qualifier; this.name = name; } + /** + * Returns the qualifier. + * + * @return the qualifier + */ public String getQualifier() { return qualifier; } + /** + * Returns the name. + * + * @return the name + */ public String getName() { return name; } + /** + * Returns the string representation. + * + * @return the string representation + */ public String getValue() { if (qualifier.isEmpty()) Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestBuildRoute.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -24,8 +24,6 @@ import org.exoplatform.web.controller.metadata.RouteDescriptor; import org.exoplatform.web.controller.metadata.RouterDescriptor; -import java.util.Collections; - /** * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ @@ -75,7 +73,7 @@ PatternRoute patternRoute = router.root.getPattern(0); assertEquals("^([^/]+)", patternRoute.pattern.toString()); assertEquals(1, patternRoute.params.size()); - assertEquals(new QualifiedName("a"), patternRoute.params.get(0).name); + assertEquals(QualifiedName.create("a"), patternRoute.params.get(0).name); assertEquals("^[^/]+$", patternRoute.params.get(0).pattern.toString()); assertEquals(EncodingMode.DEFAULT_FORM, patternRoute.params.get(0).encodingMode); assertEquals(2, patternRoute.chunks.size()); @@ -99,7 +97,7 @@ PatternRoute patternRoute = router.root.getPattern(0); assertEquals("^([^/]+)", patternRoute.pattern.toString()); assertEquals(1, patternRoute.params.size()); - assertEquals(new QualifiedName("q", "a"), patternRoute.params.get(0).name); + assertEquals(QualifiedName.create("q", "a"), patternRoute.params.get(0).name); assertEquals("^[^/]+$", patternRoute.params.get(0).pattern.toString()); assertEquals(EncodingMode.DEFAULT_FORM, patternRoute.params.get(0).encodingMode); assertEquals(2, patternRoute.chunks.size()); @@ -123,7 +121,7 @@ PatternRoute patternRoute = router.root.getPattern(0); assertEquals("^(.*)", patternRoute.pattern.toString()); assertEquals(1, patternRoute.params.size()); - assertEquals(new QualifiedName("a"), patternRoute.params.get(0).name); + assertEquals(QualifiedName.create("a"), patternRoute.params.get(0).name); assertEquals("^.*$", patternRoute.params.get(0).pattern.toString()); assertEquals(EncodingMode.DEFAULT_FORM, patternRoute.params.get(0).encodingMode); assertEquals(2, patternRoute.chunks.size()); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestDescriptorBuilder.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -86,11 +86,11 @@ assertTrue(i.hasNext()); RouteDescriptor route5 = i.next(); assertEquals("/a", route5.getPath()); - assertEquals(Collections.singletonMap(new QualifiedName("a"), "a_value"), route5.getParams()); + assertEquals(Collections.singletonMap(QualifiedName.create("a"), "a_value"), route5.getParams()); assertEquals(1, route5.getChildren().size()); RouteDescriptor route5_1 = route5.getChildren().get(0); assertEquals("/b", route5_1.getPath()); - assertEquals(Collections.singletonMap(new QualifiedName("b"), "b_value"), route5_1.getParams()); + assertEquals(Collections.singletonMap(QualifiedName.create("b"), "b_value"), route5_1.getParams()); // assertTrue(i.hasNext()); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestHierarchy.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -45,12 +45,12 @@ Router router = new Router(new RouterDescriptor().addRoute(descriptor)); // - assertEquals(Collections.singletonMap(new QualifiedName("foo"), "bar"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("foo"), "bar"), router.route("/a")); // Map<QualifiedName, String> expected = new HashMap<QualifiedName, String>(); - expected.put(new QualifiedName("foo"), "bar"); - expected.put(new QualifiedName("juu"), "daa"); + expected.put(QualifiedName.create("foo"), "bar"); + expected.put(QualifiedName.create("juu"), "daa"); assertEquals(expected, router.route("/a/b")); } } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestLegacyPortal.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -63,11 +63,11 @@ public void testPrivateClassicComponent() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), ""); - expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo"); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), ""); + expectedParameters.put(QualifiedName.create("gtn", "componentid"), "foo"); // assertEquals(expectedParameters, router.route("/private/classic", Collections.singletonMap("portal:componentId", new String[]{"foo"}))); @@ -77,10 +77,10 @@ public void testPrivateClassic() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), ""); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), ""); // assertEquals(expectedParameters, router.route("/private/classic")); @@ -90,10 +90,10 @@ public void testPrivateClassicSlash() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/"); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/"); // assertEquals(expectedParameters, router.route("/private/classic/")); @@ -103,11 +103,11 @@ public void testPrivateClassicSlashComponent() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/"); - expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo"); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/"); + expectedParameters.put(QualifiedName.create("gtn", "componentid"), "foo"); // assertEquals(expectedParameters, router.route("/private/classic/", Collections.singletonMap("portal:componentId", new String[]{"foo"}))); @@ -117,10 +117,10 @@ public void testPrivateClassicHome() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/home"); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/home"); // assertEquals(expectedParameters, router.route("/private/classic/home")); @@ -130,11 +130,11 @@ public void testPrivateClassicHomeComponent() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "handler"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "access"), "private"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/home"); - expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo"); + expectedParameters.put(QualifiedName.create("gtn", "handler"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "access"), "private"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/home"); + expectedParameters.put(QualifiedName.create("gtn", "componentid"), "foo"); // assertEquals(expectedParameters, router.route("/private/classic/home", Collections.singletonMap("portal:componentId", new String[]{"foo"}))); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestMatch.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -90,7 +90,7 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a")); } public void testParameterPropagationToDescendants() throws Exception @@ -101,7 +101,7 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a")); } public void testWildcardPattern() throws Exception @@ -111,10 +111,10 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("p"), ""), router.route("/")); - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), ""), router.route("/")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a")); assertNull(router.route("a")); - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a/b"), router.route("/a/b")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a/b"), router.route("/a/b")); } public void testDefaultForm() throws Exception @@ -124,7 +124,7 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("p"), "/"), router.route("/~")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "/"), router.route("/~")); } public void testSimplePattern() throws Exception @@ -134,7 +134,7 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a")); assertNull(router.route("a")); assertNull(router.route("/ab")); assertNull(router.route("ab")); @@ -151,7 +151,7 @@ assertNull(router.route("a")); assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/a")); assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/a/")); - assertEquals(Collections.singletonMap(new QualifiedName("p"), "a"), router.route("/a/b")); + assertEquals(Collections.singletonMap(QualifiedName.create("p"), "a"), router.route("/a/b")); } public void testTwoRules1() throws Exception @@ -162,7 +162,7 @@ Router router = new Router(routerMD); // - assertEquals(Collections.singletonMap(new QualifiedName("b"), "b"), router.route("/a")); + assertEquals(Collections.singletonMap(QualifiedName.create("b"), "b"), router.route("/a")); assertEquals(Collections.<QualifiedName, String>emptyMap(), router.route("/a/b")); } @@ -175,9 +175,9 @@ // Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("a"), "a"); - expectedParameters.put(new QualifiedName("b"), "b"); + expectedParameters.put(QualifiedName.create("a"), "a"); + expectedParameters.put(QualifiedName.create("b"), "b"); assertEquals(expectedParameters, router.route("/a")); - assertEquals(Collections.singletonMap(new QualifiedName("a"), "a"), router.route("/a/b")); + assertEquals(Collections.singletonMap(QualifiedName.create("a"), "a"), router.route("/a/b")); } } Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestPortalConfiguration.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -44,27 +44,27 @@ // RouteDescriptor portalRouteMD = new RouteDescriptor("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"); - portalRouteMD.addParam(new QualifiedName("gtn", "controller"), "site"); - portalRouteMD.addRequestParam(new QualifiedName("gtn", "componentid"), "portal:componentId", null, false); - portalRouteMD.addPathParam(new QualifiedName("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); + portalRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site"); + portalRouteMD.addRequestParam(QualifiedName.create("gtn", "componentid"), "portal:componentId", null, false); + portalRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); routerMD.addRoute(portalRouteMD); // RouteDescriptor portalRouteMD2 = new RouteDescriptor("/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"); - portalRouteMD2.addParam(new QualifiedName("gtn", "controller"), "site"); - portalRouteMD2.addPathParam(new QualifiedName("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); + portalRouteMD2.addParam(QualifiedName.create("gtn", "controller"), "site"); + portalRouteMD2.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); routerMD.addRoute(portalRouteMD2); // RouteDescriptor groupRouteMD = new RouteDescriptor("/groups/{gtn:sitetype}/{gtn:sitename}{gtn:path}"); - groupRouteMD.addParam(new QualifiedName("gtn", "controller"), "site"); - groupRouteMD.addPathParam(new QualifiedName("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); + groupRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site"); + groupRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); routerMD.addRoute(groupRouteMD); // RouteDescriptor userRouteMD = new RouteDescriptor("/users/{gtn:sitetype}/{gtn:sitename}{gtn:path}"); - userRouteMD.addParam(new QualifiedName("gtn", "controller"), "site"); - userRouteMD.addPathParam(new QualifiedName("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); + userRouteMD.addParam(QualifiedName.create("gtn", "controller"), "site"); + userRouteMD.addPathParam(QualifiedName.create("gtn", "path"), ".*", EncodingMode.PRESERVE_PATH); routerMD.addRoute(userRouteMD); // @@ -74,11 +74,11 @@ public void testComponent() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "sitetype"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/"); - expectedParameters.put(new QualifiedName("gtn", "componentid"), "foo"); + expectedParameters.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/"); + expectedParameters.put(QualifiedName.create("gtn", "componentid"), "foo"); // assertEquals(expectedParameters, router.route("/private/portal/classic/", Collections.singletonMap("portal:componentId", new String[]{"foo"}))); @@ -88,10 +88,10 @@ public void testPrivateClassic() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "sitetype"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "path"), ""); + expectedParameters.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "path"), ""); // assertEquals(expectedParameters, router.route("/private/portal/classic")); @@ -101,10 +101,10 @@ public void testPrivateClassicSlash() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "sitetype"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/"); + expectedParameters.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/"); // assertEquals(expectedParameters, router.route("/private/portal/classic/")); @@ -114,10 +114,10 @@ public void testPrivateClassicHome() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "classic"); - expectedParameters.put(new QualifiedName("gtn", "sitetype"), "portal"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/home"); + expectedParameters.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "classic"); + expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "portal"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/home"); // assertEquals(expectedParameters, router.route("/private/portal/classic/home")); @@ -127,20 +127,20 @@ public void testSiteType() throws Exception { Map<QualifiedName, String> expectedParameters = new HashMap<QualifiedName, String>(); - expectedParameters.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters.put(new QualifiedName("gtn", "sitetype"), "group"); - expectedParameters.put(new QualifiedName("gtn", "sitename"), "platform_administrator"); - expectedParameters.put(new QualifiedName("gtn", "path"), "/administration/registry"); + expectedParameters.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters.put(QualifiedName.create("gtn", "sitetype"), "group"); + expectedParameters.put(QualifiedName.create("gtn", "sitename"), "platform_administrator"); + expectedParameters.put(QualifiedName.create("gtn", "path"), "/administration/registry"); // assertEquals(expectedParameters, router.route("/private/group/platform_administrator/administration/registry")); assertEquals("/private/group/platform_administrator/administration/registry", router.render(expectedParameters)); Map<QualifiedName, String> expectedParameters1 = new HashMap<QualifiedName, String>(); - expectedParameters1.put(new QualifiedName("gtn", "controller"), "site"); - expectedParameters1.put(new QualifiedName("gtn", "sitetype"), "user"); - expectedParameters1.put(new QualifiedName("gtn", "sitename"), "root"); - expectedParameters1.put(new QualifiedName("gtn", "path"), "/tab_0"); + expectedParameters1.put(QualifiedName.create("gtn", "controller"), "site"); + expectedParameters1.put(QualifiedName.create("gtn", "sitetype"), "user"); + expectedParameters1.put(QualifiedName.create("gtn", "sitename"), "root"); + expectedParameters1.put(QualifiedName.create("gtn", "path"), "/tab_0"); // assertEquals(expectedParameters1, router.route("/private/user/root/tab_0")); Added: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestQualifiedName.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestQualifiedName.java (rev 0) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestQualifiedName.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -0,0 +1,165 @@ +/* + * Copyright (C) 2010 eXo Platform SAS. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.exoplatform.web.controller.router; + +import junit.framework.TestCase; +import org.exoplatform.web.controller.QualifiedName; + +/** + * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> + * @version $Revision$ + */ +public class TestQualifiedName extends TestCase +{ + + public void testQualifiedName() + { + QualifiedName qd1 = QualifiedName.create("a", "bc"); + assertEquals("a", qd1.getQualifier()); + assertEquals("bc", qd1.getName()); + assertEquals("a:bc", qd1.getValue()); + + // + QualifiedName qd2 = QualifiedName.parse("a:bc"); + assertEquals("a", qd2.getQualifier()); + assertEquals("bc", qd2.getName()); + assertEquals("a:bc", qd2.getValue()); + + // + assertTrue(qd1.equals(qd2)); + assertTrue(qd2.equals(qd1)); + assertTrue(qd1.equals(qd1)); + assertTrue(qd2.equals(qd2)); + + // + assertEquals(qd1.hashCode(), qd2.hashCode()); + } + + public void testEmptyQualifier() + { + QualifiedName qd1 = QualifiedName.create("abc"); + assertEquals("", qd1.getQualifier()); + assertEquals("abc", qd1.getName()); + assertEquals("abc", qd1.getValue()); + + // + QualifiedName qd2 = QualifiedName.parse("abc"); + assertEquals("", qd2.getQualifier()); + assertEquals("abc", qd2.getName()); + assertEquals("abc", qd2.getValue()); + + // + assertTrue(qd1.equals(qd2)); + assertTrue(qd2.equals(qd1)); + assertTrue(qd1.equals(qd1)); + assertTrue(qd2.equals(qd2)); + + // + assertEquals(qd1.hashCode(), qd2.hashCode()); + } + + public void testNPEInCtor() + { + try + { + QualifiedName.create(null); + fail(); + } + catch (NullPointerException ignore) + { + } + try + { + QualifiedName.create("a", null); + fail(); + } + catch (NullPointerException ignore) + { + } + try + { + QualifiedName.create(null, "a"); + fail(); + } + catch (NullPointerException ignore) + { + } + try + { + QualifiedName.create(null, null); + fail(); + } + catch (NullPointerException ignore) + { + } + try + { + QualifiedName.parse(null); + fail(); + } + catch (NullPointerException ignore) + { + } + } + + public void testIAEInCtor() + { + try + { + QualifiedName.create("a:b"); + fail(); + } + catch (IllegalArgumentException ignore) + { + } + try + { + QualifiedName.create(":", "a"); + fail(); + } + catch (IllegalArgumentException ignore) + { + } + try + { + QualifiedName.create("a", ":"); + fail(); + } + catch (IllegalArgumentException ignore) + { + } + try + { + QualifiedName.create(":", ":"); + fail(); + } + catch (IllegalArgumentException ignore) + { + } + try + { + QualifiedName.parse("::"); + fail(); + } + catch (IllegalArgumentException ignore) + { + } + } +} Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/TestRender.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -69,7 +69,7 @@ Router router = new Router(routerMD); // - assertEquals("/a", router.render(Collections.singletonMap(new QualifiedName("p"), "a"))); + assertEquals("/a", router.render(Collections.singletonMap(QualifiedName.create("p"), "a"))); assertNull(router.render(Collections.<QualifiedName, String>emptyMap())); } @@ -80,8 +80,8 @@ Router router = new Router(routerMD); // - assertEquals("/a", router.render(Collections.singletonMap(new QualifiedName("p"), "a"))); - assertNull(router.render(Collections.singletonMap(new QualifiedName("p"), "ab"))); + assertEquals("/a", router.render(Collections.singletonMap(QualifiedName.create("p"), "a"))); + assertNull(router.render(Collections.singletonMap(QualifiedName.create("p"), "ab"))); } public void testWildcardPathParam() throws Exception @@ -91,9 +91,9 @@ Router router = new Router(routerMD); // - assertEquals("/", router.render(Collections.singletonMap(new QualifiedName("p"), ""))); - assertEquals("/a", router.render(Collections.singletonMap(new QualifiedName("p"), "a"))); - assertEquals("/a/b", router.render(Collections.singletonMap(new QualifiedName("p"), "a/b"))); + assertEquals("/", router.render(Collections.singletonMap(QualifiedName.create("p"), ""))); + assertEquals("/a", router.render(Collections.singletonMap(QualifiedName.create("p"), "a"))); + assertEquals("/a/b", router.render(Collections.singletonMap(QualifiedName.create("p"), "a/b"))); } public void testFoo() throws Exception @@ -103,7 +103,7 @@ Router router = new Router(routerMD); // - assertEquals(null, router.render(Collections.singletonMap(new QualifiedName("p"), "/"))); + assertEquals(null, router.render(Collections.singletonMap(QualifiedName.create("p"), "/"))); } public void testBar() throws Exception @@ -113,7 +113,7 @@ Router router = new Router(routerMD); // - assertEquals("/~", router.render(Collections.singletonMap(new QualifiedName("p"), "/"))); + assertEquals("/~", router.render(Collections.singletonMap(QualifiedName.create("p"), "/"))); } public void testWildcardParamPathPreservePathEncoding() throws Exception @@ -123,7 +123,7 @@ Router router = new Router(routerMD); // - assertEquals("//", router.render(Collections.singletonMap(new QualifiedName("p"), "/"))); + assertEquals("//", router.render(Collections.singletonMap(QualifiedName.create("p"), "/"))); } public void testWildcardParamPathDefaultFormEncoded() throws Exception @@ -133,7 +133,7 @@ Router router = new Router(routerMD); // - assertEquals("/~", router.render(Collections.singletonMap(new QualifiedName("p"), "/"))); + assertEquals("/~", router.render(Collections.singletonMap(QualifiedName.create("p"), "/"))); } public void testPrecedence() throws Exception @@ -147,6 +147,6 @@ assertEquals("/a", router.render(Collections.<QualifiedName, String>emptyMap())); // - assertEquals("/a/b", router.render(Collections.singletonMap(new QualifiedName("p"), "a"))); + assertEquals("/a/b", router.render(Collections.singletonMap(QualifiedName.create("p"), "a"))); } } Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-05 02:54:23 UTC (rev 4950) @@ -37,10 +37,17 @@ </route>  - <route path="/groups/{gtn:sitename}{gtn:path}"> + <route path="/groups"> <route-param name="gtn:access" value="private"/> - <route-param name="gtn:sitetype" value="group"/> - <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> + <route path="/"> + <route-param name="gtn:sitetype" value="portal"/> + <route-param name="gtn:sitename" value="classic"/> + <route-param name="gtn:path" value="/groupnavigation"/> + </route> + <route path="/{gtn:sitename}{gtn:path}"> + <route-param name="gtn:sitetype" value="group"/> + <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> + </route> </route>  Modified: portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java =================================================================== --- portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/webui/framework/src/main/java/org/exoplatform/webui/url/ComponentLocator.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -41,16 +41,16 @@ public static final ResourceType<UIComponent, ComponentLocator> TYPE = new ResourceType<UIComponent, ComponentLocator>() {}; /** . */ - public static final QualifiedName COMPONENT = new QualifiedName("gtn", "componentid"); + public static final QualifiedName COMPONENT = QualifiedName.create("gtn", "componentid"); /** . */ - public static final QualifiedName ACTION = new QualifiedName("gtn", "action"); + public static final QualifiedName ACTION = QualifiedName.create("gtn", "action"); /** . */ - public static final QualifiedName TARGET = new QualifiedName("gtn", "objectid"); + public static final QualifiedName TARGET = QualifiedName.create("gtn", "objectid"); /** . */ - public static final QualifiedName PATH = new QualifiedName("gtn", "path"); + public static final QualifiedName PATH = QualifiedName.create("gtn", "path"); /** . */ private static final Set<QualifiedName> NAMES = Collections.unmodifiableSet(Tools.toSet(COMPONENT, ACTION, TARGET, PATH)); Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestHandler.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -57,16 +57,16 @@ public static final String PRIVATE_ACCESS = "private"; /** . */ - public static final QualifiedName REQUEST_PATH = new QualifiedName("gtn", "path"); + public static final QualifiedName REQUEST_PATH = QualifiedName.create("gtn", "path"); /** . */ - public static final QualifiedName REQUEST_SITE_TYPE = new QualifiedName("gtn", "sitetype"); + public static final QualifiedName REQUEST_SITE_TYPE = QualifiedName.create("gtn", "sitetype"); /** . */ - public static final QualifiedName REQUEST_SITE_NAME = new QualifiedName("gtn", "sitename"); + public static final QualifiedName REQUEST_SITE_NAME = QualifiedName.create("gtn", "sitename"); /** . */ - public static final QualifiedName ACCESS = new QualifiedName("gtn", "access"); + public static final QualifiedName ACCESS = QualifiedName.create("gtn", "access"); public String getHandlerName() { Modified: portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/navigation/NavigationLocator.java =================================================================== --- portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/navigation/NavigationLocator.java 2010-11-05 02:22:01 UTC (rev 4949) +++ portal/branches/navcontroller/webui/portal/src/main/java/org/exoplatform/portal/url/navigation/NavigationLocator.java 2010-11-05 02:54:23 UTC (rev 4950) @@ -36,16 +36,16 @@ { /** . */ - public static final QualifiedName PATH = new QualifiedName("gtn", "path"); + public static final QualifiedName PATH = QualifiedName.create("gtn", "path"); /** . */ - public static final QualifiedName REQUEST_SITE_TYPE = new QualifiedName("gtn", "sitetype"); + public static final QualifiedName REQUEST_SITE_TYPE = QualifiedName.create("gtn", "sitetype"); /** . */ - public static final QualifiedName REQUEST_SITE_NAME = new QualifiedName("gtn", "sitename"); + public static final QualifiedName REQUEST_SITE_NAME = QualifiedName.create("gtn", "sitename"); /** . */ - public static final QualifiedName ACCESS = new QualifiedName("gtn", "access"); + public static final QualifiedName ACCESS = QualifiedName.create("gtn", "access"); /** . */ public static final ResourceType<NavigationResource, NavigationLocator> TYPE = new ResourceType<NavigationResource, NavigationLocator>(){};

15 years, 6 months

1
0
0 / 0

gatein SVN: r4949 - portal/branches/branch-GTNPORTAL-1592/component/common/src/main/java/org/exoplatform/resolver.

by do-not-reply＠jboss.org

Author: hoang_to Date: 2010-11-04 22:22:01 -0400 (Thu, 04 Nov 2010) New Revision: 4949 Modified: portal/branches/branch-GTNPORTAL-1592/component/common/src/main/java/org/exoplatform/resolver/ResourceResolver.java Log: GTNPORTAL-1357: A template caching issue with a custom resource resolver Modified: portal/branches/branch-GTNPORTAL-1592/component/common/src/main/java/org/exoplatform/resolver/ResourceResolver.java =================================================================== --- portal/branches/branch-GTNPORTAL-1592/component/common/src/main/java/org/exoplatform/resolver/ResourceResolver.java 2010-11-05 01:18:39 UTC (rev 4948) +++ portal/branches/branch-GTNPORTAL-1592/component/common/src/main/java/org/exoplatform/resolver/ResourceResolver.java 2010-11-05 02:22:01 UTC (rev 4949) @@ -26,21 +26,60 @@ import java.util.List; /** + * This abstract class provide an abstract way to retrieve different resources in different contexts (war, jar....) <br/> + * For example, to retrieve resource from an portlet, we implement <br/> + * {@link org.exoplatform.resolver.PortletResourceResolver} <br/> + * <br/> + * In gatein, we have caching machanism which use {@link org.exoplatform.resolver.ResourceKey} <br/> + * as key to determine cached resource, ResourceKey is generated by ResourceResolver.createResourceKey method <br/> + * <br/> + * By default, createResourceKey method return difference ResourceKey<br/> + * if we call that method on difference ResourceResolver instances (even with the same resource url)<br/> + * <br/> + * To make our caching machanism work properly,please make sure you use the same ResourceResolver<br/> + * or override the createResourceKey method of abstract class ResourceResolver<br/> + * and return the same ResourceKey for the same resource url<br/> + * <br/> * Created by The eXo Platform SAS * Mar 15, 2006 */ abstract public class ResourceResolver { + /** + * Return URL object to resource + * @param url - String path (specific to certain context) to resource + * @throws Exception + */ abstract public URL getResource(String url) throws Exception; + /** + * Return InputStream object to resource + * @param url - String path (specific to certain context) to resource + * @throws Exception + */ abstract public InputStream getInputStream(String url) throws Exception; + /** + * Return List of URL object to resource + * @param url - String path (specific to certain context) to resource + * @throws Exception + */ abstract public List<URL> getResources(String url) throws Exception; + /** + * Return List of InputStream object to resource + * @param url - String path (specific to certain context) to resource + * @throws Exception + */ abstract public List<InputStream> getInputStreams(String url) throws Exception; @SuppressWarnings("unused") + /** + * Return web path to resource (/context/pathToResource) + * You should overidde this method in case of web context + * @param url - String path (specific to certain context) to resource + */ public String getWebAccessPath(String url) { throw new RuntimeException("This method is not supported"); @@ -54,21 +93,44 @@ throw new RuntimeException("unsupported method"); } + /** + * Return {@link org.exoplatform.resolver.ResourceKey} object<br/> + * <br/> + * Default implementation will return difference ResourceKey instance<br/> + * if we call that method on difference ResourceResolver instances (even with the same resource url)<br/> + * <br/> + * If you create new ResourceResolver each time you need access to a resource, please overidde this method<br/> + * and return the same ResourceKey for the same url<br/> + * @param url - String path (specific to certain context) to resource + */ public ResourceKey createResourceKey(String url) { return new ResourceKey(hashCode(), url); } + /** + * Return resource id + * @param url - String path (specific to certain context) to resource + */ public String createResourceId(String url) { return hashCode() + ":" + url; } + /** + * Return if this can resolve resource with specific url + * @param url String path to resource + */ public boolean isResolvable(String url) { return url.startsWith(getResourceScheme()); } + /** + * Return resource as array of bytes + * @param url - String path (specific to certain context) to resource + * @throws Exception + */ public byte[] getResourceContentAsBytes(String url) throws Exception { InputStream is = getInputStream(url); @@ -83,6 +145,11 @@ return output.toByteArray(); } + /** + * Return if resource has been modified since specific time + * @param url- String path (specific to certain context) to resource + * @param lastAccess + */ abstract public boolean isModified(String url, long lastAccess); protected String removeScheme(String url)

15 years, 6 months

1
0
0 / 0

gatein SVN: r4948 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules: GadgetDevelopment and 1 other directories.

by do-not-reply＠jboss.org

Author: smumford Date: 2010-11-04 21:18:39 -0400 (Thu, 04 Nov 2010) New Revision: 4948 Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml Log: Uncommented Gadgets subsections and commented Javascript Configuration section Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-11-04 15:46:59 UTC (rev 4947) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/GadgetDevelopment/Gadgets.xml 2010-11-05 01:18:39 UTC (rev 4948) @@ -15,8 +15,6 @@ </para> </section> - -  +</section> </section> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2010-11-04 15:46:59 UTC (rev 4947) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment/JavascriptConfiguration.xml 2010-11-05 01:18:39 UTC (rev 4948) @@ -3,6 +3,9 @@ <!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent"> %BOOK_ENTITIES; ]> + + + <chapter id="chap-Reference_Guide-Javascript_Configuration-Please_Review"> <title>Javascript Configuration - Please Review</title> <para> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment.xml 2010-11-04 15:46:59 UTC (rev 4947) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/PortalDevelopment.xml 2010-11-05 01:18:39 UTC (rev 4948) @@ -14,5 +14,6 @@ <xi:include href="PortalDevelopment/RTLFramework.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/XMLResourceBundles.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="PortalDevelopment/JavascriptInterApplicationCommunication.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <xi:include href="PortalDevelopment/JavascriptConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> +  +  </part>

15 years, 6 months

1
0
0 / 0

gatein SVN: r4947 - portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-04 11:46:59 -0400 (Thu, 04 Nov 2010) New Revision: 4947 Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml Log: change default router to be more friendly Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 15:29:38 UTC (rev 4946) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 15:46:59 UTC (rev 4947) @@ -23,17 +23,33 @@ -->  - <route path="/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> + <route path="/public/{gtn:sitename}{gtn:path}"> <route-param name="gtn:access" value="public"/> + <route-param name="gtn:sitetype" value="portal"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  - <route path="/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> + <route path="/private/{gtn:sitename}{gtn:path}"> <route-param name="gtn:access" value="private"/> + <route-param name="gtn:sitetype" value="portal"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> +  + <route path="/groups/{gtn:sitename}{gtn:path}"> + <route-param name="gtn:access" value="private"/> + <route-param name="gtn:sitetype" value="group"/> + <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> + </route> + +  + <route path="/users/{gtn:sitename}{gtn:path}"> + <route-param name="gtn:access" value="private"/> + <route-param name="gtn:sitetype" value="user"/> + <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> + </route> + </route> <route path="/upload">

15 years, 6 months

1
0
0 / 0

gatein SVN: r4946 - portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-04 11:29:38 -0400 (Thu, 04 Nov 2010) New Revision: 4946 Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java Log: replace literal by constant Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-04 15:14:38 UTC (rev 4945) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/router/Route.java 2010-11-04 15:29:38 UTC (rev 4946) @@ -213,12 +213,7 @@ switch (param.encodingMode) { case DEFAULT_FORM: - - // JULIEN - // TEMPORARY WORD AROUND - // FIX ME - s = s.replace('/', '~'); - + s = s.replace('/', slashEscape); matched = param.pattern.matcher(s).matches(); break; case PRESERVE_PATH:

15 years, 6 months

1
0
0 / 0

gatein SVN: r4945 - in portal/branches/navcontroller: component/web/controller/src/main/java/org/exoplatform/web/controller/metadata and 2 other directories.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2010-11-04 11:14:38 -0400 (Thu, 04 Nov 2010) New Revision: 4945 Modified: portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml Log: improve XML schema Modified: portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/main/java/gatein_router_1_0.xsd 2010-11-04 15:14:38 UTC (rev 4945) @@ -38,15 +38,17 @@ <xs:complexType name="routeType"> <xs:sequence> - <xs:element name="param" type="paramType" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="path-param" type="pathParamType" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="request-param" type="requestParamType" minOccurs="0" maxOccurs="unbounded"/> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="route-param" type="routeParamType" minOccurs="1" maxOccurs="1"/> + <xs:element name="path-param" type="pathParamType" minOccurs="1" maxOccurs="1"/> + <xs:element name="request-param" type="requestParamType" minOccurs="1" maxOccurs="1"/> + </xs:choice> <xs:element name="route" type="routeType" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> <xs:attribute name="path" type="xs:string" use="required"/> </xs:complexType> - <xs:complexType name="paramType"> + <xs:complexType name="routeParamType"> <xs:attribute name="name" type="xs:string" use="required"/> <xs:attribute name="value" type="xs:string" use="required"/> </xs:complexType> Modified: portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java =================================================================== --- portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/main/java/org/exoplatform/web/controller/metadata/DescriptorBuilder.java 2010-11-04 15:14:38 UTC (rev 4945) @@ -39,7 +39,7 @@ private static final QName routeQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route"); /** . */ - private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "param"); + private static final QName paramQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "route-param"); /** . */ private static final QName requestParamQN = new QName("http://www.gatein.org/xml/ns/gatein_router_1_0", "request-param"); Modified: portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml =================================================================== --- portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/component/web/controller/src/test/java/org/exoplatform/web/controller/router/router.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -4,27 +4,27 @@ xmlns="http://www.gatein.org/xml/ns/gatein_router_1_0"> <route path="/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <path-param name="gtn:path" pattern=".*"/> </route> <route path="/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> <route path="/a"> - <param name="a" value="a_value"/> + <route-param name="a" value="a_value"/> <route path="/b"> - <param name="b" value="b_value"/> + <route-param name="b" value="b_value"/> </route> </route> Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/default-router.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -6,7 +6,7 @@ <route path="/">  - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/>  <request-param name="gtn:componentid" matchName="portal:componentId" required="false"/> @@ -24,24 +24,24 @@  <route path="/public/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:access" value="public"/> + <route-param name="gtn:access" value="public"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  <route path="/private/{gtn:sitetype}/{gtn:sitename}{gtn:path}"> - <param name="gtn:access" value="private"/> + <route-param name="gtn:access" value="private"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> </router> \ No newline at end of file Modified: portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml =================================================================== --- portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml 2010-11-04 14:58:12 UTC (rev 4944) +++ portal/branches/navcontroller/web/portal/src/main/webapp/WEB-INF/conf/proto-router-1.xml 2010-11-04 15:14:38 UTC (rev 4945) @@ -8,7 +8,7 @@ <route path="/">  - <param name="gtn:handler" value="portal"/> + <route-param name="gtn:handler" value="portal"/>  <request-param name="gtn:componentid" matchName="portal:componentId" required="false"/> @@ -17,24 +17,24 @@  <route path="/public/{gtn:sitename}{gtn:path}.html"> - <param name="gtn:access" value="public"/> + <route-param name="gtn:access" value="public"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route>  <route path="/private/{gtn:sitename}{gtn:path}.html"> - <param name="gtn:access" value="private"/> + <route-param name="gtn:access" value="private"/> <path-param name="gtn:path" pattern=".*" encoding="preserve-path"/> </route> </route> <route path="/upload"> - <param name="gtn:handler" value="upload"/> + <route-param name="gtn:handler" value="upload"/> </route> <route path="/download"> - <param name="gtn:handler" value="download"/> + <route-param name="gtn:handler" value="download"/> </route> </router> \ No newline at end of file

15 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits November 2010