← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12386: App manager, minor

 

------------------------------------------------------------
revno: 12386
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-10-02 14:41:09 +0200
message:
  App manager, minor
modified:
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java
  dhis-2/dhis-web/dhis-web-portal/pom.xml


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2013-09-29 19:31:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/module/DefaultModuleManager.java	2013-10-02 12:41:09 +0000
@@ -56,8 +56,6 @@
 {
     private static final Log LOG = LogFactory.getLog( DefaultModuleManager.class );
 
-    private static final String APP_MANAGER_NAME = "dhis-web-appmanager";
-    
     private boolean modulesDetected = false;
 
     private Map<String, Module> modulesByName = new HashMap<String, Module>();
@@ -148,8 +146,6 @@
     {
         List<Module> modules = getAccessibleMenuModules();
         
-        modules.remove( new Module( APP_MANAGER_NAME ) );
-        
         List<App> apps = appManager.getInstalledApps();
         
         for ( App app : apps )

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2013-09-19 14:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2013-10-02 12:41:09 +0000
@@ -186,7 +186,7 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-web-appmanager</artifactId>
+      <artifactId>dhis-web-maintenance-appmanager</artifactId>
       <version>${project.version}</version>
       <type>war</type>
     </dependency>