Changeset 836

Timestamp:

11/03/10 10:25:21 (14 years ago)

Author:

patdui

Message:

• Removed some obsolete stuff
• Added update REST call.

Location:

ComponentRegistry/trunk/ComponentRegistry

Files:

• pom.xml (modified) (2 diffs)
• src/main/bin/registryMigration.sh (deleted)
• src/main/java/clarin/cmdi/componentregistry/AdminRegistry.java (modified) (2 diffs)
• src/main/java/clarin/cmdi/componentregistry/ComponentRegistry.java (modified) (3 diffs)
• src/main/java/clarin/cmdi/componentregistry/ComponentRegistryImpl.java (modified) (13 diffs)
• src/main/java/clarin/cmdi/componentregistry/frontend/AdminServlet.java (deleted)
• src/main/java/clarin/cmdi/componentregistry/frontend/MassMigratePage.java (modified) (2 diffs)
• src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java (modified) (4 diffs)
• src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (9 diffs)
• src/main/java/clarin/cmdi/componentregistry/tools/MigrateData.java (deleted)
• src/main/java/clarin/cmdi/componentregistry/tools/RegistryMigration.java (deleted)
• src/test/java/clarin/cmdi/componentregistry/ComponentRegistryImplTest.java (modified) (20 diffs)
• src/test/java/clarin/cmdi/componentregistry/frontend/FileInfoTest.java (modified) (1 diff)
• src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTest.java (modified) (13 diffs)
• src/test/java/clarin/cmdi/componentregistry/rest/RegistryTestHelper.java (modified) (5 diffs)

ComponentRegistry/trunk/ComponentRegistry/pom.xml

@@ -38 +38 @@
       <artifactId>jaxb-impl</artifactId>
       <version>2.1</version>
-    </dependency>
-
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -156 +156 @@
     <serviceRootUrl>http://localhost:8080/${pom.artifactId}</serviceRootUrl>
     <isocatSearchUrl>http://www.isocat.org/rest/user/guest/search</isocatSearchUrl>
-    <registryRoot>/tmp/ComponentRegistry</registryRoot> <!-- /Users/patdui/Workspace/Clarin/MyRegistry -->
+    <registryRoot>/tmp/ComponentRegistry</registryRoot>
     <ComponentBrowserGuiVersion>1.6-SNAPSHOT</ComponentBrowserGuiVersion>
     <ComponentRegistrySwfName>${pom.artifactId}-${ComponentBrowserGuiVersion}</ComponentRegistrySwfName>

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

@@ -27 +27 @@
         try {
             File file = fileInfo.getFileNode().getFile();
-            if ( fileInfo.getFileNode().isDeleted()) {
+            if (fileInfo.getFileNode().isDeleted()) {
                 //already deleted file
                 FileUtils.writeStringToFile(file, fileInfo.getText(), "UTF-8");
@@ -121 +121 @@
 
     private int submitToRegistry(AbstractDescription description, CMDComponentSpec spec, Principal userPrincipal, FileInfo fileInfo) {
-        ComponentRegistry registry = getRegistry(userPrincipal, description, fileInfo); 
+        ComponentRegistry registry = getRegistry(userPrincipal, description, fileInfo);
         if (spec.isIsProfile()) {
-            return registry.registerMDProfile((ProfileDescription) description, spec);
+            return registry.register((ProfileDescription) description, spec);
         } else {
-            return registry.registerMDComponent((ComponentDescription) description, spec);
+            return registry.register((ComponentDescription) description, spec);
         }
 
     }
 
-    private void deleteFromRegistry(Principal userPrincipal, AbstractDescription desc, FileInfo fileInfo) throws IOException, UserUnauthorizedException,
-            DeleteFailedException {
-        ComponentRegistry registry = getRegistry(userPrincipal, desc, fileInfo); 
+    private void deleteFromRegistry(Principal userPrincipal, AbstractDescription desc, FileInfo fileInfo) throws IOException,
+            UserUnauthorizedException, DeleteFailedException {
+        ComponentRegistry registry = getRegistry(userPrincipal, desc, fileInfo);
         LOG.info("Deleting item: " + desc);
         if (desc.isProfile()) {

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

@@ -5 +5 @@
 import java.security.Principal;
 import java.util.List;
-
-import javax.xml.bind.JAXBException;
 
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
@@ -33 +31 @@
      * @return -1 if profile could not be registered
      */
-    int registerMDProfile(ProfileDescription description, CMDComponentSpec spec);
+    int register(AbstractDescription desc, CMDComponentSpec spec);
 
-    int registerMDComponent(ComponentDescription description, CMDComponentSpec spec);
+    /**
+     * 
+     * @return -1 if component could not be updated
+     */
+    int update(AbstractDescription description, CMDComponentSpec spec);
 
     void getMDProfileAsXml(String profileId, OutputStream output);
@@ -64 +66 @@
      * @throws DeleteFailedException
      */
-    void deleteMDComponent(String componentId, Principal principal, boolean forceDelete) throws IOException, UserUnauthorizedException, DeleteFailedException;
-
-    void update(AbstractDescription desc, Principal principal, CMDComponentSpec spec) throws IOException, JAXBException,
-            UserUnauthorizedException;
+    void deleteMDComponent(String componentId, Principal principal, boolean forceDelete) throws IOException, UserUnauthorizedException,
+            DeleteFailedException;
 
     /**

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

@@ -21 +21 @@
 import javax.xml.bind.JAXBException;
 
+import org.apache.commons.collections.Closure;
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.commons.io.FileUtils;
@@ -29 +30 @@
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.commons.lang.time.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -217 +216 @@
     public File getProfileFile(String profileId) {
         String id = stripRegistryId(profileId);
-        File file = new File(resourceConfig.getProfileDir(), id + File.separator + id + ".xml");
+        File file = new File(getProfileDir(), id + File.separator + id + ".xml");
         return file;
     }
@@ -252 +251 @@
     public File getComponentFile(String componentId) {
         String id = stripRegistryId(componentId);
-        File file = new File(resourceConfig.getComponentDir(), id + File.separator + id + ".xml");
+        File file = new File(getComponentDir(), id + File.separator + id + ".xml");
         return file;
     }
@@ -273 +272 @@
      * CMDComponentSpec and description are assumed to be valid.
      */
-    public int registerMDComponent(ComponentDescription description, CMDComponentSpec spec) {
-        LOG.info("Attempt to register component: " + description);
-        return register(resourceConfig.getComponentDir(), description, spec, "component");
-    }
-
-    /**
-     * CMDComponentSpec and description are assumed to be valid.
-     */
-    public int registerMDProfile(ProfileDescription profileDescription, CMDComponentSpec spec) {
-        LOG.info("Attempt to register profile: " + profileDescription);
-        return register(resourceConfig.getProfileDir(), profileDescription, spec, "profile");
-    }
-
-    private int register(File storageDir, AbstractDescription description, CMDComponentSpec spec, String type) {
+    public int register(AbstractDescription desc, CMDComponentSpec spec) {
+        LOG.info("Attempt to register " + desc.getType() + ": " + desc);
+        return register(getDir(desc), desc, spec, new RegisterClosureOnFail(desc));
+    }
+
+    public int update(AbstractDescription desc, CMDComponentSpec spec) {
+        LOG.info("Attempt to update " + desc.getType() + ": " + desc);
+        return register(getDir(desc), desc, spec, new UpdateClosureOnFail(desc));
+    }
+
+    private File getDir(AbstractDescription desc) {
+        return desc.isProfile() ? getProfileDir() : getComponentDir();
+    }
+
+    private int register(File storageDir, AbstractDescription description, CMDComponentSpec spec, Closure onFail) {
         String strippedId = stripRegistryId(description.getId());
         File dir = new File(storageDir, strippedId);
@@ -292 +292 @@
         try {
             boolean dirCreated = dir.mkdir();
-            if (dirCreated) {
+            if (dirCreated || dir.exists()) {
                 writeDescription(dir, description);
-                enrichSpecHeader(spec, description);
-                writeCMDComponentSpec(dir, strippedId + ".xml", spec);
+                if (spec != null) {
+                    enrichSpecHeader(spec, description);
+                    writeCMDComponentSpec(dir, strippedId + ".xml", spec);
+                }
                 success = true;
             }
@@ -304 +306 @@
         } finally {
             if (!success) {
-                LOG.info("Registration of " + type + " " + description + " unsuccessful. Cleaning up created folders.");
-                try {
-                    FileUtils.deleteDirectory(dir);
-                } catch (IOException e) {
-                    LOG.error("Error in registration. Cleaning up " + type + " failed: " + dir + " :", e);
-                }
+                onFail.execute(dir);
                 return -1;
             }
         }
-        LOG.info("Succesfully registered a " + type + " in " + dir + " " + type + "= " + description);
+        LOG.info("Succesfully registered/updated a " + description.getType() + " in " + dir + " " + description.getType() + "= "
+                + description);
         updateCache(description);
         return 0;
@@ -327 +325 @@
             header.setDescription(description.getDescription());
         }
-
     }
 
@@ -359 +356 @@
 
     private void checkAuthorisation(AbstractDescription desc, Principal principal) throws UserUnauthorizedException {
-        if (!desc.isThisTheOwner(principal.getName()) && !Configuration.getInstance().isAdminUser(principal)) { 
+        if (!desc.isThisTheOwner(principal.getName()) && !Configuration.getInstance().isAdminUser(principal)) {
             throw new UserUnauthorizedException("Unauthorized operation user '" + principal.getName()
                     + "' is not the creator (nor an administrator) of the " + (desc.isProfile() ? "profile" : "component") + "(" + desc
@@ -366 +363 @@
     }
 
-    public void deleteMDComponent(String componentId, Principal principal, boolean forceDelete) throws IOException, UserUnauthorizedException,
-            DeleteFailedException {
+    public void deleteMDComponent(String componentId, Principal principal, boolean forceDelete) throws IOException,
+            UserUnauthorizedException, DeleteFailedException {
         ComponentDescription desc = componentDescriptions.get(componentId);
         if (desc != null) {
@@ -386 +383 @@
         if (isPublic() && !Configuration.getInstance().isAdminUser(principal)) {
             try {
-                Date regDate = DateUtils.parseDate(desc.getRegistrationDate(), new String[] { DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT
-                        .getPattern() });
+                Date regDate = AbstractDescription.getDate(desc.getRegistrationDate());
                 Calendar calendar = Calendar.getInstance();
                 calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1);
@@ -428 +424 @@
     }
 
-    
-    /**
-     * spec is optional can be null if only the description needs to be updated.
-     */
-    public void update(AbstractDescription description, Principal principal, CMDComponentSpec spec) throws IOException, JAXBException,
-            UserUnauthorizedException {
-        if (!Configuration.getInstance().isAdminUser(principal)) {
-            throw new UserUnauthorizedException("Unauthorized operation user '" + principal.getName()
-                    + "' cannot update this description (" + description + ").");
-        }
-        File typeDir;
-        if (description.isProfile()) {
-            typeDir = getProfileDir();
-        } else {
-            typeDir = getComponentDir();
-        }
-        String strippedId = stripRegistryId(description.getId());
-        File dir = new File(typeDir, strippedId);
-        writeDescription(dir, description);
-        if (spec != null)
-            writeCMDComponentSpec(dir, strippedId + ".xml", spec);
-        updateCache(description);
-    }
-
     public List<ComponentDescription> getUsageInComponents(String componentId) {
         List<ComponentDescription> result = new ArrayList<ComponentDescription>();
@@ -504 +476 @@
     }
 
+    private class RegisterClosureOnFail implements Closure {
+
+        private final AbstractDescription desc;
+
+        RegisterClosureOnFail(AbstractDescription desc) {
+            this.desc = desc;
+        }
+
+        @Override
+        public void execute(Object input) {
+            File dir = (File) input;
+            LOG.info("Registration of " + desc + " unsuccessful. Cleaning up created folders.");
+            try {
+                FileUtils.deleteDirectory(dir);
+            } catch (IOException e) {
+                LOG.error("Error in registration. Cleaning up " + desc.getId() + " failed: " + dir + " :", e);
+            }
+
+        }
+    }
+
+    private class UpdateClosureOnFail implements Closure {
+
+        private final AbstractDescription desc;
+
+        UpdateClosureOnFail(AbstractDescription desc) {
+            this.desc = desc;
+        }
+
+        @Override
+        public void execute(Object input) {
+            LOG.info("Update of " + desc + " unsuccessful.");
+        }
+
+    }
 }

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

@@ -113 +113 @@
                 desc.setUserId(userId);
                 try {
-                    registry.update(desc, getUserPrincipal(), null);
+                    registry.update(desc, null);
                     info("Updated: " + desc);
                 } catch (Exception e) {
@@ -131 +131 @@
             desc.setDescription(specDescription);
             try {
-                registry.update(desc, getUserPrincipal(), null);
+                registry.update(desc, null);
                 info("Updated: " + desc);
             } catch (Exception e) {

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
 
+import java.text.ParseException;
 import java.util.Date;
 
@@ -10 +11 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.commons.lang.time.DateUtils;
 
 @XmlAccessorType(XmlAccessType.FIELD)
@@ -102 +104 @@
     }
 
+    public String getType() {
+        return isProfile() ? "profile" : "component";
+    }
+
     public static String createNewDate() {
         return DateFormatUtils.formatUTC(new Date(), DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
@@ -115 +121 @@
     }
 
+    public static Date getDate(String registrationDate) throws ParseException {
+        return DateUtils.parseDate(registrationDate, new String[] { DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern() });
+    }
+
 }

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

@@ -181 +181 @@
     }
 
+    @POST
+    @Path("/profiles/{profileId}/update")
+    @Consumes("multipart/form-data")
+    public Response updateRegisteredProfile(@PathParam("profileId") String profileId,
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @FormDataParam(DATA_FORM_FIELD) InputStream input,
+            @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
+            @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        Principal principal = checkAndGetUserPrincipal();
+        UserCredentials userCredentials = getUserCredentials(principal);
+        ProfileDescription desc = getRegistry(userspace).getProfileDescription(profileId);
+        if (desc != null) {
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setDomainName(domainName);
+            desc.setRegistrationDate(AbstractDescription.createNewDate());
+            return register(input, desc, userCredentials, userspace, true);
+        } else {
+            LOG.error("Update of nonexistent id (" + profileId + ") failed.");
+            return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+        }
+    }
+
     /**
      * 
@@ -197 +219 @@
         } else {
             return Response.ok().build();
+        }
+    }
+
+    @POST
+    @Path("/components/{componentId}/update")
+    @Consumes("multipart/form-data")
+    public Response updateRegisteredComponent(@PathParam("componentId") String componentId,
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @FormDataParam(DATA_FORM_FIELD) InputStream input,
+            @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
+            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        Principal principal = checkAndGetUserPrincipal();
+        UserCredentials userCredentials = getUserCredentials(principal);
+        ComponentDescription desc = getRegistry(userspace).getComponentDescription(componentId);
+        if (desc != null) {
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setGroupName(group);
+            desc.setDomainName(domainName);
+            desc.setRegistrationDate(AbstractDescription.createNewDate());
+            return register(input, desc, userCredentials, userspace, true);
+        } else {
+            LOG.error("Update of nonexistent id (" + componentId + ") failed.");
+            return Response.serverError().entity("Invalid id, cannot update nonexistent component").build();
         }
     }
@@ -291 +336 @@
     @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Consumes("multipart/form-data")
-    public RegisterResponse registerProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
+    public Response registerProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
             @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(DOMAIN_FORM_FIELD) String domainName,
             @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
@@ -303 +348 @@
         desc.setDomainName(domainName);
         LOG.info("Trying to register Profile: " + desc);
-        return register(input, desc, userCredentials, userspace);
+        return register(input, desc, userCredentials, userspace, false);
     }
 
@@ -310 +355 @@
     @Produces( { MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
     @Consumes("multipart/form-data")
-    public RegisterResponse registerComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input,
-            @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
-            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+    public Response registerComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input, @FormDataParam(NAME_FORM_FIELD) String name,
+            @FormDataParam(DESCRIPTION_FORM_FIELD) String description, @FormDataParam(GROUP_FORM_FIELD) String group,
+            @FormDataParam(DOMAIN_FORM_FIELD) String domainName, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
         Principal principal = checkAndGetUserPrincipal();
         UserCredentials userCredentials = getUserCredentials(principal);
@@ -324 +368 @@
         desc.setDomainName(domainName);
         LOG.info("Trying to register Component: " + desc);
-        return register(input, desc, userCredentials, userspace);
+        return register(input, desc, userCredentials, userspace, false);
     }
 
@@ -342 +386 @@
     }
 
-    private RegisterResponse register(InputStream input, AbstractDescription desc, UserCredentials userCredentials, boolean userspace) {
+    private Response register(InputStream input, AbstractDescription desc, UserCredentials userCredentials, boolean userspace,
+            boolean update) {
         try {
             ComponentRegistry registry = getRegistry(userspace, userCredentials);
@@ -352 +397 @@
             if (response.getErrors().isEmpty()) {
                 CMDComponentSpec spec = validator.getCMDComponentSpec();
-                int returnCode = spec.isIsProfile() ? registry.registerMDProfile((ProfileDescription) desc, spec) : registry
-                        .registerMDComponent((ComponentDescription) desc, spec);
+                int returnCode;
+                if (update) {
+                    returnCode = registry.update(desc, spec);
+                } else {
+                    returnCode = registry.register(desc, spec);
+                }
                 if (returnCode == 0) {
                     response.setRegistered(true);
@@ -366 +415 @@
             }
             response.setIsProfile(desc.isProfile());
-            return response;
+            return Response.ok(response).build();
         } finally {
             try {

ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/ComponentRegistryImplTest.java

@@ -31 +31 @@
 
     @Test
-    public void testRegisterMDProfile() throws JAXBException {
+    public void testRegisterProfile() throws JAXBException {
         ComponentRegistry register = getTestRegistry(getRegistryDir());
         ProfileDescription description = ProfileDescription.createNewDescription();
@@ -45 +45 @@
         assertNull(testProfile.getHeader().getDescription());
 
-        register.registerMDProfile(description, testProfile);
+        register.register(description, testProfile);
 
         assertEquals(0, register.getComponentDescriptions().size());
@@ -60 +60 @@
 
     @Test
-    public void testRegisterMDComponent() throws JAXBException {
+    public void testRegisterComponent() throws JAXBException {
         ComponentRegistry register = getTestRegistry(getRegistryDir());
         ComponentDescription description = ComponentDescription.createNewDescription();
@@ -75 +75 @@
         testComponent.getHeader().setDescription("Will not be overwritten");
 
-        register.registerMDComponent(description, testComponent);
+        register.register(description, testComponent);
 
         assertEquals(1, register.getComponentDescriptions().size());
@@ -102 +102 @@
         assertEquals(0, register.getComponentDescriptions().size());
         assertEquals(0, register.getProfileDescriptions().size());
-        register.registerMDProfile(description, RegistryTestHelper.getTestProfile());
+        register.register(description, RegistryTestHelper.getTestProfile());
         assertEquals(0, register.getComponentDescriptions().size());
         assertEquals(1, register.getProfileDescriptions().size());
@@ -131 +131 @@
         assertEquals(0, publicReg.getComponentDescriptions().size());
         assertEquals(0, publicReg.getProfileDescriptions().size());
-        userReg.registerMDComponent(cDesc, RegistryTestHelper.getTestComponent());
-        publicReg.registerMDComponent(cDesc, RegistryTestHelper.getTestComponent());
-        publicReg.registerMDProfile(pDesc, RegistryTestHelper.getTestProfile());
-        userReg.registerMDProfile(pDesc, RegistryTestHelper.getTestProfile());
+        userReg.register(cDesc, RegistryTestHelper.getTestComponent());
+        publicReg.register(cDesc, RegistryTestHelper.getTestComponent());
+        publicReg.register(pDesc, RegistryTestHelper.getTestProfile());
+        userReg.register(pDesc, RegistryTestHelper.getTestProfile());
         assertEquals(1, userReg.getComponentDescriptions().size());
         assertEquals(1, userReg.getProfileDescriptions().size());
@@ -181 +181 @@
         assertEquals(0, register.getComponentDescriptions().size());
         assertEquals(0, register.getProfileDescriptions().size());
-        register.registerMDProfile(description, RegistryTestHelper.getTestProfile());
+        register.register(description, RegistryTestHelper.getTestProfile());
         description = new ProfileDescription();
         description.setName("Aap2");
         String id2 = "Aap2" + System.currentTimeMillis();
         description.setId(id2);
-        register.registerMDProfile(description, RegistryTestHelper.getTestProfile());
+        register.register(description, RegistryTestHelper.getTestProfile());
 
         assertEquals(0, register.getComponentDescriptions().size());
@@ -334 +334 @@
         CMDComponentSpec testProfile = RegistryTestHelper.getTestProfile();
 
-        register.registerMDProfile(description, testProfile);
+        register.register(description, testProfile);
 
         assertEquals(1, register.getProfileDescriptions().size());
@@ -365 +365 @@
         CMDComponentSpec testComp = RegistryTestHelper.getTestComponent();
 
-        registry.registerMDComponent(description, testComp);
+        registry.register(description, testComp);
         try {
             registry.deleteMDComponent(description.getId(), new DummyPrincipal("Fake User"), false);
@@ -395 +395 @@
         CMDComponentSpec testComp = RegistryTestHelper.getTestComponent();
 
-        registry.registerMDComponent(description, testComp);
+        registry.register(description, testComp);
         try {
             registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal(), false);
@@ -406 +406 @@
 
         registry = ComponentRegistryFactory.getInstance().getComponentRegistry(true, USER_CREDS); //user registry
-        registry.registerMDComponent(description, testComp);
+        registry.register(description, testComp);
         assertEquals(1, registry.getComponentDescriptions().size());
         registry.deleteMDComponent(description.getId(), USER_CREDS.getPrincipal(), false); //user workspace can always delete
@@ -426 +426 @@
         CMDComponentSpec testComp = RegistryTestHelper.getTestProfile();
 
-        registry.registerMDProfile(description, testComp);
+        registry.register(description, testComp);
         try {
             registry.deleteMDProfile(description.getId(), USER_CREDS.getPrincipal());
@@ -437 +437 @@
 
         registry = ComponentRegistryFactory.getInstance().getComponentRegistry(true, USER_CREDS); //user registry
-        registry.registerMDProfile(description, testComp);
+        registry.register(description, testComp);
         assertEquals(1, registry.getProfileDescriptions().size());
         registry.deleteMDProfile(description.getId(), USER_CREDS.getPrincipal()); //user workspace can always delete
@@ -452 +452 @@
         description.setDescription("MyDescription");
         CMDComponentSpec testComponent = RegistryTestHelper.getTestComponent();
-        registry.registerMDComponent(description, testComponent);
+        registry.register(description, testComponent);
 
         assertEquals(1, registry.getComponentDescriptions().size());
@@ -458 +458 @@
         assertEquals("MyDescription", desc.getDescription());
         desc.setDescription("NewDesc");
-        try {
-            registry.update(desc, USER_CREDS.getPrincipal(), testComponent);
-            fail("Should have failed, only admin users are allowed to update");
-        } catch (UserUnauthorizedException e) {
-        }
-        registry.update(desc, PRINCIPAL_ADMIN, testComponent);
+        registry.update(desc, testComponent);
 
         registry = getTestRegistry(getRegistryDir());
@@ -478 +473 @@
         cd.setName("Y");
         CMDComponentSpec testComponent = RegistryTestHelper.getTestComponent();
-        registry.registerMDComponent(cd, testComponent);
+        registry.register(cd, testComponent);
 
         List<ProfileDescription> result = registry.getUsageInProfiles(cd.getId());
@@ -489 +484 @@
         reference.setComponentId(cd.getId());
         testProfile.getCMDComponent().get(0).getCMDComponent().add(reference);
-        registry.registerMDProfile(pd, testProfile);
+        registry.register(pd, testProfile);
 
         result = registry.getUsageInProfiles(cd.getId());
@@ -500 +495 @@
         ComponentDescription cd = ComponentDescription.createNewDescription();
         cd.setName("Y");
-        registry.registerMDComponent(cd, RegistryTestHelper.getTestComponent());
+        registry.register(cd, RegistryTestHelper.getTestComponent());
 
         List<ComponentDescription> result = registry.getUsageInComponents(cd.getId());
@@ -511 +506 @@
         reference.setComponentId(cd.getId());
         testComponent.getCMDComponent().get(0).getCMDComponent().add(reference);
-        registry.registerMDComponent(cd2, testComponent);
+        registry.register(cd2, testComponent);
 
         ComponentDescription cd3 = ComponentDescription.createNewDescription();
@@ -519 +514 @@
         reference.setComponentId(cd.getId());
         testComponent.getCMDComponent().get(0).getCMDComponent().add(reference);
-        registry.registerMDComponent(cd3, testComponent);
+        registry.register(cd3, testComponent);
 
         result = registry.getUsageInComponents(cd.getId());

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

@@ -11 +11 @@
 import org.junit.Test;
 
-import clarin.cmdi.componentregistry.ComponentRegistryImplTest;
 import clarin.cmdi.componentregistry.ComponentRegistryTestCase;
 import clarin.cmdi.componentregistry.Configuration;

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

@@ -9 +9 @@
 
 import java.io.ByteArrayInputStream;
+import java.util.Date;
 import java.util.List;
 
@@ -20 +21 @@
 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
+import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.model.ComponentDescription;
 import clarin.cmdi.componentregistry.model.ProfileDescription;
@@ -53 +55 @@
     public void testGetUserComponents() throws Exception {
         fillUp();
-        List<ComponentDescription> response = getAuthenticatedResource(
-                getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).accept(MediaType.APPLICATION_XML).get(
-                COMPONENT_LIST_GENERICTYPE);
+        List<ComponentDescription> response = getUserComponents();
         assertEquals(0, response.size());
         response = getAuthenticatedResource(getResource().path("/registry/components")).accept(MediaType.APPLICATION_JSON).get(
@@ -275 +275 @@
     @Test
     public void testRegisterUserspaceProfile() throws Exception {
-        List<ProfileDescription> profiles = getAuthenticatedResource(
-                getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true")).accept(MediaType.APPLICATION_XML).get(
-                PROFILE_LIST_GENERICTYPE);
+        List<ProfileDescription> profiles = getUserProfiles();
         assertEquals("user registered profiles", 0, profiles.size());
-        assertEquals("public registered profiles", 0, getAuthenticatedResource("/registry/profiles").accept(MediaType.APPLICATION_XML).get(
-                PROFILE_LIST_GENERICTYPE).size());
+        assertEquals("public registered profiles", 0, getPublicProfiles().size());
         FormDataMultiPart form = createFormData(RegistryTestHelper.getTestProfileContent());
         RegisterResponse response = getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true"))
@@ -296 +293 @@
         assertEquals("http://localhost:9998/registry/profiles/" + profileDesc.getId() + "?userspace=true", profileDesc.getHref());
 
-        profiles = getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true")).accept(
-                MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE);
+        profiles = getUserProfiles();
         assertEquals(1, profiles.size());
-        assertEquals(0, getAuthenticatedResource("/registry/profiles").accept(MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE)
-                .size());
+        assertEquals(0, getPublicProfiles().size());
         ClientResponse cResponse = getResource().path("/registry/profiles/" + profileDesc.getId()).accept(MediaType.APPLICATION_XML).get(
                 ClientResponse.class);
@@ -327 +322 @@
         assertEquals(200, cResponse.getStatus());
 
-        profiles = getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true")).accept(
+        profiles = getUserProfiles();
+        assertEquals(0, profiles.size());
+    }
+
+    private List<ProfileDescription> getPublicProfiles() {
+        return getAuthenticatedResource("/registry/profiles").accept(MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE);
+    }
+
+    private List<ProfileDescription> getUserProfiles() {
+        return getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true")).accept(
                 MediaType.APPLICATION_XML).get(PROFILE_LIST_GENERICTYPE);
-        assertEquals(0, profiles.size());
     }
 
     private FormDataMultiPart createFormData(Object content) {
+        return createFormData(content, "My Test");
+    }
+
+    private FormDataMultiPart createFormData(Object content, String description) {
         FormDataMultiPart form = new FormDataMultiPart();
         form.field(ComponentRegistryRestService.DATA_FORM_FIELD, content, MediaType.APPLICATION_OCTET_STREAM_TYPE);
         form.field(ComponentRegistryRestService.NAME_FORM_FIELD, "Test1");
-        form.field(ComponentRegistryRestService.DESCRIPTION_FORM_FIELD, "My Test");
+        form.field(ComponentRegistryRestService.DESCRIPTION_FORM_FIELD, description);
         form.field(ComponentRegistryRestService.DOMAIN_FORM_FIELD, "My domain");
         form.field(ComponentRegistryRestService.GROUP_FORM_FIELD, "TestGroup");
@@ -344 +351 @@
     @Test
     public void testRegisterWithUserComponents() throws Exception {
-        ComponentRegistry userRegistry = ComponentRegistryFactory.getInstance().getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
+        ComponentRegistry userRegistry = ComponentRegistryFactory.getInstance()
+                .getComponentRegistry(true, DummyPrincipal.DUMMY_CREDENTIALS);
         String content = "";
         content += "<CMD_ComponentSpec isProfile=\"false\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n";
@@ -369 +377 @@
         assertFalse(response.isRegistered());
         assertEquals(1, response.getErrors().size());
-        assertEquals("referenced component cannot be found in the published components: "+ compDesc1.getName()+" ("+ compDesc1.getId()+")", response.getErrors().get(0));
+        assertEquals("referenced component cannot be found in the published components: " + compDesc1.getName() + " (" + compDesc1.getId()
+                + ")", response.getErrors().get(0));
 
         response = getAuthenticatedResource(getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).type(
@@ -390 +399 @@
         assertFalse(response.isRegistered());
         assertEquals(1, response.getErrors().size());
-        assertEquals("referenced component cannot be found in the published components: " + comp2.getName()+" ("+ comp2.getId()+")", response.getErrors().get(0));
+        assertEquals("referenced component cannot be found in the published components: " + comp2.getName() + " (" + comp2.getId() + ")",
+                response.getErrors().get(0));
 
         response = getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true")).type(
@@ -399 +409 @@
     @Test
     public void testRegisterUserspaceComponent() throws Exception {
-        List<ComponentDescription> components = getAuthenticatedResource(
-                getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).accept(MediaType.APPLICATION_XML).get(
-                COMPONENT_LIST_GENERICTYPE);
+        List<ComponentDescription> components = getUserComponents();
         assertEquals("user registered components", 0, components.size());
-        assertEquals("public registered components", 0, getAuthenticatedResource("/registry/components").accept(MediaType.APPLICATION_XML)
-                .get(COMPONENT_LIST_GENERICTYPE).size());
+        assertEquals("public registered components", 0, getPublicComponents().size());
         FormDataMultiPart form = createFormData(RegistryTestHelper.getComponentTestContent());
 
@@ -424 +431 @@
         assertEquals(url + "registry/components/" + desc.getId() + "?userspace=true", desc.getHref());
 
-        components = getAuthenticatedResource(getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).accept(
-                MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE);
+        components = getUserComponents();
         assertEquals(1, components.size());
-        assertEquals(0, getAuthenticatedResource("/registry/components").accept(MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE)
-                .size());
+        assertEquals(0, getPublicComponents().size());
 
         ClientResponse cResponse = getResource().path("/registry/components/" + desc.getId()).accept(MediaType.APPLICATION_XML).get(
                 ClientResponse.class);
         assertEquals(204, cResponse.getStatus());
-        CMDComponentSpec spec = getAuthenticatedResource(
-                getResource().path("/registry/components/" + desc.getId()).queryParam(USERSPACE_PARAM, "true")).accept(
-                MediaType.APPLICATION_XML).get(CMDComponentSpec.class);
+        CMDComponentSpec spec = getUserComponent(desc);
         assertNotNull(spec);
 
@@ -455 +458 @@
         assertEquals(200, cResponse.getStatus());
 
-        components = getAuthenticatedResource(getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).accept(
+        components = getUserComponents();
+        assertEquals(0, components.size());
+    }
+
+    @Test
+    public void testUpdateComponent() throws Exception {
+        List<ComponentDescription> components = getUserComponents();
+        assertEquals("user registered components", 0, components.size());
+        assertEquals("public registered components", 0, getPublicComponents().size());
+
+        FormDataMultiPart form = createFormData(RegistryTestHelper.getComponentTestContent());
+        ClientResponse cResponse = getAuthenticatedResource(getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true"))
+                .type(MediaType.MULTIPART_FORM_DATA).post(ClientResponse.class, form);
+        assertEquals(ClientResponse.Status.OK.getStatusCode(), cResponse.getStatus());
+        RegisterResponse response = cResponse.getEntity(RegisterResponse.class);
+        assertTrue(response.isRegistered());
+        assertFalse(response.isProfile());
+        assertTrue(response.isInUserSpace());
+        ComponentDescription desc = (ComponentDescription) response.getDescription();
+        assertNotNull(desc);
+        assertEquals("Test1", desc.getName());
+        assertEquals("My Test", desc.getDescription());
+        Date firstDate = AbstractDescription.getDate(desc.getRegistrationDate());
+        CMDComponentSpec spec = getUserComponent(desc);
+        assertNotNull(spec);
+        assertEquals("Access", spec.getCMDComponent().get(0).getName());
+        components = getUserComponents();
+        assertEquals(1, components.size());
+        assertEquals(0, getPublicComponents().size());
+
+        //Now update
+        form = createFormData(RegistryTestHelper.getComponentTestContent("TESTNAME"), "UPDATE DESCRIPTION!");
+        cResponse = getAuthenticatedResource(
+                getResource().path("/registry/components/" + desc.getId() + "/update").queryParam(USERSPACE_PARAM, "true")).type(
+                MediaType.MULTIPART_FORM_DATA).post(ClientResponse.class, form);
+        assertEquals(ClientResponse.Status.OK.getStatusCode(), cResponse.getStatus());
+        response = cResponse.getEntity(RegisterResponse.class);
+        assertTrue(response.isRegistered());
+        assertFalse(response.isProfile());
+        assertTrue(response.isInUserSpace());
+        desc = (ComponentDescription) response.getDescription();
+        assertNotNull(desc);
+        assertEquals("Test1", desc.getName());
+        assertEquals("UPDATE DESCRIPTION!", desc.getDescription());
+        Date secondDate = AbstractDescription.getDate(desc.getRegistrationDate());
+        assertTrue(firstDate.before(secondDate) || firstDate.equals(secondDate));
+
+        spec = getUserComponent(desc);
+        assertNotNull(spec);
+        assertEquals("TESTNAME", spec.getCMDComponent().get(0).getName());
+        components = getUserComponents();
+        assertEquals(1, components.size());
+        assertEquals(0, getPublicComponents().size());
+    }
+
+    @Test
+    public void testUpdateProfile() throws Exception {
+        List<ProfileDescription> profiles = getUserProfiles();
+        assertEquals(0, profiles.size());
+        assertEquals(0, getPublicProfiles().size());
+
+        FormDataMultiPart form = createFormData(RegistryTestHelper.getTestProfileContent());
+        ClientResponse cResponse = getAuthenticatedResource(getResource().path("/registry/profiles").queryParam(USERSPACE_PARAM, "true"))
+                .type(MediaType.MULTIPART_FORM_DATA).post(ClientResponse.class, form);
+        assertEquals(ClientResponse.Status.OK.getStatusCode(), cResponse.getStatus());
+        RegisterResponse response = cResponse.getEntity(RegisterResponse.class);
+        assertTrue(response.isRegistered());
+        assertTrue(response.isProfile());
+        assertTrue(response.isInUserSpace());
+        ProfileDescription desc = (ProfileDescription) response.getDescription();
+        assertNotNull(desc);
+        assertEquals("Test1", desc.getName());
+        assertEquals("My Test", desc.getDescription());
+        Date firstDate = AbstractDescription.getDate(desc.getRegistrationDate());
+        CMDComponentSpec spec = getUserProfile(desc);
+        assertNotNull(spec);
+        assertEquals("Actor", spec.getCMDComponent().get(0).getName());
+        profiles = getUserProfiles();
+        assertEquals(1, profiles.size());
+        assertEquals(0, getPublicComponents().size());
+
+        //Now update
+        form = createFormData(RegistryTestHelper.getTestProfileContent("TESTNAME"), "UPDATE DESCRIPTION!");
+        cResponse = getAuthenticatedResource(
+                getResource().path("/registry/profiles/" + desc.getId() + "/update").queryParam(USERSPACE_PARAM, "true")).type(
+                MediaType.MULTIPART_FORM_DATA).post(ClientResponse.class, form);
+        assertEquals(ClientResponse.Status.OK.getStatusCode(), cResponse.getStatus());
+        response = cResponse.getEntity(RegisterResponse.class);
+        assertTrue(response.isRegistered());
+        assertTrue(response.isProfile());
+        assertTrue(response.isInUserSpace());
+        desc = (ProfileDescription) response.getDescription();
+        assertNotNull(desc);
+        assertEquals("Test1", desc.getName());
+        assertEquals("UPDATE DESCRIPTION!", desc.getDescription());
+        Date secondDate = AbstractDescription.getDate(desc.getRegistrationDate());
+        assertTrue(firstDate.before(secondDate) || firstDate.equals(secondDate));
+
+        spec = getUserProfile(desc);
+        assertNotNull(spec);
+        assertEquals("TESTNAME", spec.getCMDComponent().get(0).getName());
+        profiles = getUserProfiles();
+        assertEquals(1, profiles.size());
+        assertEquals(0, getPublicComponents().size());
+    }
+
+    private CMDComponentSpec getUserComponent(ComponentDescription desc) {
+        return getAuthenticatedResource(getResource().path("/registry/components/" + desc.getId()).queryParam(USERSPACE_PARAM, "true"))
+                .accept(MediaType.APPLICATION_XML).get(CMDComponentSpec.class);
+    }
+
+    private CMDComponentSpec getUserProfile(ProfileDescription desc) {
+        return getAuthenticatedResource(getResource().path("/registry/profiles/" + desc.getId()).queryParam(USERSPACE_PARAM, "true"))
+                .accept(MediaType.APPLICATION_XML).get(CMDComponentSpec.class);
+    }
+
+    private List<ComponentDescription> getPublicComponents() {
+        return getAuthenticatedResource("/registry/components").accept(MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE);
+    }
+
+    private List<ComponentDescription> getUserComponents() {
+        return getAuthenticatedResource(getResource().path("/registry/components").queryParam(USERSPACE_PARAM, "true")).accept(
                 MediaType.APPLICATION_XML).get(COMPONENT_LIST_GENERICTYPE);
-        assertEquals(0, components.size());
     }
 
@@ -547 +670 @@
         assertEquals(MDValidator.MISMATCH_ERROR, response.getErrors().get(0));
     }
-    
-//    @Test
-//    public void testPingSession() throws Exception {
-//        ClientResponse clientResponse = getAuthenticatedResource("/registry/pingSession").get(ClientResponse.class);
-//        assertEquals(200, clientResponse.getStatus());
-//        assertEquals("<session stillActive=\"true\"/>", clientResponse.getEntity(String.class));
-//        clientResponse = getResource().path("/registry/pingSession").get(ClientResponse.class);
-//        assertEquals(200, clientResponse.getStatus());
-//        assertEquals("<session stillActive=\"false\"/>", clientResponse.getEntity(String.class));
+
+    //    @Test
+    //    public void testPingSession() throws Exception {
+    //        ClientResponse clientResponse = getAuthenticatedResource("/registry/pingSession").get(ClientResponse.class);
+    //        assertEquals(200, clientResponse.getStatus());
+    //        assertEquals("<session stillActive=\"true\"/>", clientResponse.getEntity(String.class));
+    //        clientResponse = getResource().path("/registry/pingSession").get(ClientResponse.class);
+    //        assertEquals(200, clientResponse.getStatus());
+    //        assertEquals("<session stillActive=\"false\"/>", clientResponse.getEntity(String.class));
     // TODO Patrick enable test and client, need to update dependencies first. Add some test with empty session.
-//    }
-//    @Override
-//    public Client client() {
-//      DefaultApacheHttpClientConfig config = new  
-//      DefaultApacheHttpClientConfig();
-//      config
-//      .setProperty("com.sun.jersey.impl.client.httpclient.handleCookies",  
-//      true);
-//      ApacheHttpClient c = ApacheHttpClient.create(config); 
-//      
-//        return ;
-//    }
+    //    }
+    //    @Override
+    //    public Client client() {
+    //      DefaultApacheHttpClientConfig config = new  
+    //      DefaultApacheHttpClientConfig();
+    //      config
+    //      .setProperty("com.sun.jersey.impl.client.httpclient.handleCookies",  
+    //      true);
+    //      ApacheHttpClient c = ApacheHttpClient.create(config); 
+    //      
+    //        return ;
+    //    }
 }

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

@@ -47 +47 @@
         desc.setHref("link:" + ComponentRegistry.REGISTRY_ID + id);
         CMDComponentSpec spec = MDMarshaller.unmarshal(CMDComponentSpec.class, content, MDMarshaller.getCMDComponentSchema());
-        testRegistry.registerMDComponent(desc, spec);
+        testRegistry.register(desc, spec);
         return desc;
     }
 
     public static InputStream getTestProfileContent() {
+        return getTestProfileContent("Actor");
+    }
+    
+    public static InputStream getTestProfileContent(String name) {
         String profileContent = "";
         profileContent += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
@@ -57 +61 @@
         profileContent += "    xsi:noNamespaceSchemaLocation=\"general-component-schema.xsd\">\n";
         profileContent += "    <Header />\n";
-        profileContent += "    <CMD_Component name=\"Actor\" CardinalityMin=\"0\" CardinalityMax=\"unbounded\">\n";
+        profileContent += "    <CMD_Component name=\""+name+"\" CardinalityMin=\"0\" CardinalityMax=\"unbounded\">\n";
         profileContent += "        <AttributeList>\n";
         profileContent += "            <Attribute>\n";
@@ -94 +98 @@
         desc.setHref("link:" + ComponentRegistry.REGISTRY_ID + id);
         CMDComponentSpec spec = MDMarshaller.unmarshal(CMDComponentSpec.class, content, MDMarshaller.getCMDComponentSchema());
-        testRegistry.registerMDProfile(desc, spec);
+        testRegistry.register(desc, spec);
         return desc;
     }
@@ -103 +107 @@
 
     public static InputStream getComponentTestContent() {
+        return getComponentTestContent("Access");
+    }
+
+    public static InputStream getComponentTestContent(String componentName) {
         String compContent = "";
         compContent += "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
@@ -111 +119 @@
         compContent += "    <Header/>\n";
         compContent += "    \n";
-        compContent += "    <CMD_Component name=\"Access\" CardinalityMin=\"1\" CardinalityMax=\"1\">\n";
+        compContent += "    <CMD_Component name=\"" + componentName + "\" CardinalityMin=\"1\" CardinalityMax=\"1\">\n";
         compContent += "        <CMD_Element name=\"Availability\" ValueScheme=\"string\" />\n";
         compContent += "        <CMD_Element name=\"Date\">\n";