dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 679
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-09-11 18:47:31 +0200
message:
  Renamed lite-package project to dhis-live.
renamed:
  lite-package/ => dhis-live/
modified:
  dhis-live/pom.xml
  dhis-live/src/main/java/org/hisp/dhis/TrayApp.java
  dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java


--
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.

=== renamed directory 'lite-package' => 'dhis-live'
=== modified file 'dhis-live/pom.xml'
--- lite-package/pom.xml	2009-04-22 21:34:35 +0000
+++ dhis-live/pom.xml	2009-09-11 16:47:31 +0000
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hisp.dhis</groupId>
-  <artifactId>dhis2-lite</artifactId>
+  <artifactId>dhis-live</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
-  <name>dhis2-lite</name>
+  <name>DHIS Live</name>
   
   <url>http://maven.apache.org</url>
   

=== modified file 'dhis-live/src/main/java/org/hisp/dhis/TrayApp.java'
--- lite-package/src/main/java/org/hisp/dhis/TrayApp.java	2009-09-11 16:36:42 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/TrayApp.java	2009-09-11 16:47:31 +0000
@@ -36,13 +36,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.mortbay.component.LifeCycle;
 
-
 /**
- * Describe class <code>TrayApp</code> here.
- *
- * @author <a href="mailto:bobj@bobjolliffe@xxxxxxxxx";>Bob Jolliffe</a>
- * @version $$Id$$
- * @version 1.0
+ * @author Bob Jolliffe
+ * @version $Id$
  */
 public class TrayApp
   implements LifeCycle.Listener
@@ -53,6 +49,7 @@
   private static final String STARTING_ICON = "/icons/starting.png";
   private static final String FAILED_ICON ="/icons/failed.png";
   private static final String RUNNING_ICON = "/icons/running.png";
+  
   /**
    * Describe variable <code>appServer</code> here.
    *
@@ -79,8 +76,8 @@
   public TrayApp()
     throws Exception
   {
-    //installDir = System.getProperty("user.dir");
     installDir = getInstallDir();
+    
     if (installDir==null) {
       log.info("jar not installed, setting installdir to DHIS2_HOME: "+System.getenv("DHIS2_HOME"));
       installDir = System.getenv("DHIS2_HOME");
@@ -241,30 +238,28 @@
     new TrayApp();
   }
 
-
-    /**
-     *  The <code>getInstallDir</code> method is a hack to determine the current
-     *  directory the dhis2 lite package is installed in.  It does this by finding
-     *  the file URL of a resource within the executable jar and extracting the 
-     *  installation path from that. 
-     *
-     * @return a <code>String</code> value representing the installation directory
-     */
-    public static String getInstallDir() {
-        // find a resource
-        String resourceString = TrayApp.class.getResource("/icons/").toString();
-        // we expect to see something of the form:
-        // "jar:file:<install_dir>/dhis_xxx.jar!/icons"
-        if (!resourceString.startsWith("jar:file:") ) {
-            // we're in trouble - its not in a jar file
-            return null;
-        }
-        // find the last "/" just before the "!"
-        int endIndex = resourceString.lastIndexOf("/", resourceString.lastIndexOf("!"));
-        String result = resourceString.substring(9, endIndex); 
-        // replace encoded spaces
-        result = result.replaceAll("%20"," ");
-        return result;
+  /**
+   *  The <code>getInstallDir</code> method is a hack to determine the current
+   *  directory the dhis2 lite package is installed in.  It does this by finding
+   *  the file URL of a resource within the executable jar and extracting the 
+   *  installation path from that. 
+   *
+   * @return a <code>String</code> value representing the installation directory
+   */
+  public static String getInstallDir() {
+    // find a resource
+    String resourceString = TrayApp.class.getResource("/icons/").toString();
+    // we expect to see something of the form:
+    // "jar:file:<install_dir>/dhis_xxx.jar!/icons"
+    if (!resourceString.startsWith("jar:file:") ) {
+      // we're in trouble - its not in a jar file
+      return null;
     }
-    
+    // find the last "/" just before the "!"
+    int endIndex = resourceString.lastIndexOf("/", resourceString.lastIndexOf("!"));
+    String result = resourceString.substring(9, endIndex); 
+    // replace encoded spaces
+    result = result.replaceAll("%20"," ");
+    return result;
+  }    
 }

=== modified file 'dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java'
--- lite-package/src/main/java/org/hisp/dhis/WebAppServer.java	2009-04-22 21:34:35 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java	2009-09-11 16:47:31 +0000
@@ -42,8 +42,8 @@
 import org.mortbay.jetty.webapp.WebAppContext;
 
 /**
- *
- * @author bobj
+ * @author Bob Jolliffe
+ * @version $Id$
  */
 public class WebAppServer 
 {