Merged V3.0 to HEAD

11557: ETHREEOH-666 - Consumers should not be able to create calendar entries. ETHREEOH-667 - Consumers should not be able to create/update wiki pages.
   11559: Command line utility to help with schema comparisons and upgrades
   11560: Fixed: ETHREEOH-518 Unfriendly error for "Create Site" when session has timed out. Fixed: IE7 prompt and messages now looks ok.
   11563: Need to add connection strings and hibernate dialect examples. Fixes ETHREEOH-445
   11565: Fixed ETHREEOH-538: Only support AlfrescoOracle9Dialect
   11566: Discussions "Said" changed to "said" plus missing space inserted
   11569: Fix for ETHREEOH-12 and ETHREEOH-592.
   11572: Skip unit tests when usage monitoring is disabled

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-12-18 10:01:11 +00:00
parent 3b600d05fb
commit 3b1910140f
23 changed files with 656 additions and 343 deletions

View File

@@ -170,6 +170,11 @@ public class UserUsageTest extends TestCase
public void testCreateUpdatedeleteInTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));
@@ -219,6 +224,11 @@ public class UserUsageTest extends TestCase
public void testCreateUpdatedeleteAcrossTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));
@@ -282,6 +292,11 @@ public class UserUsageTest extends TestCase
public void testCreateCopydeleteInTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));
@@ -323,6 +338,11 @@ public class UserUsageTest extends TestCase
public void testCreateCopydeleteAcrossTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));
@@ -378,6 +398,11 @@ public class UserUsageTest extends TestCase
public void testCreateCopyDeleteFolderWithContentInTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));
@@ -420,6 +445,11 @@ public class UserUsageTest extends TestCase
public void testCreateCopyDeleteFolderWithContentAcrossTx() throws Exception
{
if(!contentUsageImpl.getEnabled())
{
return;
}
runAs(TEST_USER);
assertEquals(0, contentUsageImpl.getUserUsage(TEST_USER));