Index: .
===================================================================
--- .	(revision 131589)
+++ .	(working copy)

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/oncourse-2.9.0/assignment:r123110
Index: assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
===================================================================
--- assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(revision 131589)
+++ assignment-tool/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java	(working copy)
@@ -1477,7 +1477,7 @@
 
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
-		if (taggingManager.isTaggable() && assignment != null)
+		if (taggingManager.isTaggable() && assignment != null && isProducerEnabled())
 		{
 			addProviders(context, state);
 			addActivity(context, assignment);
@@ -1771,7 +1771,7 @@
 
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
-		if (taggingManager.isTaggable() && assignment != null)
+		if (taggingManager.isTaggable() && assignment != null && isProducerEnabled())
 		{
 			addProviders(context, state);
 			addActivity(context, assignment);
@@ -1964,7 +1964,7 @@
 
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
-		if (taggingManager.isTaggable() && submission != null)
+		if (taggingManager.isTaggable() && submission != null && isProducerEnabled())
 		{
 			AssignmentActivityProducer assignmentActivityProducer = (AssignmentActivityProducer) ComponentManager
 					.get("org.sakaiproject.assignment.taggable.api.AssignmentActivityProducer");
@@ -3515,7 +3515,7 @@
 
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
-		if (taggingManager.isTaggable() && assignment != null)
+		if (taggingManager.isTaggable() && assignment != null && isProducerEnabled())
 		{
 			context.put("producer", ComponentManager
 					.get("org.sakaiproject.assignment.taggable.api.AssignmentActivityProducer"));
@@ -3656,7 +3656,7 @@
 
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
-		if (taggingManager.isTaggable() && assignment != null)
+		if (taggingManager.isTaggable() && assignment != null && isProducerEnabled())
 		{
 			Session session = SessionManager.getCurrentSession();
 			List<DecoratedTaggingProvider> providers = addProviders(context, state);
@@ -14879,6 +14879,14 @@
 		}
 	}
 	
+	/**
+	 * Check to see if the specific activity producer is enabled
+	 * @return
+	 */
+	private boolean isProducerEnabled() {
+		return ServerConfigurationService.getBoolean(AssignmentActivityProducer.PRODUCER_ENABLED_KEY, true);
+	}
+	
 	private List<DecoratedTaggingProvider> initDecoratedProviders() {
 		TaggingManager taggingManager = (TaggingManager) ComponentManager
 				.get("org.sakaiproject.taggable.api.TaggingManager");
Index: assignment-impl/impl/src/java/org/sakaiproject/assignment/taggable/impl/AssignmentActivityProducerImpl.java
===================================================================
--- assignment-impl/impl/src/java/org/sakaiproject/assignment/taggable/impl/AssignmentActivityProducerImpl.java	(revision 131589)
+++ assignment-impl/impl/src/java/org/sakaiproject/assignment/taggable/impl/AssignmentActivityProducerImpl.java	(working copy)
@@ -36,6 +36,7 @@
 import org.sakaiproject.taggable.api.TaggingManager;
 import org.sakaiproject.taggable.api.TaggingProvider;
 import org.sakaiproject.authz.api.SecurityService;
+import org.sakaiproject.component.cover.ServerConfigurationService;
 import org.sakaiproject.entity.api.EntityManager;
 import org.sakaiproject.exception.IdUnusedException;
 import org.sakaiproject.exception.PermissionException;
@@ -215,8 +216,10 @@
 
 	public void init() {
 		logger.info("init()");
-
-		taggingManager.registerProducer(this);
+		if (ServerConfigurationService.getBoolean(PRODUCER_ENABLED_KEY, true)) {
+			logger.info("Enabling AssignmentActivityProducerImpl");
+			taggingManager.registerProducer(this);
+		}
 	}
 
 	protected String parseAuthor(String itemRef) {
Index: assignment-api/api/src/java/org/sakaiproject/assignment/taggable/api/AssignmentActivityProducer.java
===================================================================
--- assignment-api/api/src/java/org/sakaiproject/assignment/taggable/api/AssignmentActivityProducer.java	(revision 131589)
+++ assignment-api/api/src/java/org/sakaiproject/assignment/taggable/api/AssignmentActivityProducer.java	(working copy)
@@ -39,6 +39,11 @@
 	 */
 	public static final String PRODUCER_ID = AssignmentActivityProducer.class
 			.getName();
+	
+	/**
+     * The key used to look up a value in the ServerConfigurationService if this producer should be enabled
+     */
+    public static final String PRODUCER_ENABLED_KEY = "assignment.activityProducer.enabled";
 
 	/**
 	 * Method to wrap the given assignment as a taggable activity.