JBoss Portal SVN: r8886 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-12 13:28:53 -0500 (Mon, 12 Nov 2007)
New Revision: 8886
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
Log:
- Fixed inverted modes and windowStates...
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2007-11-12 17:43:04 UTC (rev 8885)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2007-11-12 18:28:53 UTC (rev 8886)
@@ -59,8 +59,8 @@
{
PortletDescription portletDesc = new PortletDescription();
portletDesc.setPortletHandle(portletHandle);
- portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType("text/html", new String[]{WSRPConstants.NORMAL_WINDOW_STATE},
- new String[]{WSRPConstants.VIEW_MODE}, WSRPConstants.DEFAULT_LOCALES, null)});
+ portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType("text/html", new String[]{WSRPConstants.VIEW_MODE},
+ new String[]{WSRPConstants.NORMAL_WINDOW_STATE}, WSRPConstants.DEFAULT_LOCALES, null)});
String suffixString = suffix == null ? "" : suffix;
portletDesc.setDescription(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_DESCRIPTION + suffixString));
16 years, 11 months
JBoss Portal SVN: r8885 - in branches/UIServer: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-11-12 12:43:04 -0500 (Mon, 12 Nov 2007)
New Revision: 8885
Modified:
branches/UIServer/
branches/UIServer/build/build-thirdparty.xml
branches/UIServer/uiserver/build.xml
Log:
fixing build
Property changes on: branches/UIServer
___________________________________________________________________
Name: svn:ignore
- .project
.classpath
thirdparty
eclipseBin
myworkspace
bin
*.settings
miscellaneous
local-tests
tomcat
+ licenses
.settings
tomcat
.classpath
.project
Modified: branches/UIServer/build/build-thirdparty.xml
===================================================================
--- branches/UIServer/build/build-thirdparty.xml 2007-11-12 16:13:01 UTC (rev 8884)
+++ branches/UIServer/build/build-thirdparty.xml 2007-11-12 17:43:04 UTC (rev 8885)
@@ -117,6 +117,7 @@
<!-- patched jsf-portlet bridge -->
<componentref name="portals-bridges/jsf-portlet" version="1.2-patched"/>
<componentref name="gwt" version="1.4.60"/>
+ <componentref name="mygwt" version="0.3.0"/>
</build>
<synchronizeinfo/>
Modified: branches/UIServer/uiserver/build.xml
===================================================================
--- branches/UIServer/uiserver/build.xml 2007-11-12 16:13:01 UTC (rev 8884)
+++ branches/UIServer/uiserver/build.xml 2007-11-12 17:43:04 UTC (rev 8885)
@@ -92,6 +92,7 @@
<path refid="apache.log4j.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="gwt.gwt.classpath"/>
+ <path refid="mygwt.mygwt.classpath"/>
<path refid="httpunit.httpunit.classpath"/>
</path>
@@ -235,8 +236,12 @@
</java>
-->
+ <path id="full.gwt.classpath">
+ <path refid="gwt.gwt.classpath"/>
+ <path refid="mygwt.mygwt.classpath"/>
+ </path>
<delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.uiserver.ajax.Portal"/>
- <java classpathref="gwt.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
+ <java classpathref="full.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
16 years, 11 months
JBoss Portal SVN: r8884 - branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-11-12 11:13:01 -0500 (Mon, 12 Nov 2007)
New Revision: 8884
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
Log:
- Handle null suffix better.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2007-11-12 15:30:47 UTC (rev 8883)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/framework/TestProducerBehavior.java 2007-11-12 16:13:01 UTC (rev 8884)
@@ -61,11 +61,13 @@
portletDesc.setPortletHandle(portletHandle);
portletDesc.setMarkupTypes(new MarkupType[]{new MarkupType("text/html", new String[]{WSRPConstants.NORMAL_WINDOW_STATE},
new String[]{WSRPConstants.VIEW_MODE}, WSRPConstants.DEFAULT_LOCALES, null)});
- portletDesc.setDescription(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_DESCRIPTION + suffix));
- portletDesc.setTitle(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_TITLE + suffix));
- portletDesc.setShortTitle(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_SHORTTITLE + suffix));
- portletDesc.setDisplayName(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_DISPLAYNAME + suffix));
- portletDesc.setKeywords(new LocalizedString[]{ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_KEYWORD + suffix)});
+
+ String suffixString = suffix == null ? "" : suffix;
+ portletDesc.setDescription(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_DESCRIPTION + suffixString));
+ portletDesc.setTitle(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_TITLE + suffixString));
+ portletDesc.setShortTitle(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_SHORTTITLE + suffixString));
+ portletDesc.setDisplayName(ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_DISPLAYNAME + suffixString));
+ portletDesc.setKeywords(new LocalizedString[]{ServiceObjectFactory.createLocalizedString(ServiceObjectFactory.SAMPLE_KEYWORD + suffixString)});
return portletDesc;
}
}
16 years, 11 months
JBoss Portal SVN: r8883 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/test/core/model/portal and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-12 10:30:47 -0500 (Mon, 12 Nov 2007)
New Revision: 8883
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java
Log:
fix the thing I did not fix before
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java 2007-11-12 15:24:46 UTC (rev 8882)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/controller/portlet/PortletContextFactory.java 2007-11-12 15:30:47 UTC (rev 8883)
@@ -123,8 +123,8 @@
public PortalContextImpl()
{
- windowStates = Collections.unmodifiableSet(new CollectionBuilder().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).toHashSet());
- modes = Collections.unmodifiableSet(new CollectionBuilder().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).toHashSet());
+ windowStates = Collections.unmodifiableSet((Set)CollectionBuilder.hashSet().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).get());
+ modes = Collections.unmodifiableSet((Set)CollectionBuilder.hashSet().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).get());
props = Collections.EMPTY_MAP;
}
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java 2007-11-12 15:24:46 UTC (rev 8882)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalNodeTestCase.java 2007-11-12 15:30:47 UTC (rev 8883)
@@ -25,7 +25,6 @@
import junit.framework.TestSuite;
import org.jboss.portal.api.node.PortalNode;
import org.jboss.portal.common.junit.TransactionAssert;
-import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.portal.core.impl.api.node.PortalNodeImpl;
import org.jboss.portal.core.model.portal.Context;
import org.jboss.portal.core.model.portal.Page;
@@ -39,6 +38,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+import java.util.Collections;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -76,7 +76,7 @@
AuthorizationDomain auth = container.getAuthorizationDomain();
DomainConfigurator cfg = auth.getConfigurator();
Portal p_1 = (Portal)container.getObject(PortalObjectId.parse("/1", PortalObjectPath.CANONICAL_FORMAT));
- cfg.setSecurityBindings(p_1.getId().toString(PortalObjectPath.CANONICAL_FORMAT), CollectionBuilder.singleton(new RoleSecurityBinding("view", "admin")).toHashSet());
+ cfg.setSecurityBindings(p_1.getId().toString(PortalObjectPath.CANONICAL_FORMAT), Collections.singleton(new RoleSecurityBinding("view", "admin")));
TransactionAssert.commitTransaction();
//
@@ -103,7 +103,7 @@
AuthorizationDomain auth = container.getAuthorizationDomain();
DomainConfigurator cfg = auth.getConfigurator();
Portal tmp = (Portal)container.getObject(PortalObjectId.parse("/1", PortalObjectPath.CANONICAL_FORMAT));
- cfg.setSecurityBindings(tmp.getId().toString(PortalObjectPath.CANONICAL_FORMAT), CollectionBuilder.singleton(new RoleSecurityBinding("viewrecursive", "admin")).toHashSet());
+ cfg.setSecurityBindings(tmp.getId().toString(PortalObjectPath.CANONICAL_FORMAT), Collections.singleton(new RoleSecurityBinding("viewrecursive", "admin")));
TransactionAssert.commitTransaction();
//
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-11-12 15:24:46 UTC (rev 8882)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 2007-11-12 15:30:47 UTC (rev 8883)
@@ -296,19 +296,19 @@
PortalObject o_1_1_4 = o_1_1.getChild("4");
List l1 = new ArrayList(o_1_1.getChildren());
Collections.sort(l1, new PortalObjectComparator());
- assertEquals(new CollectionBuilder().add(o_1_1_1).add(o_1_1_2).add(o_1_1_3).add(o_1_1_4).toArrayList(), l1);
+ assertEquals(CollectionBuilder.arrayList().add(o_1_1_1).add(o_1_1_2).add(o_1_1_3).add(o_1_1_4).get(), l1);
List l2 = new ArrayList(o_1_1.getChildren(PortalObject.PAGE_MASK));
Collections.sort(l2, new PortalObjectComparator());
- assertEquals(new CollectionBuilder().add(o_1_1_1).add(o_1_1_3).toArrayList(), l2);
+ assertEquals(CollectionBuilder.arrayList().add(o_1_1_1).add(o_1_1_3).get(), l2);
List l3 = new ArrayList(o_1_1.getChildren(PortalObject.WINDOW_MASK));
Collections.sort(l3, new PortalObjectComparator());
- assertEquals(new CollectionBuilder().add(o_1_1_2).add(o_1_1_4).toArrayList(), l3);
+ assertEquals(CollectionBuilder.arrayList().add(o_1_1_2).add(o_1_1_4).get(), l3);
List l4 = new ArrayList(o_1_1.getChildren(0));
Collections.sort(l4, new PortalObjectComparator());
- assertEquals(new CollectionBuilder().toArrayList(), l4);
+ assertEquals(CollectionBuilder.arrayList().get(), l4);
List l5 = new ArrayList(o_1_1.getChildren(PortalObject.PORTAL_MASK));
Collections.sort(l5, new PortalObjectComparator());
- assertEquals(new CollectionBuilder().toArrayList(), l5);
+ assertEquals(CollectionBuilder.arrayList().get(), l5);
TransactionAssert.commitTransaction();
}
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java 2007-11-12 15:24:46 UTC (rev 8882)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/provider/GGProvider.java 2007-11-12 15:30:47 UTC (rev 8883)
@@ -25,6 +25,7 @@
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import org.jboss.portal.common.util.CollectionBuilder;
import org.jboss.portal.widget.AbstractWidgetProvider;
@@ -37,7 +38,7 @@
public final class GGProvider extends AbstractWidgetProvider
{
/** The google categories */
- private static final Collection CATEGORIES = Collections.unmodifiableList(new CollectionBuilder()
+ private static final Collection CATEGORIES = Collections.unmodifiableList((List)CollectionBuilder.arrayList()
.add(new GGWidgetCategoryInfo("all", "Popular"))
.add(new GGWidgetCategoryInfo("news", "News"))
.add(new GGWidgetCategoryInfo("communication", "Communication"))
@@ -47,7 +48,7 @@
.add(new GGWidgetCategoryInfo("lifestyle", "Lifestyle"))
.add(new GGWidgetCategoryInfo("technology", "Technology"))
.add(new GGWidgetCategoryInfo("new", "New stuff"))
- .toArrayList());
+ .get());
public Collection getCategories()
{
16 years, 11 months
JBoss Portal SVN: r8879 - /.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-12 10:12:45 -0500 (Mon, 12 Nov 2007)
New Revision: 8879
Removed:
trunk/
Log:
Delete trunk...
16 years, 11 months
JBoss Portal SVN: r8878 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-12 09:49:09 -0500 (Mon, 12 Nov 2007)
New Revision: 8878
Added:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java
Log:
Ugly test case for schema update
oups
Added: 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 (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java 2007-11-12 14:49:09 UTC (rev 8878)
@@ -0,0 +1,266 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.portal.test.core.model.instance;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import junit.framework.TestSuite;
+
+import org.apache.log4j.Appender;
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.SimpleLayout;
+import org.hibernate.Query;
+import org.hibernate.SessionFactory;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.classic.Session;
+import org.hibernate.tool.hbm2ddl.SchemaUpdate;
+import org.jboss.portal.common.junit.TransactionAssert;
+import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.state.AbstractPropertyContext;
+import org.jboss.portal.portlet.state.PropertyChange;
+import org.jboss.portal.portlet.state.PropertyContext;
+import org.jboss.portal.test.framework.AbstractPortalTestCase;
+import org.jboss.portal.test.framework.embedded.HibernateSupport;
+import org.jboss.portal.test.framework.embedded.HibernateSupport.Config;
+import org.jboss.portal.test.framework.mc.TestRuntimeContext;
+
+/**
+ * @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
+ * @version $Revision: 8786 $
+ * @since Apr 4, 2006
+ */
+public class BackwardCompatibilityInstanceTestCase extends AbstractPortalTestCase
+{
+
+ /** . */
+ private HibernateSupport instanceHibernateSupport260;
+
+ /** . */
+ private HibernateSupport portletHibernateSupport;
+
+ /** . */
+ private InstanceContainerImpl instanceContainer260;
+
+ /** . */
+ private PortletInvokerSupport portletContainer;
+
+ /** . */
+ private Config config;
+
+ /** . */
+ private Collection mappings;
+
+ static
+ {
+ Appender appender = new ConsoleAppender(new SimpleLayout());
+ Logger.getRoot().addAppender(appender);
+ Logger.getRoot().setLevel(Level.ERROR);
+ Logger.getLogger("org.hibernate").setLevel(Level.ERROR);
+ }
+
+ public static TestSuite suite() throws Exception
+ {
+ return AbstractPortalTestCase.suite(BackwardCompatibilityInstanceTestCase.class);
+ }
+
+ protected String getConfigLocationPrefix()
+ {
+ return "org/jboss/portal/test/core/model/instance/";
+ }
+
+ public HibernateSupport getInstanceHibernateSupport260()
+ {
+ return instanceHibernateSupport260;
+ }
+
+ public void setInstanceHibernateSupport260(HibernateSupport instanceHibernateSupport260)
+ {
+ this.instanceHibernateSupport260 = instanceHibernateSupport260;
+ }
+
+ public HibernateSupport getPortletHibernateSupport()
+ {
+ return portletHibernateSupport;
+ }
+
+ public void setPortletHibernateSupport(HibernateSupport portletHibernateSupport)
+ {
+ this.portletHibernateSupport = portletHibernateSupport;
+ }
+
+ public InstanceContainerImpl getInstanceContainer260()
+ {
+ return instanceContainer260;
+ }
+
+ public void setInstanceContainer260(InstanceContainerImpl instanceContainer260)
+ {
+ this.instanceContainer260 = instanceContainer260;
+ }
+
+ protected void setUp() throws Exception
+ {
+ runtimeContext = new TestRuntimeContext(getConfigLocation());
+ runtimeContext.addBean("TestBean", this);
+ runtimeContext.addBean("DataSourceConfig", dataSourceConfigParameter);
+ runtimeContext.addBean("HibernateConfig", HibernateSupport.getConfig(dataSourceConfigParameter.getName()));
+ configureRuntimeContext(runtimeContext);
+ runtimeContext.start();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ // clean up any pending transaction
+ TransactionAssert.endTransaction();
+
+ runtimeContext.stop();
+ }
+
+ public void testRead() throws Exception
+ {
+ // Add portlet
+ portletContainer.addInternalPortlet("MyPortlet", new TestPortletSupport());
+
+ // Create new instance
+ TransactionAssert.beginTransaction();
+ instanceContainer260.createDefinition("MyInstance", "MyPortlet").getId();
+ TransactionAssert.commitTransaction();
+
+ Configuration cfg = new Configuration();
+
+ //
+ for (Iterator i = mappings.iterator(); i.hasNext();)
+ {
+ String mapping = (String)i.next();
+ cfg.addResource(mapping, Thread.currentThread().getContextClassLoader());
+ }
+
+ //
+ Properties props = new Properties();
+ for (Iterator i = config.getProperties().entrySet().iterator();i.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry)i.next();
+ String key = (String)entry.getKey();
+ String value = (String)entry.getValue();
+ cfg.setProperty(key, value);
+ }
+ cfg.addProperties(props);
+
+ // todo : make this configurable somehow
+ cfg.setProperty("hibernate.connection.datasource", "java:/DefaultDS");
+
+ SessionFactory sessionFactory = cfg.buildSessionFactory();
+
+ SchemaUpdate update = new SchemaUpdate(cfg, cfg.buildSettings());
+ update.execute(false, true);
+
+ // Get Hibernate session with 2.6.x schema
+ Session session = sessionFactory.openSession();
+ session.beginTransaction();
+ Query query = session.createQuery("From PersistentInstanceDefinition");
+ Instance instance = (Instance)query.uniqueResult();
+ assertEquals(null, instance.getDisplayName().getDefaultValue());
+ }
+
+ public PortletInvokerSupport getPortletContainer()
+ {
+ return portletContainer;
+ }
+
+ public void setPortletContainer(PortletInvokerSupport portletContainer)
+ {
+ this.portletContainer = portletContainer;
+ }
+
+ private class TestPortletSupport extends PortletSupport
+ {
+
+ private PortletInvocation invocation;
+
+ public TestPortletSupport()
+ {
+ this.info.getMetaSupport().setDisplayName("Foo");
+ }
+
+ public PortletInvocationResponse invoke(PortletInvocation invocation)
+ {
+ this.invocation = invocation;
+ try
+ {
+ return execute();
+ }
+ finally
+ {
+ this.invocation = null;
+ }
+ }
+
+ public PortletInvocationResponse execute()
+ {
+ return null;
+ }
+
+ public void setProperty(String key, String value) throws IllegalStateException
+ {
+ AbstractPropertyContext props = (AbstractPropertyContext)invocation.getAttribute(PortletInvocation.INVOCATION_SCOPE, PropertyContext.PREFERENCES_ATTRIBUTE);
+ props.update(new PropertyChange[]{PropertyChange.newUpdate(key, new StringValue(value))});
+ }
+ }
+
+ public Config getConfig()
+ {
+ return config;
+ }
+
+ public void setConfig(Config config)
+ {
+ this.config = config;
+ }
+
+ public Collection getMappings()
+ {
+ return mappings;
+ }
+
+ public void setMappings(Collection mappings)
+ {
+ this.mappings = mappings;
+ }
+
+}
16 years, 11 months
JBoss Portal SVN: r8877 - in branches/JBoss_Portal_Branch_2_6/core: src/resources/portal-core-test-jar/org/jboss/portal/test/core/model and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-11-12 09:34:38 -0500 (Mon, 12 Nov 2007)
New Revision: 8877
Added:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/domain.hbm.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/backward-jboss-beans.xml
Modified:
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml
Log:
Ugly test case for schema update
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-11-12 12:05:59 UTC (rev 8876)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-11-12 14:34:38 UTC (rev 8877)
@@ -611,7 +611,7 @@
<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">
@@ -633,6 +633,10 @@
outfile="TEST-RegistrationPersistenceManagerTestCase">
</zest>
+ <zest todir="${test.reports}" name="org.jboss.portal.test.core.model.instance.BackwardCompatibilityInstanceTestCase">
+ <parameter name="Config" value="backward-jboss-beans.xml"/>
+ </zest>
+
<test todir="${test.reports}"
name="org.jboss.portal.test.core.model.portal.PortalObjectPermissionTestCase"/>
<test todir="${test.reports}"
Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/domain.hbm.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/domain.hbm.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/domain.hbm.xml 2007-11-12 14:34:38 UTC (rev 8877)
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+ <class
+ name="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceDefinition"
+ table="JBP_INSTANCE">
+ <cache usage="read-write"/>
+ <id
+ name="key"
+ column="PK"
+ access="field">
+ <generator class="native">
+ <param name="sequence">instance_seq</param>
+ </generator>
+ </id>
+ <natural-id>
+ <property
+ name="instanceId"
+ column="ID"
+ not-null="true"
+ unique="false"/>
+ </natural-id>
+ <property
+ name="portletRef"
+ column="PORTLET_REF"
+ not-null="false"
+ unique="false"/>
+ <property
+ name="mutable"
+ column="MODIFIABLE"
+ not-null="true"
+ unique="false"/>
+ <property
+ name="state"
+ column="SER_STATE"
+ not-null="false"
+ unique="false"
+ length="50000000"/>
+ <map
+ name="relatedSecurityBindings"
+ sort="unsorted"
+ inverse="true"
+ cascade="all-delete-orphan"
+ fetch="join">
+ <cache usage="read-write"/>
+ <key column="INSTANCE_PK"/>
+ <index column="ROLE" type="string"/>
+ <one-to-many class="org.jboss.portal.core.impl.model.instance.persistent.PersistentRoleSecurityBinding"/>
+ </map>
+ <map
+ name="relatedCustomizations"
+ inverse="true"
+ cascade="save-update"
+ fetch="select"
+ lazy="extra">
+ <cache usage="read-write"/>
+ <key column="INSTANCE_PK"/>
+ <map-key
+ type="string"
+ column="USER_ID"/>
+ <one-to-many class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceCustomization"/>
+ </map>
+ </class>
+
+ <class
+ name="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceCustomization"
+ table="JBP_INSTANCE_PER_USER">
+ <cache usage="read-write"/>
+ <id
+ name="key"
+ column="PK"
+ access="field">
+ <generator class="native">
+ <param name="sequence">instance_seq</param>
+ </generator>
+ </id>
+ <many-to-one
+ name="relatedDefinition"
+ column="INSTANCE_PK"
+ class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceDefinition"
+ cascade="none"
+ fetch="select"/>
+ <property
+ name="state"
+ column="SER_STATE"
+ not-null="false"
+ unique="false"
+ length="50000000"/>
+ <properties
+ name="user_and_portlet_ref"
+ unique="true">
+ <property
+ name="customizationId"
+ column="USER_ID"
+ not-null="true"
+ length="160"/>
+ <property
+ name="portletRef"
+ column="PORTLET_REF"
+ not-null="true"
+ length="170"/>
+ </properties>
+ </class>
+
+ <class
+ name="org.jboss.portal.core.impl.model.instance.persistent.PersistentRoleSecurityBinding"
+ table="JBP_INSTANCE_SECURITY">
+ <cache usage="read-write"/>
+ <id
+ name="key"
+ column="PK"
+ type="java.lang.Long">
+ <generator class="native">
+ <param name="sequence">instance_seq</param>
+ </generator>
+ </id>
+ <property
+ name="role"
+ column="ROLE"
+ not-null="true"
+ unique="false"/>
+ <set
+ name="actions"
+ table="JBP_INSTANCE_SECURITY_ACTIONS"
+ cascade="all-delete-orphan"
+ fetch="join">
+ <cache usage="read-write"/>
+ <key column="PK"/>
+ <element column="ACTIONS" type="string"/>
+ </set>
+ <many-to-one
+ name="instance"
+ column="INSTANCE_PK"
+ class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceDefinition"
+ cascade="none"
+ fetch="select"/>
+ </class>
+</hibernate-mapping>
Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/260/instance/domain.hbm.xml
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/backward-jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/backward-jboss-beans.xml (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/backward-jboss-beans.xml 2007-11-12 14:34:38 UTC (rev 8877)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+
+ <bean name="TestCaseConfig" class="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase">
+ <constructor factoryMethod="getBean">
+ <factory bean="BeanFactory"/>
+ <parameter>TestCaseConfig</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config">
+ <constructor factoryMethod="getBean">
+ <factory bean="BeanFactory"/>
+ <parameter>DataSourceConfig</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config">
+ <constructor factoryMethod="getBean">
+ <factory bean="BeanFactory"/>
+ <parameter>HibernateConfig</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport">
+ </bean>
+
+ <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport">
+ </bean>
+
+ <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport">
+ <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+ </bean>
+
+ <bean name="DataSourceSupport" class="org.jboss.portal.test.framework.embedded.DataSourceSupport">
+ <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property>
+ <property name="connectionManagerReference"><inject bean="ConnectionManagerSupport"
+ property="connectionManagerReference"/></property>
+ <property name="config"><inject bean="DataSourceConfig"/></property>
+ </bean>
+
+ <bean name="InstanceHibernateSupport260" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+ <property name="config"><inject bean="HibernateConfig"/></property>
+ <property name="mappings">
+ <list elementClass="java.lang.String">
+ <value>org/jboss/portal/test/core/model/260/instance/domain.hbm.xml</value>
+ </list>
+ </property>
+ <property name="jNDIName">java:/InstanceSessionFactory260</property>
+ </bean>
+
+ <bean name="PortletHibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+ <property name="config"><inject bean="HibernateConfig"/></property>
+ <property name="mappings">
+ <list elementClass="java.lang.String">
+ <value>conf/hibernate/portlet/domain.hbm.xml</value>
+ </list>
+ </property>
+ <property name="jNDIName">java:/PortletSessionFactory</property>
+ </bean>
+
+ <bean name="StateConverter" class="org.jboss.portal.portlet.impl.state.StateConverterV0">
+ </bean>
+ <bean name="StateManagementPolicy" class="org.jboss.portal.portlet.impl.state.StateManagementPolicyService">
+ <property name="persistLocally">true</property>
+ </bean>
+ <bean name="PersistenceManager"
+ class="org.jboss.portal.core.impl.portlet.state.PersistentPortletStatePersistenceManager">
+ <property name="sessionFactoryJNDIName">java:/PortletSessionFactory</property>
+ </bean>
+ <bean name="PortletContainer" class="org.jboss.portal.test.core.model.instance.PortletInvokerSupport">
+ </bean>
+ <bean name="Producer" class="org.jboss.portal.portlet.state.producer.ProducerPortletInvoker">
+ <property name="persistenceManager"><inject bean="PersistenceManager"/></property>
+ <property name="portletInvoker"><inject bean="PortletContainer"/></property>
+ <property name="stateManagementPolicy"><inject bean="StateManagementPolicy"/></property>
+ <property name="stateConverter"><inject bean="StateConverter"/></property>
+ </bean>
+
+ <bean name="StackFactory" class="org.jboss.portal.common.invocation.EmptyInterceptorStackFactory">
+ </bean>
+ <bean name="ContainerContext260"
+ class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext">
+ <property name="sessionFactoryJNDIName">java:/InstanceSessionFactory260</property>
+ <property name="cacheNaturalId">true</property>
+ </bean>
+ <bean name="InstanceContainer260" class="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl">
+ <property name="cloneOnCreate">true</property>
+ <property name="portletInvoker"><inject bean="Producer"/></property>
+ <property name="containerContext"><inject bean="ContainerContext260"/></property>
+ <property name="stackFactory"><inject bean="StackFactory"/></property>
+ <property name="performSecurityChecks">false</property>
+ </bean>
+
+ <bean name="TestBean" class="org.jboss.portal.test.core.model.instance.BackwardCompatibilityInstanceTestCase">
+ <constructor factoryMethod="getBean">
+ <factory bean="BeanFactory"/>
+ <parameter>TestBean</parameter>
+ </constructor>
+ <property name="portletContainer"><inject bean="PortletContainer"/></property>
+ <property name="instanceHibernateSupport260"><inject bean="InstanceHibernateSupport260"/></property>
+ <property name="portletHibernateSupport"><inject bean="PortletHibernateSupport"/></property>
+ <property name="instanceContainer260"><inject bean="InstanceContainer260"/></property>
+ <!-- property name="persistenceManager"><inject bean="PersistenceManager"/></property-->
+ <!-- property name="producer"><inject bean="Producer"/></property-->
+ <property name="mappings">
+ <list elementClass="java.lang.String">
+ <value>conf/hibernate/instance/domain.hbm.xml</value>
+ </list>
+ </property>
+ <property name="config"><inject bean="HibernateConfig"/></property>
+ </bean>
+</deployment>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2007-11-12 12:05:59 UTC (rev 8876)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-test-jar/org/jboss/portal/test/core/model/instance/persistent-jboss-beans.xml 2007-11-12 14:34:38 UTC (rev 8877)
@@ -74,6 +74,16 @@
<property name="jNDIName">java:/InstanceSessionFactory</property>
</bean>
+ <bean name="Instance260HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
+ <property name="config"><inject bean="HibernateConfig"/></property>
+ <property name="mappings">
+ <list elementClass="java.lang.String">
+ <value>conf/test/hibernate/2.6.0/instance/domain.hbm.xml</value>
+ </list>
+ </property>
+ <property name="jNDIName">java:/Instance260SessionFactory</property>
+ </bean>
+
<bean name="PortletHibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport">
<property name="config"><inject bean="HibernateConfig"/></property>
<property name="mappings">
@@ -117,14 +127,29 @@
<property name="performSecurityChecks">false</property>
</bean>
+ <bean name="Container260Context"
+ class="org.jboss.portal.core.impl.model.instance.persistent.PersistentInstanceContainerContext">
+ <property name="sessionFactoryJNDIName">java:/Instance260SessionFactory</property>
+ <property name="cacheNaturalId"><inject bean="TestCaseConfig" property="cacheNaturalId"/></property>
+ </bean>
+ <bean name="Instance260Container" class="org.jboss.portal.core.impl.model.instance.InstanceContainerImpl">
+ <property name="cloneOnCreate"><inject bean="TestCaseConfig" property="cloneOnCreate"/></property>
+ <property name="portletInvoker"><inject bean="Producer"/></property>
+ <property name="containerContext"><inject bean="Container260Context"/></property>
+ <property name="stackFactory"><inject bean="StackFactory"/></property>
+ <property name="performSecurityChecks">false</property>
+ </bean>
+
<bean name="TestBean" class="org.jboss.portal.test.core.model.instance.InstanceContainerTestCase">
<constructor factoryMethod="getBean">
<factory bean="BeanFactory"/>
<parameter>TestBean</parameter>
</constructor>
<property name="instanceHibernateSupport"><inject bean="InstanceHibernateSupport"/></property>
+ <property name="instance260HibernateSupport"><inject bean="Instance260HibernateSupport"/></property>
<property name="portletHibernateSupport"><inject bean="PortletHibernateSupport"/></property>
<property name="instanceContainer"><inject bean="InstanceContainer"/></property>
+ <property name="instance260Container"><inject bean="Instance260Container"/></property>
<property name="persistenceManager"><inject bean="PersistenceManager"/></property>
<property name="producer"><inject bean="Producer"/></property>
<property name="portletContainer"><inject bean="PortletContainer"/></property>
16 years, 11 months