October 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5812 - in jbpm4/trunk/modules: distro/src/main/files/install/src/db/upgrade-4.1-to-4.2 and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-27 07:31:02 -0400 (Tue, 27 Oct 2009) New Revision: 5812 Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml Log: JBPM-2597 fix oracle schema creation errors Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.hsqldb.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -311,14 +311,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.mysql.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -317,14 +317,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.oracle.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -310,14 +310,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/create/jbpm.postgresql.create.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -310,14 +310,10 @@ create index IDX_HDET_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDETAIL_HACTI on JBPM4_HIST_DETAIL (HACTI_); - create index IDX_HDETAIL_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDETAIL_HTASK on JBPM4_HIST_DETAIL (HTASK_); - create index IDX_HDETAIL_HPROCI on JBPM4_HIST_DETAIL (HPROCI_); - create index IDX_HDET_HVAR on JBPM4_HIST_DETAIL (HVAR_); create index IDX_HDET_HTASK on JBPM4_HIST_DETAIL (HTASK_); Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.hsqldb.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -1,6 +1,11 @@ -create table JBPM4_PROPERTY ( - KEY_ varchar(255) not null, - VERSION_ integer not null, - VALUE_ varchar(255), - primary key (KEY_) -); + + create table JBPM4_PROPERTY ( + KEY_ varchar(255) not null, + VERSION_ integer not null, + VALUE_ varchar(255), + primary key (KEY_) + ); + + drop index IDX_HDETAIL_HACTI; + + drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.mysql.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -5,3 +5,7 @@ VALUE_ varchar(255), primary key (KEY_) ) type=InnoDB; + + alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HACTI; + + alter table JBPM4_HIST_DETAIL drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 11:31:02 UTC (rev 5812) @@ -7,4 +7,7 @@ ); drop sequence hibernate_sequence; - \ No newline at end of file + + drop index IDX_HDETAIL_HACTI; + + drop index IDX_HDETAIL_HPROCI; Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-27 11:29:54 UTC (rev 5811) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-10-27 11:31:02 UTC (rev 5812) @@ -40,7 +40,7 @@ <set name="details" cascade="all"> <key foreign-key="FK_HDETAIL_HPROCI"> - <column name="HPROCI_" index="IDX_HDETAIL_HPROCI" /> + <column name="HPROCI_" /> </key> <one-to-many class="HistoryDetailImpl" /> </set> @@ -73,7 +73,7 @@ <set name="details" cascade="all"> <key foreign-key="FK_HDETAIL_HACTI"> - <column name="HACTI_" index="IDX_HDETAIL_HACTI" /> + <column name="HACTI_" /> </key> <one-to-many class="HistoryDetailImpl" /> </set>

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5811 - in jbpm4/trunk/modules/db: scripts and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-27 07:29:54 -0400 (Tue, 27 Oct 2009) New Revision: 5811 Modified: jbpm4/trunk/modules/db/pom.xml jbpm4/trunk/modules/db/scripts/antrun-schema.xml Log: JBPM-2598 remove schema generation from distro build Modified: jbpm4/trunk/modules/db/pom.xml =================================================================== --- jbpm4/trunk/modules/db/pom.xml 2009-10-27 09:07:09 UTC (rev 5810) +++ jbpm4/trunk/modules/db/pom.xml 2009-10-27 11:29:54 UTC (rev 5811) @@ -30,10 +30,40 @@ <profiles> <profile> + <id>schema</id> + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>create-drop-script</id> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="project.output.dir" value="${project.build.outputDirectory}" /> + <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>upgrade</id> + <activation> + <property> + <name>old.version</name> + </property> + </activation> <properties> - <old.version>4.1</old.version> <old.scripts.directory>${project.build.directory}/create-drop-${old.version}</old.scripts.directory> </properties> @@ -55,6 +85,7 @@ <build> <plugins> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> @@ -107,6 +138,7 @@ </plugins> </build> </profile> + </profiles>  @@ -129,27 +161,5 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-script</id> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="project.output.dir" value="${project.build.outputDirectory}" /> - <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes" /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> </project> \ No newline at end of file Modified: jbpm4/trunk/modules/db/scripts/antrun-schema.xml =================================================================== --- jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-10-27 09:07:09 UTC (rev 5810) +++ jbpm4/trunk/modules/db/scripts/antrun-schema.xml 2009-10-27 11:29:54 UTC (rev 5811) @@ -75,8 +75,8 @@ If you want to use your local database, specify property upgrade.jdbc.properties.dir in your local build properties --> <echo>loading properties from ${user.home}/.jbpm4/build.properties</echo> <property file="${user.home}/.jbpm4/build.properties" /> + <property name="upgrade.jdbc.properties.dir" location="../../qa/jdbc" /> <echo>upgrade.jdbc.properties.dir: ${upgrade.jdbc.properties.dir}</echo> - <property name="upgrade.jdbc.properties.dir" location="../../qa/jdbc" /> <mkdir dir="${upgrade.scripts.dir}" /> <antcall target="start.hsqldb" inheritrefs="true" />

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5810 - jbpm4/trunk/qa/upgrade/cfg.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-27 05:07:09 -0400 (Tue, 27 Oct 2009) New Revision: 5810 Modified: jbpm4/trunk/qa/upgrade/cfg/logging.properties Log: reduced logging from trace to default level during pre-upgrade-process-insertion-tool Modified: jbpm4/trunk/qa/upgrade/cfg/logging.properties =================================================================== --- jbpm4/trunk/qa/upgrade/cfg/logging.properties 2009-10-27 09:05:56 UTC (rev 5809) +++ jbpm4/trunk/qa/upgrade/cfg/logging.properties 2009-10-27 09:07:09 UTC (rev 5810) @@ -1,7 +1,7 @@ handlers= java.util.logging.ConsoleHandler redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.level = FINE java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter org.jbpm.level=FINE @@ -12,7 +12,7 @@ org.hibernate.level=FINE org.hibernate.cfg.SettingsFactory.level=SEVERE org.hibernate.cfg.HbmBinder.level=SEVERE -org.hibernate.SQL.level=FINEST -org.hibernate.type.level=FINEST +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST # org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST # org.hibernate.transaction.level=FINEST \ No newline at end of file

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5809 - jbpm4/trunk/qa/upgrade.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-27 05:05:56 -0400 (Tue, 27 Oct 2009) New Revision: 5809 Modified: jbpm4/trunk/qa/upgrade/pom.xml Log: fixed oracle driver jar location for upgrade script Modified: jbpm4/trunk/qa/upgrade/pom.xml =================================================================== --- jbpm4/trunk/qa/upgrade/pom.xml 2009-10-27 08:56:41 UTC (rev 5808) +++ jbpm4/trunk/qa/upgrade/pom.xml 2009-10-27 09:05:56 UTC (rev 5809) @@ -50,6 +50,7 @@ <groupId>com.oracle</groupId> <artifactId>ojdbc14</artifactId> <version>10.2.0.4</version> + <outputDirectory>target</outputDirectory> <destFileName>ojdbc14.jar</destFileName> </artifactItem> </artifactItems>

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5808 - jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-10-27 04:56:41 -0400 (Tue, 27 Oct 2009) New Revision: 5808 Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql Log: added drop sequence hibernate_sequence to 4.1-to-4.2 upgrade script Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 06:43:39 UTC (rev 5807) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/db/upgrade-4.1-to-4.2/jbpm.postgresql.upgrade.sql 2009-10-27 08:56:41 UTC (rev 5808) @@ -5,3 +5,6 @@ VALUE_ varchar(255), primary key (KEY_) ); + + drop sequence hibernate_sequence; + \ No newline at end of file

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5807 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm: graph/def and 1 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-10-27 02:43:39 -0400 (Tue, 27 Oct 2009) New Revision: 5807 Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/LimitedTextType.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Action.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java Log: [JBPM-2603] Restore automatic save of timer actions, part deux Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/LimitedTextType.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/LimitedTextType.java 2009-10-27 06:34:58 UTC (rev 5806) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/LimitedTextType.java 2009-10-27 06:43:39 UTC (rev 5807) @@ -44,9 +44,7 @@ public void set(PreparedStatement st, Object value, int index) throws SQLException { String text = (String) value; - if (text.length() > limit) text = text.substring(0, limit); - - st.setCharacterStream(index, new StringReader(text), text.length()); + st.setCharacterStream(index, new StringReader(text), limit); } public void setParameterValues(Properties parameters) { Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Action.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Action.java 2009-10-27 06:34:58 UTC (rev 5806) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/def/Action.java 2009-10-27 06:43:39 UTC (rev 5807) @@ -39,16 +39,16 @@ private static final long serialVersionUID = 1L; - long id = 0; - protected String name = null; + long id; + protected String name; protected boolean isPropagationAllowed = true; - protected boolean isAsync = false; - protected boolean isAsyncExclusive = false; - protected Action referencedAction = null; - protected Delegation actionDelegation = null; - protected String actionExpression = null; - protected Event event = null; - protected ProcessDefinition processDefinition = null; + protected boolean isAsync; + protected boolean isAsyncExclusive; + protected Action referencedAction; + protected Delegation actionDelegation; + protected String actionExpression; + protected Event event; + protected ProcessDefinition processDefinition; public Action() { } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java 2009-10-27 06:34:58 UTC (rev 5806) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/scheduler/def/CreateTimerAction.java 2009-10-27 06:43:39 UTC (rev 5807) @@ -43,13 +43,13 @@ public class CreateTimerAction extends Action { private static final long serialVersionUID = 1L; - static BusinessCalendar businessCalendar = new BusinessCalendar(); + static final BusinessCalendar businessCalendar = new BusinessCalendar(); - String timerName = null; - String dueDate = null; - String repeat = null; - String transitionName = null; - Action timerAction = null; + String timerName; + String dueDate; + String repeat; + String transitionName; + Action timerAction; public void read(Element actionElement, JpdlXmlReader jpdlReader) { timerName = actionElement.attributeValue("name");

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5806 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: test/java/org/jbpm and 6 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-10-27 02:34:58 -0400 (Tue, 27 Oct 2009) New Revision: 5806 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/JBPM1085Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/JBPM2603Test.java Removed: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/exe/JoinExecutionDbTest.java Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java Log: [JBPM-2603] Restore automatic save of timer actions Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-10-26 17:27:45 UTC (rev 5805) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/JobSession.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -31,6 +31,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; + +import org.jbpm.graph.def.Action; import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.graph.exe.Token; import org.jbpm.job.Job; @@ -48,10 +50,10 @@ public Job getFirstAcquirableJob(String lockOwner) { try { return (Job) session.getNamedQuery("JobSession.getFirstAcquirableJob") - .setString("lockOwner", lockOwner) - .setTimestamp("now", new Date()) - .setMaxResults(1) - .uniqueResult(); + .setString("lockOwner", lockOwner) + .setTimestamp("now", new Date()) + .setMaxResults(1) + .uniqueResult(); } catch (HibernateException e) { throw new JbpmPersistenceException("could not get first acquirable job", e); @@ -61,24 +63,24 @@ public List findExclusiveJobs(String lockOwner, ProcessInstance processInstance) { try { return session.getNamedQuery("JobSession.findExclusiveJobs") - .setString("lockOwner", lockOwner) - .setTimestamp("now", new Date()) - .setParameter("processInstance", processInstance) - .list(); + .setString("lockOwner", lockOwner) + .setTimestamp("now", new Date()) + .setParameter("processInstance", processInstance) + .list(); } catch (HibernateException e) { - throw new JbpmPersistenceException("could not find exclusive jobs owned by '" + - lockOwner + - "' for " + - processInstance, e); + throw new JbpmPersistenceException("could not find exclusive jobs owned by '" + + lockOwner + + "' for " + + processInstance, e); } } public List findJobsByToken(Token token) { try { return session.getNamedQuery("JobSession.findJobsByToken") - .setParameter("token", token) - .list(); + .setParameter("token", token) + .list(); } catch (HibernateException e) { throw new JbpmPersistenceException("could not find jobs for " + token, e); @@ -98,16 +100,24 @@ return (Job) query.setString("lockOwner", lockOwner).setMaxResults(1).uniqueResult(); } catch (HibernateException e) { - throw new JbpmPersistenceException("could not get first due job owned by '" + - lockOwner + - "' ignoring jobs " + - monitoredJobs, e); + throw new JbpmPersistenceException("could not get first due job owned by '" + + lockOwner + + "' ignoring jobs " + + monitoredJobs, e); } } public void saveJob(Job job) { try { session.save(job); + if (job instanceof Timer) { + Timer timer = (Timer) job; + Action action = timer.getAction(); + if (action != null && action.getId() == 0) { + // transient action, save it + session.save(action); + } + } } catch (HibernateException e) { throw new JbpmPersistenceException("could not save " + job, e); @@ -167,7 +177,9 @@ public void suspendJobs(Token token) { try { - session.getNamedQuery("JobSession.suspendJobs").setParameter("token", token).executeUpdate(); + session.getNamedQuery("JobSession.suspendJobs") + .setParameter("token", token) + .executeUpdate(); } catch (HibernateException e) { throw new JbpmPersistenceException("could not suspend jobs for " + token, e); @@ -176,7 +188,9 @@ public void resumeJobs(Token token) { try { - session.getNamedQuery("JobSession.resumeJobs").setParameter("token", token).executeUpdate(); + session.getNamedQuery("JobSession.resumeJobs") + .setParameter("token", token) + .executeUpdate(); } catch (HibernateException e) { throw new JbpmPersistenceException("could not resume jobs for " + token, e); @@ -187,29 +201,29 @@ try { // delete unowned timers session.getNamedQuery("JobSession.deleteTimersByName") - .setString("name", name) - .setParameter("token", token) - .executeUpdate(); + .setString("name", name) + .setParameter("token", token) + .executeUpdate(); // prevent further repetitions List timers = session.getNamedQuery("JobSession.findRepeatingTimersByName") - .setString("name", name) - .setParameter("token", token) - .list(); + .setString("name", name) + .setParameter("token", token) + .list(); preventFurtherRepetitions(timers); } catch (HibernateException e) { - throw new JbpmPersistenceException("could not delete timers by name '" + - name + - "' for " + - token, e); + throw new JbpmPersistenceException("could not delete timers by name '" + + name + + "' for " + + token, e); } } public int countDeletableJobsForProcessInstance(ProcessInstance processInstance) { Number jobCount = (Number) session.getNamedQuery("JobSession.countDeletableJobsForProcessInstance") - .setParameter("processInstance", processInstance) - .uniqueResult(); + .setParameter("processInstance", processInstance) + .uniqueResult(); return jobCount.intValue(); } @@ -217,13 +231,13 @@ try { // delete unowned node-execute-jobs and timers session.getNamedQuery("JobSession.deleteJobsForProcessInstance") - .setParameter("processInstance", processInstance) - .executeUpdate(); + .setParameter("processInstance", processInstance) + .executeUpdate(); // prevent further repetitions List timers = session.getNamedQuery("JobSession.findRepeatingTimersForProcessInstance") - .setParameter("processInstance", processInstance) - .list(); + .setParameter("processInstance", processInstance) + .list(); preventFurtherRepetitions(timers); } catch (HibernateException e) { @@ -243,11 +257,12 @@ public List findJobsWithOverdueLockTime(Date threshold) { try { return session.getNamedQuery("JobSession.findJobsWithOverdueLockTime") - .setDate("threshold", threshold) - .list(); + .setDate("threshold", threshold) + .list(); } catch (HibernateException e) { - throw new JbpmPersistenceException("could not find jobs with lock time over " + threshold, e); + throw new JbpmPersistenceException( + "could not find jobs with lock time over " + threshold, e); } } @@ -257,8 +272,6 @@ for (int i = 0; i < jobCount; i++) { jobs[i] = new Long(jobIds[i]); } - return session.createCriteria(Job.class) - .add(Restrictions.in("id", jobs)) - .list(); + return session.createCriteria(Job.class).add(Restrictions.in("id", jobs)).list(); } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java 2009-10-26 17:27:45 UTC (rev 5805) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/command/ChangeProcessInstanceVersionCommandTest.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -44,16 +44,16 @@ // above), in this case I got // could not delete: [org.jbpm.taskmgmt.def.TaskMgmtDefinition#2] // Integrity constraint violation FK_TASKMGTINST_TMD table: JBPM_MODULEINSTANCE in statement [/* delete org.jbpm.taskmgmt.def.TaskMgmtDefinition */ delete from JBPM_MODULEDEFINITION where ID_=?] - jbpmContext.getGraphSession().deleteProcessDefinition(pd2.getId()); - jbpmContext.getGraphSession().deleteProcessDefinition(pd1.getId()); + graphSession.deleteProcessDefinition(pd2.getId()); + graphSession.deleteProcessDefinition(pd1.getId()); } else if (pd1 != null) { newTransaction(); - jbpmContext.getGraphSession().deleteProcessDefinition(pd1.getId()); + graphSession.deleteProcessDefinition(pd1.getId()); } else if (pd2 != null) { newTransaction(); - jbpmContext.getGraphSession().deleteProcessDefinition(pd2.getId()); + graphSession.deleteProcessDefinition(pd2.getId()); } pd1 = null; @@ -83,7 +83,6 @@ pd1 = ProcessDefinition.parseXmlString(xmlVersion1); jbpmContext.deployProcessDefinition(pd1); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); // start 2 instances ProcessInstance pi1 = jbpmContext.newProcessInstance("TestChangeVersion"); @@ -108,7 +107,7 @@ pd2 = ProcessDefinition.parseXmlString(xmlVersion2); jbpmContext.deployProcessDefinition(pd2); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd2 = graphSession.findLatestProcessDefinition("TestChangeVersion"); // now change all process instances to most current version try { @@ -175,8 +174,8 @@ + " <end-state name='end' />" // + "</process-definition>"; - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion1)); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd1 = ProcessDefinition.parseXmlString(xmlVersion1); + jbpmContext.deployProcessDefinition(pd1); // start instance ProcessInstance pi1 = jbpmContext.newProcessInstance("TestChangeVersion"); @@ -206,7 +205,7 @@ + "</process-definition>"; jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion2)); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd2 = graphSession.findLatestProcessDefinition("TestChangeVersion"); // now change all process instances to most current version try { @@ -264,8 +263,8 @@ + " <end-state name='end' />" // + "</process-definition>"; - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion1)); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd1 = ProcessDefinition.parseXmlString(xmlVersion1); + jbpmContext.deployProcessDefinition(pd1); // start instance ProcessInstance pi1 = jbpmContext.newProcessInstance("TestChangeVersion"); @@ -297,7 +296,7 @@ + "</process-definition>"; jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion2)); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd2 = graphSession.findLatestProcessDefinition("TestChangeVersion"); HashMap nodeNameMap = new HashMap(); nodeNameMap.put("task1", "task1b"); @@ -381,7 +380,6 @@ pd1 = ProcessDefinition.parseXmlString(xmlVersion1); jbpmContext.deployProcessDefinition(pd1); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("testTaskInstances"); // start 2 instances ProcessInstance pi1 = jbpmContext.newProcessInstance("testTaskInstances"); @@ -408,7 +406,7 @@ pd2 = ProcessDefinition.parseXmlString(xmlVersion2); jbpmContext.deployProcessDefinition(pd2); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("testTaskInstances"); + pd2 = graphSession.findLatestProcessDefinition("testTaskInstances"); // process instance 1 can me updated, state names haven't changed in this path: new ChangeProcessInstanceVersionCommand().processInstanceId(pi1.getId()).execute(jbpmContext); @@ -484,8 +482,8 @@ + " <end-state name='end'/>" // + "</process-definition>"; - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion1)); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd1 = ProcessDefinition.parseXmlString(xmlVersion1); + jbpmContext.deployProcessDefinition(pd1); // start instance ProcessInstance pi1 = jbpmContext.newProcessInstance("TestChangeVersion"); @@ -510,7 +508,7 @@ + "</process-definition>"; jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion2)); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd2 = graphSession.findLatestProcessDefinition("TestChangeVersion"); // change version HashMap nameMap = new HashMap(); @@ -549,8 +547,8 @@ + " <end-state name='end'/>" // + "</process-definition>"; - jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion1)); - pd1 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd1 = ProcessDefinition.parseXmlString(xmlVersion1); + jbpmContext.deployProcessDefinition(pd1); // start instance ProcessInstance pi1 = jbpmContext.newProcessInstance("TestChangeVersion"); @@ -585,7 +583,7 @@ + "</process-definition>"; jbpmContext.deployProcessDefinition(ProcessDefinition.parseXmlString(xmlVersion2)); - pd2 = jbpmContext.getGraphSession().findLatestProcessDefinition("TestChangeVersion"); + pd2 = graphSession.findLatestProcessDefinition("TestChangeVersion"); // change version HashMap nameMap = new HashMap(); Copied: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/JBPM1085Test.java (from rev 5670, jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/exe/JoinExecutionDbTest.java) =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/JBPM1085Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/JBPM1085Test.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -0,0 +1,68 @@ +/* + * 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.jbpm1085; + +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; + +public class JBPM1085Test extends AbstractDbTestCase { + + public void testJoinPersistence() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + + " <start-state>" + + " <transition to='f' />" + + " </start-state>" + + " <fork name='f'>" + + " <transition name='a' to='a' />" + + " <transition name='b' to='b' />" + + " </fork>" + + " <state name='a'>" + + " <transition to='j' />" + + " </state>" + + " <state name='b'>" + + " <transition to='j' />" + + " </state>" + + " <join name='j'>" + + " <transition to='end' />" + + " </join>" + + " <end-state name='end'/>" + + "</process-definition>"); + graphSession.saveProcessDefinition(processDefinition); + + try { + ProcessInstance processInstance = new ProcessInstance(processDefinition); + processInstance.signal(); + processInstance.findToken("/a").signal(); + + processInstance = saveAndReload(processInstance); + processInstance.findToken("/b").signal(); + + assertEquals("end", processInstance.getRootToken().getNode().getName()); + assertEquals("j", processInstance.findToken("/a").getNode().getName()); + assertEquals("j", processInstance.findToken("/b").getNode().getName()); + } + finally { + jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); + } + } +} Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm1085/JBPM1085Test.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-10-26 17:27:45 UTC (rev 5805) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2036/JBPM2036Test.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -20,7 +20,6 @@ ProcessDefinition processDefinition = getProcessDefinition(); jbpmContext.deployProcessDefinition(processDefinition); - newTransaction(); try { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.signal(); Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/JBPM2603Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/JBPM2603Test.java (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/JBPM2603Test.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -0,0 +1,114 @@ +/* + * 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.jbpm2603; + +import java.util.Calendar; + +import org.jbpm.db.AbstractDbTestCase; +import org.jbpm.graph.def.Action; +import org.jbpm.graph.def.ActionHandler; +import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ExecutionContext; +import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.instantiation.Delegation; +import org.jbpm.job.Timer; + +/** + * Restore automatic save of timer actions. + * + * @see <a href="https://jira.jboss.org/jira/browse/JBPM-2603">JBPM-2603</a> + * @author Alejandro Guizar + */ +public class JBPM2603Test extends AbstractDbTestCase { + + public void testStaticTimerAction() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition" + + " name='static timer action'>" + + " <start-state><transition to='mid'/></start-state>" + + " <state name='mid'>" + + " <timer duedate='1 hour'>" + + " <action name='example' class='org.example.Action'/>" + + " </timer>" + + " </state>" + + "</process-definition>"); + jbpmContext.deployProcessDefinition(processDefinition); + + try { + ProcessInstance processInstance = new ProcessInstance(processDefinition); + processInstance.signal(); + jbpmContext.save(processInstance); + + Timer timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); + assertEquals(processDefinition.getAction("example").getId(), timer.getAction().getId()); + } + finally { + graphSession.deleteProcessDefinition(processDefinition.getId()); + } + } + + public void testDynamicTimerAction() { + ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition" + + " name='dynamic timer action'>" + + " <start-state><transition to='mid'/></start-state>" + + " <state name='mid'>" + + " <event type='node-enter'>" + + " <action class='" + + CreateDynamicTimer.class.getName() + + "'/>" + + " </event>" + + " </state>" + + "</process-definition>"); + jbpmContext.deployProcessDefinition(processDefinition); + + try { + ProcessInstance processInstance = new ProcessInstance(processDefinition); + processInstance.signal(); + jbpmContext.save(processInstance); + + Timer timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); + Action action = timer.getAction(); + assertEquals("org.example.Action", action.getActionDelegation().getClassName()); + + session.delete(action); + } + finally { + graphSession.deleteProcessDefinition(processDefinition.getId()); + } + } + + public static class CreateDynamicTimer implements ActionHandler { + private static final long serialVersionUID = 1L; + + public void execute(ExecutionContext executionContext) throws Exception { + Action action = new Action(new Delegation("org.example.Action")); + + Calendar oneHour = Calendar.getInstance(); + oneHour.add(Calendar.HOUR_OF_DAY, 1); + + Timer timer = new Timer(executionContext.getToken()); + timer.setDueDate(oneHour.getTime()); + timer.setAction(action); + + executionContext.getJbpmContext().getServices().getSchedulerService().createTimer(timer); + } + } +} Property changes on: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2603/JBPM2603Test.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/exe/JoinExecutionDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/exe/JoinExecutionDbTest.java 2009-10-26 17:27:45 UTC (rev 5805) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jpdl/exe/JoinExecutionDbTest.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -1,71 +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.jpdl.exe; - -import org.jbpm.db.AbstractDbTestCase; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; - -public class JoinExecutionDbTest extends AbstractDbTestCase { - - public void testJoinPersistence() { - ProcessDefinition processDefinition = ProcessDefinition.parseXmlString( - "<process-definition>" + - " <start-state>" + - " <transition to='f' />" + - " </start-state>" + - " <fork name='f'>" + - " <transition name='a' to='a' />" + - " <transition name='b' to='b' />" + - " </fork>" + - " <state name='a'>" + - " <transition to='j' />" + - " </state>" + - " <state name='b'>" + - " <transition to='j' />" + - " </state>" + - " <join name='j'>" + - " <transition to='end' />" + - " </join>" + - " <end-state name='end'/>" + - "</process-definition>" - ); - graphSession.saveProcessDefinition(processDefinition); - try - { - ProcessInstance processInstance = new ProcessInstance(processDefinition); - processInstance.signal(); - processInstance.findToken("/a").signal(); - - processInstance = saveAndReload(processInstance); - processInstance.findToken("/b").signal(); - - assertEquals("end", processInstance.getRootToken().getNode().getName()); - assertEquals("j", processInstance.findToken("/a").getNode().getName()); - assertEquals("j", processInstance.findToken("/b").getNode().getName()); - } - finally - { - jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); - } - } -} Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java 2009-10-26 17:27:45 UTC (rev 5805) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/taskmgmt/exe/TaskTimerExecutionDbTest.java 2009-10-27 06:34:58 UTC (rev 5806) @@ -65,7 +65,7 @@ processInstance = saveAndReload(processInstance); - Timer timer = getTimer(); + Timer timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); assertEquals("ceiling-timer", timer.getName()); } finally { @@ -200,7 +200,7 @@ newTransaction(); // fetch the original duedate - Timer timer = getTimer(); + Timer timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); assertNotNull(timer); long originalDueDate = timer.getDueDate().getTime(); @@ -210,7 +210,7 @@ assertEquals(new Integer(1), processInstance.getContextInstance().getVariable("count")); // check if the timer has be re-scheduled because of the repeat. - timer = getTimer(); + timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); assertNotNull(timer); // check that the timer was rescheduled with a duedate 60 seconds after the original duedate. assertEquals(originalDueDate + 60000, timer.getDueDate().getTime()); @@ -253,7 +253,7 @@ baseDateTest.clear(Calendar.MILLISECOND); baseDateTest.add(Calendar.DAY_OF_YEAR, 2); - Timer timer = getTimer(); + Timer timer = (Timer) session.createCriteria(Timer.class).uniqueResult(); assertEquals("ceiling-timer", timer.getName()); assertNotNull(timer.getDueDate()); @@ -263,8 +263,4 @@ jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } } - - private Timer getTimer() { - return (Timer) session.createCriteria(Timer.class).setMaxResults(1).uniqueResult(); - } }

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5805 - projects/report-server/trunk.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-10-26 13:27:45 -0400 (Mon, 26 Oct 2009) New Revision: 5805 Added: projects/report-server/trunk/README.txt Log: Leave goodbye message Added: projects/report-server/trunk/README.txt =================================================================== --- projects/report-server/trunk/README.txt (rev 0) +++ projects/report-server/trunk/README.txt 2009-10-26 17:27:45 UTC (rev 5805) @@ -0,0 +1,3 @@ +Sources moved to https://svn.jboss.org/repos/soag/report-server/trunk + +

16 years, 6 months

1
0
0 / 0

JBoss JBPM SVN: r5804 - projects/report-server/trunk.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-10-26 13:26:49 -0400 (Mon, 26 Oct 2009) New Revision: 5804 Removed: projects/report-server/trunk/core/ projects/report-server/trunk/pom.xml projects/report-server/trunk/report-server.iml projects/report-server/trunk/report-server.ipr projects/report-server/trunk/report-server.iws projects/report-server/trunk/server/ Log: move to soag repo Deleted: projects/report-server/trunk/pom.xml =================================================================== --- projects/report-server/trunk/pom.xml 2009-10-26 17:16:25 UTC (rev 5803) +++ projects/report-server/trunk/pom.xml 2009-10-26 17:26:49 UTC (rev 5804) @@ -1,121 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <name>JBoss BPM - Reporting (BIRT Integration)</name> - <groupId>org.jboss.bpm</groupId> - <artifactId>report-parent</artifactId> - <version>1.1.0-SNAPSHOT</version> - <packaging>pom</packaging> - -  - <parent> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-parent</artifactId> - <version>1.0.0.GA</version> - </parent> - - <properties> - <commons.logging.version>1.1.1</commons.logging.version> - <junit.version>3.8.1</junit.version> - <resteasy.version>1.0.2.GA</resteasy.version> - <servlet.version>2.4</servlet.version> - </properties> - - <modules> - <module>core</module> - <module>server</module> - </modules> - - <dependencyManagement> - <dependencies> -  - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons.logging.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - <version>${servlet.version}</version> - </dependency> - - - <dependency> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxrs</artifactId> - <version>${resteasy.version}</version> - <exclusions> - <exclusion> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - <exclusion> - <groupId>tjws</groupId> - <artifactId>webserver</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.stream</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>com.google.code.gson</groupId> - <artifactId>gson</artifactId> - <version>1.2.2</version> - </dependency> - - </dependencies> - </dependencyManagement> - -  - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <name>JBoss Snapshot Repository</name> - <url>http://snapshots.jboss.org/maven2</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - </repositories> - -</project> Deleted: projects/report-server/trunk/report-server.iml =================================================================== --- projects/report-server/trunk/report-server.iml 2009-10-26 17:16:25 UTC (rev 5803) +++ projects/report-server/trunk/report-server.iml 2009-10-26 17:26:49 UTC (rev 5804) @@ -1,289 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="true"> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/core/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/core/src/main/resources" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: junit:junit:jar:3.8.1:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </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.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> - <CLASSES> - <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: javassist:javassist:jar:3.6.0.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" 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" exported=""> - <library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided"> - <CLASSES> - <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.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <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.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <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.2.GA:compile"> - <CLASSES> - <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.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <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.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <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: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> -</module> - Deleted: projects/report-server/trunk/report-server.ipr =================================================================== --- projects/report-server/trunk/report-server.ipr 2009-10-26 17:16:25 UTC (rev 5803) +++ projects/report-server/trunk/report-server.ipr 2009-10-26 17:26:49 UTC (rev 5804) @@ -1,316 +0,0 @@ -<?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> - Deleted: projects/report-server/trunk/report-server.iws =================================================================== --- projects/report-server/trunk/report-server.iws 2009-10-26 17:16:25 UTC (rev 5803) +++ projects/report-server/trunk/report-server.iws 2009-10-26 17:26:49 UTC (rev 5804) @@ -1,644 +0,0 @@ -<?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="MODIFICATION" beforePath="$PROJECT_DIR$/report-server.iws" afterPath="$PROJECT_DIR$/report-server.iws" /> - </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" Scope="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="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <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 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 name="<template>" type="WebApp" default="true" selected="false"> - <Host>localhost</Host> - <Port>5050</Port> - </configuration> - </component> - <component name="ScopeViewComponent"> - <subPane subId="Project"> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <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="0" y="22" width="1280" height="774" extended-state="6" /> - <editor active="false" /> - <layout> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3290008" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3299363" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <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="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <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="8" /> - <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="8" /> - <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="3" /> - <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="8" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <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="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> - <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> -

16 years, 6 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-10-26 13:16:25 -0400 (Mon, 26 Oct 2009) New Revision: 5803 Modified: projects/report-server/trunk/core/pom.xml 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/core/src/main/java/org/jboss/bpm/report/ReportFacade.java projects/report-server/trunk/pom.xml projects/report-server/trunk/report-server.iml projects/report-server/trunk/server/pom.xml Log: Begin work on template extensions Modified: projects/report-server/trunk/core/pom.xml =================================================================== --- projects/report-server/trunk/core/pom.xml 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/core/pom.xml 2009-10-26 17:16:25 UTC (rev 5803) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -180,6 +180,11 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + </dependencies> Modified: 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 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/BirtService.java 2009-10-26 17:16:25 UTC (rev 5803) @@ -26,6 +26,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.Map; +import java.util.HashMap; +import java.util.List; +import java.util.ArrayList; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ConcurrentHashMap; +import java.io.File; +import java.io.FileFilter; + /** * Core BIRT service component. Requires to step through the lifecycle * before it can be used: @@ -50,18 +59,87 @@ private enum State {NONE, CREATED, STARTED, STOPPED, DESTROYED}; private State currentState = State.NONE; + private Map<String, IReportRunnable> cache = new HashMap<String, IReportRunnable>(); + + private boolean keepWatching = true; + + private List<String> reportNames = new ArrayList<String>(); + public BirtService(IntegrationConfig iConfig) { this.iConfig = iConfig; } + /* blocking call*/ public void create() { this.engine = BirtEngineFactory.newInstance(iConfig); + + // scan for reports and initialize watchdog + Thread watchDog = new Thread( + new Runnable() + { + public void run() + { + while(keepWatching) + { + File reportdir = new File(iConfig.getReportDir()); + assert reportdir.isDirectory(); + + File[] reportTemplates = reportdir.listFiles( + new FileFilter() + { + public boolean accept(File f) + { + return f.getName().endsWith(".rptdesign"); + } + } + ); + + synchronized(reportNames) + { + reportNames.clear(); + for(File f : reportTemplates) + reportNames.add(f.getName()); + } + + try + { + Thread.sleep(5*1000); + } + catch (InterruptedException e) + { + log.error(e); + } + } + + } + } + ); + watchDog.setName(BirtService.class.getName()+"-WatchDog"); + watchDog.start(); + log.info("Service created: " +this.engine); currentState = State.CREATED; } + /* non blocking init */ + public void createAsync() + { + Thread t = new Thread( + new Runnable() + { + public void run() + { + log.info("Creating BIRT service in the background"); + create(); + } + } + ); + + t.start(); + } + public void start() { if(currentState!=State.CREATED) @@ -75,6 +153,8 @@ if(currentState!=State.STARTED) throw new IllegalStateException("Please call start lifecylce before stopping the service"); + keepWatching=false; // shutdown watchdog + currentState = State.STOPPED; } @@ -109,8 +189,15 @@ try { - //Open a report design - IReportRunnable design = engine.openReportDesign(iConfig.getReportDir()+metaData.getReportName()); + //Open a (cached) report design + IReportRunnable design = cache.get(metaData.getReportName()); + if(null==design) + { + design = engine.openReportDesign( + iConfig.getReportDir()+metaData.getReportName() + ); + cache.put(metaData.getReportName(), design); + } //Create runRenderTask to run and render the report, IRunAndRenderTask runRenderTask = engine.createRunAndRenderTask(design); @@ -141,7 +228,7 @@ HTMLRenderOption htmlOptions = new HTMLRenderOption( options); htmlOptions.setImageHandler(new HTMLServerImageHandler()); htmlOptions.setImageDirectory(iConfig.getImageDirectory()); - htmlOptions.setBaseImageURL(iConfig.getImageBaseUrl()); + htmlOptions.setBaseImageURL(metaData.getImageBaseUrl()); htmlOptions.setHtmlPagination(false); htmlOptions.setHtmlRtLFlag(false); //Setting this to true removes html and body tags @@ -185,4 +272,9 @@ { return currentState; } + + public String[] getReportNames() + { + return reportNames.toArray(new String[] {}); + } } Modified: 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 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/IntegrationConfig.java 2009-10-26 17:16:25 UTC (rev 5803) @@ -63,12 +63,6 @@ this.outputDir = ensureDirectoryName(outputDir); } - - public String getImageBaseUrl() - { - return imageBaseUrl; - } - public void setImageBaseUrl(String imageBaseUrl) { this.imageBaseUrl = ensureDirectoryName(imageBaseUrl); Modified: 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 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/RenderMetaData.java 2009-10-26 17:16:25 UTC (rev 5803) @@ -26,67 +26,79 @@ /** * 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}; + public enum Format {HTML, PDF}; - private ClassLoader classloader; - private String reportName; - private Format format; - private Map parameters = new HashMap(); + private ClassLoader classloader; + private String reportName; + private Format format; + private Map parameters = new HashMap(); + private String imageBaseUrl; - public RenderMetaData() - { - } + public RenderMetaData() + { + } - public RenderMetaData(ClassLoader classloader, String reportName, Format format, String imageBaseUrl) - { - this.classloader = classloader; - this.reportName = reportName; - this.format = format; - } + public RenderMetaData(ClassLoader classloader, String reportName, Format format, String imageBaseUrl) + { + this.classloader = classloader; + this.reportName = reportName; + this.format = format; + this.imageBaseUrl = imageBaseUrl; + } - public ClassLoader getClassloader() - { - return classloader; - } + public String getImageBaseUrl() + { + return imageBaseUrl; + } - public void setClassloader(ClassLoader classloader) - { - this.classloader = classloader; - } + public void setImageBaseUrl(String imageBaseUrl) + { + this.imageBaseUrl = imageBaseUrl; + } - public String getReportName() - { - return reportName; - } + public ClassLoader getClassloader() + { + return classloader; + } - public void setReportName(String reportName) - { - this.reportName = reportName; - } + public void setClassloader(ClassLoader classloader) + { + this.classloader = classloader; + } - public Format getFormat() - { - return format; - } + public String getReportName() + { + return reportName; + } - public void setFormat(Format format) - { - this.format = format; - } + public void setReportName(String reportName) + { + this.reportName = reportName; + } + public Format getFormat() + { + return format; + } - public String toString() - { - return "RenderMetaData {reportName="+reportName+", format="+format+"}"; - } + public void setFormat(Format format) + { + this.format = format; + } - public Map getParameters() - { - return parameters; - } + + public String toString() + { + return "RenderMetaData {reportName="+reportName+", format="+format+"}"; + } + + public Map getParameters() + { + return parameters; + } } Modified: projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java =================================================================== --- projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-10-26 17:16:25 UTC (rev 5803) @@ -33,6 +33,9 @@ import java.util.Enumeration; import java.util.Map; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + /** * BIRT integration facade.<p> * @@ -58,7 +61,20 @@ private BirtService birtService; private boolean isInitialized; - public void lazyInitialize(HttpServletRequest request) + + public ReportFacade() + { + try + { + initBirtService(); + } + catch (BirtInitException e) + { + log.error("Failed to initialize BIRT service", e); + } + } + + public void initBirtService() throws BirtInitException { if(!isInitialized) @@ -85,17 +101,7 @@ 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()); @@ -103,7 +109,7 @@ try { this.birtService = new BirtService(iConfig); - this.birtService.create(); + this.birtService.createAsync(); } catch (Throwable t) { @@ -114,6 +120,18 @@ } } + private String buildImageUrl(HttpServletRequest request) + { + StringBuffer sb = new StringBuffer(); + sb.append("http://"); + sb.append(request.getServerName()).append(":"); + sb.append(request.getServerPort()); + sb.append(request.getContextPath()); + sb.append(request.getServletPath()); + sb.append("/report/view/image"); + return sb.toString(); + } + @GET @Path("view/{fileName}") @Produces("text/html") @@ -125,15 +143,14 @@ ) { try - { - lazyInitialize(request); - + { Map queryParams = convertRequestParametersToMap(request); RenderMetaData renderMeta = new RenderMetaData(); renderMeta.setReportName(fileName); renderMeta.setFormat(RenderMetaData.Format.HTML); renderMeta.setClassloader(Thread.currentThread().getContextClassLoader()); + renderMeta.setImageBaseUrl(buildImageUrl(request)); renderMeta.getParameters().putAll(queryParams); String outputFileName = birtService.render(renderMeta); @@ -142,11 +159,7 @@ File reportFile = new File(absoluteFile); return Response.ok(reportFile).type("text/html").build(); - } - catch (BirtInitException e2) - { - return gracefulException(e2); - } + } catch(Throwable e1) { return gracefulException(e1); @@ -162,21 +175,12 @@ request ) { - try - { - lazyInitialize(request); - - String imageDir = birtService.getIntegrationConfig().getImageDirectory(); - String absName = imageDir + fileName; - File imageFile = new File(absName); - if(!imageFile.exists()) + 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(); - } - catch (BirtInitException e) - { - return gracefulException(e); - } + return Response.ok(imageFile).build(); } private Response gracefulException(Throwable e) @@ -201,6 +205,21 @@ return parameterMap; } + @GET + @Path("templates") + @Produces("application/json") + public Response getReportNames() + { + return createJsonResponse(birtService.getReportNames()); + } + + private Response createJsonResponse(Object wrapper) + { + Gson gson = new GsonBuilder().create(); + String json = gson.toJson(wrapper); + return Response.ok(json).type("application/json").build(); + } + public class BirtInitException extends Exception { public BirtInitException(String message) @@ -213,4 +232,5 @@ super(message, cause); } } + } Modified: projects/report-server/trunk/pom.xml =================================================================== --- projects/report-server/trunk/pom.xml 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/pom.xml 2009-10-26 17:16:25 UTC (rev 5803) @@ -4,7 +4,7 @@ <name>JBoss BPM - Reporting (BIRT Integration)</name> <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging>  @@ -90,6 +90,12 @@ </exclusions> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + <version>1.2.2</version> + </dependency> + </dependencies> </dependencyManagement> Modified: projects/report-server/trunk/report-server.iml =================================================================== --- projects/report-server/trunk/report-server.iml 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/report-server.iml 2009-10-26 17:16:25 UTC (rev 5803) @@ -265,6 +265,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/report-server/trunk/server/pom.xml =================================================================== --- projects/report-server/trunk/server/pom.xml 2009-10-26 16:40:32 UTC (rev 5802) +++ projects/report-server/trunk/server/pom.xml 2009-10-26 17:16:25 UTC (rev 5803) @@ -10,7 +10,7 @@ <parent> <groupId>org.jboss.bpm</groupId> <artifactId>report-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>

16 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits October 2009