Author: julien(a)jboss.com Date: 2007-02-05 19:09:08 -0500 (Mon, 05 Feb 2007) New Revision: 6169 Modified: trunk/cms/build.xml trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java trunk/cms/src/resources/test/jcr/repository.xml trunk/core/build.xml Log: attempt to make CMS test run for the db matrix (it works on my machine with two DB). Issue is related to static services like JBossCachePM or HibernatePM, needs to be more corrected Modified: trunk/cms/build.xml =================================================================== --- trunk/cms/build.xml 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/build.xml 2007-02-06 00:09:08 UTC (rev 6169) @@ -376,7 +376,15 @@ </target> <target name="tests" depends="init"> <execute-tests> - <x-test> + <x-sysproperty> + +<!-- + <jvmarg value="-Xdebug"/> + <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> +--> + + </x-sysproperty> + <x-test> <!-- general cms setup related tests --> <test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/> @@ -400,7 +408,7 @@ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/> <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/> - + <!-- cms fine grained security related tests --> <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSecureFileGet"/--> </x-test> Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -201,6 +201,8 @@ throw new IllegalStateException("not initialized"); } + org.jboss.portal.cms.hibernate.state.Tools.destroy(); + try { if (externalBLOBs) Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/JBossCachePersistenceManager.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -111,6 +111,7 @@ * */ private static TreeCacheMBean pmCache = null; + private static boolean createdByMe; private static boolean preloaded = false; /** Creates a new <code>SimpleDbPersistenceManager</code> instance. */ @@ -201,16 +202,20 @@ Tools.init(this.jndiName); if (JBossCachePersistenceManager.pmCache == null) { - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - JBossCachePersistenceManager.pmCache = (TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class, "cms.pm.cache:service=TreeCache", server); - } - catch (Exception e) - { - JBossCachePersistenceManager.pmCache = null; - } + // julien : removed that, it should be deployed by the portal-cms.sar properly + +// try +// { +// MBeanServer server = MBeanServerLocator.locateJBoss(); +// JBossCachePersistenceManager.pmCache = (TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class, "cms.pm.cache:service=TreeCache", server); +// } +// catch (Exception e) +// { +// } + // For now we always create the cache, we could try a JMX lookup commented above because not properly done + pmCache = null; + //try to load from specified configuration if any //if nothing found in the environment...chances are running in a non-managed environment if (JBossCachePersistenceManager.pmCache == null) @@ -219,6 +224,7 @@ try { JBossCachePersistenceManager.pmCache = new TreeCache(); + createdByMe = true; //configure the cache PropertyConfigurator configurator = new PropertyConfigurator(); @@ -1167,6 +1173,14 @@ throw new IllegalStateException("not initialized"); } + // We created it, we destroy it + if (createdByMe && pmCache != null) + { + TreeCacheMBean cache = pmCache; + pmCache = null; + cache.destroy(); + } + try { if (externalBLOBs) Modified: trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/cms/hibernate/state/Tools.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -34,7 +34,9 @@ import javax.naming.InitialContext; -/* +/** + * Static state is evil. + * * Created on Aug 29, 2006 * * A Tool for performing some Hibernate related utilities. This is designed to work in both managed as well as non-managed environments @@ -50,6 +52,11 @@ private static Configuration cfg = null; private static boolean autoClose = false; + public static void destroy() + { + sessionFactory = null; + } + /** * * Modified: trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/test/cms/AbstractCMSTestCase.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -43,10 +43,10 @@ { /** . */ - private DataSourceSupport.Config dataSourceConfigParameter; + protected DataSourceSupport.Config dataSourceConfigParameter; /** . */ - private TestRuntimeContext runtimeContext; + protected TestRuntimeContext runtimeContext; public AbstractCMSTestCase() { @@ -71,7 +71,7 @@ runtimeContext.start(); } - protected void tearDown() throws Exception + public void tearDown() throws Exception { runtimeContext.stop(); } Modified: trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/test/cms/JackrabbitTestCase.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -66,7 +66,7 @@ jcr.start(); } - protected void tearDown() throws Exception + public void tearDown() throws Exception { jcr.stop(); jcr = null; Modified: trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/test/cms/TestRepositoryBootStrap.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -63,7 +63,7 @@ service.start(); } - protected void tearDown() throws Exception + public void tearDown() throws Exception { service.stop(); } Modified: trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/main/org/jboss/portal/test/cms/commands/AbstractCommandTestCase.java 2007-02-06 00:09:08 UTC (rev 6169) @@ -65,7 +65,7 @@ service.setConfig(config.getDocumentElement()); service.setRepositoryName("repo"); - service.setHomeDir("repotest"); + service.setHomeDir("repotest-" + dataSourceConfigParameter.getName()); service.startService(); } Modified: trunk/cms/src/resources/test/jcr/repository.xml =================================================================== --- trunk/cms/src/resources/test/jcr/repository.xml 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/cms/src/resources/test/jcr/repository.xml 2007-02-06 00:09:08 UTC (rev 6169) @@ -66,7 +66,7 @@ --> <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage --> - <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager"> + <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager"> <param name="schemaObjectPrefix" value="WSP"/> <param name="JNDIName" value="java:/SessionFactory"/> <param name="externalBLOBs" value="false"/> @@ -113,7 +113,7 @@ --> <!-- HibernatePersistentManager: uses RDBMS + Hibernate for storage --> - <PersistenceManager class="org.jboss.portal.cms.hibernate.state.JBossCachePersistenceManager"> + <PersistenceManager class="org.jboss.portal.cms.hibernate.state.HibernatePersistenceManager"> <param name="schemaObjectPrefix" value="Version"/> <param name="JNDIName" value="java:/SessionFactory"/> <param name="externalBLOBs" value="false"/> Modified: trunk/core/build.xml =================================================================== --- trunk/core/build.xml 2007-02-05 20:55:30 UTC (rev 6168) +++ trunk/core/build.xml 2007-02-06 00:09:08 UTC (rev 6169) @@ -535,10 +535,8 @@ <execute-tests> <x-sysproperty> -<!-- <jvmarg value="-Xdebug"/> <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/> ---> <sysproperty key="jboss.aop.path"