From 5c34653299fab52e5200a3b9e67487f9f3645227 Mon Sep 17 00:00:00 2001
From: Paul Holmes-Higgin <paulhh@alfresco.com>
Date: Mon, 7 Jul 2008 22:01:00 +0000
Subject: [PATCH] More ProjectSpace cleanup and fix test failure

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9671 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/model/ApplicationModel.java      | 3 ---
 .../java/org/alfresco/repo/site/SiteServiceImplTest.java  | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/source/java/org/alfresco/model/ApplicationModel.java b/source/java/org/alfresco/model/ApplicationModel.java
index adf3e33473..d7d2e1185f 100644
--- a/source/java/org/alfresco/model/ApplicationModel.java
+++ b/source/java/org/alfresco/model/ApplicationModel.java
@@ -61,7 +61,4 @@ public interface ApplicationModel
     // feed source aspect
     static final QName ASPECT_FEEDSOURCE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "feedsource");
     static final QName PROP_FEEDTEMPLATE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "template");
-    
-    // project space
-    static final QName TYPE_PROJECTSPACE = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "projectfolder");
 }
diff --git a/source/java/org/alfresco/repo/site/SiteServiceImplTest.java b/source/java/org/alfresco/repo/site/SiteServiceImplTest.java
index 145261177f..fc7c64591f 100644
--- a/source/java/org/alfresco/repo/site/SiteServiceImplTest.java
+++ b/source/java/org/alfresco/repo/site/SiteServiceImplTest.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.model.ApplicationModel;
+import org.alfresco.model.ForumModel;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.jscript.ClasspathScriptLocation;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
@@ -369,13 +369,13 @@ public class SiteServiceImplTest extends BaseAlfrescoSpringTest
         assertNotNull(container6);
         assertTrue(container5.equals(container6));
         assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(container6));
-        NodeRef container7 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component3", ApplicationModel.TYPE_PROJECTSPACE);
+        NodeRef container7 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component3", ForumModel.TYPE_FORUM);
         assertNotNull(container7);
         assertTrue(container5.equals(container7));
         assertEquals(ContentModel.TYPE_FOLDER, nodeService.getType(container7));
-        NodeRef container8 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component4", ApplicationModel.TYPE_PROJECTSPACE);
+        NodeRef container8 = this.siteService.getContainer(siteInfo.getShortName(), "folder.component4", ForumModel.TYPE_FORUM);
         assertNotNull(container8);
-        assertEquals(ApplicationModel.TYPE_PROJECTSPACE, nodeService.getType(container8));
+        assertEquals(ForumModel.TYPE_FORUM, nodeService.getType(container8));
     }