Index: app/sakai-tool/src/webapp/WEB-INF/applicationContext.xml =================================================================== --- app/sakai-tool/src/webapp/WEB-INF/applicationContext.xml (revision 107313) +++ app/sakai-tool/src/webapp/WEB-INF/applicationContext.xml (working copy) @@ -18,4 +18,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: app/sakai-tool/pom.xml =================================================================== --- app/sakai-tool/pom.xml (revision 107313) +++ app/sakai-tool/pom.xml (working copy) @@ -174,5 +174,34 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-antrun-plugin + [1.3,) + + run + + + + + + + + + + + + Index: app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java =================================================================== --- app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java (revision 107313) +++ app/ui/src/java/org/sakaiproject/tool/gradebook/ui/helpers/entity/GradebookEntityProvider.java (working copy) @@ -3,10 +3,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.sakaiproject.entitybroker.IdEntityReference; +import org.sakaiproject.entitybroker.EntityReference; import org.sakaiproject.entitybroker.entityprovider.CoreEntityProvider; import org.sakaiproject.entitybroker.entityprovider.EntityProvider; import org.sakaiproject.entitybroker.entityprovider.EntityProviderManager; +import org.sakaiproject.entitybroker.entityprovider.capabilities.Describeable; import org.sakaiproject.tool.gradebook.ui.helpers.producers.GradebookItemProducer; import org.sakaiproject.tool.gradebook.ui.helpers.producers.AuthorizationFailedProducer; import org.sakaiproject.tool.gradebook.ui.helpers.params.GradebookItemViewParams; @@ -18,25 +19,25 @@ /* * This is a provider for looking up and adding/editing Gradebook Items. + * It is actually passing along to a gradebook UI via RSF and does not provide any rest access to grades data */ -public class GradebookEntityProvider implements EntityProvider, CoreEntityProvider, -EntityViewParamsInferrer { +public class GradebookEntityProvider implements EntityProvider, CoreEntityProvider, EntityViewParamsInferrer, Describeable { private Log log = LogFactory.getLog(GradebookEntityProvider.class); public final static String ENTITY_PREFIX = "gradebook"; private EntityProviderManager entityProviderManager; - + private GradebookService gradebookService; - + public void init() { log.info("init()"); entityProviderManager.registerEntityProvider(this); } - + public void destroy() { log.info("destroy()"); entityProviderManager.unregisterEntityProvider(this); } - + public String getEntityPrefix() { return ENTITY_PREFIX; } @@ -50,25 +51,25 @@ } public ViewParameters inferDefaultViewParameters(String reference) { - - IdEntityReference ep = new IdEntityReference(reference); - String contextId = ep.id; - - if(gradebookService.currentUserHasEditPerm(contextId)){ - Long gradebookEntryId = null; - return new GradebookItemViewParams(GradebookItemProducer.VIEW_ID, contextId, gradebookEntryId); - }else{ - return new SimpleViewParameters(AuthorizationFailedProducer.VIEW_ID); - } + //IdEntityReference ep = new IdEntityReference(reference); + //String contextId = ep.id; + String contextId = new EntityReference(reference).getId(); + if(gradebookService.currentUserHasEditPerm(contextId)){ + Long gradebookEntryId = null; + return new GradebookItemViewParams(GradebookItemProducer.VIEW_ID, contextId, gradebookEntryId); + }else{ + return new SimpleViewParameters(AuthorizationFailedProducer.VIEW_ID); + } + } public void setEntityProviderManager(EntityProviderManager entityProviderManager) { this.entityProviderManager = entityProviderManager; } - + public void setGradebookService(GradebookService gradebookService) { - this.gradebookService = gradebookService; + this.gradebookService = gradebookService; } } Index: app/ui/src/java/gradebook.properties =================================================================== --- app/ui/src/java/gradebook.properties (revision 0) +++ app/ui/src/java/gradebook.properties (revision 0) @@ -0,0 +1,2 @@ +# this defines the entity description for gradebook +gradebook = Special provider which does not give access to the entity data but instead delegates to the gradebook tool views Property changes on: app/ui/src/java/gradebook.properties ___________________________________________________________________ Added: svn:eol-style + native Index: app/ui/pom.xml =================================================================== --- app/ui/pom.xml (revision 107313) +++ app/ui/pom.xml (working copy) @@ -296,4 +296,17 @@ jsf-spreadsheet + + + + + + ${project.build.sourceDirectory} + + *.properties + + + + +