From: <car...@us...> - 2012-04-16 14:24:34
|
Revision: 3952 http://openutils.svn.sourceforge.net/openutils/?rev=3952&view=rev Author: carlocolombo Date: 2012-04-16 14:24:24 +0000 (Mon, 16 Apr 2012) Log Message: ----------- Mapped url starting with /scorm to lms repository (previously lms -> lms) updated scormPlayerPage to use url2repositoryMapping to retrieve correct repository update js to open page with mgnlRepository=scorm Modified Paths: -------------- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-04-10 09:45:10 UTC (rev 3951) +++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/java/net/sourceforge/openutils/mgnllms/pages/lms/ScormPlayerPage.java 2012-04-16 14:24:24 UTC (rev 3952) @@ -19,10 +19,14 @@ package net.sourceforge.openutils.mgnllms.pages.lms; +import info.magnolia.cms.beans.config.URI2RepositoryManager; +import info.magnolia.cms.beans.config.URI2RepositoryMapping; import info.magnolia.cms.util.AlertUtil; import info.magnolia.context.MgnlContext; import info.magnolia.module.admininterface.TemplatedMVCHandler; +import java.text.MessageFormat; + import javax.jcr.RepositoryException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -75,9 +79,10 @@ { try { + URI2RepositoryMapping mapping = URI2RepositoryManager.getInstance().getMapping( + MessageFormat.format("/{0}/{1}", mgnlRepository, mgnlPath)); + Manifest manifestFromXml = JaxbUtils.getManifest(mgnlPath, mapping.getRepository()); - Manifest manifestFromXml = JaxbUtils.getManifest(mgnlPath, mgnlRepository); - JsonConfig jc = new JsonConfig(); manifest = JSONSerializer.toJSON(manifestFromXml, jc).toString(); } Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-bootstrap/mgnllms/config.server.URI2RepositoryMapping.mappings.mgnllms.xml =================================================================== (Binary files differ) Modified: magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-10 09:45:10 UTC (rev 3951) +++ magnoliamodules/branches/magnolia44/openutils-mgnllms/src/main/resources/mgnl-resources/mgnllms/js/lms.js 2012-04-16 14:24:24 UTC (rev 3952) @@ -56,7 +56,7 @@ // + "&mgnlRepository=lms" ,800, 600); // commentami prima del rilascio, usami solo per i test - var w=window.open(contextPath+"/.magnolia/pages/scormplayer.html?mgnlPath=" + path+ "&mgnlRepository=lms"); + var w=window.open(contextPath+"/.magnolia/pages/scormplayer.html?mgnlPath=" + path+ "&mgnlRepository=scorm"); if (w) w.focus(); }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |