Merge pull request #169 from appirio-tech/dev

fixes for resource management related to tasks

Author: ajefts

components/resource_management/src/java/main/com/topcoder/management/resource/Notification.java

@@ -24,6 +24,11 @@
  */
 public class Notification extends AuditableResourceStructure {
 
+    /**
+     * Default serial version id.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * <p>
      * The identifier of the project that the notification applies to.

components/resource_management/src/java/main/com/topcoder/management/resource/NotificationType.java

@@ -22,6 +22,11 @@
  */
 public class NotificationType extends AuditableResourceStructure {
 
+    /**
+     * Default serial version id.
+     */
+    private static final long serialVersionUID = 1L;
+
 
     /**
      * <p>

components/resource_management/src/java/main/com/topcoder/management/resource/ResourceRole.java

@@ -43,6 +43,11 @@
  */
 public class ResourceRole extends AuditableResourceStructure {
 
+    /**
+     * Default serial version id.
+     */
+    private static final long serialVersionUID = 1L;
+
     /**
      * <p>
      * The value that the id field will have (and that the getId

services/contest_service_facade/src/java/main/com/topcoder/service/facade/contest/ejb/ContestServiceFacadeBean.java

@@ -4437,11 +4437,6 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
 
                 if (isPrivateProject(contest)){
                     contest.getProjectHeader().setProperty(ProjectPropertyType.RATED_PROJECT_PROPERTY_KEY, "No");
-                }else {
-                    if (oldProject.getProperty(ProjectPropertyType.PRIVATE_PROJECT) != null && oldProject.getProperty(ProjectPropertyType.PRIVATE_PROJECT).equals("1")){
-                        //remove current registrant
-                        Set<Long> preUsers = updatePreRegister(tcSubject, contest, new HashSet<Long>());
-                    }
                 }
 
 
@@ -4498,9 +4493,9 @@ public SoftwareCompetition updateSoftwareContest(TCSubject tcSubject, SoftwareCo
                             continue;
                         }
                     }
-                    if (r.getResourceRole().getId() != ResourceRole.RESOURCE_ROLE_SUBMITTER) {
+//                    if (r.getResourceRole().getId() != ResourceRole.RESOURCE_ROLE_SUBMITTER) {
                         updatedResources.add(r);
-                    }
+//                    }
                 }
 
                 if(isF2FContest(contest)) {