May 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4825 - projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 14:28:38 -0400 (Fri, 15 May 2009) New Revision: 4825 Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java Log: Fix class cast exception Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-15 12:53:10 UTC (rev 4824) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2009-05-15 18:28:38 UTC (rev 4825) @@ -32,7 +32,7 @@ */ public class InstanceDetailView extends CaptionLayoutPanel implements ViewInterface { - public final static String ID = ProcessDetailView.class.getName(); + public final static String ID = InstanceDetailView.class.getName(); private Controller controller;

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4824 - in projects/report-server/trunk: core and 2 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 08:53:10 -0400 (Fri, 15 May 2009) New Revision: 4824 Added: projects/report-server/trunk/report-server.ipr projects/report-server/trunk/report-server.iws Modified: projects/report-server/trunk/core/pom.xml projects/report-server/trunk/report-server.iml projects/report-server/trunk/server/pom.xml projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml Log: Moving to birt 2.3.2 Modified: projects/report-server/trunk/core/pom.xml =================================================================== --- projects/report-server/trunk/core/pom.xml 2009-05-15 11:41:07 UTC (rev 4823) +++ projects/report-server/trunk/core/pom.xml 2009-05-15 12:53:10 UTC (rev 4824) @@ -15,7 +15,7 @@ </parent> <properties> - <birt.version>2.2.2</birt.version> + <birt.version>2.3.2</birt.version> </properties> <dependencies> @@ -84,19 +84,19 @@ <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>ecore</artifactId> - <version>2.2.2.v200702131851</version> + <version>2.4.2</version> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>ecore-xmi</artifactId> - <version>2.2.2.v200702131851</version> + <version>2.4.1</version> </dependency> <dependency> <groupId>org.eclipse.emf</groupId> <artifactId>common</artifactId> - <version>2.2.1.v200702131851</version> + <version>2.4.0</version> </dependency>  @@ -160,7 +160,7 @@ <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> - <version>3.6.1</version> + <version>3.8.1</version> </dependency> <dependency> Modified: projects/report-server/trunk/report-server.iml =================================================================== --- projects/report-server/trunk/report-server.iml 2009-05-15 11:41:07 UTC (rev 4823) +++ projects/report-server/trunk/report-server.iml 2009-05-15 12:53:10 UTC (rev 4824) @@ -48,15 +48,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <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" 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!/" /> @@ -66,15 +57,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <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" 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!/" /> @@ -84,218 +66,200 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.2.2:compile"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.2.2/engineapi-2.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <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.eclipse.birt:coreapi:jar:2.2.2:compile"> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.2.2/coreapi-2.2.2.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: com.sun.xml.fastinfoset:FastInfoset:jar:1.2.2:compile"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/fastinfoset/FastInfoset/1.2.2/FastInfoset-1.2.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: commons-codec:commons-codec:jar:1.3:compile"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA: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/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <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.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" exported=""> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <library name="M2 Dep: rhino:js:jar:1.6R2: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/rhino/js/1.6R2/js-1.6R2.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: com.lowagie:itext:jar:1.3: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/com/lowagie/itext/1.3/itext-1.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.2.2:compile"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.2.2/chartengineapi-2.2.2.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: org.eclipse.birt:dteapi:jar:2.2.2:compile"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.2.2/dteapi-2.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.2.2.v200702131851:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.2.2.v200702131851/ecore-2.2.2.v200702131851.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.codehaus.jettison:jettison:jar:1.0.1:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/codehaus/jettison/jettison/1.0.1/jettison-1.0.1.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: com.sun.xml.stream:sjsxp:jar:1.0.1:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/sun/xml/stream/sjsxp/1.0.1/sjsxp-1.0.1.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: javassist:javassist:jar:3.6.0.GA:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA: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/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: rhino:js:jar:1.6R2:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.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/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.jyaml:jyaml:jar:1.3:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jyaml/jyaml/1.3/jyaml-1.3.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: com.lowagie:itext:jar:1.3:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.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-beta-8:compile"> + <orderEntry type="module-library"> + <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-beta-8/resteasy-jaxrs-1.0-beta-8.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.emf:ecore-xmi:jar:2.2.2.v200702131851:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2: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!/" /> + <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.jboss.resteasy:jaxrs-api:jar:1.0-beta-8:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0-beta-8/jaxrs-api-1.0-beta-8.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: org.eclipse.birt:modelapi:jar:2.2.2:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0: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/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.w3c:flute:jar:1.2:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1: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/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:scriptapi:jar:2.2.2:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.2.2/scriptapi-2.2.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.scannotation:scannotation:jar:1.0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1: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/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Added: projects/report-server/trunk/report-server.ipr =================================================================== --- projects/report-server/trunk/report-server.ipr (rev 0) +++ projects/report-server/trunk/report-server.ipr 2009-05-15 12:53:10 UTC (rev 4824) @@ -0,0 +1,316 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="AntConfiguration"> + <defaultAnt bundledAnt="true" /> + </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> + <component name="CodeStyleSettingsManager"> + <option name="PER_PROJECT_SETTINGS" /> + <option name="USE_PER_PROJECT_SETTINGS" value="false" /> + </component> + <component name="CompilerConfiguration"> + <option name="DEFAULT_COMPILER" value="Javac" /> + <option name="DEPLOY_AFTER_MAKE" value="0" /> + <resourceExtensions> + <entry name=".+\.(properties|xml|html|dtd|tld)" /> + <entry name=".+\.(gif|png|jpeg|jpg)" /> + </resourceExtensions> + <wildcardResourcePatterns> + <entry name="?*.properties" /> + <entry name="?*.xml" /> + <entry name="?*.gif" /> + <entry name="?*.png" /> + <entry name="?*.jpeg" /> + <entry name="?*.jpg" /> + <entry name="?*.html" /> + <entry name="?*.dtd" /> + <entry name="?*.tld" /> + </wildcardResourcePatterns> + </component> + <component name="DataSourceManagerImpl" /> + <component name="DependenciesAnalyzeManager"> + <option name="myForwardDirection" value="false" /> + </component> + <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EntryPointsManager"> + <entry_points /> + </component> + <component name="ExportToHTMLSettings"> + <option name="PRINT_LINE_NUMBERS" value="false" /> + <option name="OPEN_IN_BROWSER" value="false" /> + <option name="OUTPUT_DIRECTORY" /> + </component> + <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="1E46A79AE09FDDA36C7AA36A15233C1A" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + </profile> + </profiles> + </component> + <component name="JavacSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="DEPRECATION" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="JavadocGenerationManager"> + <option name="OUTPUT_DIRECTORY" /> + <option name="OPTION_SCOPE" value="protected" /> + <option name="OPTION_HIERARCHY" value="true" /> + <option name="OPTION_NAVIGATOR" value="true" /> + <option name="OPTION_INDEX" value="true" /> + <option name="OPTION_SEPARATE_INDEX" value="true" /> + <option name="OPTION_DOCUMENT_TAG_USE" value="false" /> + <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" /> + <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" /> + <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" /> + <option name="OPTION_DEPRECATED_LIST" value="true" /> + <option name="OTHER_OPTIONS" value="" /> + <option name="HEAP_SIZE" /> + <option name="LOCALE" /> + <option name="OPEN_IN_BROWSER" value="true" /> + </component> + <component name="JikesSettings"> + <option name="JIKES_PATH" value="" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="DEPRECATION" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="IS_EMACS_ERRORS_MODE" value="true" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> + <component name="Maven Reloaded"> + <option name="config"> + <value> + <option name="pluginEnabled" value="true" /> + <option name="offlineModeEnabled" value="false" /> + <option name="updateClasspathsEnabled" value="true" /> + <option name="sortDependenciesEnabled" value="false" /> + <option name="removeDuplicateDependenciesEnabled" value="false" /> + <option name="respondToPomChangesEnabled" value="true" /> + <option name="manageSourceRootsEnabled" value="true" /> + <option name="manageModuleInterdependenciesEnabled" value="true" /> + <option name="downloadSourcesEnabled" value="false" /> + <option name="downloadJavadocEnabled" value="false" /> + <option name="generateSourcesEnabled" value="false" /> + <option name="settingsPath" value="/Users/hbraun/.m2/settings.xml" /> + <option name="searchFilter" value="" /> + <option name="disabledPoms"> + <value> + <collection type="java.util.TreeSet" /> + </value> + </option> + <option name="moduleInterDependencies"> + <value> + <map type="java.util.TreeMap" /> + </value> + </option> + <option name="logLevel" value="1" /> + </value> + </option> + </component> + <component name="Palette2"> + <group name="Swing"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> + </item> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> + <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> + <initial-values> + <property name="text" value="Button" /> + </initial-values> + </item> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="RadioButton" /> + </initial-values> + </item> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="CheckBox" /> + </initial-values> + </item> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> + <initial-values> + <property name="text" value="Label" /> + </initial-values> + </item> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> + <preferred-size width="150" height="-1" /> + </default-constraints> + </item> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> + <preferred-size width="150" height="50" /> + </default-constraints> + </item> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> + <preferred-size width="200" height="200" /> + </default-constraints> + </item> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> + </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> + </group> + </component> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/report-server.iml" filepath="$PROJECT_DIR$/report-server.iml" /> + </modules> + </component> + <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK"> + <output url="file://$PROJECT_DIR$/classes" /> + </component> + <component name="ProjectRunConfigurationManager" /> + <component name="RmicSettings"> + <option name="IS_EANABLED" value="false" /> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="false" /> + <option name="GENERATE_IIOP_STUBS" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + </component> + <component name="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> + <UsedPathMacros /> +</project> + Added: projects/report-server/trunk/report-server.iws =================================================================== --- projects/report-server/trunk/report-server.iws (rev 0) +++ projects/report-server/trunk/report-server.iws 2009-05-15 12:53:10 UTC (rev 4824) @@ -0,0 +1,640 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4" relativePaths="false"> + <component name="BookmarkManager" /> + <component name="ChangeBrowserSettings"> + <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> + <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> + <option name="USE_DATE_BEFORE_FILTER" value="false" /> + <option name="USE_DATE_AFTER_FILTER" value="false" /> + <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> + <option name="USE_CHANGE_AFTER_FILTER" value="false" /> + <option name="DATE_BEFORE" value="" /> + <option name="DATE_AFTER" value="" /> + <option name="CHANGE_BEFORE" value="" /> + <option name="CHANGE_AFTER" value="" /> + <option name="USE_USER_FILTER" value="false" /> + <option name="USER" value="" /> + </component> + <component name="ChangeListManager"> + <list default="true" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/report-server.iws" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/report-server.iml" afterPath="$PROJECT_DIR$/report-server.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/report-server.ipr" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/pom.xml" afterPath="$PROJECT_DIR$/server/pom.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/server/src/main/webapp/WEB-INF/web.xml" afterPath="$PROJECT_DIR$/server/src/main/webapp/WEB-INF/web.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/core/pom.xml" afterPath="$PROJECT_DIR$/core/pom.xml" /> + </list> + </component> + <component name="ChangeListSynchronizer" /> + <component name="ChangesViewManager" flattened_view="true" /> + <component name="CheckinPanelState" /> + <component name="Commander"> + <leftPanel /> + <rightPanel /> + <splitter proportion="0.5" /> + </component> + <component name="CompilerWorkspaceConfiguration"> + <option name="COMPILE_IN_BACKGROUND" value="false" /> + <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> + <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> + <option name="COMPILE_DEPENDENT_FILES" value="false" /> + <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> + <option name="ASSERT_NOT_NULL" value="true" /> + </component> + <component name="CoverageDataManager" /> + <component name="Cvs2Configuration"> + <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> + <option name="MERGING_MODE" value="0" /> + <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> + <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> + <option name="RESET_STICKY" value="false" /> + <option name="CREATE_NEW_DIRECTORIES" value="true" /> + <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> + <option name="PROCESS_UNKNOWN_FILES" value="false" /> + <option name="PROCESS_DELETED_FILES" value="false" /> + <option name="PROCESS_IGNORED_FILES" value="false" /> + <option name="RESERVED_EDIT" value="false" /> + <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_CHANGES_REVISION_SETTINGS"> + <value> + <option name="BRANCH" value="" /> + <option name="DATE" value="" /> + <option name="USE_BRANCH" value="false" /> + <option name="USE_DATE" value="false" /> + </value> + </option> + <option name="SHOW_OUTPUT" value="false" /> + <option name="ADD_WATCH_INDEX" value="0" /> + <option name="REMOVE_WATCH_INDEX" value="0" /> + <option name="UPDATE_KEYWORD_SUBSTITUTION" /> + <option name="MAKE_NEW_FILES_READONLY" value="false" /> + <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> + <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> + <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> + <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> + <option name="CLEAN_COPY" value="false" /> + </component> + <component name="DaemonCodeAnalyzer"> + <disable_hints /> + </component> + <component name="DebuggerManager"> + <breakpoint_any> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint> + <option name="NOTIFY_CAUGHT" value="true" /> + <option name="NOTIFY_UNCAUGHT" value="true" /> + <option name="ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + </breakpoint_any> + <breakpoint_rules /> + <ui_properties /> + </component> + <component name="ErrorTreeViewConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="HIDE_WARNINGS" value="false" /> + </component> + <component name="FavoritesManager"> + <favorites_list name="report-server" /> + </component> + <component name="FavoritesProjectViewPane" /> + <component name="FileEditorManager"> + <leaf /> + </component> + <component name="FindManager"> + <FindUsagesManager> + <setting name="OPEN_NEW_TAB" value="false" /> + </FindUsagesManager> + </component> + <component name="HierarchyBrowserManager"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SORT_ALPHABETICALLY" value="false" /> + <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> + </component> + <component name="InspectionManager"> + <option name="AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="SPLITTER_PROPORTION" value="0.5" /> + <option name="GROUP_BY_SEVERITY" value="false" /> + <option name="FILTER_RESOLVED_ITEMS" value="true" /> + <option name="ANALYZE_TEST_SOURCES" value="true" /> + <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> + <option name="SCOPE_TYPE" value="1" /> + <option name="CUSTOM_SCOPE_NAME" value="" /> + <option name="SHOW_ONLY_DIFF" value="false" /> + <option name="myCurrentProfileName" value="Default" /> + </component> + <component name="J2EEProjectPane" /> + <component name="JspContextManager" /> + <component name="ModuleEditorState"> + <option name="LAST_EDITED_MODULE_NAME" /> + <option name="LAST_EDITED_TAB_NAME" /> + </component> + <component name="NamedScopeManager" /> + <component name="PackagesPane"> + <subPane /> + </component> + <component name="PerforceChangeBrowserSettings"> + <option name="USE_CLIENT_FILTER" value="true" /> + <option name="CLIENT" value="" /> + </component> + <component name="PerforceDirect.Settings"> + <option name="useP4CONFIG" value="true" /> + <option name="port" value="<perforce_server>:1666" /> + <option name="client" value="" /> + <option name="user" value="" /> + <option name="passwd" value="" /> + <option name="showCmds" value="false" /> + <option name="useNativeApi" value="false" /> + <option name="pathToExec" value="p4" /> + <option name="useCustomPathToExec" value="false" /> + <option name="SYNC_FORCE" value="false" /> + <option name="SYNC_RUN_RESOLVE" value="true" /> + <option name="REVERT_UNCHANGED_FILES" value="true" /> + <option name="CHARSET" value="none" /> + <option name="SHOW_BRANCHES_HISTORY" value="true" /> + <option name="ENABLED" value="true" /> + <option name="USE_LOGIN" value="false" /> + <option name="LOGIN_SILENTLY" value="false" /> + <option name="INTEGRATE_RUN_RESOLVE" value="true" /> + <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> + <option name="SERVER_TIMEOUT" value="20000" /> + </component> + <component name="ProjectLevelVcsManager"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkin" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <OptionsSetting value="true" id="Undo Check Out" /> + <OptionsSetting value="true" id="Compare with SourceSafe Version" /> + <OptionsSetting value="true" id="Get Latest Version" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src" /> + <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" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="report-server.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="report-server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/core/src" /> + <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" /> + <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/java" /> + <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/java/org/jboss/bpm/report" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </component> + <component name="ProjectReloadState"> + <option name="STATE" value="0" /> + </component> + <component name="ProjectView"> + <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> + <flattenPackages /> + <showMembers /> + <showModules /> + <showLibraryContents /> + <hideEmptyPackages /> + <abbreviatePackageNames /> + <showStructure PackagesPane="false" ProjectPane="false" /> + <autoscrollToSource /> + <autoscrollFromSource /> + <sortByType /> + </navigator> + </component> + <component name="PropertiesComponent"> + <property name="MemberChooser.copyJavadoc" value="false" /> + <property name="GoToClass.includeLibraries" value="false" /> + <property name="MemberChooser.showClasses" value="true" /> + <property name="MemberChooser.sorted" value="false" /> + <property name="GoToFile.includeJavaFiles" value="false" /> + <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + </component> + <component name="ReadonlyStatusHandler"> + <option name="SHOW_DIALOG" value="true" /> + </component> + <component name="RecentsManager" /> + <component name="RestoreUpdateTree" /> + <component name="RunManager"> + <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="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="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + </configuration> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> + <option name="MAIN_CLASS_NAME" /> + <option name="VM_PARAMETERS" /> + <option name="PROGRAM_PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> + <module name="" /> + </configuration> + <configuration name="<template>" type="WebApp" default="true" selected="false"> + <Host>localhost</Host> + <Port>5050</Port> + </configuration> + </component> + <component name="ScopeViewComponent" /> + <component name="SelectInManager" /> + <component name="StarteamConfiguration"> + <option name="SERVER" value="" /> + <option name="PORT" value="49201" /> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROJECT" value="" /> + <option name="VIEW" value="" /> + <option name="ALTERNATIVE_WORKING_PATH" value="" /> + <option name="LOCK_ON_CHECKOUT" value="false" /> + <option name="UNLOCK_ON_CHECKIN" value="false" /> + </component> + <component name="StructuralSearchPlugin" /> + <component name="StructureViewFactory"> + <option name="AUTOSCROLL_MODE" value="true" /> + <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> + <option name="ACTIVE_ACTIONS" value="" /> + </component> + <component name="Struts Assistant"> + <option name="showInputs" value="true" /> + <option name="resources"> + <value> + <option name="strutsPath" /> + <option name="strutsHelp" /> + </value> + </option> + <option name="selectedTaglibs" /> + <option name="selectedTaglibs" /> + <option name="myStrutsValidationEnabled" value="true" /> + <option name="myTilesValidationEnabled" value="true" /> + <option name="myValidatorValidationEnabled" value="true" /> + <option name="myReportErrorsAsWarnings" value="true" /> + </component> + <component name="SvnChangesBrowserSettings"> + <option name="USE_AUTHOR_FIELD" value="true" /> + <option name="AUTHOR" value="" /> + <option name="LOCATION" value="" /> + <option name="USE_PROJECT_SETTINGS" value="true" /> + <option name="USE_ALTERNATE_LOCATION" value="false" /> + </component> + <component name="SvnConfiguration"> + <option name="USER" value="" /> + <option name="PASSWORD" value="" /> + <option name="PROCESS_UNRESOLVED" value="false" /> + <option name="LAST_MERGED_REVISION" /> + <option name="UPDATE_RUN_STATUS" value="false" /> + <option name="UPDATE_RECURSIVELY" value="true" /> + <option name="MERGE_DRY_RUN" value="false" /> + <configuration useDefault="true">/Users/hbraun/.subversion</configuration> + </component> + <component name="TodoView" selected-index="0"> + <todo-panel id="selected-file"> + <are-packages-shown value="false" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + <todo-panel id="all"> + <are-packages-shown value="true" /> + <are-modules-shown value="false" /> + <flatten-packages value="false" /> + <is-autoscroll-to-source value="true" /> + </todo-panel> + </component> + <component name="ToolWindowManager"> + <frame x="501" y="63" width="1144" height="882" extended-state="0" /> + <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="-1" /> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32968035" 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="-1" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> + <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> + <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> + </layout> + </component> + <component name="VCS.FileViewConfiguration"> + <option name="SELECTED_STATUSES" value="DEFAULT" /> + <option name="SELECTED_COLUMNS" value="DEFAULT" /> + <option name="SHOW_FILTERS" value="true" /> + <option name="CUSTOMIZE_VIEW" value="true" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> + </component> + <component name="VcsManagerConfiguration"> + <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> + <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> + <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> + <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> + <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> + <option name="LAST_COMMIT_MESSAGE" /> + <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> + <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> + <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> + <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> + <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> + <option name="ERROR_OCCURED" value="false" /> + <option name="ACTIVE_VCS_NAME" value="svn" /> + <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> + <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> + <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> + </component> + <component name="VssConfiguration"> + <option name="CLIENT_PATH" value="" /> + <option name="SRCSAFEINI_PATH" value="" /> + <option name="USER_NAME" value="" /> + <option name="PWD" value="" /> + <option name="VSS_IS_INITIALIZED" value="true" /> + <CheckoutOptions> + <option name="COMMENT" value="" /> + <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> + <option name="REPLACE_WRITABLE" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckoutOptions> + <CheckinOptions> + <option name="COMMENT" value="" /> + <option name="KEEP_CHECKED_OUT" value="false" /> + <option name="RECURSIVE" value="false" /> + </CheckinOptions> + <AddOptions> + <option name="STORE_ONLY_LATEST_VERSION" value="false" /> + <option name="CHECK_OUT_IMMEDIATELY" value="false" /> + <option name="FILE_TYPE" value="0" /> + </AddOptions> + <UndocheckoutOptions> + <option name="MAKE_WRITABLE" value="false" /> + <option name="REPLACE_LOCAL_COPY" value="0" /> + <option name="RECURSIVE" value="false" /> + </UndocheckoutOptions> + <GetOptions> + <option name="REPLACE_WRITABLE" value="0" /> + <option name="MAKE_WRITABLE" value="false" /> + <option name="ANSWER_NEGATIVELY" value="false" /> + <option name="ANSWER_POSITIVELY" value="false" /> + <option name="RECURSIVE" value="false" /> + <option name="VERSION" /> + </GetOptions> + <VssConfigurableExcludedFilesTag /> + </component> + <component name="antWorkspaceConfiguration"> + <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> + <option name="FILTER_TARGETS" value="false" /> + </component> + <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> + <option name="myPlainMode" value="false" /> + <option name="myLastEditedConfigurable" value="report-server" /> + </component> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="10" column="3" selection-start="467" selection-end="467" vertical-scroll-proportion="0.2973568"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/server/src/main/webapp/WEB-INF/web.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="21" column="0" selection-start="654" selection-end="654" vertical-scroll-proportion="0.370068"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/server/src/main/webapp/WEB-INF/jboss-web.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="14" column="34" selection-start="366" selection-end="366" vertical-scroll-proportion="0.30476192"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="171" column="38" selection-start="4892" selection-end="4892" vertical-scroll-proportion="2.3111112"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/server/pom.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="36" column="22" selection-start="925" selection-end="925" vertical-scroll-proportion="0.78367347"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="56" column="0" selection-start="2155" selection-end="2155" vertical-scroll-proportion="0.7111111"> + <folding /> + </state> + </provider> + </entry> + </component> +</project> + Modified: projects/report-server/trunk/server/pom.xml =================================================================== --- projects/report-server/trunk/server/pom.xml 2009-05-15 11:41:07 UTC (rev 4823) +++ projects/report-server/trunk/server/pom.xml 2009-05-15 12:53:10 UTC (rev 4824) @@ -19,7 +19,7 @@ <dependencies> <dependency> - <groupId>org.jbpm</groupId> + <groupId>org.jboss.bpm</groupId> <artifactId>report-core</artifactId> <version>${version}</version> </dependency> Modified: projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-05-15 11:41:07 UTC (rev 4823) +++ projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-05-15 12:53:10 UTC (rev 4824) @@ -20,11 +20,6 @@ <param-value>org.jboss.bpm.report.FileWriter</param-value> </context-param> -  - <listener> <listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4823 - projects/report-server/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 07:41:07 -0400 (Fri, 15 May 2009) New Revision: 4823 Added: projects/report-server/branches/report-server-1.0.x/ Log: 1.0.x branch Copied: projects/report-server/branches/report-server-1.0.x (from rev 4822, projects/report-server/trunk)

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4822 - projects/report-server.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 07:40:57 -0400 (Fri, 15 May 2009) New Revision: 4822 Added: projects/report-server/branches/ Log: Create branch dir

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4821 - in jbpm4/trunk/modules: jpdl/src/main/java/org/jbpm/jpdl/internal/activity and 3 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-05-15 06:45:02 -0400 (Fri, 15 May 2009) New Revision: 4821 Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateBinding.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/SuperStateBasicsTest.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml Log: JBPM-2026 initial addition of basic super-state test Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java 2009-05-15 09:59:31 UTC (rev 4820) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/model/Activity.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -129,4 +129,7 @@ * and {@link Execution#getPreviousTransition()} will be available to the * activity behaviour when it is executed or signalled. */ boolean isPreviousNeeded(); + + /** the type of this activity which corresponds to the xml tag */ + String getType(); } \ No newline at end of file Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java 2009-05-15 09:59:31 UTC (rev 4820) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/StartBinding.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -44,7 +44,7 @@ if (processDefinition.getInitial()==null) { processDefinition.setInitial(startActivity); - } else { + } else if (startActivity.getParentActivity()==null) { parse.addProblem("multiple start events not yet supported"); } Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateActivity.java (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateActivity.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -0,0 +1,74 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbpm.jpdl.internal.activity; + +import java.util.List; +import java.util.Map; + +import org.jbpm.api.JbpmException; +import org.jbpm.api.activity.ActivityExecution; +import org.jbpm.api.model.Activity; +import org.jbpm.api.model.Transition; +import org.jbpm.pvm.internal.model.ActivityImpl; + + +/** + * @author Tom Baeyens + */ +public class SuperStateActivity extends JpdlExternalActivity { + + private static final long serialVersionUID = 1L; + + public void execute(ActivityExecution execution) throws Exception { + // find the start activity + Activity activity = execution.getActivity(); + Activity startActivity = findStartActivity(activity); + execution.execute(startActivity); + } + + private Activity findStartActivity(Activity activity) { + List nestedActivities = activity.getActivities(); + for (ActivityImpl nestedActivity : (List<ActivityImpl>) nestedActivities) { + if (nestedActivity.getBehaviour() instanceof StartActivity) { + return nestedActivity; + } + } + throw new JbpmException("no start activity in "+activity); + } + + public void signal(ActivityExecution execution, String signalName, Map<String, Object> parameters) throws Exception { + Transition transition = null; + Activity activity = execution.getActivity(); + List<Transition> outgoingTransitions = activity.getOutgoingTransitions(); + + int nbrOfOutgoingTransitions = (outgoingTransitions!=null ? outgoingTransitions.size() : 0); + if ( (signalName==null) + && (nbrOfOutgoingTransitions==1) + ) { + transition = outgoingTransitions.get(0); + } else { + transition = activity.getOutgoingTransition(signalName); + } + + execution.take(transition); + } +} Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateActivity.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateBinding.java (rev 0) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateBinding.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbpm.jpdl.internal.activity; + +import org.jbpm.jpdl.internal.xml.JpdlParser; +import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + + +/** + * @author Tom Baeyens + */ +public class SuperStateBinding extends JpdlBinding { + + public SuperStateBinding() { + super("super-state"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + SuperStateActivity superStateActivity = new SuperStateActivity(); + + ActivityImpl activity = parse.findObject(ActivityImpl.class); + + JpdlParser jpdlParser = (JpdlParser) parser; + jpdlParser.parseActivities(element, parse, activity); + + return superStateActivity; + } +} Property changes on: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/SuperStateBinding.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-15 09:59:31 UTC (rev 4820) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -31,9 +31,6 @@ import java.util.Set; import java.util.StringTokenizer; -import javax.print.attribute.standard.Severity; - -import org.jbpm.api.Problem; import org.jbpm.api.activity.ActivityBehaviour; import org.jbpm.api.env.Environment; import org.jbpm.api.listener.EventListener; @@ -42,6 +39,7 @@ import org.jbpm.jpdl.internal.model.JpdlProcessDefinition; import org.jbpm.pvm.internal.model.ActivityCoordinatesImpl; import org.jbpm.pvm.internal.model.ActivityImpl; +import org.jbpm.pvm.internal.model.CompositeElementImpl; import org.jbpm.pvm.internal.model.EventImpl; import org.jbpm.pvm.internal.model.ObservableElementImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; @@ -221,33 +219,33 @@ } } - public void parseActivities(Element documentElement, Parse parse, JpdlProcessDefinition processDefinition) { + public void parseActivities(Element documentElement, Parse parse, CompositeElementImpl compositeElement) { List<Element> elements = XmlUtil.elements(documentElement); - for (Element element : elements) { - String tagName = XmlUtil.getTagLocalName(element); + for (Element nestedElement : elements) { + String tagName = XmlUtil.getTagLocalName(nestedElement); if ( !"on".equals(tagName) && !"timer".equals(tagName) && !"swimlane".equals(tagName) ) { - JpdlBinding activityBinding = (JpdlBinding) getBinding(element, "activity"); + JpdlBinding activityBinding = (JpdlBinding) getBinding(nestedElement, "activity"); if (activityBinding != null) { - ActivityImpl activity = processDefinition.createActivity(); + ActivityImpl activity = compositeElement.createActivity(); parse.pushObject(activity); try { activity.setType(activityBinding.getTagName()); - activityBinding.parseName(element, activity, parse); - activityBinding.parseTransitions(element, activity, parse, this); + activityBinding.parseName(nestedElement, activity, parse); + activityBinding.parseTransitions(nestedElement, activity, parse, this); - if (XmlUtil.attributeBoolean(element, "async", false, parse, Boolean.FALSE)) { + if (XmlUtil.attributeBoolean(nestedElement, "async", false, parse, Boolean.FALSE)) { activity.setExecutionAsync(true); } - ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(element, parse, this); + ActivityBehaviour activityBehaviour = (ActivityBehaviour) activityBinding.parse(nestedElement, parse, this); activity.setBehaviour(activityBehaviour); - parseOnEvents(element, parse, activity); + parseOnEvents(nestedElement, parse, activity); - String g = XmlUtil.attribute(element, "g"); + String g = XmlUtil.attribute(nestedElement, "g"); if (g != null) { StringTokenizer stringTokenizer = new StringTokenizer(g, ","); ActivityCoordinatesImpl coordinates = null; Modified: jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-05-15 09:59:31 UTC (rev 4820) +++ jbpm4/trunk/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-05-15 10:45:02 UTC (rev 4821) @@ -15,4 +15,5 @@ <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> <activity binding="org.jbpm.jpdl.internal.activity.MailBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SuperStateBinding" /> </activities> Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/SuperStateBasicsTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/SuperStateBasicsTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/SuperStateBasicsTest.java 2009-05-15 10:45:02 UTC (rev 4821) @@ -0,0 +1,135 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbpm.test.activities; + +import java.util.HashMap; +import java.util.Map; + +import org.jbpm.api.ProcessInstance; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class SuperStateBasicsTest extends JbpmTestCase { + + public void testSimplestSuperState() { + deployJpdlXmlString( + "<process name='Super'>" + + " <start>" + + " <transition to='super' />" + + " </start>" + + " <super-state name='super'>" + + " <start>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='done' />" + + " </state>" + + " <end name='done' />" + + " <transition to='end' />" + + " </super-state>" + + " <end name='end' />" + + "</process>" + ); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("Super"); + assertEquals("a", processInstance.getActivityName()); + + processInstance = executionService.signalExecutionById(processInstance.getId()); + assertTrue(processInstance.isEnded()); + } + + public void testSuperStateDirectEntry() { + deployJpdlXmlString( + "<process name='Super'>" + + " <start>" + + " <transition to='direct' />" + + " </start>" + + " <super-state name='super'>" + + " <start name='direct'>" + + " <transition to='a' />" + + " </start>" + + " <state name='a'>" + + " <transition to='done' />" + + " </state>" + + " <end name='done' />" + + " <transition to='end' />" + + " </super-state>" + + " <end name='end' />" + + "</process>" + ); + + ProcessInstance processInstance = executionService.startProcessInstanceByKey("Super"); + assertEquals("a", processInstance.getActivityName()); + + processInstance = executionService.signalExecutionById(processInstance.getId()); + assertTrue(processInstance.isEnded()); + } + + public void testSuperStateMultipleEntries() { + deployJpdlXmlString( + "<process name='Super'>" + + " <start>" + + " <transition to='choose' />" + + " </start>" + + " <decision name='choose' expr='#{theWayToGo}'>" + + " <transition name='left' to='left' />" + + " <transition name='right' to='right' />" + + " </decision>" + + " <super-state name='super'>" + + " <start name='left'>" + + " <transition to='a' />" + + " </start>" + + " <start name='right'>" + + " <transition to='b' />" + + " </start>" + + " <state name='a'>" + + " <transition to='done' />" + + " </state>" + + " <state name='b'>" + + " <transition to='done' />" + + " </state>" + + " <end name='done' />" + + " <transition to='end' />" + + " </super-state>" + + " <end name='end' />" + + "</process>" + ); + + Map<String, Object> variables = new HashMap<String, Object>(); + variables.put("theWayToGo", "left"); + ProcessInstance processInstance = executionService.startProcessInstanceByKey("Super", variables); + assertEquals("a", processInstance.getActivityName()); + + processInstance = executionService.signalExecutionById(processInstance.getId()); + assertTrue(processInstance.isEnded()); + + variables.put("theWayToGo", "right"); + processInstance = executionService.startProcessInstanceByKey("Super", variables); + assertEquals("b", processInstance.getActivityName()); + + processInstance = executionService.signalExecutionById(processInstance.getId()); + assertTrue(processInstance.isEnded()); + } +} Property changes on: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/SuperStateBasicsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4820 - in jbpm4/trunk/modules/distro/src/main/files: examples and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-05-15 05:59:31 -0400 (Fri, 15 May 2009) New Revision: 4820 Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml jbpm4/trunk/modules/distro/src/main/files/examples/build.xml jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml Log: fixed reference to user-local jdbc properties Modified: jbpm4/trunk/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/db/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,16 +5,16 @@  <property file="${user.home}/.jbpm4/build.properties" /> -  - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> -  <property name="database" value="hsqldb" /> <property name="jbpm.parent.dir" value="../.." /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> +  + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> +  <target name="log.properties"> <echo message="database....... ${database}" /> Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,10 +5,6 @@  <property file="${user.home}/.jbpm4/build.properties" /> -  - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> -  <property name="database" value="hsqldb" /> <property name="jbpm.parent.dir" value="../.." /> @@ -16,7 +12,11 @@ <property name="jboss.version" value="5.0.0.GA" /> <property name="jbpm.home" value="${jbpm.parent.dir}/jbpm-${jbpm.version}" /> -  +  + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> + +  <target name="log.properties"> <echo message="database: ${database}" /> <echo message="jdbc.driver........ ${jdbc.driver}" /> Modified: jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-15 09:59:03 UTC (rev 4819) +++ jbpm4/trunk/modules/distro/src/main/files/jboss/build.xml 2009-05-15 09:59:31 UTC (rev 4820) @@ -5,10 +5,6 @@  <property file="${user.home}/.jbpm4/build.properties" /> -  - <property file="${user.home}/jdbc/${database}.properties" /> - <property file="${jbpm.home}/db/jdbc/${database}.properties" /> -  <property name="database" value="hsqldb" /> <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> @@ -25,6 +21,10 @@ <property name="jboss.server.configuration" value="default" /> <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> +  + <property file="${user.home}/.jbpm4/jdbc/${database}.properties" /> + <property file="${jbpm.home}/db/jdbc/${database}.properties" /> +  <target name="log.properties"> <echo message="database.................... ${database}" />

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4819 - jbpm4/trunk/modules/distro/src/main/files/db.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-05-15 05:59:03 -0400 (Fri, 15 May 2009) New Revision: 4819 Modified: jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql Log: fixed example identity script Modified: jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql 2009-05-15 09:07:49 UTC (rev 4818) +++ jbpm4/trunk/modules/distro/src/main/files/db/example.identities.sql 2009-05-15 09:59:03 UTC (rev 4819) @@ -3,10 +3,10 @@ INSERT INTO JBPM4_ID_GROUP VALUES (3,0,'user','user','security-role',NULL); INSERT INTO JBPM4_ID_GROUP VALUES(4,0,'sales','sales',NULL,NULL); -INSERT INTO JBPM4_ID_USER VALUES (1,0,'alex','password','Administrator Login',''); -INSERT INTO JBPM4_ID_USER VALUES (2,0,'mike','password','Managers Login',''); -INSERT INTO JBPM4_ID_USER VALUES (3,0,'peter','password','Users Login',''); -INSERT INTO JBPM4_ID_USER VALUES (4,0,'mary','password','Users Login',''); +INSERT INTO JBPM4_ID_USER VALUES (1,0,'alex','password','Alex',NULL,'alex(a)jbpm.org'); +INSERT INTO JBPM4_ID_USER VALUES (2,0,'mike','password','Mike',NULL,'mike(a)jbpm.org'); +INSERT INTO JBPM4_ID_USER VALUES (3,0,'peter','password','Peter',NULL,'peter(a)jbpm.org'); +INSERT INTO JBPM4_ID_USER VALUES (4,0,'mary','password','Mary',NULL,'mary(a)jbpm.org'); INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (1,0,1,2,NULL); INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (2,0,2,1,NULL); @@ -14,4 +14,3 @@ INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (4,0,3,4,NULL); INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (5,0,4,3,NULL); INSERT INTO JBPM4_ID_MEMBERSHIP VALUES (6,0,4,4,NULL); -

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4818 - in projects/report-server/trunk: core and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 05:07:49 -0400 (Fri, 15 May 2009) New Revision: 4818 Modified: projects/report-server/trunk/core/pom.xml projects/report-server/trunk/pom.xml projects/report-server/trunk/server/pom.xml Log: groupId: org.jboss.bpm Modified: projects/report-server/trunk/core/pom.xml =================================================================== --- projects/report-server/trunk/core/pom.xml 2009-05-15 09:05:11 UTC (rev 4817) +++ projects/report-server/trunk/core/pom.xml 2009-05-15 09:07:49 UTC (rev 4818) @@ -1,14 +1,14 @@ <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 jBPM3 - Report Core</name> - <groupId>org.jbpm</groupId> + <name>JBoss BPM - Report Core</name> + <groupId>org.jboss.bpm</groupId> <artifactId>report-core</artifactId> <packaging>jar</packaging>  <parent> - <groupId>org.jbpm</groupId> + <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> Modified: projects/report-server/trunk/pom.xml =================================================================== --- projects/report-server/trunk/pom.xml 2009-05-15 09:05:11 UTC (rev 4817) +++ projects/report-server/trunk/pom.xml 2009-05-15 09:07:49 UTC (rev 4818) @@ -1,8 +1,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 jBPM3 - Report (BIRT integration)</name> - <groupId>org.jbpm</groupId> + <name>JBoss BPM - Reporting (BIRT Integration)</name> + <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> Modified: projects/report-server/trunk/server/pom.xml =================================================================== --- projects/report-server/trunk/server/pom.xml 2009-05-15 09:05:11 UTC (rev 4817) +++ projects/report-server/trunk/server/pom.xml 2009-05-15 09:07:49 UTC (rev 4818) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM3 - Report Server</name> - <groupId>org.jbpm</groupId> + <name>JBoss BPM - Report Server</name> + <groupId>org.jboss.bpm</groupId> <artifactId>report-server</artifactId> <packaging>war</packaging>  <parent> - <groupId>org.jbpm</groupId> + <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4817 - in projects/report-server/trunk: core/src/main/java/org/jboss and 6 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-05-15 05:05:11 -0400 (Fri, 15 May 2009) New Revision: 4817 Added: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/IntegrationConfig.java projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java projects/report-server/trunk/server/src/main/java/org/jboss/bpm/ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/FileWriter.java projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/JMXServerConfig.java projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ReportFacade.java projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ServerApplication.java Removed: projects/report-server/trunk/core/src/main/java/org/jboss/balalaika/ projects/report-server/trunk/server/src/main/java/org/jboss/balalaika/ Modified: projects/report-server/trunk/pom.xml projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml Log: Rename packages Added: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java =================================================================== --- projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java (rev 0) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtEngineFactory.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,56 @@ +/* + * 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 org.eclipse.birt.report.engine.api.IReportEngine; +import org.eclipse.birt.report.engine.api.EngineConfig; +import org.eclipse.birt.report.engine.api.IReportEngineFactory; +import org.eclipse.birt.core.framework.Platform; +import org.eclipse.birt.core.exception.BirtException; + +/** + * Constructs an {@link IReportEngine} from {@link org.jboss.bpm.report.IntegrationConfig} + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class BirtEngineFactory +{ + public static IReportEngine newInstance(IntegrationConfig iConfig) + { + try + { + EngineConfig config = new EngineConfig( ); + config.setBIRTHome(iConfig.getBirtHome()); + + Platform.startup( config ); + IReportEngineFactory factory = (IReportEngineFactory) Platform + .createFactoryObject( IReportEngineFactory.EXTENSION_REPORT_ENGINE_FACTORY ); + + IReportEngine engine = factory.createReportEngine( config ); + return engine; + } + catch (BirtException e) + { + throw new RuntimeException("Failed to create birt engine", e); + } + } +} Added: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java =================================================================== --- projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java (rev 0) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,188 @@ +/* + * 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 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; + +/** + * Core BIRT service component. Requires to step through the lifecycle + * before it can be used: + * <ul> + * <li>create: constructs a BIRT engine and platform + * <li>start: + * <li>stop: + * <li>destroy: destroy engine and shutdown platform + * + * @see org.eclipse.birt.report.engine.api.IReportEngine#destroy() + * @see org.eclipse.birt.core.framework.Platform#shutdown() + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class BirtService +{ + private static final Log log = LogFactory.getLog(BirtService.class); + + private IReportEngine engine; + private IntegrationConfig iConfig; + + private enum State {NONE, CREATED, STARTED, STOPPED, DESTROYED}; + private State currentState = State.NONE; + + public BirtService(IntegrationConfig iConfig) + { + this.iConfig = iConfig; + } + + public void create() + { + this.engine = BirtEngineFactory.newInstance(iConfig); + log.info("Service created: " +this.engine); + currentState = State.CREATED; + } + + public void start() + { + if(currentState!=State.CREATED) + throw new IllegalStateException("Please call create lifecylce before starting the service"); + + currentState = State.STARTED; + } + + public void stop() + { + if(currentState!=State.STARTED) + throw new IllegalStateException("Please call start lifecylce before stopping the service"); + + currentState = State.STOPPED; + } + + public void destroy() + { + if(engine!=null) + engine.destroy(); + Platform.shutdown(); + log.info("Service destroyed"); + currentState = State.DESTROYED; + } + + /** + * Render a report based on render meta data. + * this routin simply return the output filename. + * in order to get to an absolute path you need to prepend the service output directory:<p> + * <code> + * BirtService.getIntegrationConfig().getOutputDir() + outputFileName; + * </code> + * + * @param metaData render instruction like the template name + * @return output filename + */ + public String render(RenderMetaData metaData) + { + if( (currentState==State.CREATED || currentState==State.STARTED) == false) + throw new IllegalStateException("Cannot render in state " + currentState); + + String outputFileName = null; + + log.debug("Render " + metaData); + + try + { + //Open a report design + IReportRunnable design = engine.openReportDesign(iConfig.getReportDir()+metaData.getReportName()); + + //Create runRenderTask to run and render the report, + IRunAndRenderTask runRenderTask = engine.createRunAndRenderTask(design); + //Set parent classloader for engine + runRenderTask.getAppContext().put(EngineConstants.APPCONTEXT_CLASSLOADER_KEY, metaData.getClassloader()); + runRenderTask.setParameterValues(metaData.getParameters()); + + // ------------------ + + IRenderOption options = new RenderOption(); + switch(metaData.getFormat()) + { + case HTML: + options.setOutputFormat("html"); + outputFileName = extactReportName(metaData.getReportName())+".html"; + break; + case PDF: + options.setOutputFormat("pdf"); + outputFileName = extactReportName(metaData.getReportName())+".pdf"; + break; + } + options.setOutputFileName(iConfig.getOutputDir() + outputFileName); + + // ------------------ + + if( options.getOutputFormat().equalsIgnoreCase("html")) + { + HTMLRenderOption htmlOptions = new HTMLRenderOption( options); + htmlOptions.setImageHandler(new HTMLServerImageHandler()); + htmlOptions.setImageDirectory(iConfig.getImageDirectory()); + htmlOptions.setBaseImageURL(iConfig.getImageBaseUrl()); + htmlOptions.setHtmlPagination(false); + htmlOptions.setHtmlRtLFlag(false); + //Setting this to true removes html and body tags + htmlOptions.setEmbeddable(false); + runRenderTask.setRenderOption(htmlOptions); + } + else if( options.getOutputFormat().equalsIgnoreCase("pdf") ){ + + PDFRenderOption pdfOptions = new PDFRenderOption( options ); + pdfOptions.setOption( IPDFRenderOption.FIT_TO_PAGE, new Boolean(true) ); + pdfOptions.setOption( IPDFRenderOption.PAGEBREAK_PAGINATION_ONLY, new Boolean(true) ); + runRenderTask.setRenderOption(pdfOptions); + } + + // ------------------ + if(runRenderTask.getRenderOption()==null) + runRenderTask.setRenderOption(options); + + runRenderTask.run(); + runRenderTask.close(); + } + catch (EngineException e) + { + throw new RuntimeException("Failed to render report", e); + } + + return outputFileName; + } + + public IntegrationConfig getIntegrationConfig() + { + return iConfig; + } + + private static String extactReportName(String reportFile) + { + return reportFile.substring( 0, reportFile.indexOf(".")); + } + + public State getCurrentState() + { + return currentState; + } +} Added: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/IntegrationConfig.java =================================================================== --- projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/IntegrationConfig.java (rev 0) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/IntegrationConfig.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,91 @@ +/* + * 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; + +/** + * Adopts an integration layout (i.e. working directories) to BIRT configuration. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class IntegrationConfig +{ + private String birtHome = null; + private String reportDir = null; + private String outputDir = null; + private String imageBaseUrl = null; + + public String getBirtHome() + { + return birtHome; + } + + public void setBirtHome(String birtHome) + { + this.birtHome = birtHome; + } + + public String getReportDir() + { + return reportDir; + } + + public void setReportDir(String reportDir) + { + this.reportDir = ensureDirectoryName(reportDir); + } + + public String getOutputDir() + { + return outputDir; + } + + public void setOutputDir(String outputDir) + { + this.outputDir = ensureDirectoryName(outputDir); + } + + + public String getImageBaseUrl() + { + return imageBaseUrl; + } + + public void setImageBaseUrl(String imageBaseUrl) + { + this.imageBaseUrl = ensureDirectoryName(imageBaseUrl); + } + + + public String getImageDirectory() + { + return getOutputDir()+"image/"; + } + + private String ensureDirectoryName(String name) + { + if(name.endsWith("/")) + return name; + else + return name+"/"; + } + +} Added: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java =================================================================== --- projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java (rev 0) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,92 @@ +/* + * 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 java.util.Map; +import java.util.HashMap; + +/** + * Drives a {@link org.jboss.bpm.report.BirtService#render(RenderMetaData)} call. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class RenderMetaData +{ + public enum Format {HTML, PDF}; + + private ClassLoader classloader; + private String reportName; + private Format format; + private Map parameters = new HashMap(); + + public RenderMetaData() + { + } + + public RenderMetaData(ClassLoader classloader, String reportName, Format format, String imageBaseUrl) + { + this.classloader = classloader; + this.reportName = reportName; + this.format = format; + } + + public ClassLoader getClassloader() + { + return classloader; + } + + public void setClassloader(ClassLoader classloader) + { + this.classloader = classloader; + } + + public String getReportName() + { + return reportName; + } + + public void setReportName(String reportName) + { + this.reportName = reportName; + } + + public Format getFormat() + { + return format; + } + + public void setFormat(Format format) + { + this.format = format; + } + + + public String toString() + { + return "RenderMetaData {reportName="+reportName+", format="+format+"}"; + } + + public Map getParameters() + { + return parameters; + } +} Modified: projects/report-server/trunk/pom.xml =================================================================== --- projects/report-server/trunk/pom.xml 2009-05-14 17:19:28 UTC (rev 4816) +++ projects/report-server/trunk/pom.xml 2009-05-15 09:05:11 UTC (rev 4817) @@ -17,7 +17,7 @@ <properties> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> - <resteasy.version>1.0-beta-8</resteasy.version> + <resteasy.version>1.0.2.GA</resteasy.version> <servlet.version>2.4</servlet.version> </properties> Added: projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/FileWriter.java =================================================================== --- projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/FileWriter.java (rev 0) +++ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/FileWriter.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,67 @@ +/* + * 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 javax.ws.rs.ext.Provider; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.Produces; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; +import java.lang.reflect.Type; +import java.lang.annotation.Annotation; +import java.io.OutputStream; +import java.io.IOException; +import java.io.FileInputStream; +import java.io.File; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Provider +@Produces({"text/html", "image/*"}) +public class FileWriter implements MessageBodyWriter +{ + + public boolean isWriteable(Class aClass, Type type, Annotation[] annotations, MediaType mediaType) + { + return aClass.equals(java.io.File.class); + } + + public long getSize(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType) + { + return ((File)o).length(); + } + + public void writeTo(Object o, Class aClass, Type type, Annotation[] annotations, MediaType mediaType, MultivaluedMap multivaluedMap, OutputStream outputStream) throws IOException, WebApplicationException + { + FileInputStream fin = new FileInputStream((File)o); + int c; + while ((c = fin.read()) != -1) + { + outputStream.write(c); + } + + fin.close(); + + } +} Added: projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/JMXServerConfig.java =================================================================== --- projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/JMXServerConfig.java (rev 0) +++ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/JMXServerConfig.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,152 @@ +/* + * 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 javax.management.*; +import java.io.File; +import java.util.Hashtable; +import java.util.List; + +/** + * Hooks into JMX to get the JBoss AS configuration. + * (temp directories, etc) + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class JMXServerConfig +{ + // The MBeanServer + private MBeanServer mbeanServer; + + public JMXServerConfig() + { + this.mbeanServer = getDefaultMBeanServer(); + } + + public MBeanServer getMbeanServer() + { + return mbeanServer; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public File getServerTempDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir"); + return dir; + } + catch (JMException e) + { + return null; + } + } + + public File getHomeDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir"); + return dir; + } + catch (JMException e) + { + return null; + } + } + + public File getServerDataDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir"); + return dir; + } + catch (JMException e) + { + return null; + } + } + + public static MBeanServer getDefaultMBeanServer() { + return findMBeanServer("jboss"); + } + + private static MBeanServer findMBeanServer(String agentId) { + List servers = MBeanServerFactory.findMBeanServer(null); + if (servers != null && servers.size() > 0) { + for (Object object : servers) { + MBeanServer server = (MBeanServer) object; + if (server.getDefaultDomain().equals(agentId)) { + return server; + } + } + } + return null; + } + + public static class ObjectNameFactory + { + public static ObjectName create(String name) + { + try + { + return new ObjectName(name); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + name + "; " + e); + } + } + + public static ObjectName create(String domain, String key, String value) + { + try + { + return new ObjectName(domain, key, value); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e); + } + } + + public static ObjectName create(String domain, Hashtable table) + { + try + { + return new ObjectName(domain, table); + } + catch (MalformedObjectNameException e) + { + throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e); + } + } + } +} Added: projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ReportFacade.java =================================================================== --- projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ReportFacade.java (rev 0) +++ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,167 @@ +/* + * 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 org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import java.io.*; +import java.util.HashMap; +import java.util.Enumeration; +import java.util.Map; + +/** + * 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> + */ +@Path("report") +public class ReportFacade +{ + private static final Log log = LogFactory.getLog(ReportFacade.class); + private BirtService birtService; + private boolean isInitialized; + + public void lazyInitialize(HttpServletRequest request) + { + 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 IllegalStateException("The BIRT report engine doesn't seem to be installed:" +defaultBirtHome); + + // -- + + iConfig.setBirtHome(defaultBirtHome); + iConfig.setOutputDir( birtOutputDir ); + iConfig.setReportDir( birtDataDir ); + + 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"); + + iConfig.setImageBaseUrl(sb.toString()); + + log.info("BIRT home: " +iConfig.getBirtHome()); + log.info("Output dir: " +iConfig.getOutputDir()); + log.info("Report dir: " +iConfig.getReportDir()); + + this.birtService = new BirtService(iConfig); + this.birtService.create(); + + isInitialized = true; + } + } + + @GET + @Path("view/{fileName}") + @Produces("text/html") + public Response viewReportHtml( + @PathParam("fileName") + String fileName, + @Context HttpServletRequest + request + ) + { + lazyInitialize(request); + + Map queryParams = convertRequestParametersToMap(request); + + RenderMetaData renderMeta = new RenderMetaData(); + renderMeta.setReportName(fileName); + renderMeta.setFormat(RenderMetaData.Format.HTML); + renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); + renderMeta.getParameters().putAll(queryParams); + + String outputFileName = birtService.render(renderMeta); + String absoluteFile = birtService.getIntegrationConfig().getOutputDir() + outputFileName; + log.info("Render " + absoluteFile); + + File reportFile = new File(absoluteFile); + return Response.ok(reportFile).type("text/html").build(); + } + + @GET + @Path("view/image/{fileName}") + public Response getImage( + @PathParam("fileName") + String fileName, + @Context HttpServletRequest + request + ) + { + lazyInitialize(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(); + } + + static public Map<String, String> convertRequestParametersToMap(HttpServletRequest request){ + Enumeration<?> initParameters=request.getParameterNames(); + HashMap<String, String> parameterMap = new HashMap<String, String>(); + while (initParameters.hasMoreElements()) { + String param = (String) initParameters.nextElement(); + String value = request.getParameter(param); + if (param != null & value != null) + parameterMap.put(param, value); + } + return parameterMap; + } +} Added: projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ServerApplication.java =================================================================== --- projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ServerApplication.java (rev 0) +++ projects/report-server/trunk/server/src/main/java/org/jboss/bpm/report/ServerApplication.java 2009-05-15 09:05:11 UTC (rev 4817) @@ -0,0 +1,54 @@ +/* + * 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 javax.ws.rs.core.Application; +import java.util.HashSet; +import java.util.Set; + +/** + * JAX-RS core component. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ServerApplication extends Application +{ + HashSet<Object> singletons = new HashSet<Object>(); + + public ServerApplication() + { + singletons.add(new ReportFacade()); + } + + @Override + public Set<Class<?>> getClasses() + { + HashSet<Class<?>> set = new HashSet<Class<?>>(); + return set; + } + + @Override + public Set<Object> getSingletons() + { + return singletons; + } +} Modified: projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-05-14 17:19:28 UTC (rev 4816) +++ projects/report-server/trunk/server/src/main/webapp/WEB-INF/web.xml 2009-05-15 09:05:11 UTC (rev 4817) @@ -7,7 +7,7 @@ <context-param> <param-name>javax.ws.rs.core.Application</param-name> - <param-value>org.jboss.balalaika.ServerApplication</param-value> + <param-value>org.jboss.bpm.report.ServerApplication</param-value> </context-param> <context-param> @@ -17,7 +17,7 @@ <context-param> <param-name>resteasy.providers</param-name> - <param-value>org.jboss.balalaika.FileWriter</param-value> + <param-value>org.jboss.bpm.report.FileWriter</param-value> </context-param> <!--context-param>

15 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r4816 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/email/impl and 2 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-05-14 13:19:28 -0400 (Thu, 14 May 2009) New Revision: 4816 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateRegistry.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateMap.java Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java Log: [JBPM-2254] prevent registration of an inline template Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-05-14 16:04:40 UTC (rev 4815) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/activity/MailBinding.java 2009-05-14 17:19:28 UTC (rev 4816) @@ -21,20 +21,18 @@ */ package org.jbpm.jpdl.internal.activity; +import org.w3c.dom.Element; + import org.jbpm.api.env.Environment; import org.jbpm.pvm.internal.email.impl.MailProducerImpl; import org.jbpm.pvm.internal.email.impl.MailTemplate; -import org.jbpm.pvm.internal.email.impl.MailTemplateMap; +import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry; import org.jbpm.pvm.internal.email.spi.MailProducer; import org.jbpm.pvm.internal.util.XmlUtil; -import org.jbpm.pvm.internal.wire.Descriptor; -import org.jbpm.pvm.internal.wire.WireContext; import org.jbpm.pvm.internal.wire.binding.MailTemplateBinding; import org.jbpm.pvm.internal.wire.binding.ObjectBinding; -import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; /** * @author Alejandro Guizar @@ -67,22 +65,22 @@ } protected MailTemplate parseTemplate(Element element, Parse parse, Parser parser) { + MailTemplate template; + // look for template reference String templateName = XmlUtil.attribute(element, "template"); if (templateName != null) { // load template from configuration - MailTemplateMap mailTemplateMap = Environment.getFromCurrent(MailTemplateMap.class); - MailTemplate template = mailTemplateMap.getTemplate(templateName); - if (template==null) { - parse.addProblem("mail-template "+templateName+" is not configured", element); + MailTemplateRegistry templateRegistry = Environment.getFromCurrent(MailTemplateRegistry.class); + template = templateRegistry.getTemplate(templateName); + if (template == null) { + parse.addProblem("mail template not found: " + templateName, element); } - return template; - } - - // parse inline template - ProvidedObjectDescriptor templateDescriptor = (ProvidedObjectDescriptor) templateBinding.parse(element, parse, parser); - MailTemplateMap mailTemplateMap = (MailTemplateMap) templateDescriptor.getProvidedObject(); - String name = XmlUtil.attribute(element, "name"); - return mailTemplateMap.getTemplate(name); + } + else { + // parse inline template + template = templateBinding.parseMailTemplate(element, parse, parser); + } + return template; } } Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateMap.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateMap.java 2009-05-14 16:04:40 UTC (rev 4815) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateMap.java 2009-05-14 17:19:28 UTC (rev 4816) @@ -1,44 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.email.impl; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Tom Baeyens - */ -public class MailTemplateMap implements Serializable { - - private static final long serialVersionUID = 1L; - - Map<String, MailTemplate> templates = new HashMap<String, MailTemplate>(); - - public void addTemplate(String templateName, MailTemplate template) { - templates.put(templateName, template); - } - - public MailTemplate getTemplate(String templateName) { - return templates.get(templateName); - } -} Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateRegistry.java (from rev 4815, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateMap.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateRegistry.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/email/impl/MailTemplateRegistry.java 2009-05-14 17:19:28 UTC (rev 4816) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.jbpm.pvm.internal.email.impl; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Tom Baeyens + */ +public class MailTemplateRegistry implements Serializable { + + private static final long serialVersionUID = 1L; + + Map<String, MailTemplate> templates = new HashMap<String, MailTemplate>(); + + public void addTemplate(String templateName, MailTemplate template) { + templates.put(templateName, template); + } + + public MailTemplate getTemplate(String templateName) { + return templates.get(templateName); + } +} Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-05-14 16:04:40 UTC (rev 4815) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/MailTemplateBinding.java 2009-05-14 17:19:28 UTC (rev 4816) @@ -21,21 +21,19 @@ */ package org.jbpm.pvm.internal.wire.binding; -import java.util.ArrayList; -import java.util.List; +import org.w3c.dom.DocumentFragment; +import org.w3c.dom.Element; +import org.w3c.dom.Node; import org.jbpm.pvm.internal.email.impl.AddressTemplate; import org.jbpm.pvm.internal.email.impl.AttachmentTemplate; import org.jbpm.pvm.internal.email.impl.MailTemplate; -import org.jbpm.pvm.internal.email.impl.MailTemplateMap; +import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.DocumentFragment; -import org.w3c.dom.Element; -import org.w3c.dom.Node; /** * @author Alejandro Guizar @@ -47,48 +45,54 @@ } public Object parse(Element element, Parse parse, Parser parser) { - - // MailTemplateMap is added to the WireDescriptor with a ProvidedObjectDescriptor - // The MailTemplateMap descriptor is lazy initialized by this binding - // mail-templates will add a MailTemplate to the MailTemplateMap - - ProvidedObjectDescriptor mailTemplateMapDescriptor = null; - MailTemplateMap mailTemplateMap = null; - + // MailTemplateRegistry is added to the WireDescriptor with a ProvidedObjectDescriptor + // The MailTemplateRegistry descriptor is lazy initialized by this binding + // mail-templates will add a MailTemplate to the MailTemplateRegistry + ProvidedObjectDescriptor templateRegistryDescriptor; + MailTemplateRegistry templateRegistry; + WireDefinition wireDefinition = parse.findObject(WireDefinition.class); - String templateMapDescriptorName = (wireDefinition!=null ? wireDefinition.getDescriptorName(MailTemplateMap.class) : null); - if (templateMapDescriptorName!=null) { - mailTemplateMapDescriptor = (ProvidedObjectDescriptor) wireDefinition.getDescriptor(templateMapDescriptorName); - mailTemplateMap = (MailTemplateMap) mailTemplateMapDescriptor.getProvidedObject(); - mailTemplateMapDescriptor = null; // setting it to null so that the wire parser won't be add it to the wiredefinition a second time - } else { - mailTemplateMap = new MailTemplateMap(); - mailTemplateMapDescriptor = new ProvidedObjectDescriptor(mailTemplateMap, true); + String templateRegistryDescriptorName = wireDefinition != null ? wireDefinition.getDescriptorName(MailTemplateRegistry.class) + : null; + if (templateRegistryDescriptorName != null) { + templateRegistryDescriptor = (ProvidedObjectDescriptor) wireDefinition.getDescriptor(templateRegistryDescriptorName); + templateRegistry = (MailTemplateRegistry) templateRegistryDescriptor.getProvidedObject(); + templateRegistryDescriptor = null; // setting it to null so that the wire parser doesn't add it to the wiredefinition again } + else { + templateRegistry = new MailTemplateRegistry(); + templateRegistryDescriptor = new ProvidedObjectDescriptor(templateRegistry, true); + } - // create the mail template and add it to the mailTemplateMap + // create the mail template and add it to the registry + MailTemplate mailTemplate = parseMailTemplate(element, parse, parser); + String templateName = XmlUtil.attribute(element, "name", true, parse); + templateRegistry.addTemplate(templateName, mailTemplate); + + return templateRegistryDescriptor; + } + + public MailTemplate parseMailTemplate(Element element, Parse parse, Parser parser) { MailTemplate mailTemplate = new MailTemplate(); - String templateName = XmlUtil.attribute(element, "name", true, parse); - mailTemplateMap.addTemplate(templateName, mailTemplate); - mailTemplate.setLanguage(XmlUtil.attribute(element, "language")); + mailTemplate.setFrom(parseRecipientTemplate(element, "from", parse, parser)); mailTemplate.setTo(parseRecipientTemplate(element, "to", parse, parser)); mailTemplate.setCc(parseRecipientTemplate(element, "cc", parse, parser)); mailTemplate.setBcc(parseRecipientTemplate(element, "bcc", parse, parser)); Element subjectElement = XmlUtil.element(element, "subject"); - if (subjectElement!=null) { + if (subjectElement != null) { mailTemplate.setSubject(XmlUtil.getContentText(subjectElement)); } - + Element textElement = XmlUtil.element(element, "text"); - if (textElement!=null) { + if (textElement != null) { mailTemplate.setText(XmlUtil.getContentText(textElement)); } - + Element htmlElement = XmlUtil.element(element, "html"); - if (htmlElement!=null) { + if (htmlElement != null) { // extract child nodes from html element DocumentFragment fragment = htmlElement.getOwnerDocument().createDocumentFragment(); for (Node child = htmlElement.getFirstChild(), next; child != null; child = next) { @@ -97,34 +101,31 @@ } mailTemplate.setHtml(XmlUtil.toString(fragment)); } - + // attachments Element attachmentsElement = XmlUtil.element(element, "attachments"); if (attachmentsElement != null) { - List<AttachmentTemplate> attachmentTemplates = new ArrayList<AttachmentTemplate>(); for (Element attachmentElement : XmlUtil.elements(attachmentsElement, "attachment")) { AttachmentTemplate attachmentTemplate = new AttachmentTemplate(); mailTemplate.addAttachmentTemplate(attachmentTemplate); - + attachmentTemplate.setUrl(XmlUtil.attribute(attachmentElement, "url")); attachmentTemplate.setResource(XmlUtil.attribute(attachmentElement, "resource")); attachmentTemplate.setFile(XmlUtil.attribute(attachmentElement, "file")); } } - return mailTemplateMapDescriptor; + return mailTemplate; } - protected AddressTemplate parseRecipientTemplate(Element element, String tagName, Parse parse, Parser parser) { - AddressTemplate addressTemplate = null; - + protected AddressTemplate parseRecipientTemplate(Element element, String tagName, Parse parse, + Parser parser) { Element recipientElement = XmlUtil.element(element, tagName); - if (recipientElement!=null) { - addressTemplate = new AddressTemplate(); - - addressTemplate.setAddresses(XmlUtil.attribute(recipientElement, "addresses")); - addressTemplate.setUsers(XmlUtil.attribute(recipientElement, "users")); - addressTemplate.setGroups(XmlUtil.attribute(recipientElement, "groups")); - } + if (recipientElement == null) return null; + + AddressTemplate addressTemplate = new AddressTemplate(); + addressTemplate.setAddresses(XmlUtil.attribute(recipientElement, "addresses")); + addressTemplate.setUsers(XmlUtil.attribute(recipientElement, "users")); + addressTemplate.setGroups(XmlUtil.attribute(recipientElement, "groups")); return addressTemplate; } } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-05-14 16:04:40 UTC (rev 4815) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MailTemplateWireTest.java 2009-05-14 17:19:28 UTC (rev 4816) @@ -25,7 +25,7 @@ import org.jbpm.pvm.internal.email.impl.AttachmentTemplate; import org.jbpm.pvm.internal.email.impl.MailTemplate; -import org.jbpm.pvm.internal.email.impl.MailTemplateMap; +import org.jbpm.pvm.internal.email.impl.MailTemplateRegistry; /** * @author Alejandro Guizar @@ -41,9 +41,9 @@ + "</mail-template>" + "</objects>"); - MailTemplateMap mailTemplateMap = wireContext.get(MailTemplateMap.class); - assertNotNull(mailTemplateMap); - assertNotNull(mailTemplateMap.getTemplate("memo")); + MailTemplateRegistry templateRegistry = wireContext.get(MailTemplateRegistry.class); + assertNotNull(templateRegistry); + assertNotNull(templateRegistry.getTemplate("memo")); } public void testLanguage() { @@ -55,7 +55,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("juel", template.getLanguage()); } @@ -69,7 +69,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("wacko(a)jbpm.org", template.getFrom().getAddresses()); } @@ -82,7 +82,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("dilbert@office, alice@work, dogbert@house", template.getTo().getAddresses()); } @@ -96,7 +96,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("theboss, hrpolicymaker", template.getCc().getUsers()); } @@ -110,7 +110,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("thoughtpolice", template.getBcc().getGroups()); } @@ -123,7 +123,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("bureaucracy", template.getSubject()); } @@ -137,7 +137,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("plain text content", template.getText()); } @@ -151,7 +151,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); assertEquals("<strong>rich</strong> content", template.getHtml()); } @@ -169,7 +169,7 @@ + "</mail-template>" + "</objects>"); - MailTemplate template = wireContext.get(MailTemplateMap.class).getTemplate("memo"); + MailTemplate template = wireContext.get(MailTemplateRegistry.class).getTemplate("memo"); List<AttachmentTemplate> attachmentTemplates = template.getAttachmentTemplates(); assertEquals(3, attachmentTemplates.size()); // url

15 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits May 2009