Author: hfnukal Date: 2011-07-01 10:40:09 -0400 (Fri, 01 Jul 2011) New Revision: 6788 Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/conf/content-nodetypes.xml epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java epp/portal/branches/EPP_5_2_Branch/component/test/core/src/main/resources/conf/portal-configuration.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml Log: JBEPP-970 configuration changes Modified: epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/common/src/main/java/conf/configuration-jboss.properties 2011-07-01 14:40:09 UTC (rev 6788) @@ -39,6 +39,7 @@ # IDM gatein.idm.datasource.name=java:gatein-idm +gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter # EMail gatein.email.smtp.username= Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/conf/content-nodetypes.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/conf/content-nodetypes.xml 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/conf/content-nodetypes.xml 2011-07-01 14:40:09 UTC (rev 6788) @@ -20,6 +20,17 @@ --> <nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"> + <nodeType name="mop:protectedresource" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> + <propertyDefinitions> + <propertyDefinition name="mop:access-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + <propertyDefinition name="mop:edit-permissions" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + <nodeType name="mop:portletpreferences" isMixin="false" hasOrderableChildNodes="false" primaryItemName=""> <supertypes> <supertype>mop:customizationstate</supertype> Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/MappedAttributes.java 2011-07-01 14:40:09 UTC (rev 6788) @@ -50,6 +50,9 @@ public static final Key<String> FACTORY_ID = Key.create("factory-id", ValueType.STRING); /** . */ + public static final Key<String> DECORATOR = Key.create("decorator", ValueType.STRING); + + /** . */ public static final Key<Integer> PRIORITY = Key.create("priority", ValueType.INTEGER); /** . */ Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2011-07-01 14:40:09 UTC (rev 6788) @@ -82,8 +82,10 @@ /** . */ private static final Set<String> windowPropertiesBlackList = Tools.set( - MappedAttributes.THEME.getName(), MappedAttributes.TYPE.getName(), + MappedAttributes.THEME.getName(), + MappedAttributes.SHOW_INFO_BAR.getName(), + MappedAttributes.SHOW_MODE.getName(), MappedAttributes.ICON.getName(), MappedAttributes.WIDTH.getName(), MappedAttributes.HEIGHT.getName()); @@ -314,7 +316,7 @@ accessPermissions = pr.getAccessPermissions(); editPermission = pr.getEditPermission(); } - + Described described = src.adapt(Described.class); // @@ -354,10 +356,6 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); pr.setEditPermission(src.getEditPermission()); - - Described described = dst.adapt(Described.class); - described.setName(src.getLabel()); - described.setDescription(src.getDescription()); // org.gatein.mop.api.workspace.Page templates = dst.getRootPage().getChild("templates"); @@ -448,7 +446,7 @@ private ContainerData load(UIContainer src, List<ComponentData> children) { - // + List<String> accessPermissions = Collections.emptyList(); if (src.isAdapted(ProtectedResource.class)) { @@ -586,11 +584,6 @@ pr.setEditPermission(src.getEditPermission()); // - Described described = dst.adapt(Described.class); - described.setName(src.getTitle()); - described.setDescription(src.getDescription()); - - // Attributes attrs = dst.getAttributes(); attrs.setValue(MappedAttributes.FACTORY_ID, src.getFactoryId()); attrs.setValue(MappedAttributes.SHOW_MAX_WINDOW, src.isShowMaxWindow()); @@ -636,10 +629,6 @@ ProtectedResource pr = dst.adapt(ProtectedResource.class); pr.setAccessPermissions(src.getAccessPermissions()); - Described described = dst.adapt(Described.class); - described.setName(src.getTitle()); - described.setDescription(src.getDescription()); - Attributes dstAttrs = dst.getAttributes(); dstAttrs.setValue(MappedAttributes.ID, src.getId()); dstAttrs.setValue(MappedAttributes.TYPE, src instanceof DashboardData ? "dashboard" : null); Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2011-07-01 14:40:09 UTC (rev 6788) @@ -232,4 +232,4 @@ assertEquals("web/BannerPortlet", customization.getContentId()); // assertEquals("banner", customization.getName()); } -} \ No newline at end of file +} Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/src/main/resources/conf/portal-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/core/src/main/resources/conf/portal-configuration.xml 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/component/test/core/src/main/resources/conf/portal-configuration.xml 2011-07-01 14:40:09 UTC (rev 6788) @@ -25,6 +25,22 @@ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"> <component> + <key>org.jboss.cache.transaction.TransactionManagerLookup</key> + <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> + </component> + + <component> + <key>org.exoplatform.services.transaction.TransactionService</key> + <type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type> + <init-params> + <value-param> + <name>timeout</name> + <value>300</value> + </value-param> + </init-params> + </component> + + <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> <type>org.exoplatform.services.naming.InitialContextInitializer</type> <init-params> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-07-01 14:40:09 UTC (rev 6788) @@ -41,7 +41,7 @@ </init-params> </component> - <component> + <component> <key>org.exoplatform.services.naming.InitialContextInitializer</key> <type>org.exoplatform.commons.InitialContextInitializer2</type> <init-params> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-07-01 14:40:09 UTC (rev 6788) @@ -155,6 +155,12 @@ <value>true</value> </value-param> + <value-param> + <name>cacheExpiration</name> + <value>1800000</value> + </value-param> + + </init-params> </component> Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-07-01 12:39:44 UTC (rev 6787) +++ epp/portal/branches/EPP_5_2_Branch/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2011-07-01 14:40:09 UTC (rev 6788) @@ -262,6 +262,9 @@ <value>org.exoplatform.portal.pom.spi.portlet.PreferenceState</value> <value>org.exoplatform.portal.pom.spi.gadget.GadgetState</value> <value>org.exoplatform.portal.pom.spi.wsrp.WSRPState</value> + <value>org.exoplatform.portal.mop.ProtectedResource</value> + <value>org.exoplatform.portal.mop.Described</value> + <value>org.exoplatform.portal.mop.Visible</value> </values-param> <properties-param> <name>options</name>