JBoss Portal SVN: r7785 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 12:09:16 -0400 (Mon, 16 Jul 2007)
New Revision: 7785
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
Log:
Removed unused former portlet (need some cleanup here)
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-07-16 16:03:21 UTC (rev 7784)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2007-07-16 16:09:16 UTC (rev 7785)
@@ -70,7 +70,7 @@
</portlet-info>
</portlet>
- <portlet>
+ <!-- portlet>
<description>CMS Content Editor</description>
<portlet-name>CMSContentEditorPortlet</portlet-name>
<display-name>CMS Content Editor</display-name>
@@ -87,6 +87,6 @@
<portlet-info>
<title>CMS Content Type</title>
</portlet-info>
- </portlet>
+ </portlet-->
</portlet-app>
16 years, 11 months
JBoss Portal SVN: r7784 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-16 12:03:21 -0400 (Mon, 16 Jul 2007)
New Revision: 7784
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
Log:
avoid usage of hibernate natural id cache as it is not implemented properly
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-16 15:52:27 UTC (rev 7783)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-16 16:03:21 UTC (rev 7784)
@@ -23,11 +23,9 @@
package org.jboss.portal.core.impl.model.portal;
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-import org.hibernate.Criteria;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.hibernate.criterion.Restrictions;
import org.jboss.logging.Logger;
import org.jboss.portal.core.model.portal.DuplicatePortalObjectException;
import org.jboss.portal.core.model.portal.PortalObjectId;
@@ -48,6 +46,9 @@
/** The query for lookup when the path is null. */
private static final String LOOKUP_QUERY_FOR_ROOT = "from ObjectNode where path=:path or path is null";
+ /** The query for lookup when the path is null. */
+ private static final String LOOKUP_QUERY = "from ObjectNode where path=:path";
+
/** . */
private static Logger log = Logger.getLogger(PersistentPortalObjectContainer.class);
@@ -245,27 +246,23 @@
{
Object result;
+ //
+ String queryString = LOOKUP_QUERY;
+
// We need to lookup the root of the empty namespace with a special query in order to fix
// oracle weird behavior with zero length strings considered as null value
if (id.getPath().getLength() == 0 && id.getNamespace().length() == 0)
{
- String queryString = LOOKUP_QUERY_FOR_ROOT;
- Query query = session.createQuery(queryString);
- query.setParameter("path", id);
- query.setCacheable(true);
-
- // Unique result will return null if no object is found
- result = query.uniqueResult();
+ queryString = LOOKUP_QUERY_FOR_ROOT;
}
- else
- {
- Criteria criteria = session.createCriteria(ObjectNode.class);
- criteria.add(Restrictions.naturalId().set("path", id));
- criteria.setCacheable(true);
- // Unique result will return null if no object is found
- result = criteria.uniqueResult();
- }
+ //
+ Query query = session.createQuery(queryString);
+ query.setParameter("path", id);
+
+ // Unique result will return null if no object is found
+ result = query.uniqueResult();
+
return (ObjectNode)result;
}
16 years, 11 months
JBoss Portal SVN: r7783 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 11:52:27 -0400 (Mon, 16 Jul 2007)
New Revision: 7783
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/PortletManagerBean.java
Log:
JBPORTAL-1584: Hide the CMS Content-type selector portlets definitions and instances
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-07-16 15:36:29 UTC (rev 7782)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-07-16 15:52:27 UTC (rev 7783)
@@ -37,14 +37,19 @@
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
+import javax.portlet.PortletMode;
+import org.jboss.portal.Mode;
import org.jboss.portal.common.value.Value;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.InstanceDefinition;
import org.jboss.portal.core.model.instance.NoSuchInstanceException;
import org.jboss.portal.identity.RoleModule;
+import org.jboss.portal.portlet.Portlet;
import org.jboss.portal.portlet.PortletInvokerException;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.portlet.state.PropertyChange;
@@ -58,6 +63,9 @@
*/
public class InstanceManagerBean
{
+
+ /** . */
+ private final Mode INTERNAL_EDIT_CONTENT = Mode.create("edit_content");
// Wired services
@@ -238,10 +246,37 @@
{
if (instances == null)
{
- instances = new ArrayList(instanceContainer.getDefinitions());
- Collections.sort(instances, INSTANCE_COMPARATOR);
+ // Remove content editors
+ List tmpInstances = new ArrayList();
+ nextInstance:
+ for (Iterator i = instanceContainer.getDefinitions().iterator();i.hasNext();)
+ {
+ Instance instance = (Instance)i.next();
+
+ //
+ try
+ {
+ // Filter portlets that are editors
+ Portlet portlet = instance.getPortlet();
+ PortletInfo info = portlet.getInfo();
+ for (Iterator j = info.getCapabilities().getAllModes().iterator();j.hasNext();)
+ {
+ ModeInfo modeInfo = (ModeInfo)j.next();
+ if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT))
+ {
+ continue nextInstance;
+ }
+ }
+ //
+ tmpInstances.add(instance);
+ }
+ catch (PortletInvokerException ignore)
+ {
+ }
+ }
+ Collections.sort(tmpInstances, INSTANCE_COMPARATOR);
+ instances = tmpInstances;
}
-
//
return instances;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-07-16 15:36:29 UTC (rev 7782)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortletManagerBean.java 2007-07-16 15:52:27 UTC (rev 7783)
@@ -23,6 +23,8 @@
package org.jboss.portal.core.admin.ui;
import org.jboss.logging.Logger;
+import org.jboss.portal.Mode;
+import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.identity.RoleModule;
import org.jboss.portal.portlet.Portlet;
@@ -32,6 +34,8 @@
import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.portlet.federation.impl.FederatedPortlet;
+import org.jboss.portal.portlet.info.ModeInfo;
+import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.PreferenceInfo;
import org.jboss.portal.portlet.info.PreferencesInfo;
import org.jboss.portal.security.AuthorizationDomainRegistry;
@@ -57,6 +61,9 @@
/** . */
private static final Logger log = Logger.getLogger(PortletManagerBean.class);
+
+ /** . */
+ private final Mode INTERNAL_EDIT_CONTENT = Mode.create("edit_content");
static
{
@@ -269,7 +276,27 @@
{
if (portlets == null)
{
- portlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
+ portlets = new ArrayList();
+ List tmpPortlets = new ArrayList(getSelectedPortletInvoker().getPortlets());
+
+ // Remove content editors
+ nextPortlet:
+ for (Iterator i = tmpPortlets.iterator();i.hasNext();)
+ {
+ Portlet portlet = (Portlet)i.next();
+
+ PortletInfo info = portlet.getInfo();
+ for (Iterator j = info.getCapabilities().getAllModes().iterator();j.hasNext();)
+ {
+ ModeInfo modeInfo = (ModeInfo)j.next();
+ if (modeInfo.getMode().equals(INTERNAL_EDIT_CONTENT))
+ {
+ continue nextPortlet;
+ }
+ }
+ //
+ portlets.add(portlet);
+ }
Collections.sort(portlets, comparator);
}
return portlets;
16 years, 11 months
JBoss Portal SVN: r7782 - branches/JBoss_Portal_Branch_2_6/core.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-16 11:36:29 -0400 (Mon, 16 Jul 2007)
New Revision: 7782
Modified:
branches/JBoss_Portal_Branch_2_6/core/build.xml
Log:
accidentally disabled test cases from build.xml of core
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-16 15:35:24 UTC (rev 7781)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-16 15:36:29 UTC (rev 7782)
@@ -555,11 +555,89 @@
</x-sysproperty>
<x-test>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase"
+ outfile="TEST-PortalNodeTestCase">
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="persistent-jboss-beans.xml"/>
+ </zest>
+ <!--
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase"
+ outfile="TEST-PortalObjectContainerTestCase">
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="transient-jboss-beans.xml"/>
+ </zest>
+ -->
<zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"
outfile="TEST-PortalObjectContainerTestCase">
<parameter name="CacheNaturalId" value="true"/>
<parameter name="Config" value="persistent-jboss-beans.xml"/>
</zest>
+ <!--
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"
+ outfile="TEST-PortalObjectContainerTestCase">
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="transient-jboss-beans.xml"/>
+ </zest>
+ -->
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+ outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
+ <parameter name="PersistLocally" value="true"/>
+ <parameter name="CloneOnCreate" value="true"/>
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="persistent-jboss-beans.xml"/>
+ </zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+ outfile="TEST-NotPersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
+ <parameter name="PersistLocally" value="false"/>
+ <parameter name="CloneOnCreate" value="true"/>
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="persistent-jboss-beans.xml"/>
+ </zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+ outfile="TEST-PersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+ <parameter name="PersistLocally" value="true"/>
+ <parameter name="CloneOnCreate" value="false"/>
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="persistent-jboss-beans.xml"/>
+ </zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+ outfile="TEST-NotPersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
+ <parameter name="PersistLocally" value="false"/>
+ <parameter name="CloneOnCreate" value="false"/>
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="persistent-jboss-beans.xml"/>
+ </zest>
+
+ <!--
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
+ outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
+ <parameter name="PersistLocally" value="true"/>
+ <parameter name="CloneOnCreate" value="true"/>
+ <parameter name="CacheNaturalId" value="true"/>
+ <parameter name="Config" value="transient-jboss-beans.xml"/>
+ </zest>
+ -->
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase"
+ outfile="TEST-ProducerTestCase-WithoutRegistration">
+ <parameter name="UseRegistration" value="false"/>
+ </zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase"
+ outfile="TEST-ProducerTestCase-WithRegistration">
+ <parameter name="UseRegistration" value="true"/>
+ </zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.RegistrationPersistenceManagerTestCase"
+ outfile="TEST-RegistrationPersistenceManagerTestCase">
+ </zest>
+ <test todir="${test.reports}"
+ name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
+ <test todir="${test.reports}"
+ name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>
+ <test todir="${test.reports}"
+ name="org.jboss.portal.test.core.model.portal.PortalObjectIdTestCase"/>
+ <test todir="${test.reports}"
+ name="org.jboss.portal.test.core.model.portal.PortalObjectPathTestCase"/>
+
+
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
16 years, 11 months
JBoss Portal SVN: r7781 - in branches/JBoss_Portal_Branch_2_6/core: src/main/org/jboss/portal/core/impl/model/portal and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-16 11:35:24 -0400 (Mon, 16 Jul 2007)
New Revision: 7781
Modified:
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
Log:
Fix oracle issue in a slightly simpler way
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-16 14:38:39 UTC (rev 7780)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-07-16 15:35:24 UTC (rev 7781)
@@ -555,89 +555,11 @@
</x-sysproperty>
<x-test>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase"
- outfile="TEST-PortalNodeTestCase">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- <!--
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalNodeTestCase"
- outfile="TEST-PortalObjectContainerTestCase">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="transient-jboss-beans.xml"/>
- </zest>
- -->
<zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"
outfile="TEST-PortalObjectContainerTestCase">
<parameter name="CacheNaturalId" value="true"/>
<parameter name="Config" value="persistent-jboss-beans.xml"/>
</zest>
- <!--
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase"
- outfile="TEST-PortalObjectContainerTestCase">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="transient-jboss-beans.xml"/>
- </zest>
- -->
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
- outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
- <parameter name="PersistLocally" value="true"/>
- <parameter name="CloneOnCreate" value="true"/>
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
- outfile="TEST-NotPersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
- <parameter name="PersistLocally" value="false"/>
- <parameter name="CloneOnCreate" value="true"/>
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
- outfile="TEST-PersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
- <parameter name="PersistLocally" value="true"/>
- <parameter name="CloneOnCreate" value="false"/>
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
- outfile="TEST-NotPersistedLocally-NotClonedOnCreate-InstanceContainerTestCase">
- <parameter name="PersistLocally" value="false"/>
- <parameter name="CloneOnCreate" value="false"/>
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
-
- <!--
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase"
- outfile="TEST-PersistedLocally-ClonedOnCreate-InstanceContainerTestCase">
- <parameter name="PersistLocally" value="true"/>
- <parameter name="CloneOnCreate" value="true"/>
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="transient-jboss-beans.xml"/>
- </zest>
- -->
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase"
- outfile="TEST-ProducerTestCase-WithoutRegistration">
- <parameter name="UseRegistration" value="false"/>
- </zest>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.ProducerTestCase"
- outfile="TEST-ProducerTestCase-WithRegistration">
- <parameter name="UseRegistration" value="true"/>
- </zest>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.state.RegistrationPersistenceManagerTestCase"
- outfile="TEST-RegistrationPersistenceManagerTestCase">
- </zest>
- <test todir="${test.reports}"
- name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
- <test todir="${test.reports}"
- name="org.jboss.portal.test.core.deployment.JBossApplicationMetaDataFactoryTestCase"/>
- <test todir="${test.reports}"
- name="org.jboss.portal.test.core.model.portal.PortalObjectIdTestCase"/>
- <test todir="${test.reports}"
- name="org.jboss.portal.test.core.model.portal.PortalObjectPathTestCase"/>
-
-
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-07-16 14:38:39 UTC (rev 7780)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/ObjectNode.java 2007-07-16 15:35:24 UTC (rev 7781)
@@ -243,7 +243,7 @@
public String toString()
{
- return path.toString() + PortalObjectId.NAMESPACE_SEPARATOR + name;
+ return "PortalObject[id=" + path + "]";
}
protected PortalObjectId toChildPath(String name)
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-16 14:38:39 UTC (rev 7780)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 2007-07-16 15:35:24 UTC (rev 7781)
@@ -24,8 +24,6 @@
import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
import org.hibernate.Criteria;
-import org.hibernate.HibernateException;
-import org.hibernate.ObjectNotFoundException;
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -48,7 +46,6 @@
{
/** The query for lookup when the path is null. */
- private static final String LOOKUP_QUERY_FOR_EMPTY_PATH = "from ObjectNode where path=:path";
private static final String LOOKUP_QUERY_FOR_ROOT = "from ObjectNode where path=:path or path is null";
/** . */
@@ -247,33 +244,26 @@
private ObjectNode getObjectNodeNoCache(Session session, PortalObjectId id)
{
Object result;
- if (id.getPath().getLength() == 0)
- {
- // Oracle returns the root object when using LOOKUP_QUERY_FOR_NULL_PATH thus preventing the creation of the
- // dashboard node as null is never returned for it and is therefore cached...
- String queryString = LOOKUP_QUERY_FOR_EMPTY_PATH;
- if (id.toString().lastIndexOf(PortalObjectPath.CanonicalFormat.PATH_SEPARATOR) == 0)
- {
- queryString = LOOKUP_QUERY_FOR_ROOT;
- }
+ // We need to lookup the root of the empty namespace with a special query in order to fix
+ // oracle weird behavior with zero length strings considered as null value
+ if (id.getPath().getLength() == 0 && id.getNamespace().length() == 0)
+ {
+ String queryString = LOOKUP_QUERY_FOR_ROOT;
Query query = session.createQuery(queryString);
query.setParameter("path", id);
query.setCacheable(true);
- try
- {
- result = query.uniqueResult();
- }
- catch (ObjectNotFoundException e)
- {
- throw new HibernateException("Could not find ObjectNode with path '" + id + "'", e);
- }
+
+ // Unique result will return null if no object is found
+ result = query.uniqueResult();
}
else
{
Criteria criteria = session.createCriteria(ObjectNode.class);
criteria.add(Restrictions.naturalId().set("path", id));
criteria.setCacheable(true);
+
+ // Unique result will return null if no object is found
result = criteria.uniqueResult();
}
return (ObjectNode)result;
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-16 14:38:39 UTC (rev 7780)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-07-16 15:35:24 UTC (rev 7781)
@@ -80,6 +80,14 @@
TransactionAssert.commitTransaction();
}
+ public void testRetrieveNonExistingObject()
+ {
+ TransactionAssert.beginTransaction();
+ PortalObject foo = container.getObject(PortalObjectId.parse("/foo", PortalObjectPath.CANONICAL_FORMAT));
+ assertNull(foo);
+ TransactionAssert.commitTransaction();
+ }
+
public void testPropertyUpdateCascadeToDescendantsWhenTheyDoNotDeclareIt() throws Exception
{
TransactionAssert.beginTransaction();
16 years, 11 months
JBoss Portal SVN: r7780 - branches/JBoss_Portal_Branch_2_6/build/etc.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-07-16 10:38:39 -0400 (Mon, 16 Jul 2007)
New Revision: 7780
Added:
branches/JBoss_Portal_Branch_2_6/build/etc/oracle10gXE.properties
Log:
added oracle 10g XE db settings
Added: branches/JBoss_Portal_Branch_2_6/build/etc/oracle10gXE.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/etc/oracle10gXE.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/build/etc/oracle10gXE.properties 2007-07-16 14:38:39 UTC (rev 7780)
@@ -0,0 +1,4 @@
+portal.datasource.driver=oracle.jdbc.driver.OracleDriver
+portal.datasource.url=jdbc:oracle:thin:@localhost:1521:xe
+portal.datasource.username=portal
+portal.datasource.password=portalpassword
Property changes on: branches/JBoss_Portal_Branch_2_6/build/etc/oracle10gXE.properties
___________________________________________________________________
Name: svn:executable
+ *
16 years, 11 months
JBoss Portal SVN: r7779 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf/common and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 10:26:13 -0400 (Mon, 16 Jul 2007)
New Revision: 7779
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
Log:
JBPORTAL-1509: Window name set the previously defined value when content-type has changed
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16 10:10:08 UTC (rev 7778)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2007-07-16 14:26:13 UTC (rev 7779)
@@ -273,6 +273,8 @@
Window tmp = (Window)windows.get(i);
tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
+
+ this.windowName = "";
}
catch (DuplicatePortalObjectException unexpected)
{
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16 10:10:08 UTC (rev 7778)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageLayout.xhtml 2007-07-16 14:26:13 UTC (rev 7779)
@@ -42,11 +42,13 @@
</td>
<td>
<h:form id="abc">
+ <h:inputHidden id="windowNameCopy" value="#{pageManager.windowName}"/>
<h:selectOneMenu
id="instanceId"
value="#{pageManager.selectedContentType}"
styleClass="portlet-form-field contentType"
- onchange="document.getElementById('abc').submit()">
+ onchange="document.getElementById('abc:windowNameCopy').value = document.getElementById('windowForm:windowName').value;
+ document.getElementById('abc').submit(); ">
<f:selectItems value="#{pageManager.contentTypeItems}"/>
</h:selectOneMenu>
<h:message for="instanceId" errorClass="portlet-msg-error"/>
16 years, 11 months
JBoss Portal SVN: r7778 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 06:10:08 -0400 (Mon, 16 Jul 2007)
New Revision: 7778
Modified:
branches/JBoss_Portal_Branch_2_6/build/build.xml
Log:
Fix deploy-all/undeploy-all for portal-admin-wsrp.sar
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 09:56:19 UTC (rev 7777)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 10:10:08 UTC (rev 7778)
@@ -301,7 +301,6 @@
<!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>-->
<copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
- <copy file="../core-wsrp/output/lib/portal-wsrp-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
<target name="undeploy-all"
@@ -319,7 +318,6 @@
<!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>-->
<delete file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp-admin.sar"/>
</target>
<target name="exploded-deploy"
16 years, 11 months
JBoss Portal SVN: r7777 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 05:56:19 -0400 (Mon, 16 Jul 2007)
New Revision: 7777
Modified:
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
Log:
Samples missing
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 09:43:25 UTC (rev 7776)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 09:56:19 UTC (rev 7777)
@@ -146,7 +146,7 @@
<sequential>
<mkdir dir="${todir}"/>
<copy todir="${todir}">
- <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar"/>
+ <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar/**"/>
</copy>
<copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/>
</sequential>
16 years, 11 months
JBoss Portal SVN: r7776 - in branches/JBoss_Portal_Branch_2_6: wsrp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-07-16 05:43:25 -0400 (Mon, 16 Jul 2007)
New Revision: 7776
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
Fix wsrp build (oups)
Remove core-admin sar isolation
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16 08:47:14 UTC (rev 7775)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-16 09:43:25 UTC (rev 7776)
@@ -23,10 +23,6 @@
<server>
- <loader-repository>
- org.jboss.portal:loader=core-admin
- </loader-repository>
-
<mbean
code="org.jboss.portal.core.model.instance.InstanceCommandFactory"
name="portal:commandFactory=Configurator"
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:47:14 UTC (rev 7775)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 09:43:25 UTC (rev 7776)
@@ -295,7 +295,10 @@
</jar>
<!-- Build Admin GUI... -->
- <ant inheritAll="false" antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output"/>
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output">
+ <property name="build.lib" value="${build.lib}"/>
+ <property name="build.resources" value="${build.resources}"/>
+ </ant>
<copy todir="${build.resources}/portal-wsrp-sar" overwrite="true">
<fileset dir="${build.lib}" includes="portal-wsrp-client.jar"/>
<fileset dir="${build.lib}" includes="portal-wsrp.jse"/>
@@ -321,6 +324,7 @@
<!-- Clean up all build output -->
<target name="clean" depends="_default:clean">
+ <ant inheritAll="false" antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="clean"/>
<!-- Add module specific elements here. -->
</target>
16 years, 11 months