[overlord-commits] Overlord SVN: r909 - in report-server/tags: report-parent-1.2.0 and 4 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-12-15 05:30:21 -0500 (Tue, 15 Dec 2009) New Revision: 909 Added: report-server/tags/report-parent-1.2.0/ report-server/tags/report-parent-1.2.0/core/pom.xml report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java report-server/tags/report-parent-1.2.0/pom.xml report-server/tags/report-parent-1.2.0/server/pom.xml report-server/tags/report-parent-1.2.0/shared/pom.xml Removed: report-server/tags/report-parent-1.2.0/core/pom.xml report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java report-server/tags/report-parent-1.2.0/pom.xml report-server/tags/report-parent-1.2.0/server/pom.xml report-server/tags/report-parent-1.2.0/shared/pom.xml Log: [maven-release-plugin] copy for tag report-parent-1.2.0 Copied: report-server/tags/report-parent-1.2.0 (from rev 900, report-server/trunk) Deleted: report-server/tags/report-parent-1.2.0/core/pom.xml =================================================================== --- report-server/trunk/core/pom.xml 2009-12-10 14:36:40 UTC (rev 900) +++ report-server/tags/report-parent-1.2.0/core/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -1,199 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Report Core</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-core</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <properties> - <birt.version>2.3.2</birt.version> - </properties> - - <dependencies> - - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-shared</artifactId> - <version>${version}</version> - </dependency> - <!-- Other --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>engineapi</artifactId> - <version>${birt.version}</version> - <exclusions> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>chartengineapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>coreapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>dataadapterapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>modelapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>scriptapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <dependency> - <groupId>org.eclipse.birt</groupId> - <artifactId>dteapi</artifactId> - <version>${birt.version}</version> - </dependency> - - <!-- EMF (Eclipse Modeling Framework ) --> - - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>ecore</artifactId> - <version>2.4.2</version> - </dependency> - - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>ecore-xmi</artifactId> - <version>2.4.1</version> - </dependency> - - <dependency> - <groupId>org.eclipse.emf</groupId> - <artifactId>common</artifactId> - <version>2.4.0</version> - </dependency> - - <!-- W3C --> - - <dependency> - <groupId>org.w3c</groupId> - <artifactId>flute</artifactId> - <version>1.2</version> - </dependency> - - <dependency> - <groupId>org.w3c</groupId> - <artifactId>sac</artifactId> - <version>1.3</version> - </dependency> - - <!-- Commons --> - <dependency> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.3</version> - <!-- removing unwanted transitive dependencies --> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>1.0</version> - <!-- removing unwanted transitive dependencies --> - <exclusions> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> - </dependency> - - <!-- misc --> - <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>1.3</version> - </dependency> - - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8.1</version> - </dependency> - - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>1.6R2</version> - </dependency> - - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - - </dependencies> - - - -</project> Copied: report-server/tags/report-parent-1.2.0/core/pom.xml (from rev 908, report-server/trunk/core/pom.xml) =================================================================== --- report-server/tags/report-parent-1.2.0/core/pom.xml (rev 0) +++ report-server/tags/report-parent-1.2.0/core/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -0,0 +1,198 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - Report Core</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-core</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-parent</artifactId> + <version>1.2.0</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <properties> + <birt.version>2.3.2</birt.version> + </properties> + + <dependencies> + + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-shared</artifactId> + <version>${version}</version> + </dependency> + <!-- Other --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>engineapi</artifactId> + <version>${birt.version}</version> + <exclusions> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>chartengineapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>coreapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>dataadapterapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>modelapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>scriptapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <dependency> + <groupId>org.eclipse.birt</groupId> + <artifactId>dteapi</artifactId> + <version>${birt.version}</version> + </dependency> + + <!-- EMF (Eclipse Modeling Framework ) --> + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>ecore</artifactId> + <version>2.4.2</version> + </dependency> + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>ecore-xmi</artifactId> + <version>2.4.1</version> + </dependency> + + <dependency> + <groupId>org.eclipse.emf</groupId> + <artifactId>common</artifactId> + <version>2.4.0</version> + </dependency> + + <!-- W3C --> + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>flute</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>org.w3c</groupId> + <artifactId>sac</artifactId> + <version>1.3</version> + </dependency> + + <!-- Commons --> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + <!-- removing unwanted transitive dependencies --> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + <version>1.0</version> + <!-- removing unwanted transitive dependencies --> + <exclusions> + <exclusion> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> + </dependency> + + <!-- misc --> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.8.1</version> + </dependency> + + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>1.6R2</version> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + + </dependencies> + + + +</project> Deleted: report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java =================================================================== --- report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-12-10 14:36:40 UTC (rev 900) +++ report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-12-15 10:30:21 UTC (rev 909) @@ -1,293 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.report; - -import com.google.gson.GsonBuilder; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.bpm.report.model.ReportReference; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -/** - * BIRT integration facade.<p> - * - * Uses the server data directory (i.e. <code>$JBOSS_HOME/server/default/data/birt</code>) - * as it's work directory (referred to as $WORK_DIR in the subsequent sections): - * - * <ul> - * <li>report template location: $WORK_DIR/ - * <li>output directory: $WORK_DIR/output - * </ul> - * - * NOTE: It requires a BIRT report engine to be installed in the work directory: - * (<code>$WORK_DIR/ReportEngine</code>. - * - * @see org.jboss.bpm.report.JMXServerConfig - * - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Path("report") -public class ReportFacade -{ - private static final Log log = LogFactory.getLog(ReportFacade.class); - private BirtService birtService; - private boolean isInitialized; - - - public ReportFacade() - { - try - { - initBirtService(); - } - catch (BirtInitException e) - { - log.error("Failed to initialize BIRT service", e); - } - } - - public void initBirtService() - throws BirtInitException - { - if(!isInitialized) - { - JMXServerConfig jmxConfig = new JMXServerConfig(); - IntegrationConfig iConfig = new IntegrationConfig(); - - File severDataDir = jmxConfig.getServerDataDir(); - String absServerDataDir = severDataDir.getAbsolutePath(); - - String birtDataDir = absServerDataDir + "/birt"; - String defaultBirtHome = birtDataDir + "/ReportEngine"; - String birtOutputDir = birtDataDir + "/output"; - - File birtOutput = new File(birtOutputDir); - birtOutput.mkdirs(); // will create parent directoy as well - - // check dependency on ReportEngine - if(! new File(defaultBirtHome).exists()) - throw new BirtInitException("The BIRT report engine doesn't seem to be installed:" +defaultBirtHome); - - // -- - - iConfig.setBirtHome(defaultBirtHome); - iConfig.setOutputDir( birtOutputDir ); - iConfig.setReportDir( birtDataDir ); - - log.info("BIRT home: " +iConfig.getBirtHome()); - log.info("Output dir: " +iConfig.getOutputDir()); - log.info("Report dir: " +iConfig.getReportDir()); - - try - { - this.birtService = new BirtService(iConfig); - this.birtService.createAsync(); - } - catch (Throwable t) - { - throw new BirtInitException(t.getMessage(), t); - } - - isInitialized = true; - } - } - - @GET - @Path("render/{fileName}") - @Produces("text/html") - public Response viewReportHtml( - @PathParam("fileName") - String fileName, - @Context HttpServletRequest request - ) - { - try - { - RenderMetaData renderMeta = defaultRenderMetaData(fileName, request); - - String outputFileName = birtService.view(renderMeta); - String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName; - log.debug("View " + absoluteFile); - - File reportFile = new File(absoluteFile); - return Response.ok(reportFile).type("text/html").build(); - } - catch(Throwable e1) - { - return gracefulException(e1); - } - } - - @POST - @Path("render/{fileName}") - @Produces("text/html") - public Response renderReportHtml( - @PathParam("fileName") - String fileName, - @Context HttpServletRequest request - ) - { - try - { - RenderMetaData renderMeta = defaultRenderMetaData(fileName, request); - Map<String,String> postParams = convertRequestParametersToMap(request); - renderMeta.getParameters().putAll(postParams); - - String outputFileName = birtService.render(renderMeta); - String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName; - log.debug("Render " + absoluteFile); - - return Response.ok().type("text/html").build(); - } - catch(Throwable e1) - { - return gracefulException(e1); - } - } - - @GET - @Path("view/image/{fileName}") - public Response getImage( - @PathParam("fileName") - String fileName, - @Context HttpServletRequest - request - ) - { - String imageDir = birtService.getIntegrationConfig().getImageDirectory(); - String absName = imageDir + fileName; - File imageFile = new File(absName); - if(!imageFile.exists()) - throw new IllegalArgumentException("Image " +absName+" doesn't exist"); - return Response.ok(imageFile).build(); - } - - private RenderMetaData defaultRenderMetaData(String fileName, HttpServletRequest request) - { - RenderMetaData renderMeta = new RenderMetaData(); - renderMeta.setReportName(fileName); - renderMeta.setFormat(RenderMetaData.Format.HTML); - renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); - renderMeta.setImageBaseUrl(buildImageUrl(request)); - return renderMeta; - } - - private String buildImageUrl(HttpServletRequest request) - { - StringBuffer sb = new StringBuffer(); - sb.append("http://"); - sb.append(request.getServerName()).append(":"); - sb.append(request.getServerPort()); - sb.append(request.getContextPath()); - sb.append(request.getServletPath()); - sb.append("/report/view/image"); - return sb.toString(); - } - - private Response gracefulException(Throwable e) - { - log.error("Error processing report", e); - - StringBuffer sb = new StringBuffer(); - sb.append("<div style='font-family:sans-serif; padding:10px;'>"); - sb.append("<h3>Unable to process report").append("</h3>"); - sb.append(e.getMessage()); - sb.append("</div>"); - return Response.ok(sb.toString()).status(400).build(); - } - - static public Map<String, String> convertRequestParametersToMap(HttpServletRequest request){ - HashMap<String, String> parameterMap = new HashMap<String, String>(); - BufferedReader br = null; - try - { - - br = request.getReader(); - String line; - while ((line = br.readLine()) != null) - { - StringTokenizer st = new StringTokenizer(line, ";"); - while(st.hasMoreTokens()) - { - String s = st.nextToken(); - if(s.indexOf("=")!=-1) - { - String[] tuple = s.split("="); - parameterMap.put(tuple[0], tuple[1]); - } - } - } - } - catch (IOException e) - { - log.error("Failed to parse report parameters", e); - } - finally{ - if(br!=null) - try - { - br.close(); - } - catch (IOException e) - { - // - } - } - - return parameterMap; - } - - @GET - @Path("config") - @Produces("application/json") - public Response getReportConfig() - { - List<ReportReference> refs = birtService.getReportReferences(); - String json = new GsonBuilder().create().toJson(refs); - return Response.ok(json).build(); - } - - public class BirtInitException extends Exception - { - public BirtInitException(String message) - { - super(message); - } - - public BirtInitException(String message, Throwable cause) - { - super(message, cause); - } - } - -} Copied: report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java (from rev 902, report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java) =================================================================== --- report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java (rev 0) +++ report-server/tags/report-parent-1.2.0/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-12-15 10:30:21 UTC (rev 909) @@ -0,0 +1,332 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.report; + +import com.google.gson.GsonBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.report.model.ReportReference; + +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + +/** + * BIRT integration facade.<p> + * + * Uses the server data directory (i.e. <code>$JBOSS_HOME/server/default/data/birt</code>) + * as it's work directory (referred to as $WORK_DIR in the subsequent sections): + * + * <ul> + * <li>report template location: $WORK_DIR/ + * <li>output directory: $WORK_DIR/output + * </ul> + * + * NOTE: It requires a BIRT report engine to be installed in the work directory: + * (<code>$WORK_DIR/ReportEngine</code>. + * + * @see org.jboss.bpm.report.JMXServerConfig + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +@Path("report") +public class ReportFacade +{ + private static final Log log = LogFactory.getLog(ReportFacade.class); + private BirtService birtService; + private boolean isInitialized; + private boolean initAttempt; + + public ReportFacade() + { + try + { + if(!initAttempt) initBirtService(); + } + catch (BirtInitException e) + { + initAttempt = true; // RIFTSAW-111: gracefully exit when BIRT not installed + log.warn("Failed to initialize BIRT service. Please check the DEBUG log for further details."); + log.debug("Initialization failed", e); + } + } + + public void initBirtService() + throws BirtInitException + { + if(!isInitialized) + { + File serverDataDir = resolveDataDir(); + + IntegrationConfig iConfig = new IntegrationConfig(); + String absServerDataDir = serverDataDir.getAbsolutePath(); + + String birtDataDir = absServerDataDir + "/birt"; + String defaultBirtHome = birtDataDir + "/ReportEngine"; + String birtOutputDir = birtDataDir + "/output"; + + File birtOutput = new File(birtOutputDir); + birtOutput.mkdirs(); // will create parent directoy as well + + // check dependency on ReportEngine + if(! new File(defaultBirtHome).exists()) + throw new BirtInitException("The BIRT report engine doesn't seem to be installed:" +defaultBirtHome); + + // -- + + iConfig.setBirtHome(defaultBirtHome); + iConfig.setOutputDir( birtOutputDir ); + iConfig.setReportDir( birtDataDir ); + + log.info("BIRT home: " +iConfig.getBirtHome()); + log.info("Output dir: " +iConfig.getOutputDir()); + log.info("Report dir: " +iConfig.getReportDir()); + + try + { + this.birtService = new BirtService(iConfig); + this.birtService.createAsync(); + } + catch (Throwable t) + { + throw new BirtInitException(t.getMessage(), t); + } + + isInitialized = true; + } + } + + private File resolveDataDir() + { + JMXServerConfig jmxConfig = null; + File serverDataDir = null; + try + { + jmxConfig = new JMXServerConfig(); + serverDataDir = jmxConfig.getServerDataDir(); + } + catch (Exception e) + { + // fallback on on CATALINA_HOME or blow up + log.warn("Resolving serverDataDir based on -Dcatalina.home"); + if(System.getProperty("catalina.home")!=null) + serverDataDir = new File(System.getProperty("catalina.home")); + else + throw new IllegalStateException("Neither JMX config nor '-Dcatalina.home' available to resolve serverDataDir"); + } + + return serverDataDir; + } + + @GET + @Path("render/{fileName}") + @Produces("text/html") + public Response viewReportHtml( + @PathParam("fileName") + String fileName, + @Context HttpServletRequest request + ) + { + assertBirtAvailability(); + + try + { + RenderMetaData renderMeta = defaultRenderMetaData(fileName, request); + + String outputFileName = birtService.view(renderMeta); + String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName; + log.debug("View " + absoluteFile); + + File reportFile = new File(absoluteFile); + return Response.ok(reportFile).type("text/html").build(); + } + catch(Throwable e1) + { + return gracefulException(e1); + } + } + + private void assertBirtAvailability() + { + if(!isInitialized) + throw new IllegalStateException("Report server not initialized. " + + "Please check the server logs for further details."); + } + + @POST + @Path("render/{fileName}") + @Produces("text/html") + public Response renderReportHtml( + @PathParam("fileName") + String fileName, + @Context HttpServletRequest request + ) + { + + assertBirtAvailability(); + + try + { + RenderMetaData renderMeta = defaultRenderMetaData(fileName, request); + Map<String,String> postParams = convertRequestParametersToMap(request); + renderMeta.getParameters().putAll(postParams); + + String outputFileName = birtService.render(renderMeta); + String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName; + log.debug("Render " + absoluteFile); + + return Response.ok().type("text/html").build(); + } + catch(Throwable e1) + { + return gracefulException(e1); + } + } + + @GET + @Path("view/image/{fileName}") + public Response getImage( + @PathParam("fileName") + String fileName, + @Context HttpServletRequest + request + ) + { + assertBirtAvailability(); + + String imageDir = birtService.getIntegrationConfig().getImageDirectory(); + String absName = imageDir + fileName; + File imageFile = new File(absName); + if(!imageFile.exists()) + throw new IllegalArgumentException("Image " +absName+" doesn't exist"); + return Response.ok(imageFile).build(); + } + + private RenderMetaData defaultRenderMetaData(String fileName, HttpServletRequest request) + { + RenderMetaData renderMeta = new RenderMetaData(); + renderMeta.setReportName(fileName); + renderMeta.setFormat(RenderMetaData.Format.HTML); + renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); + renderMeta.setImageBaseUrl(buildImageUrl(request)); + return renderMeta; + } + + private String buildImageUrl(HttpServletRequest request) + { + StringBuffer sb = new StringBuffer(); + sb.append("http://"); + sb.append(request.getServerName()).append(":"); + sb.append(request.getServerPort()); + sb.append(request.getContextPath()); + sb.append(request.getServletPath()); + sb.append("/report/view/image"); + return sb.toString(); + } + + private Response gracefulException(Throwable e) + { + log.error("Error processing report", e); + + StringBuffer sb = new StringBuffer(); + sb.append("<div style='font-family:sans-serif; padding:10px;'>"); + sb.append("<h3>Unable to process report").append("</h3>"); + sb.append(e.getMessage()); + sb.append("</div>"); + return Response.ok(sb.toString()).status(400).build(); + } + + static public Map<String, String> convertRequestParametersToMap(HttpServletRequest request){ + HashMap<String, String> parameterMap = new HashMap<String, String>(); + BufferedReader br = null; + try + { + + br = request.getReader(); + String line; + while ((line = br.readLine()) != null) + { + StringTokenizer st = new StringTokenizer(line, ";"); + while(st.hasMoreTokens()) + { + String s = st.nextToken(); + if(s.indexOf("=")!=-1) + { + String[] tuple = s.split("="); + parameterMap.put(tuple[0], tuple[1]); + } + } + } + } + catch (IOException e) + { + log.error("Failed to parse report parameters", e); + } + finally{ + if(br!=null) + try + { + br.close(); + } + catch (IOException e) + { + // + } + } + + return parameterMap; + } + + @GET + @Path("config") + @Produces("application/json") + public Response getReportConfig() + { + assertBirtAvailability(); + + List<ReportReference> refs = birtService.getReportReferences(); + String json = new GsonBuilder().create().toJson(refs); + return Response.ok(json).build(); + } + + public class BirtInitException extends Exception + { + public BirtInitException(String message) + { + super(message); + } + + public BirtInitException(String message, Throwable cause) + { + super(message, cause); + } + } + +} Deleted: report-server/tags/report-parent-1.2.0/pom.xml =================================================================== --- report-server/trunk/pom.xml 2009-12-10 14:36:40 UTC (rev 900) +++ report-server/tags/report-parent-1.2.0/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -1,142 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Reporting (BIRT Integration)</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-parent</artifactId> - <version>1.0.0.GA</version> - </parent> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <commons.logging.version>1.1.1</commons.logging.version> - <junit.version>3.8.1</junit.version> - <resteasy.version>1.0.2.GA</resteasy.version> - <servlet.version>2.4</servlet.version> - <gson.version>1.2.2</gson.version> - </properties> - - <modules> - <module>shared</module> - <module>core</module> - <module>server</module> - </modules> - - <dependencyManagement> - <dependencies> - <!-- Other --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - <version>${servlet.version}</version> - </dependency> - - - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>${resteasy.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>tjws</groupId> - <artifactId>webserver</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>${gson.version}</version> - </dependency> - - - </dependencies> - </dependencyManagement> - - <build> - <plugins> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - - <!-- Repositories --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>http://snapshots.jboss.org/maven2</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - -</project> Copied: report-server/tags/report-parent-1.2.0/pom.xml (from rev 908, report-server/trunk/pom.xml) =================================================================== --- report-server/tags/report-parent-1.2.0/pom.xml (rev 0) +++ report-server/tags/report-parent-1.2.0/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -0,0 +1,156 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - Reporting (BIRT Integration)</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-parent</artifactId> + <version>1.2.0</version> + <packaging>pom</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jbpm</groupId> + <artifactId>jbpm-parent</artifactId> + <version>1.0.0.GA</version> + </parent> + + <scm> + <connection>scm:svn:http://svn.jboss.org/repos/soag/report-server/tags/... + <developerConnection>scm:svn:http://svn.jboss.org/repos/soag/report-ser... + <url>http://svn.jboss.org/repos/soag/report-server/tags/report-parent-1... + </scm> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <commons.logging.version>1.1.1</commons.logging.version> + <junit.version>3.8.1</junit.version> + <resteasy.version>1.0.2.GA</resteasy.version> + <servlet.version>2.4</servlet.version> + <gson.version>1.2.2</gson.version> + </properties> + + <modules> + <module>shared</module> + <module>core</module> + <module>server</module> + </modules> + + <dependencyManagement> + <dependencies> + <!-- Other --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons.logging.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + <version>${servlet.version}</version> + </dependency> + + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${resteasy.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>tjws</groupId> + <artifactId>webserver</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>${gson.version}</version> + </dependency> + + + </dependencies> + </dependencyManagement> + + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-7</version> + <configuration> + <tagBase>http://svn.jboss.org/repos/soag/report-server/tags</tagBase... + </configuration> + </plugin> + + </plugins> + </build> + + <!-- Repositories --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshot Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + +</project> Deleted: report-server/tags/report-parent-1.2.0/server/pom.xml =================================================================== --- report-server/trunk/server/pom.xml 2009-12-10 14:36:40 UTC (rev 900) +++ report-server/tags/report-parent-1.2.0/server/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -1,53 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Report Server</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-server</artifactId> - <packaging>war</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - - <!-- Dependencies --> - <dependencies> - - <dependency> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-core</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - </dependencies> - - <!-- Plugins --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - - <finalName>report-server</finalName> - </build> -</project> Copied: report-server/tags/report-parent-1.2.0/server/pom.xml (from rev 908, report-server/trunk/server/pom.xml) =================================================================== --- report-server/tags/report-parent-1.2.0/server/pom.xml (rev 0) +++ report-server/tags/report-parent-1.2.0/server/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - Report Server</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-server</artifactId> + <packaging>war</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-parent</artifactId> + <version>1.2.0</version> + <relativePath>../pom.xml</relativePath> + </parent> + + + <!-- Dependencies --> + <dependencies> + + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-core</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <!-- Plugins --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + + <finalName>report-server</finalName> + </build> +</project> Deleted: report-server/tags/report-parent-1.2.0/shared/pom.xml =================================================================== --- report-server/trunk/shared/pom.xml 2009-12-10 14:36:40 UTC (rev 900) +++ report-server/tags/report-parent-1.2.0/shared/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Report Shared</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-shared</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-parent</artifactId> - <version>1.2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - - <!-- Dependencies --> - <dependencies> - - </dependencies> - - <!-- Plugins --> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - - <finalName>report-shared</finalName> - </build> -</project> Copied: report-server/tags/report-parent-1.2.0/shared/pom.xml (from rev 908, report-server/trunk/shared/pom.xml) =================================================================== --- report-server/tags/report-parent-1.2.0/shared/pom.xml (rev 0) +++ report-server/tags/report-parent-1.2.0/shared/pom.xml 2009-12-15 10:30:21 UTC (rev 909) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - Report Shared</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-shared</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>report-parent</artifactId> + <version>1.2.0</version> + <relativePath>../pom.xml</relativePath> + </parent> + + + <!-- Dependencies --> + <dependencies> + + </dependencies> + + <!-- Plugins --> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + + <finalName>report-shared</finalName> + </build> +</project>