Author: thomas.heute(a)jboss.com Date: 2007-12-10 11:57:16 -0500 (Mon, 10 Dec 2007) New Revision: 9332 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java Log: Sync with 2.6.3 - Remove vertical bar on index page - Adding a server interceptor to stick the portal context path into the request - Fix the modal login window so that it works with other portal context path - delete relationship before deleting a customization - JBPORTAL-1839 - problem with deployment of clustered portal Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-12-10 16:57:16 UTC (rev 9332) @@ -2,7 +2,7 @@ <property name="source.dir" value="../../jboss-portal-2.6"/> <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6.3.SNAPSHOT"/> + <property name="release.version" value="2.6.SNAPSHOT"/> <!-- --> <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:57:16 UTC (rev 9332) @@ -47,7 +47,15 @@ public PortletIconInfo getPortletIconInfo() { - return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon()); + if (portletInfoMetaData.getPortletIcon() != null) + { + return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon()); + } + else + { + return null; + } + } } Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java 2007-12-10 16:57:16 UTC (rev 9332) @@ -48,6 +48,7 @@ import org.hibernate.tool.hbm2ddl.SchemaUpdate; import org.jboss.portal.common.junit.TransactionAssert; import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl; import org.jboss.portal.core.model.instance.Instance; import org.jboss.portal.portlet.invocation.PortletInvocation; @@ -195,7 +196,9 @@ session.beginTransaction(); Query query = session.createQuery("From PersistentInstanceDefinition"); Instance instance = (Instance)query.uniqueResult(); - assertEquals(null, instance.getDisplayName().getDefaultValue()); + assertNotNull(instance); + LocalizedString lString = instance.getDisplayName(); + assertEquals(null, lString.getDefaultValue()); } public PortletInvokerSupport getPortletContainer() Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-12-10 16:57:16 UTC (rev 9332) @@ -369,14 +369,17 @@ { String id = (String)ae.getComponent().getAttributes().get("instanceId"); - // - instanceContainer.destroyDefinition(id); + if (id != null) + { + // + instanceContainer.destroyDefinition(id); - // - selectedId = null; - selectedPrefs = null; - selectedFrom = 0; - selectedPlugin = null; + // + selectedId = null; + selectedPrefs = null; + selectedFrom = 0; + selectedPlugin = null; + } } catch (NoSuchInstanceException e) { Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-12-10 16:57:16 UTC (rev 9332) @@ -54,7 +54,7 @@ <name>default-view</name> <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value> </init-param> - <expiration-cache>-1</expiration-cache> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2007-12-10 16:57:16 UTC (rev 9332) @@ -9,13 +9,10 @@ } #welcomegreybox { - padding: 15px; margin-bottom: 30px; } #welcomegreyboxTD { - border-left: 1px solid #d5d5d5; - padding-left: 15px; } #welcomegreybox h3 { @@ -33,7 +30,7 @@ publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license combined with a flexible and scalable underling platform.</p> - +<br /> <div id="welcomegreybox"> <table width="100%"> <tr> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-10 16:32:14 UTC (rev 9331) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-10 16:57:16 UTC (rev 9332) @@ -37,7 +37,7 @@ <name>default-view</name> <value>/WEB-INF/jsf/index.xhtml</value> </init-param> - <expiration-cache>-1</expiration-cache> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode>