[overlord-commits] Overlord SVN: r859 - in report-server/trunk: core and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-10-27 09:05:02 -0400 (Tue, 27 Oct 2009) New Revision: 859 Modified: report-server/trunk/core/pom.xml report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java report-server/trunk/pom.xml report-server/trunk/report-server.iml report-server/trunk/report-server.iws Log: Serialze report.xml towards console Modified: report-server/trunk/core/pom.xml =================================================================== --- report-server/trunk/core/pom.xml 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/core/pom.xml 2009-10-27 13:05:02 UTC (rev 859) @@ -172,6 +172,7 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> + <scope>provided</scope> </dependency> <dependency> @@ -180,11 +181,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - </dependency> - </dependencies> Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java =================================================================== --- report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-27 13:05:02 UTC (rev 859) @@ -21,19 +21,22 @@ */ package org.jboss.bpm.report; -import org.eclipse.birt.report.engine.api.*; -import org.eclipse.birt.core.framework.Platform; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.eclipse.birt.core.framework.Platform; +import org.eclipse.birt.report.engine.api.*; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; -import java.util.Map; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.File; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ConcurrentHashMap; -import java.io.File; -import java.io.FileFilter; +import java.util.Map; /** * Core BIRT service component. Requires to step through the lifecycle @@ -61,10 +64,10 @@ private Map<String, IReportRunnable> cache = new HashMap<String, IReportRunnable>(); - private boolean keepWatching = true; + private List<String> templateNames = new ArrayList<String>(); - private List<String> reportNames = new ArrayList<String>(); - + private Document reportConfig; + public BirtService(IntegrationConfig iConfig) { this.iConfig = iConfig; @@ -75,54 +78,47 @@ { this.engine = BirtEngineFactory.newInstance(iConfig); - // scan for reports and initialize watchdog - Thread watchDog = new Thread( - new Runnable() - { - public void run() - { - while(keepWatching) - { - File reportdir = new File(iConfig.getReportDir()); - assert reportdir.isDirectory(); + // parse template config + File workDir = new File(iConfig.getReportDir()); + if(!workDir.exists()) + throw new IllegalStateException("Working directory "+iConfig.getReportDir()+" cannot be found!"); + + File config = new File(workDir, "reports.xml"); + if(!config.exists()) + throw new IllegalStateException("Template config (reports.xml) not found: "+iConfig.getReportDir()); - File[] reportTemplates = reportdir.listFiles( - new FileFilter() - { - public boolean accept(File f) - { - return f.getName().endsWith(".rptdesign"); - } - } - ); + try + { + DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + reportConfig = docBuilder.parse(config); + parseReportNames(reportConfig); + } + catch (Exception e) + { + throw new RuntimeException("Failed to parse config", e); + } - synchronized(reportNames) - { - reportNames.clear(); - for(File f : reportTemplates) - reportNames.add(f.getName()); - } - - try - { - Thread.sleep(5*1000); - } - catch (InterruptedException e) - { - log.error(e); - } - } - - } - } - ); - watchDog.setName(BirtService.class.getName()+"-WatchDog"); - watchDog.start(); - log.info("Service created: " +this.engine); currentState = State.CREATED; } + private void parseReportNames(Document reportConfig) + { + Element root = reportConfig.getDocumentElement(); + + NodeList groups = root.getElementsByTagName("group"); + for(int i=0; i<groups.getLength(); i++) + { + Element group = (Element)groups.item(i); + NodeList reports = group.getElementsByTagName("report"); + for(int x=0; x<reports.getLength(); x++) + { + Element report = (Element)reports.item(x); + templateNames.add(report.getAttribute("template")); + } + } + } + /* non blocking init */ public void createAsync() { @@ -153,8 +149,6 @@ if(currentState!=State.STARTED) throw new IllegalStateException("Please call start lifecylce before stopping the service"); - keepWatching=false; // shutdown watchdog - currentState = State.STOPPED; } @@ -183,6 +177,9 @@ if( (currentState==State.CREATED || currentState==State.STARTED) == false) throw new IllegalStateException("Cannot render in state " + currentState); + if(!templateNames.contains(metaData.getReportName())) + throw new IllegalArgumentException("No such report template: "+metaData.getReportName()); + String outputFileName = null; log.debug("Render " + metaData); @@ -273,8 +270,10 @@ return currentState; } - public String[] getReportNames() + public String getTemplateConfig() { - return reportNames.toArray(new String[] {}); + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + new DOMWriter(bout).print(reportConfig.getDocumentElement()); + return new String(bout.toByteArray()); } } Modified: report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java =================================================================== --- report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-27 13:05:02 UTC (rev 859) @@ -25,17 +25,17 @@ import org.apache.commons.logging.LogFactory; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.*; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; -import java.io.*; -import java.util.HashMap; +import java.io.File; import java.util.Enumeration; +import java.util.HashMap; import java.util.Map; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - /** * BIRT integration facade.<p> * @@ -206,20 +206,13 @@ } @GET - @Path("templates") - @Produces("application/json") - public Response getReportNames() + @Path("config") + @Produces("text/xml") + public Response getReportConfig() { - return createJsonResponse(birtService.getReportNames()); + return Response.ok(birtService.getTemplateConfig()).build(); } - private Response createJsonResponse(Object wrapper) - { - Gson gson = new GsonBuilder().create(); - String json = gson.toJson(wrapper); - return Response.ok(json).type("application/json").build(); - } - public class BirtInitException extends Exception { public BirtInitException(String message) Modified: report-server/trunk/pom.xml =================================================================== --- report-server/trunk/pom.xml 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/pom.xml 2009-10-27 13:05:02 UTC (rev 859) @@ -87,15 +87,9 @@ <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> </exclusion> - </exclusions> + </exclusions> </dependency> - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> </dependencyManagement> Modified: report-server/trunk/report-server.iml =================================================================== --- report-server/trunk/report-server.iml 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/report-server.iml 2009-10-27 13:05:02 UTC (rev 859) @@ -12,18 +12,9 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +23,7 @@ <orderEntry type="module-library" exported=""> <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,25 +32,16 @@ <orderEntry type="module-library" exported=""> <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!/" /> + <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" exported=""> - <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -68,216 +50,226 @@ <orderEntry type="module-library" exported=""> <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!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library" exported=""> <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!/" /> + <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" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + <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" exported=""> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: report-server/trunk/report-server.iws =================================================================== --- report-server/trunk/report-server.iws 2009-10-26 17:23:53 UTC (rev 858) +++ report-server/trunk/report-server.iws 2009-10-27 13:05:02 UTC (rev 859) @@ -16,9 +16,7 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/report-server.iws" afterPath="$PROJECT_DIR$/report-server.iws" /> - </list> + <list default="true" name="Default" comment="" /> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -132,7 +130,26 @@ </component> <component name="FavoritesProjectViewPane" /> <component name="FileEditorManager"> - <leaf /> + <leaf> + <file leaf-file-name="BirtService.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/bpm/report/BirtService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="87" column="52" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.026143791"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="sample-reports.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/core/src/main/resources/sample-reports.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="9" column="19" selection-start="412" selection-end="412" vertical-scroll-proportion="0.22966507"> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> </component> <component name="FindManager"> <FindUsagesManager> @@ -164,7 +181,18 @@ </component> <component name="NamedScopeManager" /> <component name="PackagesPane"> - <subPane /> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> </component> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> @@ -293,6 +321,10 @@ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src/main/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -361,25 +393,6 @@ <component name="RecentsManager" /> <component name="RestoreUpdateTree" /> <component name="RunManager"> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> @@ -405,7 +418,29 @@ <option name="TEST_SEARCH_SCOPE"> <value defaultName="wholeProject" /> </option> + <method> + <option name="Make" value="true" /> + </method> </configuration> + <configuration default="true" type="Applet" factoryName="Applet"> + <module name="" /> + <option name="MAIN_CLASS_NAME" /> + <option name="HTML_FILE_NAME" /> + <option name="HTML_USED" value="false" /> + <option name="WIDTH" value="400" /> + <option name="HEIGHT" value="300" /> + <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> + <option name="VM_PARAMETERS" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + </configuration> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> + </configuration> <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false"> <Host>localhost</Host> <Port>5050</Port> @@ -487,13 +522,13 @@ </component> <component name="ToolWindowManager"> <frame x="0" y="22" width="1280" height="774" extended-state="6" /> - <editor active="false" /> + <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3290008" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30625507" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3299363" order="1" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -639,6 +674,20 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/bpm/report/BirtService.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="87" column="52" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.026143791"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/resources/sample-reports.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="9" column="19" selection-start="412" selection-end="412" vertical-scroll-proportion="0.22966507"> + <folding /> + </state> + </provider> + </entry> </component> </project>