Merge pull request sakaiproject#248 from sakaiproject/revert-243-master

Revert "SAK-29118 add copyrightAlert to Content entity broker feed"
bbailla2 · Mar 4, 2015 · eefdb97 · eefdb97
2 parents d63844e + 023e7d1
commit eefdb97
Showing 1 changed file with 17 additions and 23 deletions.
diff --git a/...nt-tool/tool/src/java/org/sakaiproject/content/entityproviders/ContentEntityProvider.java b/...nt-tool/tool/src/java/org/sakaiproject/content/entityproviders/ContentEntityProvider.java
@@ -297,26 +297,23 @@ private List<ContentItem> getSiteListItems(String siteId) {
 	 * @param item
 	 * @param props
 	 */
-   private void setContentItemValues(ContentEntity entity,
-         ContentItem item, ResourceProperties props) {
-      item.setTitle(props.getProperty(ResourceProperties.PROP_DISPLAY_NAME));
-      item.setDescription(props.getProperty(ResourceProperties.PROP_DESCRIPTION));
-      item.setUrl(entity.getUrl());
-      item.setAuthor(getDisplayName(props.getProperty(ResourceProperties.PROP_CREATOR)));
-      item.setModifiedDate(props.getProperty(ResourceProperties.PROP_MODIFIED_DATE));
-      item.setContainer(entity.getContainingCollection().getReference());
-      item.isVisible = !entity.isHidden() && entity.isAvailable();
-      item.isHidden = entity.isHidden();
-      if(entity.getReleaseDate() != null) {
-         item.setFromDate(entity.getReleaseDate().toStringGmtFull());
-      }
-      if(entity.getRetractDate()!=null) {
-         item.setEndDate(entity.getRetractDate().toStringGmtFull());
-         item.setEndDate(entity.getRetractDate().toStringGmtFull());
-      }
-      item.copyrightAlert = props.getProperty(props.getNamePropCopyrightAlert());
-
-   }
+	private void setContentItemValues(ContentEntity entity,
+			ContentItem item, ResourceProperties props) {
+		item.setTitle(props.getProperty(ResourceProperties.PROP_DISPLAY_NAME));
+		item.setDescription(props.getProperty(ResourceProperties.PROP_DESCRIPTION));
+		item.setUrl(entity.getUrl());
+		item.setAuthor(getDisplayName(props.getProperty(ResourceProperties.PROP_CREATOR)));
+		item.setModifiedDate(props.getProperty(ResourceProperties.PROP_MODIFIED_DATE));
+		item.setContainer(entity.getContainingCollection().getReference());
+		item.isVisible = !entity.isHidden() && entity.isAvailable();
+		item.isHidden = entity.isHidden();
+		if(entity.getReleaseDate() != null) {
+             item.setFromDate(entity.getReleaseDate().toStringGmtFull());
+         }
+		if(entity.getRetractDate()!=null) {
+		item.setEndDate(entity.getRetractDate().toStringGmtFull());
+		}
+	}
 
 	/**
 	 * 
@@ -514,9 +511,6 @@ public static class ContentItem {
 
 		@Getter @Setter
 		private String endDate;
-
-		@Getter @Setter
-		private String copyrightAlert;
 	}
 
 	/**