Changeset 1993

Timestamp:

06/18/12 15:24:30 (12 years ago)

Author:

twagoo

Message:

ComponentRegistryFactory? now using ComponentStatus? and Owner instead of userId and userspace parameter.

Refs #142 and #143

Location:

ComponentRegistry/trunk/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/ComponentRegistryFactory.java (modified) (1 diff)
• main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java (modified) (3 diffs)
• main/java/clarin/cmdi/componentregistry/frontend/CMDItemInfo.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/frontend/DisplayDataNode.java (modified) (2 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/AdminRegistry.java (modified) (3 diffs)
• main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java (modified) (4 diffs)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (61 diffs)
• test/java/clarin/cmdi/componentregistry/frontend/CMDItemInfoTest.java (modified) (2 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java (modified) (4 diffs)
• test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java (modified) (4 diffs)
• test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (3 diffs)
• test/java/clarin/cmdi/componentregistry/rest/MDValidatorTest.java (modified) (2 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/ComponentRegistryFactory.java

@@ -15 +15 @@
     List<ComponentRegistry> getAllUserRegistries();
 
-    ComponentRegistry getComponentRegistry(boolean userspace, UserCredentials credentials);
+    /**
+     * Gets the specified registry
+     *
+     * @param status status of the registry
+     * @param owner owner of the registry. Passing null will assume the authenticated user as a {@link OwnerUser}
+     * @param credentials credentials that authenticate user, can be left null if requested registry has a public status
+     * @return
+     */
+    ComponentRegistry getComponentRegistry(ComponentStatus status, Owner owner, UserCredentials credentials) throws UserUnauthorizedException;
 
-    ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, String userId);
+    ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, ComponentStatus status, Owner owner);
 
     ComponentRegistry getPublicRegistry();

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/AdminHomePage.java

@@ -29 +29 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.impl.database.AdminRegistry;
 import clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDao;
@@ -275 +276 @@
         DefaultMutableTreeNode componentsNode = new DefaultMutableTreeNode(new DisplayDataNode("Components", false));
         parent.add(componentsNode);
-        add(componentsNode, registry.getComponentDescriptions(), false, registry.isPublic());
+        add(componentsNode, registry.getComponentDescriptions(), false, registry.getStatus());
 
         DefaultMutableTreeNode profilesNode = new DefaultMutableTreeNode(new DisplayDataNode("Profiles", false));
         parent.add(profilesNode);
-        add(profilesNode, registry.getProfileDescriptions(), false, registry.isPublic());
+        add(profilesNode, registry.getProfileDescriptions(), false, registry.getStatus());
 
         DefaultMutableTreeNode deletedCompNode = new DefaultMutableTreeNode(new DisplayDataNode("Deleted Components", true));
@@ -285 +286 @@
 
         List<ComponentDescription> deletedComponentDescriptions = registry.getDeletedComponentDescriptions();
-        add(deletedCompNode, deletedComponentDescriptions, true, registry.isPublic());
+        add(deletedCompNode, deletedComponentDescriptions, true, registry.getStatus());
 
         DefaultMutableTreeNode deletedProfNode = new DefaultMutableTreeNode(new DisplayDataNode("Deleted Profiles", true));
         parent.add(deletedProfNode);
         List<ProfileDescription> deletedProfileDescriptions = registry.getDeletedProfileDescriptions();
-        add(deletedProfNode, deletedProfileDescriptions, true, registry.isPublic());
-    }
-
-    private void add(DefaultMutableTreeNode parent, List<? extends AbstractDescription> descs, boolean isDeleted, boolean isPublic) {
+        add(deletedProfNode, deletedProfileDescriptions, true, registry.getStatus());
+    }
+
+    private void add(DefaultMutableTreeNode parent, List<? extends AbstractDescription> descs, boolean isDeleted, ComponentStatus status) {
         for (AbstractDescription desc : descs) {
-            DefaultMutableTreeNode child = new DefaultMutableTreeNode(new DisplayDataNode(desc.getName(), isDeleted, desc, isPublic));
+            DefaultMutableTreeNode child = new DefaultMutableTreeNode(new DisplayDataNode(desc.getName(), isDeleted, desc, status));
             parent.add(child);
         }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/CMDItemInfo.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.frontend;
 
+import clarin.cmdi.componentregistry.ComponentStatus;
 import java.io.Serializable;
 
@@ -92 +93 @@
     }
 
-
-    public boolean isInUserWorkSpace() {
-        return !displayNode.isPublic();
+    
+    public ComponentStatus getStatus() {
+        return displayNode.getStatus();
     }
-
+        
     public void setForceUpdate(boolean forceUpdate) {
         this.forceUpdate = forceUpdate;

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/DisplayDataNode.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.frontend;
 
+import clarin.cmdi.componentregistry.ComponentStatus;
 import java.io.Serializable;
 
@@ -11 +12 @@
     private final boolean isDeleted;
     private AbstractDescription desc;
-    private final boolean isPublic;
+    private final ComponentStatus status;
 
     public DisplayDataNode(String name, boolean isDeleted) {
-        this(name, isDeleted, null, false);
+        // TODO: what is sensible default status?
+        this(name, isDeleted, null, ComponentStatus.DEVELOPMENT);
     }
 
-    public DisplayDataNode(String name, boolean isDeleted, AbstractDescription desc, boolean isPublic) {
-        this.name = name;
-        this.isDeleted = isDeleted;
-        this.desc = desc;
-        this.isPublic = isPublic;
+    public DisplayDataNode(String name, boolean isDeleted, AbstractDescription desc, ComponentStatus status) {
+        this.name = name;
+        this.isDeleted = isDeleted;
+        this.desc = desc;
+        this.status = status;
     }
 
     /**
      * Can be null for non leaves.
+     *
      * @return
      */
     public AbstractDescription getDescription() {
-        return desc;
+        return desc;
     }
 
     public boolean isDeleted() {
-        return isDeleted;
+        return isDeleted;
     }
 
     @Override
     public String toString() {
-        return name;
+        return name;
     }
 
-    public boolean isPublic() {
-        return isPublic;
+    public ComponentStatus getStatus() {
+        return status;
     }
-
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/AdminRegistry.java

@@ -14 +14 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
 import clarin.cmdi.componentregistry.MDMarshaller;
+import clarin.cmdi.componentregistry.OwnerUser;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
@@ -25 +27 @@
 
 public class AdminRegistry {
+
     private final static Logger LOG = LoggerFactory.getLogger(AdminRegistry.class);
-
     private ComponentRegistryFactory componentRegistryFactory;
     private ProfileDescriptionDao profileDescriptionDao;
@@ -118 +120 @@
     private ComponentRegistry getRegistry(Principal userPrincipal, AbstractDescription desc, CMDItemInfo info) {
         ComponentRegistry registry = componentRegistryFactory.getPublicRegistry();
-        if (info.isInUserWorkSpace()) {
-            registry = componentRegistryFactory.getOtherUserComponentRegistry(userPrincipal, desc.getUserId());
+        //TODO: More generic check
+        if (info.getStatus() == ComponentStatus.DEVELOPMENT /* || info.getStatus() == ComponentStatus.PRIVATE */) {
+            registry = componentRegistryFactory.getOtherUserComponentRegistry(userPrincipal, info.getStatus(), new OwnerUser(Integer.parseInt(desc.getUserId())));
         }
         return registry;
     }
-
 }

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.impl.database;
-
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
 
 import clarin.cmdi.componentregistry.ComponentRegistry;
@@ -14 +5 @@
 import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.Configuration;
+import clarin.cmdi.componentregistry.Owner;
 import clarin.cmdi.componentregistry.OwnerUser;
 import clarin.cmdi.componentregistry.UserCredentials;
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.model.RegistryUser;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
 
 /**
@@ -53 +53 @@
 
     @Override
-    public ComponentRegistry getComponentRegistry(boolean userspace, UserCredentials credentials) {
-        ComponentRegistry result = null;
-        if (userspace) {
+    public ComponentRegistry getComponentRegistry(ComponentStatus status, Owner owner, UserCredentials credentials) throws UserUnauthorizedException {
+        switch (status) {
+            case DEVELOPMENT:
+                return getDevelopmentRegistry(owner, credentials);
+            case PUBLIC:
+                return getPublicRegistry();
+            default:
+                // TODO: Add support for other status types
+                throw new UnsupportedOperationException("Unsupported component status" + status);
+        }
+    }
+
+    private ComponentRegistry getDevelopmentRegistry(Owner owner, UserCredentials credentials) throws IllegalArgumentException, DataAccessException, UserUnauthorizedException {
+        if (owner == null || owner instanceof OwnerUser) {
             RegistryUser user = getOrCreateUser(credentials);
             if (user != null) {
+                if (owner != null && !user.getId().equals(owner.getId())) {
+                    throw new UserUnauthorizedException("User cannot access other user's development registry");
+                }
+
                 try {
-                    result = getNewComponentRegistryForUser(user.getId());
+                    return getNewComponentRegistryForUser(user.getId());
                 } catch (DataAccessException ex) {
                     LOG.error("Could not retrieve or create user", ex);
@@ -68 +83 @@
             }
         } else {
-            result = getPublicRegistry();
+            // TODO: Support group owners
+            throw new UnsupportedOperationException("Group owners not supported");
         }
-        return result;
     }
 
     @Override
-    public ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, String userId) {
+    public ComponentRegistry getOtherUserComponentRegistry(Principal adminPrincipal, ComponentStatus status, Owner owner) {
         try {
-            RegistryUser user = userDao.getById(Integer.parseInt(userId));
+            RegistryUser user;
+            if (owner instanceof OwnerUser) {
+                user = userDao.getById(owner.getId());
+            } else {
+                // TODO: Implement for groups
+                throw new UnsupportedOperationException("Groups not implemented yet");
+            }
             ComponentRegistry result = null;
             if (user != null) {

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -4 +4 @@
 import clarin.cmdi.componentregistry.ComponentRegistryException;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
+import clarin.cmdi.componentregistry.Owner;
 import clarin.cmdi.componentregistry.UserCredentials;
 import clarin.cmdi.componentregistry.UserUnauthorizedException;
@@ -48 +50 @@
 @Path("/registry")
 public class ComponentRegistryRestService {
-    
+
     @Context
     private UriInfo uriInfo;
@@ -65 +67 @@
     @Inject(value = "componentRegistryFactory")
     private ComponentRegistryFactory componentRegistryFactory;
-    
-    private ComponentRegistry getRegistry(boolean userspace) {
+
+    /**
+     * Converts userspace boolean to component status. Temporary solution!!!
+     *
+     * TODO: Replace all calls to getRegistry that use this by calls using ComponentStatus
+     * @param userSpace
+     * @return
+     * @deprecated All calls should go directly to {@link #getRegistry(clarin.cmdi.componentregistry.ComponentStatus)}
+     */
+    @Deprecated
+    private static ComponentStatus getStatus(boolean userSpace) {
+        if (userSpace) {
+            return ComponentStatus.DEVELOPMENT;
+        } else {
+            return ComponentStatus.PUBLIC;
+        }
+    }
+
+    private ComponentRegistry getRegistry(ComponentStatus status) {
         Principal userPrincipal = security.getUserPrincipal();
         UserCredentials userCredentials = getUserCredentials(userPrincipal);
-        return getRegistry(userspace, userCredentials);
-    }
-    
-    private ComponentRegistry getRegistry(boolean userspace, UserCredentials userCredentials) {
-        return componentRegistryFactory.getComponentRegistry(userspace, userCredentials);
+        return getRegistry(status, null, userCredentials);
+    }
+
+    private ComponentRegistry getRegistry(ComponentStatus status, Owner owner, UserCredentials userCredentials) {
+        try {
+            return componentRegistryFactory.getComponentRegistry(status, owner, userCredentials);
+        } catch (UserUnauthorizedException uuEx) {
+            //TODO: Throw actual exception and catch nicely
+            throw new RuntimeException("Cannot access requested registry", uuEx);
+        }
     }
 
@@ -88 +112 @@
         return principal;
     }
-    
+
     private UserCredentials getUserCredentials(Principal userPrincipal) {
         UserCredentials userCredentials = null;
@@ -96 +120 @@
         return userCredentials;
     }
-    
+
     @GET
     @Path("/components")
@@ -102 +126 @@
     public List<ComponentDescription> getRegisteredComponents(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
         long start = System.currentTimeMillis();
-        List<ComponentDescription> components = getRegistry(userspace).getComponentDescriptions();
+        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
         LOG.info("Releasing " + components.size() + " registered components into the world (" + (System.currentTimeMillis() - start)
                 + " millisecs)");
         return components;
     }
-    
+
     @GET
     @Path("/profiles")
@@ -114 +138 @@
             @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
         long start = System.currentTimeMillis();
-        
+
         List<ProfileDescription> profiles;
         if (metadataEditor) {
-            profiles = getRegistry(userspace).getProfileDescriptionsForMetadaEditor();
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptionsForMetadaEditor();
         } else {
-            profiles = getRegistry(userspace).getProfileDescriptions();
-        }
-        
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+        }
+
         LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
                 + " millisecs)");
         return profiles;
     }
-    
+
     @GET
     @Path("/components/{componentId}")
@@ -133 +157 @@
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
         LOG.info("Component with id: " + componentId + " is requested.");
-        CMDComponentSpec mdComponent = getRegistry(userspace).getMDComponent(componentId);
+        CMDComponentSpec mdComponent = getRegistry(getStatus(userspace)).getMDComponent(componentId);
         if (mdComponent == null) {
             return Response.status(Status.NOT_FOUND).build();
@@ -140 +164 @@
         }
     }
-    
+
     @GET
     @Path("/components/{componentId}/{rawType}")
@@ -157 +181 @@
             if ("xml".equalsIgnoreCase(rawType)) {
                 result = new StreamingOutput() {
-                    
+
                     @Override
                     public void write(OutputStream output) throws IOException, WebApplicationException {
@@ -170 +194 @@
             } else if ("xsd".equalsIgnoreCase(rawType)) {
                 result = new StreamingOutput() {
-                    
+
                     @Override
                     public void write(OutputStream output) throws IOException, WebApplicationException {
@@ -179 +203 @@
                             throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
                         }
-                        
+
                     }
                 };
@@ -192 +216 @@
         }
     }
-    
+
     public ComponentRegistry findRegistry(String id, RegistryClosure<? extends AbstractDescription> clos) throws ComponentRegistryException {
         AbstractDescription desc = null;
-        ComponentRegistry result = getRegistry(false);
+        ComponentRegistry result = getRegistry(getStatus(false));
         desc = clos.getDescription(result, id);
         if (desc == null) {
@@ -209 +233 @@
         return result;
     }
-    
+
     @GET
     @Path("/profiles/{profileId}")
@@ -216 +240 @@
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
         LOG.info("Profile with id: " + profileId + " is requested.");
-        CMDComponentSpec mdProfile = getRegistry(userspace).getMDProfile(profileId);
+        CMDComponentSpec mdProfile = getRegistry(getStatus(userspace)).getMDProfile(profileId);
         if (mdProfile == null) {
             return Response.status(Status.NOT_FOUND).build();
@@ -223 +247 @@
         }
     }
-    
+
     @GET
     @Path("/components/usage/{componentId}")
@@ -230 +254 @@
         try {
             final long start = System.currentTimeMillis();
-            ComponentRegistry registry = getRegistry(userspace);
+            ComponentRegistry registry = getRegistry(getStatus(userspace));
             List<ComponentDescription> components = registry.getUsageInComponents(componentId);
             List<ProfileDescription> profiles = registry.getUsageInProfiles(componentId);
-            
+
             LOG.info("Found " + components.size() + " components and " + profiles.size() + " profiles that use component " + componentId
                     + " (" + (System.currentTimeMillis() - start) + " millisecs)");
-            
+
             List<AbstractDescription> usages = new ArrayList<AbstractDescription>(components.size() + profiles.size());
             usages.addAll(components);
             usages.addAll(profiles);
-            
+
             return usages;
         } catch (ComponentRegistryException e) {
@@ -247 +271 @@
         }
     }
-    
+
     @GET
     @Path("/profiles/{profileId}/comments")
@@ -254 +278 @@
         long start = System.currentTimeMillis();
         final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(userspace).getCommentsInProfile(profileId, principal);
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
         LOG.info("Releasing " + comments.size() + " registered comments in Profile into the world (" + (System.currentTimeMillis() - start)
                 + " millisecs)");
         return comments;
     }
-    
+
     @GET
     @Path("/components/{componentId}/comments")
@@ -266 +290 @@
         long start = System.currentTimeMillis();
         final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(userspace).getCommentsInComponent(componentId, principal);
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
         LOG.info("Releasing " + comments.size() + " registered comments in Component into the world (" + (System.currentTimeMillis() - start)
                 + " millisecs)");
         return comments;
     }
-    
+
     @GET
     @Path("/profiles/{profileId}/comments/{commentId}")
@@ -278 +302 @@
         LOG.info(" Comments of component with id" + commentId + " are requested.");
         final Principal principal = security.getUserPrincipal();
-        return getRegistry(userspace).getSpecifiedCommentInProfile(profileId, commentId, principal);
-    }
-    
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInProfile(profileId, commentId, principal);
+    }
+
     @GET
     @Path("/components/{componentId}/comments/{commentId}")
@@ -287 +311 @@
         LOG.info(" Comments of component with id" + commentId + " are requested.");
         final Principal principal = security.getUserPrincipal();
-        return getRegistry(userspace).getSpecifiedCommentInComponent(componentId, commentId, principal);
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInComponent(componentId, commentId, principal);
     }
 
@@ -309 +333 @@
         }
     }
-    
+
     @POST
     @Path("/profiles/{profileId}/comments/{commentId}")
@@ -320 +344 @@
         }
     }
-    
+
     @POST
     @Path("/components/{componentId}/comments/{commentId}")
@@ -331 +355 @@
         }
     }
-    
+
     @POST
     @Path("/profiles/{profileId}/publish")
@@ -340 +364 @@
         try {
             Principal principal = checkAndGetUserPrincipal();
-            ProfileDescription desc = getRegistry(true).getProfileDescription(profileId);
+            ProfileDescription desc = getRegistry(getStatus(true)).getProfileDescription(profileId);
             if (desc != null) {
                 updateDescription(desc, name, description, domainName, group);
@@ -355 +379 @@
         }
     }
-    
+
     @POST
     @Path("/profiles/{profileId}/update")
@@ -366 +390 @@
             Principal principal = checkAndGetUserPrincipal();
             UserCredentials userCredentials = getUserCredentials(principal);
-            ProfileDescription desc = getRegistry(userspace).getProfileDescription(profileId);
+            ProfileDescription desc = getRegistry(getStatus(userspace)).getProfileDescription(profileId);
             if (desc != null) {
                 updateDescription(desc, name, description, domainName, group);
@@ -380 +404 @@
             return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
         }
-        
+
     }
 
@@ -402 +426 @@
         }
     }
-    
+
     @POST
     @Path("/components/{componentId}/publish")
@@ -412 +436 @@
         try {
             Principal principal = checkAndGetUserPrincipal();
-            ComponentDescription desc = getRegistry(true).getComponentDescription(componentId);
+            // TODO: Get status from parameter
+            ComponentDescription desc = getRegistry(getStatus(true)).getComponentDescription(componentId);
             if (desc != null) {
                 updateDescription(desc, name, description, domainName, group);
@@ -427 +452 @@
         }
     }
-    
+
     @POST
     @Path("/components/{componentId}/update")
@@ -437 +462 @@
         try {
             Principal principal = checkAndGetUserPrincipal();
-            ComponentDescription desc = getRegistry(userspace).getComponentDescription(componentId);
+            ComponentDescription desc = getRegistry(getStatus(userspace)).getComponentDescription(componentId);
             if (desc != null) {
                 updateDescription(desc, name, description, domainName, group);
@@ -452 +477 @@
         }
     }
-    
+
     private void updateDescription(AbstractDescription desc, String name, String description, String domainName, String group) {
         desc.setName(name);
@@ -460 +485 @@
         desc.setRegistrationDate(AbstractDescription.createNewDate());
     }
-    
+
     @DELETE
     @Path("/components/{componentId}")
@@ -467 +492 @@
         try {
             Principal principal = checkAndGetUserPrincipal();
-            ComponentRegistry registry = getRegistry(userspace);
+            ComponentRegistry registry = getRegistry(getStatus(userspace));
             LOG.info("Component with id: " + componentId + " set for deletion.");
             registry.deleteMDComponent(componentId, principal, false);
@@ -486 +511 @@
         return Response.ok().build();
     }
-    
+
     @DELETE
     @Path("/profiles/{profileId}")
@@ -494 +519 @@
             Principal principal = checkAndGetUserPrincipal();
             LOG.info("Profile with id: " + profileId + " set for deletion.");
-            getRegistry(userspace).deleteMDProfile(profileId, principal);
+            getRegistry(getStatus(userspace)).deleteMDProfile(profileId, principal);
         } catch (DeleteFailedException e) {
             LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
@@ -511 +536 @@
         return Response.ok().build();
     }
-    
+
     @DELETE
     @Path("/profiles/{profileId}/comments/{commentId}")
@@ -518 +543 @@
         try {
             final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(userspace);
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
             final Comment comment = registry.getSpecifiedCommentInProfile(profileId, commentId, principal);
             if (comment != null && profileId.equals(comment.getProfileDescriptionId())) {
@@ -542 +567 @@
         return Response.ok().build();
     }
-    
+
     @DELETE
     @Path("/components/{componentId}/comments/{commentId}")
@@ -549 +574 @@
         try {
             final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(userspace);
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
             final Comment comment = registry.getSpecifiedCommentInComponent(componentId, commentId, principal);
             if (comment != null && componentId.equals(comment.getComponentDescriptionId())) {
@@ -573 +598 @@
         return Response.ok().build();
     }
-    
+
     @GET
     @Path("/profiles/{profileId}/{rawType}")
@@ -588 +613 @@
             checkAndThrowDescription(desc, profileId);
             String fileName = desc.getName() + "." + rawType;
-            
+
             if ("xml".equalsIgnoreCase(rawType)) {
                 result = new StreamingOutput() {
-                    
+
                     @Override
                     public void write(OutputStream output) throws IOException, WebApplicationException {
@@ -604 +629 @@
             } else if ("xsd".equalsIgnoreCase(rawType)) {
                 result = new StreamingOutput() {
-                    
+
                     @Override
                     public void write(OutputStream output) throws IOException, WebApplicationException {
@@ -625 +650 @@
         }
     }
-    
+
     private void checkAndThrowDescription(AbstractDescription desc, String id) {
         if (desc == null) {
@@ -631 +656 @@
         }
     }
-    
+
     private Response createDownloadResponse(StreamingOutput result, String fileName) {
         //Making response so it triggers browsers native save as dialog.
@@ -637 +662 @@
                 "attachment; filename=\"" + fileName + "\"").entity(result).build();
         return response;
-        
-    }
-    
+
+    }
+
     @POST
     @Path("/profiles")
@@ -663 +688 @@
         }
     }
-    
+
     @POST
     @Path("/components")
@@ -687 +712 @@
         }
     }
-    
+
     @POST
     @Path("/components/{componentId}/comments")
@@ -700 +725 @@
                 throw new UserUnauthorizedException("Cannot materialize authenticated user");
             }
-            ComponentRegistry registry = getRegistry(userspace, userCredentials);
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
             ComponentDescription description = registry.getComponentDescription(componentId);
             if (description != null) {
@@ -713 +739 @@
         }
     }
-    
+
     @POST
     @Path("/profiles/{profileId}/comments")
@@ -726 +752 @@
                 throw new UserUnauthorizedException("Cannot materialize authenticated user");
             }
-            ComponentRegistry registry = getRegistry(userspace, userCredentials);
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
             ProfileDescription description = registry.getProfileDescription(profileId);
             if (description != null) {
@@ -739 +766 @@
         }
     }
-    
+
     @GET
     @Path("/pingSession")
@@ -754 +781 @@
         return Response.ok().entity("<session stillActive=\"" + stillActive + "\"/>").build();
     }
-    
+
     private Response register(InputStream input, AbstractDescription desc, UserCredentials userCredentials, boolean userspace,
             RegisterAction action) {
         try {
-            ComponentRegistry registry = getRegistry(userspace, userCredentials);
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
             DescriptionValidator descriptionValidator = new DescriptionValidator(desc);
-            MDValidator validator = new MDValidator(input, desc, registry, getRegistry(true), componentRegistryFactory.getPublicRegistry());
+            MDValidator validator = new MDValidator(input, desc, registry, getRegistry(getStatus(true)), componentRegistryFactory.getPublicRegistry());
             RegisterResponse response = new RegisterResponse();
             response.setIsInUserSpace(userspace);
@@ -798 +826 @@
         }
     }
-    
+
     private Response registerComment(InputStream input, ComponentRegistry registry, boolean userspace,
             AbstractDescription description, Principal principal, UserCredentials userCredentials) {
@@ -818 +846 @@
                     }
                 }
-                
+
                 int returnCode = registry.registerComment(com, principal.getName());
                 if (returnCode == 0) {
@@ -844 +872 @@
         }
     }
-    
+
     private ComponentDescription createNewComponentDescription() {
         ComponentDescription desc = ComponentDescription.createNewDescription();
@@ -850 +878 @@
         return desc;
     }
-    
+
     private ProfileDescription createNewProfileDescription() {
         ProfileDescription desc = ProfileDescription.createNewDescription();
@@ -856 +884 @@
         return desc;
     }
-    
+
     private Comment createNewComment() {
         Comment com = Comment.createANewComment();
         return com;
     }
-    
+
     private String createXlink(String id) {
         URI uri = uriInfo.getRequestUriBuilder().path(id).build();
         return uri.toString();
     }
-    
+
     private void validate(RegisterResponse response, Validator... validators) {
         for (Validator validator : validators) {
@@ -876 +904 @@
         }
     }
-    
+
     private void validateComment(CommentResponse response, Validator... validators) {
         for (Validator validator : validators) {

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/frontend/CMDItemInfoTest.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.frontend;
 
+import clarin.cmdi.componentregistry.ComponentStatus;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -14 +15 @@
     @Test
     public void testGetUserDir() throws Exception {
-        CMDItemInfo info = new CMDItemInfo();
-        //info.setDataNode(new FileNode(createFile("users/user1/components/c_123/description.xml"), false));
-        info.setDataNode(new DisplayDataNode("test", false, createDescription(), false));
-        assertTrue(info.isDeletable());
-        assertFalse(info.isUndeletable());
-        assertTrue(info.isEditable());
-        assertFalse(info.getDataNode().isDeleted());
-        assertTrue(info.isInUserWorkSpace());
-        //info.setDataNode(new FileNode(createFile("users/user1/components/deleted/c_123/description.xml"), true));
-        info.setDataNode(new DisplayDataNode("test", true, createDescription(), false));
-        assertFalse(info.isDeletable());
-        assertTrue(info.isUndeletable());
-        assertTrue(info.isEditable());
-        assertTrue(info.getDataNode().isDeleted());
-        assertTrue(info.isInUserWorkSpace());
-        //info.setDataNode(new FileNode(createFile("components/c_123/description.xml"), false));
-        info.setDataNode(new DisplayDataNode("test", false, createDescription(), true));
-        assertTrue(info.isDeletable());
-        assertFalse(info.isUndeletable());
-        assertTrue(info.isEditable());
-        assertFalse(info.isInUserWorkSpace());
-        //info.setDataNode(new FileNode(createFile("components/c_123/"), false));
-        info.setDataNode(new DisplayDataNode("test", false));
-        assertFalse(info.isDeletable());
-        assertFalse(info.isUndeletable());
-        assertFalse(info.isEditable());
-        //info.setDataNode(new FileNode(createFile("components/deleted/c_123/description.xml"), true));
-        info.setDataNode(new DisplayDataNode("test", true, createDescription(), true));
-        assertFalse(info.isDeletable());
-        assertTrue(info.isUndeletable());
-        assertTrue(info.isEditable());
-        assertFalse(info.isInUserWorkSpace());
-        assertTrue(info.getDescription().startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<profileDescription"));
-        //info.setDataNode(new FileNode(createFile("components/deleted/c_123/"), true));
-        info.setDataNode(new DisplayDataNode("test", true));
-        assertFalse(info.isDeletable());
-        assertFalse(info.isUndeletable());
-        assertFalse(info.isEditable());
-        assertEquals("", info.getDescription());
+        CMDItemInfo info = new CMDItemInfo();
+        //info.setDataNode(new FileNode(createFile("users/user1/components/c_123/description.xml"), false));
+        info.setDataNode(new DisplayDataNode("test", false, createDescription(), ComponentStatus.DEVELOPMENT));
+        assertTrue(info.isDeletable());
+        assertFalse(info.isUndeletable());
+        assertTrue(info.isEditable());
+        assertFalse(info.getDataNode().isDeleted());
+        assertEquals(ComponentStatus.DEVELOPMENT, info.getStatus());
+        //info.setDataNode(new FileNode(createFile("users/user1/components/deleted/c_123/description.xml"), true));
+        info.setDataNode(new DisplayDataNode("test", true, createDescription(), ComponentStatus.DEVELOPMENT));
+        assertFalse(info.isDeletable());
+        assertTrue(info.isUndeletable());
+        assertTrue(info.isEditable());
+        assertTrue(info.getDataNode().isDeleted());
+        assertEquals(ComponentStatus.DEVELOPMENT, info.getStatus());
+        //info.setDataNode(new FileNode(createFile("components/c_123/description.xml"), false));
+        info.setDataNode(new DisplayDataNode("test", false, createDescription(), ComponentStatus.PUBLIC));
+        assertTrue(info.isDeletable());
+        assertFalse(info.isUndeletable());
+        assertTrue(info.isEditable());
+        assertEquals(ComponentStatus.PUBLIC, info.getStatus());
+        //info.setDataNode(new FileNode(createFile("components/c_123/"), false));
+        info.setDataNode(new DisplayDataNode("test", false));
+        assertFalse(info.isDeletable());
+        assertFalse(info.isUndeletable());
+        assertFalse(info.isEditable());
+        //info.setDataNode(new FileNode(createFile("components/deleted/c_123/description.xml"), true));
+        info.setDataNode(new DisplayDataNode("test", true, createDescription(), ComponentStatus.PUBLIC));
+        assertFalse(info.isDeletable());
+        assertTrue(info.isUndeletable());
+        assertTrue(info.isEditable());
+        assertEquals(ComponentStatus.PUBLIC, info.getStatus());
+        assertTrue(info.getDescription().startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<profileDescription"));
+        //info.setDataNode(new FileNode(createFile("components/deleted/c_123/"), true));
+        info.setDataNode(new DisplayDataNode("test", true));
+        assertFalse(info.isDeletable());
+        assertFalse(info.isUndeletable());
+        assertFalse(info.isEditable());
+        assertEquals("", info.getDescription());
     }
 
     private AbstractDescription createDescription() {
-        return ProfileDescription.createNewDescription();
+        return ProfileDescription.createNewDescription();
     }
-
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java

@@ -17 +17 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.DeleteFailedException;
 import clarin.cmdi.componentregistry.frontend.CMDItemInfo;
@@ -28 +29 @@
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"/applicationContext.xml"})
-public class AdminRegistryTest  {
-    
+public class AdminRegistryTest {
+
     @Autowired
     private ComponentDescriptionDao componentDescriptionDao;
@@ -37 +38 @@
     private ComponentRegistryFactory componentRegistryFactory;
     private static final Principal PRINCIPAL_ADMIN = DummyPrincipal.DUMMY_ADMIN_PRINCIPAL;
-    
     @Autowired
     private JdbcTemplate jdbcTemplate;
-    
+
     @Before
     public void init() {
@@ -48 +48 @@
     @Test
     public void testForceUpdate() throws Exception {
-        ComponentRegistry testRegistry = componentRegistryFactory.getPublicRegistry();
-        String content1 = "";
-        content1 += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-        content1 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
-        content1 += "    <Header/>\n";
-        content1 += "    <CMD_Component name=\"XXX\" CardinalityMin=\"1\" CardinalityMax=\"10\">\n";
-        content1 += "        <CMD_Element name=\"Availability\" ValueScheme=\"string\" />\n";
-        content1 += "    </CMD_Component>\n";
-        content1 += "</CMD_ComponentSpec>\n";
-        ComponentDescription compDesc1 = RegistryTestHelper.addComponent(testRegistry, "XXX1", content1);
+        ComponentRegistry testRegistry = componentRegistryFactory.getPublicRegistry();
+        String content1 = "";
+        content1 += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+        content1 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
+        content1 += "    <Header/>\n";
+        content1 += "    <CMD_Component name=\"XXX\" CardinalityMin=\"1\" CardinalityMax=\"10\">\n";
+        content1 += "        <CMD_Element name=\"Availability\" ValueScheme=\"string\" />\n";
+        content1 += "    </CMD_Component>\n";
+        content1 += "</CMD_ComponentSpec>\n";
+        ComponentDescription compDesc1 = RegistryTestHelper.addComponent(testRegistry, "XXX1", content1);
 
-        String content2 = "";
-        content2 += "<CMD_ComponentSpec isProfile=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
-        content2 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
-        content2 += "    <Header/>\n";
-        content2 += "    <CMD_Component name=\"YYY\" CardinalityMin=\"1\" CardinalityMax=\"unbounded\">\n";
-        content2 += "        <CMD_Component ComponentId=\"" + compDesc1.getId() + "\" CardinalityMin=\"0\" CardinalityMax=\"99\">\n";
-        content2 += "        </CMD_Component>\n";
-        content2 += "    </CMD_Component>\n";
-        content2 += "</CMD_ComponentSpec>\n";
-        ProfileDescription profileDesc = RegistryTestHelper.addProfile(testRegistry, "YYY1", content2);
+        String content2 = "";
+        content2 += "<CMD_ComponentSpec isProfile=\"true\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
+        content2 += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
+        content2 += "    <Header/>\n";
+        content2 += "    <CMD_Component name=\"YYY\" CardinalityMin=\"1\" CardinalityMax=\"unbounded\">\n";
+        content2 += "        <CMD_Component ComponentId=\"" + compDesc1.getId() + "\" CardinalityMin=\"0\" CardinalityMax=\"99\">\n";
+        content2 += "        </CMD_Component>\n";
+        content2 += "    </CMD_Component>\n";
+        content2 += "</CMD_ComponentSpec>\n";
+        ProfileDescription profileDesc = RegistryTestHelper.addProfile(testRegistry, "YYY1", content2);
 
-        AdminRegistry adminReg = new AdminRegistry();
-        adminReg.setComponentRegistryFactory(componentRegistryFactory);
-        adminReg.setComponentDescriptionDao(componentDescriptionDao);
-        adminReg.setProfileDescriptionDao(profileDescriptionDao);
-        CMDItemInfo fileInfo = new CMDItemInfo();
-        fileInfo.setForceUpdate(false);
-        fileInfo.setDataNode(new DisplayDataNode(compDesc1.getName(), false, compDesc1, true));
-        fileInfo.setContent(content1);
-        try {
-            adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN);
-            fail();
-        } catch (SubmitFailedException e) {}
-        fileInfo.setForceUpdate(true);
-        adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN); //Component needs to be forced because they can be used by other profiles/components
+        AdminRegistry adminReg = new AdminRegistry();
+        adminReg.setComponentRegistryFactory(componentRegistryFactory);
+        adminReg.setComponentDescriptionDao(componentDescriptionDao);
+        adminReg.setProfileDescriptionDao(profileDescriptionDao);
+        CMDItemInfo fileInfo = new CMDItemInfo();
+        fileInfo.setForceUpdate(false);
+        fileInfo.setDataNode(new DisplayDataNode(compDesc1.getName(), false, compDesc1, ComponentStatus.PUBLIC));
+        fileInfo.setContent(content1);
+        try {
+            adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN);
+            fail();
+        } catch (SubmitFailedException e) {
+        }
+        fileInfo.setForceUpdate(true);
+        adminReg.submitFile(fileInfo, PRINCIPAL_ADMIN); //Component needs to be forced because they can be used by other profiles/components
 
-        assertEquals(1, testRegistry.getComponentDescriptions().size());
-        try {
-            fileInfo.setForceUpdate(false);
-            adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
-            fail();
-        } catch (SubmitFailedException e) {
-            assertTrue(e.getCause() instanceof DeleteFailedException);
-        }
-        assertEquals(1, testRegistry.getComponentDescriptions().size());
-        fileInfo.setForceUpdate(true);
-        adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
-        assertEquals(0, testRegistry.getComponentDescriptions().size());
+        assertEquals(1, testRegistry.getComponentDescriptions().size());
+        try {
+            fileInfo.setForceUpdate(false);
+            adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
+            fail();
+        } catch (SubmitFailedException e) {
+            assertTrue(e.getCause() instanceof DeleteFailedException);
+        }
+        assertEquals(1, testRegistry.getComponentDescriptions().size());
+        fileInfo.setForceUpdate(true);
+        adminReg.delete(fileInfo, PRINCIPAL_ADMIN);
+        assertEquals(0, testRegistry.getComponentDescriptions().size());
 
-        assertEquals(1, testRegistry.getProfileDescriptions().size());
-        fileInfo.setForceUpdate(false);
-        fileInfo.setDataNode(new DisplayDataNode(profileDesc.getName(), false, profileDesc, true));
-        adminReg.delete(fileInfo, PRINCIPAL_ADMIN); //Profile do not need to be forced they cannot be used by other profiles
-        assertEquals(0, testRegistry.getProfileDescriptions().size());
+        assertEquals(1, testRegistry.getProfileDescriptions().size());
+        fileInfo.setForceUpdate(false);
+        fileInfo.setDataNode(new DisplayDataNode(profileDesc.getName(), false, profileDesc, ComponentStatus.PUBLIC));
+        adminReg.delete(fileInfo, PRINCIPAL_ADMIN); //Profile do not need to be forced they cannot be used by other profiles
+        assertEquals(0, testRegistry.getProfileDescriptions().size());
     }
 }

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java

@@ -5 +5 @@
 import clarin.cmdi.componentregistry.model.RegistryUser;
 import clarin.cmdi.componentregistry.ComponentRegistry;
+import clarin.cmdi.componentregistry.ComponentStatus;
+import clarin.cmdi.componentregistry.OwnerUser;
 import clarin.cmdi.componentregistry.UserCredentials;
+import clarin.cmdi.componentregistry.UserUnauthorizedException;
 import clarin.cmdi.componentregistry.rest.DummyPrincipal;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50 +53 @@
 
     @Test
-    public void getComponentRegistry() {
+    public void getComponentRegistry() throws UserUnauthorizedException {
         // Get public
-        assertNotNull(componentRegistryFactory.getComponentRegistry(false, null));
+        assertNotNull(componentRegistryFactory.getComponentRegistry(ComponentStatus.PUBLIC, null, null));
 
         // Get for non-existing user
         final RegistryUser testUser = UserDaoTest.createTestUser();
-        UserCredentials credentials = new DummyPrincipal(testUser.
-                getPrincipalName()).getCredentials();
+        UserCredentials credentials = new DummyPrincipal(testUser.getPrincipalName()).getCredentials();
 
-        ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory.
-                getComponentRegistry(true, credentials);
+        ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, credentials);
         assertNotNull(cr1);
         // Get for existing user
-        ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory.
-                getComponentRegistry(true, credentials);
+        ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, credentials);;
         assertNotNull(cr2);
         assertEquals(cr1.getOwner(), cr2.getOwner());
 
         // Get for another new user
-        UserCredentials credentials2 = new DummyPrincipal(testUser.
-                getPrincipalName() + "2").getCredentials();
-        ComponentRegistryDbImpl cr3 = (ComponentRegistryDbImpl) componentRegistryFactory.
-                getComponentRegistry(true, credentials2);
+        UserCredentials credentials2 = new DummyPrincipal(testUser.getPrincipalName() + "2").getCredentials();
+        ComponentRegistryDbImpl cr3 = (ComponentRegistryDbImpl) componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, credentials2);
         assertNotNull(cr3);
         assertNotSame(cr1.getOwner(), cr3.getOwner());
@@ -78 +76 @@
 
     @Test
-    public void testGetOtherUserComponentRegistry() {
-        UserCredentials userCredentials = DummyPrincipal.DUMMY_PRINCIPAL.
-                getCredentials();
+    public void testGetOtherUserComponentRegistry() throws UserUnauthorizedException {
+        UserCredentials userCredentials = DummyPrincipal.DUMMY_PRINCIPAL.getCredentials();
 
         // Create registry for new user
-        ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory.
-                getComponentRegistry(true, userCredentials);
+        ComponentRegistryDbImpl cr1 = (ComponentRegistryDbImpl) componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, userCredentials);
 
-        String id = cr1.getOwner().getId().toString();
+        Number id = cr1.getOwner().getId();
 
         // Get it as admin
-        ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory.
-                getOtherUserComponentRegistry(DummyPrincipal.DUMMY_ADMIN_PRINCIPAL, id);
+        ComponentRegistryDbImpl cr2 = (ComponentRegistryDbImpl) componentRegistryFactory.getOtherUserComponentRegistry(DummyPrincipal.DUMMY_ADMIN_PRINCIPAL, ComponentStatus.DEVELOPMENT, new OwnerUser(id));
         assertNotNull(cr2);
         // Should be this user's registry
@@ -97 +92 @@
         // Try get it as non-admin
         try {
-            componentRegistryFactory.getOtherUserComponentRegistry(DummyPrincipal.DUMMY_PRINCIPAL, id);
+            componentRegistryFactory.getOtherUserComponentRegistry(DummyPrincipal.DUMMY_PRINCIPAL, ComponentStatus.DEVELOPMENT, new OwnerUser(id));
             fail("Non-admin can get other user's component registry");
         } catch (Exception ex) {

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory;
@@ -16 +17 @@
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.multipart.FormDataMultiPart;
+import java.awt.image.ComponentSampleModel;
 import java.io.ByteArrayInputStream;
 import java.util.Date;
@@ -689 +691 @@
     @Test
     public void testRegisterWithUserComponents() throws Exception {
-        ComponentRegistry userRegistry = componentRegistryFactory.getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
+        ComponentRegistry userRegistry = componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, DummyPrincipal.DUMMY_CREDENTIALS);
         String content = "";
         content += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/MDValidatorTest.java

@@ -3 +3 @@
 import clarin.cmdi.componentregistry.ComponentRegistry;
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
+import clarin.cmdi.componentregistry.ComponentStatus;
 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryTestDatabase;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
@@ -164 +165 @@
         String id1 = "component1";
         String id2 = "component2";
-        ComponentRegistry userRegistry = componentRegistryFactory.getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
+        ComponentRegistry userRegistry = componentRegistryFactory.getComponentRegistry(ComponentStatus.DEVELOPMENT, null, DummyPrincipal.DUMMY_CREDENTIALS);
 
         String profileContent = "";