From: <die...@us...> - 2010-02-16 09:03:09
|
Revision: 1952 http://openutils.svn.sourceforge.net/openutils/?rev=1952&view=rev Author: diego_schivo Date: 2010-02-16 09:03:01 +0000 (Tue, 16 Feb 2010) Log Message: ----------- Module store: magnolia-module-modulestore module + version-handler Added Paths: ----------- trunk/magnolia-module-modulestore/src/main/java/info/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java trunk/magnolia-module-modulestore/src/main/resources/META-INF/ trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/ trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml trunk/magnolia-module-modulestore/src/main/resources/info/ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/ trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif Removed Paths: ------------- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-images/loading.gif trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/icons/24/todo.gif Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java =================================================================== --- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java (rev 0) +++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,27 @@ +package info.magnolia.module.modulestore; + +import info.magnolia.module.ModuleLifecycle; +import info.magnolia.module.ModuleLifecycleContext; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author dschivo + * @version $Id$ + */ +public class ModuleStoreModule implements ModuleLifecycle +{ + + private static final Logger log = LoggerFactory.getLogger(ModuleStoreModule.class); + + public void start(ModuleLifecycleContext ctx) + { + } + + public void stop(ModuleLifecycleContext ctx) + { + } + +} Property changes on: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/ModuleStoreModule.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java =================================================================== --- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java (rev 0) +++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,80 @@ +package info.magnolia.module.modulestore.pages; + +import info.magnolia.module.ModuleRegistry; +import info.magnolia.module.admininterface.TemplatedMVCHandler; +import info.magnolia.module.model.ModuleDefinition; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.apache.taglibs.standard.functions.Functions; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author dschivo + * @version $Id$ + */ +public class AllModulesListPage extends TemplatedMVCHandler +{ + + /** + * Logger. + */ + private static Logger log = LoggerFactory.getLogger(AllModulesListPage.class); + + private String postdata; + + /** + * + */ + public AllModulesListPage(String name, HttpServletRequest request, HttpServletResponse response) + { + + super(name, request, response); + } + + /** + * Returns the postdata. + * @return the postdata + */ + public String getPostdata() + { + return postdata; + } + + /** + * {@inheritDoc} + */ + @Override + public String show() + { + JSONArray installedModules = new JSONArray(); + ModuleRegistry registry = ModuleRegistry.Factory.getInstance(); + List<String> moduleNames = new ArrayList<String>(registry.getModuleNames()); + Collections.sort(moduleNames); + for (String name : moduleNames) + { + ModuleDefinition def = registry.getDefinition(name); + if (def != null) + { + JSONObject module = new JSONObject(); + module.set("name", def.getName()); + module.set("version", def.getVersion().toString()); + installedModules.put(module); + } + } + JSONObject json = new JSONObject(); + json.set("installedModules", installedModules); + postdata = Functions.escapeXml(json.toString()); + return super.show(); + } +} Property changes on: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/AllModulesListPage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java =================================================================== --- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java (rev 0) +++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,69 @@ +package info.magnolia.module.modulestore.pages; + +import info.magnolia.module.ModuleRegistry; +import info.magnolia.module.admininterface.TemplatedMVCHandler; +import info.magnolia.module.model.ModuleDefinition; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * @author dschivo + * @version $Id$ + */ +public class InstalledModulesListPage extends TemplatedMVCHandler +{ + + /** + * Logger. + */ + private static Logger log = LoggerFactory.getLogger(InstalledModulesListPage.class); + + private List<ModuleDefinition> installedModules = new ArrayList<ModuleDefinition>(); + + /** + * + */ + public InstalledModulesListPage(String name, HttpServletRequest request, HttpServletResponse response) + { + + super(name, request, response); + } + + /** + * Returns the installedModules. + * @return the installedModules + */ + public List<ModuleDefinition> getInstalledModules() + { + return installedModules; + } + + /** + * {@inheritDoc} + */ + @Override + public String show() + { + ModuleRegistry registry = ModuleRegistry.Factory.getInstance(); + List<String> moduleNames = new ArrayList<String>(registry.getModuleNames()); + Collections.sort(moduleNames); + for (String name : moduleNames) + { + ModuleDefinition def = registry.getDefinition(name); + if (def != null) + { + installedModules.add(def); + } + } + return super.show(); + } +} Property changes on: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/pages/InstalledModulesListPage.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java =================================================================== --- trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java (rev 0) +++ trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,36 @@ +package info.magnolia.module.modulestore.setup; + +import info.magnolia.module.DefaultModuleVersionHandler; +import info.magnolia.module.delta.BootstrapSingleModuleResource; +import info.magnolia.module.delta.DeltaBuilder; + + +/** + * @author dschivo + * @version $Id$ + */ +public class ModuleStoreModuleVersionHandler extends DefaultModuleVersionHandler +{ + + /** + * + */ + public ModuleStoreModuleVersionHandler() + { + register(DeltaBuilder.update("4.3", "").addTask( + new BootstrapSingleModuleResource( + "Module store menu", + "Adds the module store menu", + "config.modules.admininterface.config.menu.moduleStore.xml"))); + register(DeltaBuilder.update("4.3", "").addTask( + new BootstrapSingleModuleResource( + "All modules list page", + "Adds the all modules list page", + "config.modules.modulestore.pages.allModulesList.xml"))); + register(DeltaBuilder.update("4.3", "").addTask( + new BootstrapSingleModuleResource( + "Installed modules list page", + "Adds the installed modules list page", + "config.modules.modulestore.pages.installedModulesList.xml"))); + } +} Property changes on: trunk/magnolia-module-modulestore/src/main/java/info/magnolia/module/modulestore/setup/ModuleStoreModuleVersionHandler.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE module SYSTEM "module.dtd" > +<module> + <name>modulestore</name> + <displayName>Magnolia Module Store Module</displayName> + <description></description> + <class>info.magnolia.module.modulestore.ModuleStoreModule</class> + <versionHandler>info.magnolia.module.modulestore.setup.ModuleStoreModuleVersionHandler</versionHandler> + <version>4.3-m1</version> + <dependencies> + <dependency> + <name>core</name> + <version>4.3/*</version> + </dependency> + </dependencies> +</module> Property changes on: trunk/magnolia-module-modulestore/src/main/resources/META-INF/magnolia/modulestore.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,30 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> + <head> + <title>All modules</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" /> + <style type="text/css"> +body#mgnl { + margin: 0; + padding: 0; +} + </style> + <script type="text/javascript"> +function loadModules(){ + document.getElementById('loadModulesForm').submit(); +} + </script> + </head> + <body id="mgnl" onload="setTimeout(loadModules, 1000);"> + <form id="loadModulesForm" action="/module-store-server/module-list.html" method="post"> + <div> + <input type="hidden" name="postdata" value="${this.postdata}" /> + </div> + </form> + <div style="display: block; width: 400px; background-color: #999; margin: 50px auto; text-align: center;"> + <h2>Contacting server...</h2> + <img src="${this.request.contextPath}/.resources/admin-images/loading.gif" alt="Loading..." /> + </div> + </body> +</html> \ No newline at end of file Property changes on: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/AllModulesListPage.html ___________________________________________________________________ Added: svn:mime-type + text/html Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,63 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> + <head> + <title>Installed modules</title> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" /> + <style type="text/css"> +body#mgnl { + margin: 0; + padding: 0; +} + +table { + border-collapse: collapse; + width: 100%; + border-bottom: 1px solid #CCCCCC; +} + +table td { + font-family: Verdana,sans-serif; + font-size: 11px; + height: 20px; + padding: 0 8px; + border-left: 1px solid #D8EFB6; +} + +table tr.odd td { + background-color: #EDF3EE; +} + +table thead td { + font-weight: bold; + border-left: 1px solid #ADBC61; + background: transparent url('${this.request.contextPath}/.resources/controls/list/headerBackgroundGreen.gif') repeat-x scroll left top; +} + +table td.icon { + border-left: 0; + width: 16px; +} + </style> + </head> + <body id="mgnl"> + <table> + <thead> + <tr> + <td>Name</td> + <td>Display name</td> + <td>Description</td> + <td>Version</td> + </tr> + </thead> + [#list this.installedModules as def] + <tr> + <td>${def.name!''}</td> + <td>${def.displayName!''}</td> + <td>${def.description!''}</td> + <td>${def.version!''}</td> + </tr> + [/#list] + </table> + </body> +</html> \ No newline at end of file Property changes on: trunk/magnolia-module-modulestore/src/main/resources/info/magnolia/module/modulestore/pages/InstalledModulesListPage.html ___________________________________________________________________ Added: svn:mime-type + text/html Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="moduleStore" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>349bab23-d565-4690-8fce-fd434fb0b470</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/icons/24/todo.gif</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>Module store</sv:value> + </sv:property> + <sv:property sv:name="onclick" sv:type="String"> + <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/allModulesList.html');</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2005-05-16T20:45:54.530+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-17T14:32:32.595Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-02-11T11:42:51.156+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="installedModules"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>5e775bb6-5e9b-423d-bff3-3a9a86f0e646</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/icons/16/dot.gif</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>Installed modules</sv:value> + </sv:property> + <sv:property sv:name="onclick" sv:type="String"> + <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/installedModulesList.html');</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2008-06-17T14:45:51.521Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-17T14:45:58.283Z</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-02-10T11:22:45.796+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> +</sv:node> Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.admininterface.config.menu.moduleStore.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="allModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>9540c394-7663-4572-bf38-2c610a17c995</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>info.magnolia.module.modulestore.pages.AllModulesListPage</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2005-07-15T14:26:11.205+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2006-05-07T10:04:20.253+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-02-11T11:41:41.765+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.allModulesList.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml =================================================================== --- trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml (rev 0) +++ trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="installedModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>3637fc26-2609-4d90-bdda-184162efc9b9</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>info.magnolia.module.modulestore.pages.InstalledModulesListPage</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:Data" sv:type="String"> + <sv:value>MetaData</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activatorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2005-07-15T14:26:11.205+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2006-05-07T10:04:20.253+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-02-11T11:42:19.390+01:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-bootstrap/modulestore/config.modules.modulestore.pages.installedModulesList.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif =================================================================== (Binary files differ) Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/admin-images/loading.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Added: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif =================================================================== (Binary files differ) Property changes on: trunk/magnolia-module-modulestore/src/main/resources/mgnl-resources/icons/24/todo.gif ___________________________________________________________________ Added: svn:mime-type + image/gif Deleted: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java =================================================================== --- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/AllModulesListPage.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,80 +0,0 @@ -package info.magnolia.module.admininterface.pages; - -import info.magnolia.module.ModuleRegistry; -import info.magnolia.module.admininterface.TemplatedMVCHandler; -import info.magnolia.module.model.ModuleDefinition; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - -import org.apache.taglibs.standard.functions.Functions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @author dschivo - * @version $Id$ - */ -public class AllModulesListPage extends TemplatedMVCHandler -{ - - /** - * Logger. - */ - private static Logger log = LoggerFactory.getLogger(AllModulesListPage.class); - - private String postdata; - - /** - * - */ - public AllModulesListPage(String name, HttpServletRequest request, HttpServletResponse response) - { - - super(name, request, response); - } - - /** - * Returns the postdata. - * @return the postdata - */ - public String getPostdata() - { - return postdata; - } - - /** - * {@inheritDoc} - */ - @Override - public String show() - { - JSONArray installedModules = new JSONArray(); - ModuleRegistry registry = ModuleRegistry.Factory.getInstance(); - List<String> moduleNames = new ArrayList<String>(registry.getModuleNames()); - Collections.sort(moduleNames); - for (String name : moduleNames) - { - ModuleDefinition def = registry.getDefinition(name); - if (def != null) - { - JSONObject module = new JSONObject(); - module.set("name", def.getName()); - module.set("version", def.getVersion().toString()); - installedModules.put(module); - } - } - JSONObject json = new JSONObject(); - json.set("installedModules", installedModules); - postdata = Functions.escapeXml(json.toString()); - return super.show(); - } -} Deleted: trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java =================================================================== --- trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/java/info/magnolia/module/admininterface/pages/InstalledModulesListPage.java 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,69 +0,0 @@ -package info.magnolia.module.admininterface.pages; - -import info.magnolia.module.ModuleRegistry; -import info.magnolia.module.admininterface.TemplatedMVCHandler; -import info.magnolia.module.model.ModuleDefinition; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @author dschivo - * @version $Id$ - */ -public class InstalledModulesListPage extends TemplatedMVCHandler -{ - - /** - * Logger. - */ - private static Logger log = LoggerFactory.getLogger(InstalledModulesListPage.class); - - private List<ModuleDefinition> installedModules = new ArrayList<ModuleDefinition>(); - - /** - * - */ - public InstalledModulesListPage(String name, HttpServletRequest request, HttpServletResponse response) - { - - super(name, request, response); - } - - /** - * Returns the installedModules. - * @return the installedModules - */ - public List<ModuleDefinition> getInstalledModules() - { - return installedModules; - } - - /** - * {@inheritDoc} - */ - @Override - public String show() - { - ModuleRegistry registry = ModuleRegistry.Factory.getInstance(); - List<String> moduleNames = new ArrayList<String>(registry.getModuleNames()); - Collections.sort(moduleNames); - for (String name : moduleNames) - { - ModuleDefinition def = registry.getDefinition(name); - if (def != null) - { - installedModules.add(def); - } - } - return super.show(); - } -} Deleted: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/AllModulesListPage.html 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,30 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> - <head> - <title>All modules</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" /> - <style type="text/css"> -body#mgnl { - margin: 0; - padding: 0; -} - </style> - <script type="text/javascript"> -function loadModules(){ - document.getElementById('loadModulesForm').submit(); -} - </script> - </head> - <body id="mgnl" onload="setTimeout(loadModules, 1000);"> - <form id="loadModulesForm" action="/module-store-server/module-list.html" method="post"> - <div> - <input type="hidden" name="postdata" value="${this.postdata}" /> - </div> - </form> - <div style="display: block; width: 400px; background-color: #999; margin: 50px auto; text-align: center;"> - <h2>Contacting server...</h2> - <img src="${this.request.contextPath}/.resources/admin-images/loading.gif" alt="Loading..." /> - </div> - </body> -</html> \ No newline at end of file Deleted: trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/resources/info/magnolia/module/admininterface/pages/InstalledModulesListPage.html 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,63 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html> - <head> - <title>Installed modules</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <link href="${this.request.contextPath}/.resources/admin-css/admin-all.css" type="text/css" rel="stylesheet" /> - <style type="text/css"> -body#mgnl { - margin: 0; - padding: 0; -} - -table { - border-collapse: collapse; - width: 100%; - border-bottom: 1px solid #CCCCCC; -} - -table td { - font-family: Verdana,sans-serif; - font-size: 11px; - height: 20px; - padding: 0 8px; - border-left: 1px solid #D8EFB6; -} - -table tr.odd td { - background-color: #EDF3EE; -} - -table thead td { - font-weight: bold; - border-left: 1px solid #ADBC61; - background: transparent url('${this.request.contextPath}/.resources/controls/list/headerBackgroundGreen.gif') repeat-x scroll left top; -} - -table td.icon { - border-left: 0; - width: 16px; -} - </style> - </head> - <body id="mgnl"> - <table> - <thead> - <tr> - <td>Name</td> - <td>Display name</td> - <td>Description</td> - <td>Version</td> - </tr> - </thead> - [#list this.installedModules as def] - <tr> - <td>${def.name!''}</td> - <td>${def.displayName!''}</td> - <td>${def.description!''}</td> - <td>${def.version!''}</td> - </tr> - [/#list] - </table> - </body> -</html> \ No newline at end of file Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.config.menu.moduleStore.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="moduleStore" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>349bab23-d565-4690-8fce-fd434fb0b470</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/.resources/icons/24/todo.gif</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>Module store</sv:value> - </sv:property> - <sv:property sv:name="onclick" sv:type="String"> - <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/allModulesList.html');</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:Data" sv:type="String"> - <sv:value>MetaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activatorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2005-05-16T20:45:54.530+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-17T14:32:32.595Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-02-11T11:42:51.156+01:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="installedModules"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>5e775bb6-5e9b-423d-bff3-3a9a86f0e646</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/.resources/icons/16/dot.gif</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>Installed modules</sv:value> - </sv:property> - <sv:property sv:name="onclick" sv:type="String"> - <sv:value>MgnlAdminCentral.showContent('/.magnolia/pages/installedModulesList.html');</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activatorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2008-06-17T14:45:51.521Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-17T14:45:58.283Z</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-02-10T11:22:45.796+01:00</sv:value> - </sv:property> - </sv:node> - </sv:node> -</sv:node> Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.allModulesList.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="allModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>9540c394-7663-4572-bf38-2c610a17c995</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>info.magnolia.module.admininterface.pages.AllModulesListPage</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:Data" sv:type="String"> - <sv:value>MetaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activatorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2005-07-15T14:26:11.205+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2006-05-07T10:04:20.253+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-02-11T11:41:41.765+01:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml 2010-02-16 08:30:13 UTC (rev 1951) +++ trunk/magnolia-test-webapp/src/main/resources/mgnl-bootstrap/adminInterface/config.modules.adminInterface.pages.installedModulesList.xml 2010-02-16 09:03:01 UTC (rev 1952) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="installedModulesList" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>3637fc26-2609-4d90-bdda-184162efc9b9</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>info.magnolia.module.admininterface.pages.InstalledModulesListPage</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:metaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:Data" sv:type="String"> - <sv:value>MetaData</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activated" sv:type="Boolean"> - <sv:value>false</sv:value> - </sv:property> - <sv:property sv:name="mgnl:activatorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2005-07-15T14:26:11.205+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2006-05-07T10:04:20.253+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-02-11T11:42:19.390+01:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/admin-images/loading.gif =================================================================== (Binary files differ) Deleted: trunk/magnolia-test-webapp/src/main/resources/mgnl-resources/icons/24/todo.gif =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |