[jbpm-commits] JBoss JBPM SVN: r3228 - in projects/gwt-console/trunk/server: src/main/java/org/jboss/bpm/console/server and 1 other directory.

Author: heiko.braun(a)jboss.com Date: 2008-12-05 09:42:33 -0500 (Fri, 05 Dec 2008) New Revision: 3228 Removed: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java Modified: projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/pom.xml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java Log: Report facacde moved to project balalaika Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/gwt-server.iml 2008-12-05 14:42:33 UTC (rev 3228) @@ -10,11 +10,10 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="jbpm3-identity" /> <orderEntry type="module" module-name="jbpm3-enterprise" /> - <orderEntry type="module" module-name="gwt-parent" /> - <orderEntry type="module" module-name="Balalaika" /> + <orderEntry type="module" module-name="jbpm3-identity" /> <orderEntry type="module" module-name="jbpm3-core" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -529,33 +528,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.2.2/coreapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.2.2/dataadapterapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.2.2/chartengineapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.0.CR1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.0.CR1/jboss-reflect-2.0.0.CR1.jar!/" /> @@ -565,15 +537,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.2.2/dteapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" /> @@ -592,15 +555,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.2.2/scriptapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.CR13:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar!/" /> @@ -637,15 +591,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.2.2/engineapi-2.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.0.CR1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.0.CR1/jboss-kernel-2.0.0.CR1.jar!/" /> @@ -673,113 +618,14 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.2.2:compile"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.2.2/modelapi-2.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.6.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.6.1/icu4j-3.6.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.2.2.v200702131851:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.2.2.v200702131851/ecore-xmi-2.2.2.v200702131851.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.2.1.v200702131851:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.2.1.v200702131851/common-2.2.1.v200702131851.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.2.2.v200702131851:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.2.2.v200702131851/ecore-2.2.2.v200702131851.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/pom.xml =================================================================== --- projects/gwt-console/trunk/server/pom.xml 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/pom.xml 2008-12-05 14:42:33 UTC (rev 3228) @@ -52,12 +52,7 @@ <artifactId>bpm-spec-api</artifactId> <version>${jboss.bpm.spec.version}</version> <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>balalaika-core</artifactId> - <version>${balalaika.version}</version> - </dependency> + </dependency> <!-- GWT related --> <dependency> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-12-05 14:42:33 UTC (rev 3228) @@ -40,8 +40,7 @@ singletons.add(new TaskMgmtFacade()); singletons.add(new UserMgmtFacade()); singletons.add(new JBPM3MgmtFacade()); - singletons.add(new TestFacade()); - singletons.add(new ReportFacade()); + singletons.add(new TestFacade()); } @Override Deleted: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java 2008-12-05 14:41:31 UTC (rev 3227) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ReportFacade.java 2008-12-05 14:42:33 UTC (rev 3228) @@ -1,99 +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.console.server; - -import org.jboss.balalaika.BirtService; -import org.jboss.balalaika.RenderMetaData; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.ws.rs.*; -import javax.ws.rs.core.Response; -import java.io.*; - -/** - * BIRT integration facade. - * - * @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; - - public ReportFacade() - { - // TODO: configuration - this.birtService = new BirtService(); - this.birtService.create(); - } - - @GET - @Path("view/{fileName}") - @Produces("text/html") - public Response viewReportHtml( - @PathParam("fileName") - String fileName - ) - { - RenderMetaData renderMeta = new RenderMetaData(); - renderMeta.setReportName(fileName); - renderMeta.setFormat(RenderMetaData.Format.HTML); - renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); - - String outputFileName = birtService.render(renderMeta); - String absoluteFile = birtService.getIConfig().getOutputDir() + outputFileName; - log.info("Render " + absoluteFile); - - File f = new File(absoluteFile); - return Response.ok(bytesFromFile(f)).type("text/html").build(); - } - - public static byte[] bytesFromFile(File file) - { - try - { - InputStream is = new FileInputStream(file); - long length = file.length(); - - byte[] bytes = new byte[(int)length]; - int offset = 0; - int numRead = 0; - while (offset < bytes.length && (numRead=is.read(bytes, - offset, bytes.length-offset)) >= 0) { - offset += numRead; - } - if (offset < bytes.length) { - throw new IOException("Could not completely read file " - + file.getName()); - } - is.close(); - return bytes; - } - catch (IOException e) - { - throw new RuntimeException("Failed to read file " + file); - } - } - -}