Changeset 2268

Timestamp:

09/28/12 16:32:49 (12 years ago)

Author:

olhsha

Message:

data conversion is fixed. Safari still magnify the items

Location:

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/RssCreator.java (modified) (8 diffs)
• main/java/clarin/cmdi/componentregistry/RssCreatorComments.java (modified) (4 diffs)
• main/java/clarin/cmdi/componentregistry/RssCreatorDescriptions.java (modified) (4 diffs)
• main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java (modified) (5 diffs)
• main/java/clarin/cmdi/componentregistry/model/Comment.java (modified) (8 diffs)
• main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (46 diffs)
• test/java/clarin/cmdi/componentregistry/RssCreatorCommentsTest.java (modified) (1 diff)
• test/java/clarin/cmdi/componentregistry/RssCreatorDescriptionsTest.java (modified) (9 diffs)

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreator.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry;
 
+import clarin.cmdi.componentregistry.model.AbstractDescription;
 import clarin.cmdi.componentregistry.rss.Category;
 import clarin.cmdi.componentregistry.rss.Cloud;
@@ -16 +17 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
@@ -26 +28 @@
 public abstract class RssCreator<T> { // extends nothing so far, throuw nothing // make it abstract
 
-   
-    protected String uriForGuid; // MUST
-   
-     // all the fields below are not mandatory, no crashes will happen if they are not set
+    
     private String title;
     private String link;
@@ -50 +49 @@
     private SkipDaysList skipDays;
     private double version = 2.0; // of an rss
-    
-    ////////////////////
-    
-    public RssCreator(String uri){
-        this.uriForGuid = uri;
-    }
-    
+
     
 
@@ -81 +74 @@
     }
 
-    public String getTitle(){
+    public String getTitle() {
         return this.title;
     }
-    
+
     /**
      * Sets the value of the link property.
@@ -95 +88 @@
     }
 
-    public String getLink(){
+    public String getLink() {
         return this.link;
     }
-     
+
     /**
      * Sets the value of the description property.
@@ -329 +322 @@
         return (makeRssChannel(makeListOfRssItems(objs)));
     }
-    
-
-    protected String getRFCDateTime(String datestring) throws ParseException {
-
-        Date date = DatatypeConverter.parseDateTime(datestring).getTime();
-        SimpleDateFormat RFC822DATEFORMAT = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z");
-        return RFC822DATEFORMAT.format(date);
-    }
-
-    
-   protected Guid makeGuid(String href){
+
+    // Helping stuff 
+    protected Guid makeGuid(String href) {
         Guid result = new Guid();
         // result.setIsPermaLink(null);
@@ -345 +330 @@
         return result;
     }
+
+    /// Helping stuff: for working with dates
+    private static Date parseWorks(String dateString) {
+        Date d = null;
+        try {
+            d = AbstractDescription.getDate(dateString);
+        } catch (ParseException pe) {
+            return null;
+        };
+        return d;
+    }
+
+    protected String getRFCDateTime(String dateString) {
+
+        Date date = parseWorks(dateString);
+
+        if (date == null) {
+            return dateString;
+        } else {
+            SimpleDateFormat RFC822DATEFORMAT = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yyyy' 'HH:mm:ss' 'Z");
+            return RFC822DATEFORMAT.format(date);
+        }
+    }
+
     
+    ///////
+    // returns 1 if ds1 is older (before) than ds2, returns -1 if ds1 is younger (after) than ds2
+    public static int compareDateStrings(String ds1, String ds2) {
+
+        int result = 0;
+
+        Date d1 = parseWorks(ds1);
+        Date d2 = parseWorks(ds2);
+
+        if (d1 == null) {
+            if (d2 == null) {
+                result = 0;
+            } else {
+                result = 1;
+            }
+        } else {
+            if (d2 == null) {
+                result = -1;
+            } else {
+                // cpmparteTo reurns:
+                // a value less than 0 if d2 is before d1 (d1 is younger than d2);
+                // a value greater than 0 if d2 is after  d1 (d1 is older than d2)
+                result = d2.compareTo(d1);
+            }
+
+        }
+        return result;
+    }
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreatorComments.java

@@ -16 +16 @@
 public class RssCreatorComments extends RssCreator<Comment> {
 
-    
-    private boolean isFromProfile;
-    
-    public RssCreatorComments(String uri){
-        super(uri);
-    }
-    
+   
     // creator method, comment to rssItem, ovverrides the dummy method of the RssCreator class
     // ?? is there a better way than boolean flag to arrange switch beween comment for profiles and commentss for components
     
-    public void setFlagIsFromProfile(boolean isFromProfile) {
-        this.isFromProfile = isFromProfile;
-    }
+   
     
     @Override  
@@ -35 +27 @@
          
         RssItem retval = new RssItem();
-        String hrefPostfix = "&view=comments&commentId=";
-        String hrefInfix = "?item=";
         
-        String descId;
-        if (isFromProfile) {descId=comm.getProfileDescriptionId();} 
-        else{descId=comm.getComponentDescriptionId();};
-        
-        
-        String link = uriForGuid+hrefInfix+descId+hrefPostfix+comm.getId();
         
                 //The content 
@@ -50 +34 @@
        
         //Guid
-        retval.setGuid(makeGuid(link));
+        //retval.setGuid(makeGuid(link));
         
         // link
-        retval.setLink(link);
+        retval.setLink(super.getLink()+"&commentId="+comm.getId()+"#");
         
         
@@ -71 +55 @@
      protected String  makeCommentTitle(String commentId, String user){
          
-        return("The comment "+commentId +" by "+user);
+        return("The comment "+commentId +" by "+user+" ");
            
        }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/RssCreatorDescriptions.java

@@ -14 +14 @@
 public class RssCreatorDescriptions<T extends AbstractDescription>  extends RssCreator<T> {
     
-    public RssCreatorDescriptions(String uri){
-        super(uri);
-    }
-    
+ 
     // creator method, desc to rssItem, ovverrides the dummy method of the RssCreatorClass
     @Override 
@@ -25 +22 @@
 
         RssItem retval = new RssItem();
-        String hrefInfix = "?item=";
-        String link =  uriForGuid+hrefInfix+desc.getId();
-         
+        
         //Description (blah-blah)
         retval.setDescription(desc.getDescription());
@@ -34 +29 @@
         
         //Guid
-        retval.setGuid(makeGuid(link));
+        //retval.setGuid(makeGuid(link));
         
         // link
-        retval.setLink(link);
+        retval.setLink(super.getLink()+"?item="+desc.getId()+"#");
         
         //time-date
@@ -51 +46 @@
 
     protected String makeDescriptionTitle(String name, String creatorname, String group, String domain){
-        String retval =  name+"by user"+creatorname+", group "+group+",domain "+domain;
+        String retval =  name+"by user "+creatorname+", group "+group+",domain "+domain;
         
         return retval;

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/AbstractDescription.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
 
-import java.text.DateFormat;
+import clarin.cmdi.componentregistry.RssCreator;
 import java.text.ParseException;
 import java.util.Comparator;
 import java.util.Date;
-import javax.xml.bind.DatatypeConverter;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16 +15 @@
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @XmlRootElement(name = "description")
@@ -33 +34 @@
     private String groupName;
     private int commentsCount;
+    private final static Logger LOG = LoggerFactory.getLogger(AbstractDescription.class);
 
     public void setId(String id) {
-        this.id = id;
+        this.id = id;
     }
 
     public String getId() {
-        return id;
+        return id;
     }
 
     public void setDescription(String description) {
-        this.description = description;
+        this.description = description;
     }
 
     public String getDescription() {
-        return description;
+        return description;
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name;
     }
 
     public String getName() {
-        return name;
+        return name;
     }
 
     public void setRegistrationDate(String registrationDate) {
-        this.registrationDate = registrationDate;
+        this.registrationDate = registrationDate;
     }
 
     public String getRegistrationDate() {
-        return registrationDate;
+        return registrationDate;
     }
 
     public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
+        this.creatorName = creatorName;
     }
 
     public String getCreatorName() {
-        return creatorName;
+        return creatorName;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.userId = userId;
     }
 
     /**
-     * MD5 string representation of the user id. Storing the hash because the userId can be the email address which we don't want to make
-     * public.
+     * MD5 string representation of the user id. Storing the hash because the
+     * userId can be the email address which we don't want to make public.
      */
     public String getUserId() {
-        return userId;
+        return userId;
     }
 
     public void setDomainName(String domainName) {
-        this.domainName = domainName;
+        this.domainName = domainName;
     }
 
     public String getDomainName() {
-        return domainName;
+        return domainName;
     }
 
     public void setHref(String href) {
-        this.href = href;
+        this.href = href;
     }
 
     public String getHref() {
-        return href;
+        return href;
     }
 
     public void setGroupName(String groupName) {
-        this.groupName = groupName;
+        this.groupName = groupName;
     }
 
     public String getGroupName() {
-        return groupName;
+        return groupName;
     }
 
@@ -114 +116 @@
      */
     public int getCommentsCount() {
-        return commentsCount;
+        return commentsCount;
     }
 
@@ -121 +123 @@
      */
     public void setCommentsCount(int commentsCount) {
-        this.commentsCount = commentsCount;
+        this.commentsCount = commentsCount;
     }
 
     @Override
     public String toString() {
-        return "Name=" + getName() + ", id=" + getId() + ", creatorName=" + getCreatorName() + ", userId=" + getUserId();
+        return "Name=" + getName() + ", id=" + getId() + ", creatorName=" + getCreatorName() + ", userId=" + getUserId();
     }
 
     public boolean isProfile() {
-        return this instanceof ProfileDescription;
+        return this instanceof ProfileDescription;
     }
 
     public String getType() {
-        return isProfile() ? "profile" : "component";
+        return isProfile() ? "profile" : "component";
     }
 
     public static String createNewDate() {
-        return createNewDate(new Date().getTime());
+        return createNewDate(new Date().getTime());
     }
 
     public static String createNewDate(long time) {
-        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
+        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
     }
 
     /**
      * Helper method.
-     * @param userId normal string which will be checked to see if it matches the md5 hash of the stored userId
+     *
+     * @param userId normal string which will be checked to see if it matches
+     * the md5 hash of the stored userId
      */
     public boolean isThisTheOwner(String userId) {
-        String userHash = DigestUtils.md5Hex(userId);
-        return userHash.equals(getUserId());
+        String userHash = DigestUtils.md5Hex(userId);
+        return userHash.equals(getUserId());
     }
 
     public static Date getDate(String registrationDate) throws ParseException {
-        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
+        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
     }
 
     public static String createPublicHref(String href) {
-        String result = href;
-        if (href != null) {
-            int index = href.indexOf("?");
-            if (index != -1) { //strip off query params the rest should be the public href.
-                result = href.substring(0, index);
-            }
-        }
-        return result;
+        String result = href;
+        if (href != null) {
+            int index = href.indexOf("?");
+            if (index != -1) { //strip off query params the rest should be the public href.
+                result = href.substring(0, index);
+            }
+        }
+        return result;
     }
-    
     public static final Comparator<? super AbstractDescription> COMPARE_ON_NAME = new Comparator<AbstractDescription>() {
-
-        public int compare(AbstractDescription o1, AbstractDescription o2) {
-            int result = 0;
-            if (o1.getName() != null && o2.getName() != null) {
-                result = o1.getName().compareToIgnoreCase(o2.getName());
-            }
-            if (o1.getId() != null && result == 0) {
-                result = o1.getId().compareTo(o2.getId());
-            }
-            return result;
-        }
-    };
-    
-    public static final Comparator<? super AbstractDescription> COMPARE_ON_DATE = new Comparator<AbstractDescription>() {
-        
-        //compare two components by the date of registration
-        // the dates, which are strings accrording to  ISO 8601, compared lexicographically 
-    @Override    
+        @Override
         public int compare(AbstractDescription o1, AbstractDescription o2) {
-            
             int result = 0;
-            
-            Date d1 = DatatypeConverter.parseDateTime(o1.getRegistrationDate()).getTime();
-            Date d2 = DatatypeConverter.parseDateTime(o2.getRegistrationDate()).getTime();
-            
-            result = d2.compareTo(d1);
-            
+            if (o1.getName() != null && o2.getName() != null) {
+                result = o1.getName().compareToIgnoreCase(o2.getName());
+            }
+            if (o1.getId() != null && result == 0) {
+                result = o1.getId().compareTo(o2.getId());
+            }
             return result;
         }
     };
-    
+    public static final Comparator<? super AbstractDescription> COMPARE_ON_DATE = new Comparator<AbstractDescription>() {
+        //compare two components by the date of registration
+        // returns 1 if o11 is older than o2, returns -1 if o1 is younger than o2
+        @Override
+        public int compare(AbstractDescription o1, AbstractDescription o2) {
+
+            return (RssCreator.compareDateStrings(o1.getRegistrationDate(), o2.getRegistrationDate()));
+        }
+    };
 }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/model/Comment.java

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.model;
 
+import clarin.cmdi.componentregistry.RssCreator;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -12 +13 @@
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.apache.commons.lang.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
@@ -31 +34 @@
     @XmlTransient // this prevents userId from being serialized to XML and thus exposed (which is useless and undesirable)
     private String userId;
+    private final static Logger LOG = LoggerFactory.getLogger(Comment.class);
 
     public void setComment(String comment) {
-        this.comments = comment;
+        this.comments = comment;
     }
 
     public String getComment() {
-        return comments;
+        return comments;
     }
 
     public void setCommentDate(String commentDate) {
-        this.commentDate = commentDate;
+        this.commentDate = commentDate;
     }
 
     public String getCommentDate() {
-        return commentDate;
+        return commentDate;
     }
 
     public void setId(String commentId) {
-        this.id = commentId;
+        this.id = commentId;
     }
 
     public String getId() {
-        return id;
+        return id;
     }
 
     public String getComponentDescriptionId() {
-        return componentDescriptionId;
+        return componentDescriptionId;
     }
 
     public void setComponentDescriptionId(String ComponentDescriptionId) {
-        this.componentDescriptionId = ComponentDescriptionId;
+        this.componentDescriptionId = ComponentDescriptionId;
     }
 
     public void setProfileDescriptionId(String profileDescriptionId) {
-        this.profileDescriptionId = profileDescriptionId;
+        this.profileDescriptionId = profileDescriptionId;
     }
 
     public String getProfileDescriptionId() {
-        return profileDescriptionId;
+        return profileDescriptionId;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.userId = userId;
     }
 
     public String getUserId() {
-        return userId;
+        return userId;
     }
 
@@ -85 +89 @@
      */
     public String getUserName() {
-        return userName;
+        return userName;
     }
 
@@ -92 +96 @@
      */
     public void setUserName(String userName) {
-        this.userName = userName;
+        this.userName = userName;
     }
 
@@ -99 +103 @@
      */
     public boolean isCanDelete() {
-        return canDelete;
+        return canDelete;
     }
 
@@ -106 +110 @@
      */
     public void setCanDelete(boolean canDelete) {
-        this.canDelete = canDelete;
+        this.canDelete = canDelete;
     }
 
     public static Date getDate(String registrationDate) throws ParseException {
-        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
+        return DateUtils.parseDate(registrationDate, new String[]{DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern()});
     }
 
-    
-    
     /*
      * Helper method to set the Date
      */
     public static String createNewDate() {
-        return createNewDate(new Date().getTime());
+        return createNewDate(new Date().getTime());
     }
 
@@ -127 +129 @@
      */
     public static String createNewDate(long time) {
-        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
+        return DateFormatUtils.formatUTC(time, DateFormatUtils.ISO_DATETIME_TIME_ZONE_FORMAT.getPattern());
     }
 
     public static Comment createANewComment() {
-        Comment com = new Comment();
-        com.setCommentDate(createNewDate());
-        return com;
+        Comment com = new Comment();
+        com.setCommentDate(createNewDate());
+        return com;
     }
     
-    
     public static final Comparator<Comment> COMPARE_ON_DATE = new Comparator<Comment>() {
-        
         //compare two commments by the date of registration
-        // the dates, which are strings accrording to  ISO 8601, compared lexicographically 
-    @Override    
-    public int compare(Comment o1, Comment o2) {
-            
-            int result = 0;
-            
-            Date d1 = DatatypeConverter.parseDateTime(o1.getCommentDate()).getTime();
-            Date d2 = DatatypeConverter.parseDateTime(o2.getCommentDate()).getTime();
-            
-            result = d2.compareTo(d1);
-            
-            return result;
+         // returns 1 if o11 is older than o2, returns -1 if o1 is younger than o2
+        @Override
+        public int compare(Comment o1, Comment o2) {
+
+            return (RssCreator.compareDateStrings(o1.getCommentDate(), o2.getCommentDate()));
         }
     };

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -35 +35 @@
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.ServletContext;
@@ -56 +57 @@
 import javax.ws.rs.core.StreamingOutput;
 import javax.ws.rs.core.UriInfo;
+import javax.xml.bind.DatatypeConverter;
 import javax.xml.bind.JAXBException;
 import org.slf4j.Logger;
@@ -87 +89 @@
      * Converts userspace boolean to component status. Temporary solution!!!
      *
-     * TODO: Replace all calls to getRegistry that use this by calls using ComponentStatus
+     * 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 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;
-        }
+        if (userSpace) {
+            return ComponentStatus.DEVELOPMENT;
+        } else {
+            return ComponentStatus.PUBLIC;
+        }
     }
 
     private ComponentRegistry getRegistry(ComponentStatus status) {
-        Principal userPrincipal = security.getUserPrincipal();
-        UserCredentials userCredentials = getUserCredentials(userPrincipal);
-        return getRegistry(status, null, userCredentials);
+        Principal userPrincipal = security.getUserPrincipal();
+        UserCredentials userCredentials = getUserCredentials(userPrincipal);
+        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);
-        }
+        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);
+        }
     }
 
@@ -123 +127 @@
      */
     private Principal checkAndGetUserPrincipal() throws UserUnauthorizedException {
-        Principal principal = security.getUserPrincipal();
-        if (principal == null) {
-            throw new UserUnauthorizedException("no user principal found.");
-        }
-        return principal;
+        Principal principal = security.getUserPrincipal();
+        if (principal == null) {
+            throw new UserUnauthorizedException("no user principal found.");
+        }
+        return principal;
     }
 
     private UserCredentials getUserCredentials(Principal userPrincipal) {
-        UserCredentials userCredentials = null;
-        if (userPrincipal != null) {
-            userCredentials = new UserCredentials(userPrincipal);
-        }
-        return userCredentials;
+        UserCredentials userCredentials = null;
+        if (userPrincipal != null) {
+            userCredentials = new UserCredentials(userPrincipal);
+        }
+        return userCredentials;
     }
 
@@ -142 +146 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ComponentDescription> getRegisteredComponents(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
-        LOG.info("Releasing " + components.size() + " registered components into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return components;
+        long start = System.currentTimeMillis();
+        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
+        LOG.info("Releasing " + components.size() + " registered components into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return components;
     }
 
@@ -153 +157 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<ProfileDescription> getRegisteredProfiles(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace,
-            @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        List<ProfileDescription> profiles;
-        if (metadataEditor) {
-            profiles = getRegistry(getStatus(userspace)).getProfileDescriptionsForMetadaEditor();
-        } else {
-            profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
-        }
-
-        LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
-                + " millisecs)");
-        return profiles;
+            @QueryParam(METADATA_EDITOR_PARAM) @DefaultValue("false") boolean metadataEditor) throws ComponentRegistryException {
+        long start = System.currentTimeMillis();
+        List<ProfileDescription> profiles;
+        if (metadataEditor) {
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptionsForMetadaEditor();
+        } else {
+            profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+        }
+
+        LOG.info("Releasing " + profiles.size() + " registered profiles into the world (" + (System.currentTimeMillis() - start)
+                + " millisecs)");
+        return profiles;
     }
 
@@ -171 +175 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response getRegisteredComponent(@PathParam("componentId") String componentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info("Component with id: " + componentId + " is requested.");
-        CMDComponentSpec mdComponent = getRegistry(getStatus(userspace)).getMDComponent(componentId);
-        if (mdComponent == null) {
-            return Response.status(Status.NOT_FOUND).build();
-        } else {
-            return Response.ok(mdComponent).build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        LOG.info("Component with id: " + componentId + " is requested.");
+        CMDComponentSpec mdComponent = getRegistry(getStatus(userspace)).getMDComponent(componentId);
+        if (mdComponent == null) {
+            return Response.status(Status.NOT_FOUND).build();
+        } else {
+            return Response.ok(mdComponent).build();
+        }
     }
 
@@ -185 +189 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML})
     public Response getRegisteredComponentRawType(@PathParam("componentId") final String componentId, @PathParam("rawType") String rawType) {
-        LOG.info("Component with id: " + componentId + " and rawType:" + rawType + " is requested.");
-        StreamingOutput result = null;
-        try {
-            final ComponentRegistry registry = findRegistry(componentId, new ComponentClosure());
-            if (registry == null) {
-                return Response.status(Status.NOT_FOUND).entity("Id: " + componentId + " is not registered, cannot create data.").build();
-            }
-            ComponentDescription desc = registry.getComponentDescription(componentId);
-            checkAndThrowDescription(desc, componentId);
-            String fileName = desc.getName() + "." + rawType;
-            if ("xml".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDComponentAsXml(componentId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.info("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else if ("xsd".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDComponentAsXsd(componentId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.info("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-
-                    }
-                };
-            } else {
-                throw new WebApplicationException(Response.serverError().entity(
-                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
-            }
-            return createDownloadResponse(result, fileName);
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        }
+        LOG.info("Component with id: " + componentId + " and rawType:" + rawType + " is requested.");
+        StreamingOutput result = null;
+        try {
+            final ComponentRegistry registry = findRegistry(componentId, new ComponentClosure());
+            if (registry == null) {
+                return Response.status(Status.NOT_FOUND).entity("Id: " + componentId + " is not registered, cannot create data.").build();
+            }
+            ComponentDescription desc = registry.getComponentDescription(componentId);
+            checkAndThrowDescription(desc, componentId);
+            String fileName = desc.getName() + "." + rawType;
+            if ("xml".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDComponentAsXml(componentId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.info("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else if ("xsd".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDComponentAsXsd(componentId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.info("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+
+                    }
+                };
+            } else {
+                throw new WebApplicationException(Response.serverError().entity(
+                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
+            }
+            return createDownloadResponse(result, fileName);
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        }
     }
 
     public ComponentRegistry findRegistry(String id, RegistryClosure<? extends AbstractDescription> clos) throws ComponentRegistryException {
-        AbstractDescription desc = null;
-        ComponentRegistry result = getRegistry(getStatus(false));
-        desc = clos.getDescription(result, id);
-        if (desc == null) {
-            List<ComponentRegistry> userRegs = componentRegistryFactory.getAllUserRegistries();
-            for (ComponentRegistry reg : userRegs) {
-                desc = clos.getDescription(reg, id);
-                if (desc != null) {
-                    result = reg;
-                    break;
-                }
-            }
-        }
-        return result;
+        AbstractDescription desc = null;
+        ComponentRegistry result = getRegistry(getStatus(false));
+        desc = clos.getDescription(result, id);
+        if (desc == null) {
+            List<ComponentRegistry> userRegs = componentRegistryFactory.getAllUserRegistries();
+            for (ComponentRegistry reg : userRegs) {
+                desc = clos.getDescription(reg, id);
+                if (desc != null) {
+                    result = reg;
+                    break;
+                }
+            }
+        }
+        return result;
     }
 
@@ -252 +256 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response getRegisteredProfile(@PathParam("profileId") String profileId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info("Profile with id: " + profileId + " is requested.");
-        CMDComponentSpec mdProfile = getRegistry(getStatus(userspace)).getMDProfile(profileId);
-        if (mdProfile == null) {
-            return Response.status(Status.NOT_FOUND).build();
-        } else {
-            return Response.ok(mdProfile).build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        LOG.info("Profile with id: " + profileId + " is requested.");
+        CMDComponentSpec mdProfile = getRegistry(getStatus(userspace)).getMDProfile(profileId);
+        if (mdProfile == null) {
+            return Response.status(Status.NOT_FOUND).build();
+        } else {
+            return Response.ok(mdProfile).build();
+        }
     }
 
@@ -266 +270 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<AbstractDescription> getComponentUsage(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("true") boolean userspace) throws ComponentRegistryException {
-        try {
-            final long start = System.currentTimeMillis();
-            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) {
-            LOG.info("Could not retrieve profile usage", e);
-            throw e;
-        }
+        try {
+            final long start = System.currentTimeMillis();
+            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) {
+            LOG.info("Could not retrieve profile usage", e);
+            throw e;
+        }
     }
 
@@ -290 +294 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<Comment> getCommentsFromProfile(@PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        final Principal principal = security.getUserPrincipal();
-        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;
+        long start = System.currentTimeMillis();
+        final Principal principal = security.getUserPrincipal();
+        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;
     }
 
@@ -302 +306 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public List<Comment> getCommentsFromComponent(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        long start = System.currentTimeMillis();
-        final Principal principal = security.getUserPrincipal();
-        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;
+        long start = System.currentTimeMillis();
+        final Principal principal = security.getUserPrincipal();
+        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;
     }
 
@@ -314 +318 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Comment getSpecifiedCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info(" Comments of component with id" + commentId + " are requested.");
-        final Principal principal = security.getUserPrincipal();
-        return getRegistry(getStatus(userspace)).getSpecifiedCommentInProfile(profileId, commentId, principal);
+        LOG.info(" Comments of component with id" + commentId + " are requested.");
+        final Principal principal = security.getUserPrincipal();
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInProfile(profileId, commentId, principal);
     }
 
@@ -323 +327 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Comment getSpecifiedCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        LOG.info(" Comments of component with id" + commentId + " are requested.");
-        final Principal principal = security.getUserPrincipal();
-        return getRegistry(getStatus(userspace)).getSpecifiedCommentInComponent(componentId, commentId, principal);
+        LOG.info(" Comments of component with id" + commentId + " are requested.");
+        final Principal principal = security.getUserPrincipal();
+        return getRegistry(getStatus(userspace)).getSpecifiedCommentInComponent(componentId, commentId, principal);
     }
 
     /**
      *
-     * Purely helper method for my front-end (FLEX) which only does post/get requests. The query param is checked and the "proper" method is
-     * called.
+     * Purely helper method for my front-end (FLEX) which only does post/get
+     * requests. The query param is checked and the "proper" method is called.
      *
      * @param profileId
@@ -340 +344 @@
     @Path("/profiles/{profileId}")
     public Response manipulateRegisteredProfile(@PathParam("profileId") String profileId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteRegisteredProfile(profileId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteRegisteredProfile(profileId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -351 +355 @@
     @Path("/profiles/{profileId}/comments/{commentId}")
     public Response manipulateCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteCommentFromProfile(profileId, commentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteCommentFromProfile(profileId, commentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -362 +366 @@
     @Path("/components/{componentId}/comments/{commentId}")
     public Response manipulateCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteCommentFromComponent(componentId, commentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteCommentFromComponent(componentId, commentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -374 +378 @@
     @Consumes("multipart/form-data")
     public Response publishRegisteredProfile(@PathParam("profileId") String profileId, @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) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ProfileDescription desc = getRegistry(getStatus(true)).getProfileDescription(profileId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @FormDataParam(NAME_FORM_FIELD) String name, @FormDataParam(DESCRIPTION_FORM_FIELD) String description,
+            @FormDataParam(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ProfileDescription desc = getRegistry(getStatus(true)).getProfileDescription(profileId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -398 +402 @@
     @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(GROUP_FORM_FIELD) String group, @FormDataParam(DOMAIN_FORM_FIELD) String domainName) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ProfileDescription desc = getRegistry(getStatus(userspace)).getProfileDescription(profileId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, userCredentials, userspace, new UpdateAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ProfileDescription desc = getRegistry(getStatus(userspace)).getProfileDescription(profileId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, userCredentials, userspace, new UpdateAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
 
     }
@@ -423 +427 @@
     /**
      *
-     * Purely helper method for my front-end (FLEX) which van only do post/get requests. The query param is checked and the "proper" method
-     * is called.
+     * Purely helper method for my front-end (FLEX) which van only do post/get
+     * requests. The query param is checked and the "proper" method is called.
      *
      * @param componentId
@@ -433 +437 @@
     @Path("/components/{componentId}")
     public Response manipulateRegisteredComponent(@PathParam("componentId") String componentId, @FormParam("method") String method,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        if ("delete".equalsIgnoreCase(method)) {
-            return deleteRegisteredComponent(componentId, userspace);
-        } else {
-            return Response.ok().build();
-        }
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        if ("delete".equalsIgnoreCase(method)) {
+            return deleteRegisteredComponent(componentId, userspace);
+        } else {
+            return Response.ok().build();
+        }
     }
 
@@ -445 +449 @@
     @Consumes("multipart/form-data")
     public Response publishRegisteredComponent(@PathParam("componentId") String componentId,
-            @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) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            // TODO: Get status from parameter
-            ComponentDescription desc = getRegistry(getStatus(true)).getComponentDescription(componentId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            // TODO: Get status from parameter
+            ComponentDescription desc = getRegistry(getStatus(true)).getComponentDescription(componentId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), true, new PublishAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent profile").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -471 +475 @@
     @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) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ComponentDescription desc = getRegistry(getStatus(userspace)).getComponentDescription(componentId);
-            if (desc != null) {
-                updateDescription(desc, name, description, domainName, group);
-                return register(input, desc, getUserCredentials(principal), userspace, new UpdateAction(principal));
-            } else {
-                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot update nonexistent component").build();
-            }
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ComponentDescription desc = getRegistry(getStatus(userspace)).getComponentDescription(componentId);
+            if (desc != null) {
+                updateDescription(desc, name, description, domainName, group);
+                return register(input, desc, getUserCredentials(principal), userspace, new UpdateAction(principal));
+            } else {
+                LOG.error("Update of nonexistent id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot update nonexistent component").build();
+            }
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
     private void updateDescription(AbstractDescription desc, String name, String description, String domainName, String group) {
-        desc.setName(name);
-        desc.setDescription(description);
-        desc.setDomainName(domainName);
-        desc.setGroupName(group);
-        desc.setRegistrationDate(AbstractDescription.createNewDate());
+        desc.setName(name);
+        desc.setDescription(description);
+        desc.setDomainName(domainName);
+        desc.setGroupName(group);
+        desc.setRegistrationDate(AbstractDescription.createNewDate());
     }
 
@@ -503 +507 @@
     @Path("/components/{componentId}")
     public Response deleteRegisteredComponent(@PathParam("componentId") String componentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            ComponentRegistry registry = getRegistry(getStatus(userspace));
-            LOG.info("Component with id: " + componentId + " set for deletion.");
-            registry.deleteMDComponent(componentId, principal, false);
-        } catch (DeleteFailedException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Component with id: " + componentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Component with id: " + componentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            ComponentRegistry registry = getRegistry(getStatus(userspace));
+            LOG.info("Component with id: " + componentId + " set for deletion.");
+            registry.deleteMDComponent(componentId, principal, false);
+        } catch (DeleteFailedException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Component with id: " + componentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Component with id: " + componentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -529 +533 @@
     @Path("/profiles/{profileId}")
     public Response deleteRegisteredProfile(@PathParam("profileId") String profileId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            LOG.info("Profile with id: " + profileId + " set for deletion.");
-            getRegistry(getStatus(userspace)).deleteMDProfile(profileId, principal);
-        } catch (DeleteFailedException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Profile with id: " + profileId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            LOG.info("Profile with id: " + profileId + " set for deletion.");
+            getRegistry(getStatus(userspace)).deleteMDProfile(profileId, principal);
+        } catch (DeleteFailedException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Profile with id: " + profileId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Profile with id: " + profileId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -554 +558 @@
     @Path("/profiles/{profileId}/comments/{commentId}")
     public Response deleteCommentFromProfile(@PathParam("profileId") String profileId, @PathParam("commentId") String commentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(getStatus(userspace));
-            final Comment comment = registry.getSpecifiedCommentInProfile(profileId, commentId, principal);
-            if (comment != null && profileId.equals(comment.getProfileDescriptionId())) {
-                LOG.info("Comment with id: " + commentId + " set for deletion.");
-                registry.deleteComment(commentId, principal);
-            } else {
-                throw new ComponentRegistryException("Comment not found for specified profile");
-            }
-        } catch (DeleteFailedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Comment with id: " + commentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            final Principal principal = checkAndGetUserPrincipal();
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
+            final Comment comment = registry.getSpecifiedCommentInProfile(profileId, commentId, principal);
+            if (comment != null && profileId.equals(comment.getProfileDescriptionId())) {
+                LOG.info("Comment with id: " + commentId + " set for deletion.");
+                registry.deleteComment(commentId, principal);
+            } else {
+                throw new ComponentRegistryException("Comment not found for specified profile");
+            }
+        } catch (DeleteFailedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Comment with id: " + commentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -585 +589 @@
     @Path("/components/{componentId}/comments/{commentId}")
     public Response deleteCommentFromComponent(@PathParam("componentId") String componentId, @PathParam("commentId") String commentId,
-            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
-        try {
-            final Principal principal = checkAndGetUserPrincipal();
-            final ComponentRegistry registry = getRegistry(getStatus(userspace));
-            final Comment comment = registry.getSpecifiedCommentInComponent(componentId, commentId, principal);
-            if (comment != null && componentId.equals(comment.getComponentDescriptionId())) {
-                LOG.info("Comment with id: " + commentId + " set for deletion.");
-                registry.deleteComment(commentId, principal);
-            } else {
-                throw new ComponentRegistryException("Comment not found for specified component");
-            }
-        } catch (DeleteFailedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (IOException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        } catch (UserUnauthorizedException e) {
-            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
-            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
-        }
-        LOG.info("Comment with id: " + commentId + " deleted.");
-        return Response.ok().build();
+            @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) {
+        try {
+            final Principal principal = checkAndGetUserPrincipal();
+            final ComponentRegistry registry = getRegistry(getStatus(userspace));
+            final Comment comment = registry.getSpecifiedCommentInComponent(componentId, commentId, principal);
+            if (comment != null && componentId.equals(comment.getComponentDescriptionId())) {
+                LOG.info("Comment with id: " + commentId + " set for deletion.");
+                registry.deleteComment(commentId, principal);
+            } else {
+                throw new ComponentRegistryException("Comment not found for specified component");
+            }
+        } catch (DeleteFailedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.FORBIDDEN).entity("" + e.getMessage()).build();
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (IOException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed.", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        } catch (UserUnauthorizedException e) {
+            LOG.info("Comment with id: " + commentId + " deletion failed: " + e.getMessage());
+            return Response.serverError().status(Status.UNAUTHORIZED).entity("" + e.getMessage()).build();
+        }
+        LOG.info("Comment with id: " + commentId + " deleted.");
+        return Response.ok().build();
     }
 
@@ -617 +621 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML})
     public Response getRegisteredProfileRawType(@PathParam("profileId") final String profileId, @PathParam("rawType") String rawType) {
-        LOG.info("Profile with id: " + profileId + " and rawType:" + rawType + " is requested.");
-        StreamingOutput result = null;
-        try {
-            final ComponentRegistry registry = findRegistry(profileId, new ProfileClosure());
-            if (registry == null) {
-                return Response.status(Status.NOT_FOUND).entity("Id: " + profileId + " is not registered, cannot create data.").build();
-            }
-            ProfileDescription desc = registry.getProfileDescription(profileId);
-            checkAndThrowDescription(desc, profileId);
-            String fileName = desc.getName() + "." + rawType;
-
-            if ("xml".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDProfileAsXml(profileId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.warn("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else if ("xsd".equalsIgnoreCase(rawType)) {
-                result = new StreamingOutput() {
-                    @Override
-                    public void write(OutputStream output) throws IOException, WebApplicationException {
-                        try {
-                            registry.getMDProfileAsXsd(profileId, output);
-                        } catch (ComponentRegistryException e) {
-                            LOG.warn("Could not retrieve component", e);
-                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
-                        }
-                    }
-                };
-            } else {
-                throw new WebApplicationException(Response.serverError().entity(
-                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
-            }
-            return createDownloadResponse(result, fileName);
-        } catch (ComponentRegistryException e) {
-            LOG.info("Could not retrieve component", e);
-            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
-        }
+        LOG.info("Profile with id: " + profileId + " and rawType:" + rawType + " is requested.");
+        StreamingOutput result = null;
+        try {
+            final ComponentRegistry registry = findRegistry(profileId, new ProfileClosure());
+            if (registry == null) {
+                return Response.status(Status.NOT_FOUND).entity("Id: " + profileId + " is not registered, cannot create data.").build();
+            }
+            ProfileDescription desc = registry.getProfileDescription(profileId);
+            checkAndThrowDescription(desc, profileId);
+            String fileName = desc.getName() + "." + rawType;
+
+            if ("xml".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDProfileAsXml(profileId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.warn("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else if ("xsd".equalsIgnoreCase(rawType)) {
+                result = new StreamingOutput() {
+                    @Override
+                    public void write(OutputStream output) throws IOException, WebApplicationException {
+                        try {
+                            registry.getMDProfileAsXsd(profileId, output);
+                        } catch (ComponentRegistryException e) {
+                            LOG.warn("Could not retrieve component", e);
+                            throw new WebApplicationException(e, Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build());
+                        }
+                    }
+                };
+            } else {
+                throw new WebApplicationException(Response.serverError().entity(
+                        "unsupported rawType: " + rawType + " (only xml or xsd are supported)").build());
+            }
+            return createDownloadResponse(result, fileName);
+        } catch (ComponentRegistryException e) {
+            LOG.info("Could not retrieve component", e);
+            return Response.serverError().status(Status.INTERNAL_SERVER_ERROR).build();
+        }
     }
 
     private void checkAndThrowDescription(AbstractDescription desc, String id) {
-        if (desc == null) {
-            throw new WebApplicationException(Response.serverError().entity("Incorrect id:" + id + "cannot handle request").build());
-        }
+        if (desc == null) {
+            throw new WebApplicationException(Response.serverError().entity("Incorrect id:" + id + "cannot handle request").build());
+        }
     }
 
     private Response createDownloadResponse(StreamingOutput result, String fileName) {
-        //Making response so it triggers browsers native save as dialog.
-        Response response = Response.ok().type("application/x-download").header("Content-Disposition",
-                "attachment; filename=\"" + fileName + "\"").entity(result).build();
-        return response;
+        //Making response so it triggers browsers native save as dialog.
+        Response response = Response.ok().type("application/x-download").header("Content-Disposition",
+                "attachment; filename=\"" + fileName + "\"").entity(result).build();
+        return response;
 
     }
@@ -682 +686 @@
     @Consumes("multipart/form-data")
     public Response registerProfile(@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) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ProfileDescription desc = createNewProfileDescription();
-            desc.setCreatorName(userCredentials.getDisplayName());
-            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
-            desc.setName(name);
-            desc.setDescription(description);
-            desc.setGroupName(group);
-            desc.setDomainName(domainName);
-            LOG.info("Trying to register Profile: " + desc);
-            return register(input, desc, userCredentials, userspace, new NewAction());
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ProfileDescription desc = createNewProfileDescription();
+            desc.setCreatorName(userCredentials.getDisplayName());
+            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setGroupName(group);
+            desc.setDomainName(domainName);
+            LOG.info("Trying to register Profile: " + desc);
+            return register(input, desc, userCredentials, userspace, new NewAction());
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -706 +710 @@
     @Consumes("multipart/form-data")
     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) {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            ComponentDescription desc = createNewComponentDescription();
-            desc.setCreatorName(userCredentials.getDisplayName());
-            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
-            desc.setName(name);
-            desc.setDescription(description);
-            desc.setGroupName(group);
-            desc.setDomainName(domainName);
-            LOG.info("Trying to register Component: " + desc);
-            return register(input, desc, userCredentials, userspace, new NewAction());
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @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) {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            ComponentDescription desc = createNewComponentDescription();
+            desc.setCreatorName(userCredentials.getDisplayName());
+            desc.setUserId(userCredentials.getPrincipalName()); // Hash used to be created here, now Id is constructed by impl
+            desc.setName(name);
+            desc.setDescription(description);
+            desc.setGroupName(group);
+            desc.setDomainName(domainName);
+            LOG.info("Trying to register Component: " + desc);
+            return register(input, desc, userCredentials, userspace, new NewAction());
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -730 +734 @@
     @Consumes("multipart/form-data")
     public Response registerCommentInComponent(@FormDataParam(DATA_FORM_FIELD) InputStream input,
-            @PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
-                throw new UserUnauthorizedException("Cannot materialize authenticated user");
-            }
-            // TODO: Add user/group param
-            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
-            ComponentDescription description = registry.getComponentDescription(componentId);
-            if (description != null) {
-                LOG.info("Trying to register comment to " + componentId);
-                return registerComment(input, registry, userspace, description, principal, userCredentials);
-            } else {
-                LOG.error("Attempt to post comment on nonexistent component id (" + componentId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot comment on nonexistent component").build();
-            }
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
+                throw new UserUnauthorizedException("Cannot materialize authenticated user");
+            }
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
+            ComponentDescription description = registry.getComponentDescription(componentId);
+            if (description != null) {
+                LOG.info("Trying to register comment to " + componentId);
+                return registerComment(input, registry, userspace, description, principal, userCredentials);
+            } else {
+                LOG.error("Attempt to post comment on nonexistent component id (" + componentId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot comment on nonexistent component").build();
+            }
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -757 +761 @@
     @Consumes("multipart/form-data")
     public Response registerCommentInProfile(@FormDataParam(DATA_FORM_FIELD) InputStream input,
-            @PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
-        try {
-            Principal principal = checkAndGetUserPrincipal();
-            UserCredentials userCredentials = getUserCredentials(principal);
-            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
-                throw new UserUnauthorizedException("Cannot materialize authenticated user");
-            }
-            // TODO: Add user/group param
-            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
-            ProfileDescription description = registry.getProfileDescription(profileId);
-            if (description != null) {
-                LOG.info("Trying to register comment to " + profileId);
-                return registerComment(input, registry, userspace, description, principal, userCredentials);
-            } else {
-                LOG.error("Attempt to post comment on nonexistent profile id (" + profileId + ") failed.");
-                return Response.serverError().entity("Invalid id, cannot comment on nonexistent profile").build();
-            }
-        } catch (UserUnauthorizedException ex) {
-            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
-        }
+            @PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace) throws ComponentRegistryException {
+        try {
+            Principal principal = checkAndGetUserPrincipal();
+            UserCredentials userCredentials = getUserCredentials(principal);
+            if (null == componentRegistryFactory.getOrCreateUser(userCredentials)) {
+                throw new UserUnauthorizedException("Cannot materialize authenticated user");
+            }
+            // TODO: Add user/group param
+            ComponentRegistry registry = getRegistry(getStatus(userspace), null, userCredentials);
+            ProfileDescription description = registry.getProfileDescription(profileId);
+            if (description != null) {
+                LOG.info("Trying to register comment to " + profileId);
+                return registerComment(input, registry, userspace, description, principal, userCredentials);
+            } else {
+                LOG.error("Attempt to post comment on nonexistent profile id (" + profileId + ") failed.");
+                return Response.serverError().entity("Invalid id, cannot comment on nonexistent profile").build();
+            }
+        } catch (UserUnauthorizedException ex) {
+            return Response.status(Status.UNAUTHORIZED).entity(ex.getMessage()).build();
+        }
     }
 
@@ -783 +787 @@
     @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
     public Response pingSession() {
-        boolean stillActive = false;
-        Principal userPrincipal = security.getUserPrincipal();
-        LOG.info("ping by user: " + (userPrincipal == null ? "null" : userPrincipal.getName()));
-        if (request != null) {
-            if (userPrincipal != null && !ComponentRegistryFactory.ANONYMOUS_USER.equals(userPrincipal.getName())) {
-                stillActive = !((HttpServletRequest) request).getSession().isNew();
-            }
-        }
-        return Response.ok().entity("<session stillActive=\"" + stillActive + "\"/>").build();
+        boolean stillActive = false;
+        Principal userPrincipal = security.getUserPrincipal();
+        LOG.info("ping by user: " + (userPrincipal == null ? "null" : userPrincipal.getName()));
+        if (request != null) {
+            if (userPrincipal != null && !ComponentRegistryFactory.ANONYMOUS_USER.equals(userPrincipal.getName())) {
+                stillActive = !((HttpServletRequest) request).getSession().isNew();
+            }
+        }
+        return Response.ok().entity("<session stillActive=\"" + stillActive + "\"/>").build();
     }
 
     private Response register(InputStream input, AbstractDescription desc, UserCredentials userCredentials, boolean userspace,
-            RegisterAction action) {
-        try {
-            // 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(getStatus(true)), componentRegistryFactory.getPublicRegistry());
-            RegisterResponse response = new RegisterResponse();
-            response.setIsInUserSpace(userspace);
-            validate(response, descriptionValidator, validator);
-            if (response.getErrors().isEmpty()) {
-
-                CMDComponentSpec spec = validator.getCMDComponentSpec();
-
-                // Olha: removing filename from spec before it gets extended!!! recursion over all the components
-                setFileNamesFromListToNull(spec.getCMDComponent());
-
-
-
-                try {
-
-
-                    // Expand to check for recursion
-                    registry.getExpander().expandNestedComponent(spec.getCMDComponent(), desc.getId());
-
-
-
-                    // Add profile
-
-
-                    int returnCode = action.execute(desc, spec, response, registry);
-                    if (returnCode == 0) {
-                        response.setRegistered(true);
-                        response.setDescription(desc);
-                    } else {
-                        response.setRegistered(false);
-                        response.addError("Unable to register at this moment. Internal server error.");
-                    }
-                } catch (ComponentRegistryException ex) {
-                    // Recursion detected
-                    response.setRegistered(false);
-                    response.addError("Error while expanding specification. " + ex.getMessage());
-                }
-            } else {
-                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
-                response.setRegistered(false);
-            }
-            response.setIsProfile(desc.isProfile());
-            return Response.ok(response).build();
-        } finally {
-            try {
-                input.close();//either we read the input or there was an exception, we need to close it.
-            } catch (IOException e) {
-                LOG.error("Error when closing inputstream: ", e);
-            }
-        }
+            RegisterAction action) {
+        try {
+            // 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(getStatus(true)), componentRegistryFactory.getPublicRegistry());
+            RegisterResponse response = new RegisterResponse();
+            response.setIsInUserSpace(userspace);
+            validate(response, descriptionValidator, validator);
+            if (response.getErrors().isEmpty()) {
+
+                CMDComponentSpec spec = validator.getCMDComponentSpec();
+
+                // Olha: removing filename from spec before it gets extended!!! recursion over all the components
+                setFileNamesFromListToNull(spec.getCMDComponent());
+
+
+
+                try {
+
+
+                    // Expand to check for recursion
+                    registry.getExpander().expandNestedComponent(spec.getCMDComponent(), desc.getId());
+
+
+
+                    // Add profile
+
+
+                    int returnCode = action.execute(desc, spec, response, registry);
+                    if (returnCode == 0) {
+                        response.setRegistered(true);
+                        response.setDescription(desc);
+                    } else {
+                        response.setRegistered(false);
+                        response.addError("Unable to register at this moment. Internal server error.");
+                    }
+                } catch (ComponentRegistryException ex) {
+                    // Recursion detected
+                    response.setRegistered(false);
+                    response.addError("Error while expanding specification. " + ex.getMessage());
+                }
+            } else {
+                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
+                response.setRegistered(false);
+            }
+            response.setIsProfile(desc.isProfile());
+            return Response.ok(response).build();
+        } finally {
+            try {
+                input.close();//either we read the input or there was an exception, we need to close it.
+            } catch (IOException e) {
+                LOG.error("Error when closing inputstream: ", e);
+            }
+        }
     }
 
     private Response registerComment(InputStream input, ComponentRegistry registry, boolean userspace,
-            AbstractDescription description, Principal principal, UserCredentials userCredentials) {
-        try {
-            CommentValidator validator = new CommentValidator(input, description);
-            CommentResponse response = new CommentResponse();
-            response.setIsInUserSpace(userspace);
-            validateComment(response, validator);
-            if (response.getErrors().isEmpty()) {
-                Comment com = validator.getCommentSpec();
-                //int returnCode = action.executeComment(com, response, registry, principal.getName());
-
-                // If user name is left empty, fill it using the user's display name
-                if (null == com.getUserName() || "".equals(com.getUserName())) {
-                    if (userCredentials != null) {
-                        com.setUserName(userCredentials.getDisplayName());
-                    } else {
-                        com.setUserName(principal.getName());
-                    }
-                }
-
-                int returnCode = registry.registerComment(com, principal.getName());
-                if (returnCode == 0) {
-                    response.setRegistered(true);
-                    response.setComment(com);
-                } else {
-                    response.setRegistered(false);
-                    response.addError("Unable to register at this moment. Internal server error.");
-                }
-            } else {
-                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
-                response.setRegistered(false);
-            }
-            return Response.ok(response).build();
-        } catch (ComponentRegistryException ex) {
-            LOG.error("Error while inserting comment: ", ex);
-            return Response.serverError().entity(ex.getMessage()).build();
-        } finally {
-            try {
-                input.close();//either we read the input or there was an exception, we need to close it.
-            } catch (IOException e) {
-                LOG.error("Error when closing inputstream: ", e);
-                return Response.serverError().build();
-            }
-        }
+            AbstractDescription description, Principal principal, UserCredentials userCredentials) {
+        try {
+            CommentValidator validator = new CommentValidator(input, description);
+            CommentResponse response = new CommentResponse();
+            response.setIsInUserSpace(userspace);
+            validateComment(response, validator);
+            if (response.getErrors().isEmpty()) {
+                Comment com = validator.getCommentSpec();
+                //int returnCode = action.executeComment(com, response, registry, principal.getName());
+
+                // If user name is left empty, fill it using the user's display name
+                if (null == com.getUserName() || "".equals(com.getUserName())) {
+                    if (userCredentials != null) {
+                        com.setUserName(userCredentials.getDisplayName());
+                    } else {
+                        com.setUserName(principal.getName());
+                    }
+                }
+
+                int returnCode = registry.registerComment(com, principal.getName());
+                if (returnCode == 0) {
+                    response.setRegistered(true);
+                    response.setComment(com);
+                } else {
+                    response.setRegistered(false);
+                    response.addError("Unable to register at this moment. Internal server error.");
+                }
+            } else {
+                LOG.info("Registration failed with validation errors:" + Arrays.toString(response.getErrors().toArray()));
+                response.setRegistered(false);
+            }
+            return Response.ok(response).build();
+        } catch (ComponentRegistryException ex) {
+            LOG.error("Error while inserting comment: ", ex);
+            return Response.serverError().entity(ex.getMessage()).build();
+        } finally {
+            try {
+                input.close();//either we read the input or there was an exception, we need to close it.
+            } catch (IOException e) {
+                LOG.error("Error when closing inputstream: ", e);
+                return Response.serverError().build();
+            }
+        }
     }
 
     private ComponentDescription createNewComponentDescription() {
-        ComponentDescription desc = ComponentDescription.createNewDescription();
-        desc.setHref(createXlink(desc.getId()));
-        return desc;
+        ComponentDescription desc = ComponentDescription.createNewDescription();
+        desc.setHref(createXlink(desc.getId()));
+        return desc;
     }
 
     private ProfileDescription createNewProfileDescription() {
-        ProfileDescription desc = ProfileDescription.createNewDescription();
-        desc.setHref(createXlink(desc.getId()));
-        return desc;
+        ProfileDescription desc = ProfileDescription.createNewDescription();
+        desc.setHref(createXlink(desc.getId()));
+        return desc;
     }
 
     private String createXlink(String id) {
-        URI uri = uriInfo.getRequestUriBuilder().path(id).build();
-        return uri.toString();
+        URI uri = uriInfo.getRequestUriBuilder().path(id).build();
+        return uri.toString();
     }
 
     /**
      *
-     * @return The application's base URI as configured in the "componentRegistryServiceRootUrl" context parameter.
-     * If correctly configured, it should look something like "http://catalog.clarin.eu/ds/ComponentRegistry".
-     * <em>Be aware that this can also be null if configured incorrectly!</em>
+     * @return The application's base URI as configured in the
+     * "componentRegistryServiceRootUrl" context parameter. If correctly
+     * configured, it should look something like
+     * "http://catalog.clarin.eu/ds/ComponentRegistry". <em>Be aware that this
+     * can also be null if configured incorrectly!</em>
      *
      * @see #APPLICATION_BASE_URL_PARAM
      */
     private String getApplicationBaseURI() {
-        return servletContext.getInitParameter(APPLICATION_BASE_URL_PARAM);
+        return servletContext.getInitParameter(APPLICATION_BASE_URL_PARAM);
     }
 
     private void validate(RegisterResponse response, Validator... validators) {
-        for (Validator validator : validators) {
-            if (!validator.validate()) {
-                for (String error : validator.getErrorMessages()) {
-                    response.addError(error);
-                }
-            }
-        }
+        for (Validator validator : validators) {
+            if (!validator.validate()) {
+                for (String error : validator.getErrorMessages()) {
+                    response.addError(error);
+                }
+            }
+        }
     }
 
     private void validateComment(CommentResponse response, Validator... validators) {
-        for (Validator validator : validators) {
-            if (!validator.validate()) {
-                for (String error : validator.getErrorMessages()) {
-                    response.addError(error);
-                }
-            }
-        }
+        for (Validator validator : validators) {
+            if (!validator.validate()) {
+                for (String error : validator.getErrorMessages()) {
+                    response.addError(error);
+                }
+            }
+        }
     }
 
@@ -951 +957 @@
      */
     public void setComponentRegistryFactory(ComponentRegistryFactory componentRegistryFactory) {
-        this.componentRegistryFactory = componentRegistryFactory;
+        this.componentRegistryFactory = componentRegistryFactory;
     }
 
@@ -960 +966 @@
     public void setFileNamesFromListToNull(List<CMDComponentType> listofcomponents) {
 
-        for (CMDComponentType currentcomponent : listofcomponents) {
-            setFileNamesToNullCurrent(currentcomponent);
-        }
+        for (CMDComponentType currentcomponent : listofcomponents) {
+            setFileNamesToNullCurrent(currentcomponent);
+        }
 
     }
@@ -971 +977 @@
     public void setFileNamesToNullCurrent(CMDComponentType currentcomponent) {
 
-        currentcomponent.setFilename(null);
-        setFileNamesFromListToNull(currentcomponent.getCMDComponent());
+        currentcomponent.setFilename(null);
+        setFileNamesFromListToNull(currentcomponent.getCMDComponent());
 
     }
@@ -980 +986 @@
      * 
      */
-    
-     private <T extends AbstractDescription> Rss getRss(boolean userspace,String limit, List<T> descs, String kindofdesc) throws ComponentRegistryException, ParseException {
-        
-        String baseUri = getApplicationBaseURI()+"/";
-        RssCreatorDescriptions rssCreator = new RssCreatorDescriptions(baseUri);
-        rssCreator.setVersion(2.0);
+    private <T extends AbstractDescription> Rss getRss(String limit, List<T> descs, 
+            String link, String description, String title) throws ComponentRegistryException, ParseException {
+
         
+        RssCreatorDescriptions rssCreator = new RssCreatorDescriptions();
         
+        rssCreator.setLink(link);
+        rssCreator.setDescription(description);
+        rssCreator.setTitle(title);
+
+        Collections.sort(descs, AbstractDescription.COMPARE_ON_DATE);
+
         int limitInt = Integer.parseInt(limit);
+
+        if (descs.size() < limitInt) {
+            limitInt = descs.size();
+        };
+        List<T> sublist = descs.subList(0, limitInt);
+
+        Rss rss = rssCreator.makeRss(sublist);
+
+        return rss;
+    }
+    ////////////////////////////////////////////////
+
+    @GET
+    @Path("/components/rss")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    public Rss getRssComponent(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
+
+        List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
         
-        if (descs.size()<limitInt) {limitInt = descs.size();};
-        List<T> sublist = descs.subList(0, limitInt);
-        Collections.sort(sublist, AbstractDescription.COMPARE_ON_DATE);
+        String title;
+         if (userspace) { title= "Workspace components";}
+         else {title= "Workspace components";
+       }
+         String link= getApplicationBaseURI() + "/";
+         String description = "Updates for components";
         
+        Rss rss = getRss(limit, components, link, description, title);
+
+        LOG.info("Releasing " + limit + "most recent registered components into the world sorted by their registration date-and-time");
+
+
+        return rss;
+    }
+
+    ////////////////////////////////////////////////
+    @GET
+    @Path("/profiles/rss")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    public Rss getRssProfile(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
+
         
-        if (userspace)   {rssCreator.setTitle("Workspace "+kindofdesc);} 
-        else {rssCreator.setTitle("Public "+kindofdesc);}
+
+        // ?? How to get rid of the deprecated stuff ??
+        List<ProfileDescription> profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
+        
+        String title;
+         if (userspace) { title= "Workspace profiles";}
+         else {title= "Workspace profiles";
+       }
+         String link= getApplicationBaseURI() + "/";
+         String description = "Updates for profiles";
+        
+        Rss rss = getRss(limit, profiles, link, description, title);
+        
+
+        LOG.info("Releasing " + limit + "most recent registered profiles into the world sorted by their registration date-and-time");
+        return rss;
+    }
+
+    /* auxiliary debigging piece of code for grabbing Id-s of profiles and comments
+     * 
+     List<ProfileDescription> lprfaux = getRegisteredProfiles(userspace, true);
+        
          
-        Rss rss =rssCreator.makeRss(sublist);
-
-        return rss;
-    }
-    ////////////////////////////////////////////////
-
-    @GET
-    @Path("/components/rss")
-    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Rss getRssComponent(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
-    
-       List<ComponentDescription> components = getRegistry(getStatus(userspace)).getComponentDescriptions();
-      Rss rss = getRss(userspace, limit, components, "components");
+     for (ProfileDescription currentProfile : lprfaux) {
+     String currentProfileId = currentProfile.getId();
+     LOG.debug(currentProfileId);
+            
+     }
+     * 
+     List<ComponentDescription> lcmaux = getRegisteredProfiles(userspace, true);
         
-      LOG.info("Releasing " + limit + "most recent registered components into the world sorted by their registration date-and-time");
-        
+         
+     for (ProfileDescription currentProfile : lprfaux) {
+     String currentProfileId = currentProfile.getId();
+     LOG.debug(currentProfileId);
+            
+     }
+     * 
         
-       return rss;
-    }
-
-    ////////////////////////////////////////////////
-    @GET
-    @Path("/profiles/rss")
-    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Rss getRssProfile(@QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, ParseException {
-
-        //http://www.clarin.eu/cmdi/profiles 
-
-        // ?? How to get rid of the deprecated stuff ??
-        List<ProfileDescription> profiles = getRegistry(getStatus(userspace)).getProfileDescriptions();
-        Rss rss = getRss(userspace, limit, profiles, "profiles");
-
-        LOG.info("Releasing " + limit + "most recent registered profiles into the world sorted by their registration date-and-time");
-        return rss;
-    }
-
+     */
     ///////////////////////////////////////////////////////////
-    @GET
-    @Path("/profiles/{profileId}/comments/rss")
-    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
-    public Rss getRssOfCommentsFromProfile(@PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, IOException, JAXBException, ParseException {
-
-
-        // ?? this is for debugging. But, anyway, how to get all the profiles without the need to type them in?
-        // what if a user do not remember his/her id of profile?
-        // grabbing all registered profile names from the register and outputting them  on the tomcat terminal */
-        /*List<ProfileDescription> lprfaux = getRegisteredProfiles(userspace, true);
-       
-        for (ProfileDescription currentProfile : lprfaux) {
-            String currentProfileId = currentProfile.getId();
-            LOG.debug(currentProfileId);
-        }
-        */
-        // end of grabbing */
-
-
-
-        final Principal principal = security.getUserPrincipal();
-        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
-
-        String baseUri = getApplicationBaseURI()+"/";
-        
-        
+    private Rss getRssOfComments(String limit, List<Comment> comments, String description,
+            String title, String link) throws ComponentRegistryException, ParseException, IOException, JAXBException {
+
+        Collections.sort(comments, Comment.COMPARE_ON_DATE);
+
         int limitInt = Integer.parseInt(limit);
-        
-        if (comments.size()<limitInt) {limitInt = comments.size();};
+        if (comments.size() < limitInt) {
+            limitInt = comments.size();
+        };
         List<Comment> sublist = comments.subList(0, limitInt);
-        Collections.sort(sublist, Comment.COMPARE_ON_DATE);
-        
-        for (Comment comm: sublist){
-            LOG.debug(comm.getCommentDate());
-        }
-         
-        RssCreatorComments instance = new RssCreatorComments(baseUri);
-        instance.setFlagIsFromProfile(true);
-        instance.setDescription("Update of comments for current profile");
-        
-        String hrefPostfix = "&view=comments";
-        String hrefInfix = "?item=";
-        instance.setLink(baseUri+hrefInfix+profileId+hrefPostfix);
-        
-        String title="Comments feed for the profile \""+
-                getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName()+
-                "\" ";
+
+
+        // debug stuff, to see if the dates are sorted with the latest on the top
+        for (Comment comm : sublist) {
+            String dt = comm.getCommentDate();
+            LOG.debug(dt);
+        }
+        //
+
+
+
+        RssCreatorComments instance = new RssCreatorComments();
+
+        instance.setDescription(description);
+        instance.setLink(link);
         instance.setTitle(title);
-        
-        
+
         Rss result = instance.makeRss(sublist);
         
-        // testing stuff
-        String path=openTestDir("testRss");
+         // testing stuff
+        String path = openTestDir("testRss");
         String os = MDMarshaller.marshalToString(result);
         writeStringToFile(os, path + "testRssResl.xml");
         //end of testing stuff
+
+        // debugging stuff
+        LOG.debug("The amount of items: " + Integer.toString(result.getChannel().getItem().size()));
+        LOG.debug("The amount of comments: " + Integer.toString(comments.size()));
+        // end of debugging stuff
+
+
+
+        return result;
+
+    }
+
+    ///////////////////////////////////////////////////////
+    @GET
+    @Path("/profiles/{profileId}/comments/rss")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    public Rss getRssOfCommentsFromProfile(@PathParam("profileId") String profileId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, IOException, JAXBException, ParseException {
+
+
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInProfile(profileId, principal);
+
+        String baseUri = getApplicationBaseURI() + "/";
+        String link = baseUri + "?item=" + profileId + "&view=comments";
+
+        String title = "Comments feed for the profile \""
+                + getRegistry(getStatus(userspace)).getProfileDescription(profileId).getName()
+                + "\" ";
+
+        Rss result = getRssOfComments(limit, comments, "Update of comments for current profile",
+                title, link);
+
+       
+        return result;
+    }
+
+    //////////////////////////////
+    @GET
+    @Path("/components/{componentId}/comments/rss")
+    @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+    public Rss getRssOfCommentsFromComponent(@PathParam("componentId") String componentId, @QueryParam(USERSPACE_PARAM) @DefaultValue("false") boolean userspace, @QueryParam(NUMBER_OF_RSSITEMS) @DefaultValue("20") String limit) throws ComponentRegistryException, IOException, JAXBException, ParseException {
+
+        //debigging piece 
+        List<ComponentDescription> lcmaux = getRegisteredComponents(userspace);
+
+
+        for (ComponentDescription current : lcmaux) {
+            String currentId = current.getId();
+            LOG.debug(currentId);
+        }
         
-        // debugging stuff
-        LOG.debug("The amount of items: "+Integer.toString(result.getChannel().getItem().size()));
-        LOG.debug("The amount of comments: "+Integer.toString(comments.size()));
-        // end of debugging stuff
-        
-
-        return result;
+        //end of debug 
+
+        final Principal principal = security.getUserPrincipal();
+        List<Comment> comments = getRegistry(getStatus(userspace)).getCommentsInComponent(componentId, principal);
+
+        String baseUri = getApplicationBaseURI() + "/";
+        String link = baseUri + "?item=" + componentId + "&view=comments";
+        String title = "Comments feed for the component \""
+                + getRegistry(getStatus(userspace)).getComponentDescription(componentId).getName()
+                + "\" ";
+
+        Rss result = getRssOfComments(limit, comments, "Update of comments for current component",
+                title, link);
+
+
+
+        return result;
     }
 
@@ -1106 +1189 @@
     /**
      *
-     * @param bytes is an array of bytes to be written in the file filename (from scratch!)
-     * @param filename is the name of the file where the array "bytes" is to be written to
+     * @param bytes is an array of bytes to be written in the file filename
+     * (from scratch!)
+     * @param filename is the name of the file where the array "bytes" is to be
+     * written to
      * @throws IOException
      * @throws JAXBException
@@ -1113 +1198 @@
     public static void writeBytesToFile(byte[] bytes, String filename) throws IOException, JAXBException {
 
-        File file = new File(filename);
-        FileOutputStream fop = new FileOutputStream(file);
-
-        fop.write(bytes);
-
-        fop.flush();
-        fop.close();
+        File file = new File(filename);
+        FileOutputStream fop = new FileOutputStream(file);
+
+        fop.write(bytes);
+
+        fop.flush();
+        fop.close();
 
 
@@ -1126 +1211 @@
     /**
      *
-     * @param str is a string which is to be written into the filename (from scratch!)
+     * @param str is a string which is to be written into the filename (from
+     * scratch!)
      * @param filename is a filename where the string is to be written to
      * @throws IOException
@@ -1133 +1219 @@
     public static void writeStringToFile(String str, String filename) throws IOException, JAXBException {
 
-        writeBytesToFile(str.getBytes(), filename);
+        writeBytesToFile(str.getBytes(), filename);
 
 
@@ -1140 +1226 @@
     /**
      *
-     * @param os is an output stream which is to be written into the filename (from scratch!)
+     * @param os is an output stream which is to be written into the filename
+     * (from scratch!)
      * @param filename is a filename where the stream is to be written to
      * @throws IOException
@@ -1147 +1234 @@
     public static void writeStreamToFile(ByteArrayOutputStream os, String filename) throws IOException, JAXBException {
 
-        writeBytesToFile(os.toByteArray(), filename);
+        writeBytesToFile(os.toByteArray(), filename);
 
 
@@ -1154 +1241 @@
     /**
      *
-     * @param cdesc is a component which is to be written into the filename (from scratch!)
+     * @param cdesc is a component which is to be written into the filename
+     * (from scratch!)
      * @param filename is a filename where the component is to be written to
      * @throws IOException
@@ -1162 +1250 @@
 
 
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        MDMarshaller.marshal(cdesc, os);
-
-        writeStreamToFile(os, filename);
+        ByteArrayOutputStream os = new ByteArrayOutputStream();
+        MDMarshaller.marshal(cdesc, os);
+
+        writeStreamToFile(os, filename);
 
     }
@@ -1172 +1260 @@
      * opens a temporary sub-directory dirName in /target/
      *
-     * @param dirName is the name of the temporary subdirectory which is to be opened
+     * @param dirName is the name of the temporary subdirectory which is to be
+     * opened
      * @return the absolute part for this directory
      */
     public static String openTestDir(String dirName) {
 
-        File testDir = new File("target/" + dirName);
-
-
-        testDir.mkdir();
-
-        System.out.println(dirName);
-        //String retval = new File(testDir, dirName).getAbsolutePath();
-        String retval = new File(testDir, "/").getAbsolutePath();
-
-        return (retval);
+        File testDir = new File("target/" + dirName);
+
+
+        testDir.mkdir();
+
+        System.out.println(dirName);
+        //String retval = new File(testDir, dirName).getAbsolutePath();
+        String retval = new File(testDir, "/").getAbsolutePath();
+
+        return (retval);
 
     }

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/RssCreatorCommentsTest.java

@@ -90 +90 @@
        
         
-        RssCreatorComments instance = new RssCreatorComments(hrefPrefix);
+        RssCreatorComments instance = new RssCreatorComments();
         assertEquals(Double.toString(instance.getVersion()) , "2.0"); // check if the default version is set properly
         
-        instance.setFlagIsFromProfile(isFromProfile);
+        
         instance.setVersion(3.0); 
         

ComponentRegistry/branches/ComponentRegistry-1.13.0-olha/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/RssCreatorDescriptionsTest.java

@@ -48 +48 @@
     private void createTestDescription(AbstractDescription desc, int commentcount, String creatorname,
             String description, String domainname, String groupname, 
-            String name, String date, String id) {
+            String name, String date, String href, String id) {
         
         desc.setId(id);
@@ -58 +58 @@
         desc.setName(name);
         desc.setRegistrationDate(date);
-        desc.setHref(null);
+        desc.setHref(href+id);
 
     }
@@ -64 +64 @@
     private ProfileDescription createTestProfileDescription(int commentcount, String creatorname,
             String description, String domainname, String groupname, 
-            String name, boolean editorFlag, String date, String id) {
+            String name, boolean editorFlag, String date, String href, String id) {
 
         ProfileDescription pdesc = ProfileDescription.createNewDescription();
 
-        createTestDescription(pdesc, commentcount, creatorname, description, domainname, groupname, name, date, id);
+        createTestDescription(pdesc, commentcount, creatorname, description, domainname, groupname, name, date, href, id);
 
         pdesc.setShowInEditor(editorFlag);
@@ -79 +79 @@
     private ComponentDescription createTestComponentDescription(int commentcount, String creatorname,
             String description, String domainname, String groupname, 
-            String name, String date, String id) {
+            String name, String date, String href, String id) {
 
         ComponentDescription cdesc = ComponentDescription.createNewDescription();
 
-        createTestDescription(cdesc, commentcount, creatorname, description, domainname, groupname, name, date, id);
+        createTestDescription(cdesc, commentcount, creatorname, description, domainname, groupname, name, date, href, id);
 
         return cdesc;
@@ -94 +94 @@
        
         assertEquals(description, item.getDescription());
-        assertEquals(href, item.getGuid().getValue()  );
+        //assertEquals(href, item.getGuid().getValue()  );
         assertEquals(href, item.getLink());
         assertEquals(date, item.getPubDate());
@@ -108 +108 @@
 
         
-        String hrefPrefix = "http://catalog.clarin.eu/ds/ComponentRegistry/";
-        String hrefInfix="?item=";
+        String link = "http://catalog.clarin.eu/ds/ComponentRegistry/profiles";
+        String href =  link+"?item=";
         
         ProfileDescription desc1 = createTestProfileDescription(23, "Useratti",
-                "description-1", "domainname-1", "groupname-1", "name-1", true, "2001-01-01", "p_1");
+                "description-1", "domainname-1", "groupname-1", "name-1", true, "2001-01-01", href,"p_1");
 
         ProfileDescription desc2 = createTestProfileDescription(23, "Usereno",
-                "description-2", "domainname-2", "groupname-2", "name-2", false, "2001-01-02", "p_2");
+                "description-2", "domainname-2", "groupname-2", "name-2", false, "2001-01-02", href, "p_2");
 
         ProfileDescription desc3 = createTestProfileDescription(23, "Userio",
-                "description-3", "domainname-3", "groupname-3", "name-3", true, "2001-01-03", "p_3");
+                "description-3", "domainname-3", "groupname-3", "name-3", true, "2001-01-03", href, "p_3");
 
         List<ProfileDescription> descriptions = Arrays.asList(desc1, desc2, desc3);
 
-        RssCreatorDescriptions instance = new RssCreatorDescriptions(hrefPrefix);
+        RssCreatorDescriptions instance = new RssCreatorDescriptions();
         
         
@@ -129 +129 @@
         instance.setVersion(2.0);
         
-        instance.setLink(null);
+        instance.setLink(link);
         instance.setCategory(null);
         instance.setCloud(null);
@@ -158 +158 @@
         // String creatorname, String description, String href, String date, String nametitle, RssItem item
         
-        String href =  hrefPrefix+hrefInfix;
+        
 
         compareRssVsValues("description-1", href+"p_1", "2001-01-01", 
@@ -182 +182 @@
         assertEquals("engl", result.getChannel().getLanguage());
         assertEquals("today", result.getChannel().getLastBuildDate());
-        assertEquals(null, result.getChannel().getLink());
+        assertEquals(link, result.getChannel().getLink());
         assertEquals("twan", result.getChannel().getManagingEditor());
         assertEquals("publication date", result.getChannel().getPubDate());