[Branch ~dhis2-devs-core/dhis2/trunk] Rev 796: Made the WebAppServer verify that the BIRT webapp is included before attempting to start it. BIRT...

revision-diff.txt (1.67 KB)

I guess we also don’t need the Report Configuration anymore?

···

On Mon, Sep 28, 2009 at 8:14 PM, noreply@launchpad.net wrote:


revno: 796

committer: Lars Helge Oeverland larshelge@gmail.com

branch nick: trunk

timestamp: Mon 2009-09-28 20:11:45 +0200

message:

Made the WebAppServer verify that the BIRT webapp is included before attempting to start it. BIRT is optional now that Jasper is supported.

modified:

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.

=== modified file ‘dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java’

— dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java 2009-09-28 17:18:13 +0000

+++ dhis-live/src/main/java/org/hisp/dhis/WebAppServer.java 2009-09-28 18:11:45 +0000

@@ -33,6 +33,8 @@

package org.hisp.dhis;

+import java.io.File;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.mortbay.component.LifeCycle;

@@ -68,18 +70,20 @@

 connector.setPort(Integer.getInteger("jetty.port",8080).intValue());

 server.setConnectors(new Connector[]{connector});
  • ContextHandlerCollection handlers = new ContextHandlerCollection();

 WebAppContext dhisWebApp = new WebAppContext();

 dhisWebApp.setWar(installDir + DHIS_DIR);
  • handlers.addHandler(dhisWebApp);

    log.info("Setting DHIS 2 web app context to: "+ installDir + DHIS_DIR);

  • WebAppContext birtWebApp = new WebAppContext();

  • birtWebApp.setContextPath(BIRT_CONTEXT_PATH);

  • birtWebApp.setWar(installDir + BIRT_DIR);

  • log.info("Setting BIRT web app context to: "+ installDir + BIRT_DIR);

  • ContextHandlerCollection handlers = new ContextHandlerCollection();

  • handlers.addHandler(dhisWebApp);

  • handlers.addHandler(birtWebApp);

  • if ( new File( installDir, BIRT_DIR ).exists() ) {

  •  WebAppContext birtWebApp = new WebAppContext();
    
  •  birtWebApp.setContextPath(BIRT_CONTEXT_PATH);
    
  •  birtWebApp.setWar(installDir + BIRT_DIR);
    
  •  handlers.addHandler(birtWebApp);
    
  •  [log.info](http://log.info)("Setting BIRT web app context to: "+ installDir + BIRT_DIR);
    
  • }

    server.setHandler(handlers);

    server.addLifeCycleListener(serverListener);


Mailing list: https://launchpad.net/~dhis2-devs

Post to : dhis2-devs@lists.launchpad.net

Unsubscribe : https://launchpad.net/~dhis2-devs

More help : https://help.launchpad.net/ListHelp


Cheers,
Knut Staring

Whether to use Jasper or BIRT as the underlying reporting library can now be defined through a system setting. If BIRT is chosen then we need the report configuration. I guess we could hide that option from the menu if Jasper is chosen.

···

On Mon, Sep 28, 2009 at 8:21 PM, Knut Staring knutst@gmail.com wrote:

I guess we also don’t need the Report Configuration anymore?

The reason for my question is that BIRT seems to work fine without entering anything in the configuration. Or am I mistaken?

Knut

···

2009/9/28 Lars Helge Øverland larshelge@gmail.com

On Mon, Sep 28, 2009 at 8:21 PM, Knut Staring knutst@gmail.com wrote:

I guess we also don’t need the Report Configuration anymore?

Whether to use Jasper or BIRT as the underlying reporting library can now be defined through a system setting. If BIRT is chosen then we need the report configuration. I guess we could hide that option from the menu if Jasper is chosen.


Cheers,
Knut Staring

That’s true when running from DHIS Live, which I guess is what you are doing. When running normally in Tomcat you will still need it. But we could hide that option in the former case as well, will make it less confusing…

···

2009/9/28 Knut Staring knutst@gmail.com

2009/9/28 Lars Helge Øverland larshelge@gmail.com

On Mon, Sep 28, 2009 at 8:21 PM, Knut Staring knutst@gmail.com wrote:

I guess we also don’t need the Report Configuration anymore?

Whether to use Jasper or BIRT as the underlying reporting library can now be defined through a system setting. If BIRT is chosen then we need the report configuration. I guess we could hide that option from the menu if Jasper is chosen.

The reason for my question is that BIRT seems to work fine without entering anything in the configuration. Or am I mistaken?