[overlord-commits] Overlord SVN: r992 - in activity-monitor/trunk: model and 2 other directories.

Author: heiko.braun(a)jboss.com Date: 2010-03-07 14:48:11 -0500 (Sun, 07 Mar 2010) New Revision: 992 Added: activity-monitor/trunk/model/scripts/ activity-monitor/trunk/model/scripts/antrun-schema.xml Modified: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/ProcessRunnable.java activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/bpaf/Event.java Log: added bpaf costraints to hibernate model Modified: activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/ProcessRunnable.java =================================================================== --- activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/ProcessRunnable.java 2010-03-07 19:34:43 UTC (rev 991) +++ activity-monitor/trunk/emu/src/main/java/org/jboss/bpm/monitor/emu/ProcessRunnable.java 2010-03-07 19:48:11 UTC (rev 992) @@ -49,6 +49,7 @@ { Event startEvent = new Event(true); startEvent.setProcessName(process.getName()); + startEvent.setProcessDefinitionID(process.getName()); startEvent.setProcessInstanceID(process.getInstanceId()); startEvent.getEventDetails().setCurrentState(State.Open); @@ -78,8 +79,9 @@ // lifecycle end event Event endEvent = new Event(true); + endEvent.setProcessDefinitionID(process.getName()); + endEvent.setProcessInstanceID(process.getInstanceId()); endEvent.setProcessName(process.getName()); - endEvent.setProcessInstanceID(process.getInstanceId()); endEvent.getEventDetails().setCurrentState(State.Closed); handler.processEvent(endEvent); @@ -87,26 +89,26 @@ private Event createActivityEvent(String actitivity, State state) { - Event activityEvent = new Event(true); - activityEvent.setProcessName(process.getName()); - activityEvent.setActivityDefinitionID(actitivity); - activityEvent.setActivityInstanceID(actitivity+"_"+System.currentTimeMillis()); - activityEvent.getEventDetails().setCurrentState(state); - return activityEvent; - } + Event event = new Event(true); - private Event createActivityEvent(String actitivity, State state, long timestamp) - { - Event event = new Event(); - event.setTimestamp(timestamp); + event.setProcessDefinitionID(process.getName()); + event.setProcessInstanceID(process.getInstanceId()); event.setProcessName(process.getName()); - event.setProcessInstanceID(process.getInstanceId()); + event.setActivityDefinitionID(actitivity); event.setActivityInstanceID(actitivity+"_"+System.currentTimeMillis()); + event.getEventDetails().setCurrentState(state); return event; } + private Event createActivityEvent(String actitivity, State state, long timestamp) + { + Event event = createActivityEvent(actitivity, state); + event.setTimestamp(timestamp); + return event; + } + private String invokeActivity() throws InterruptedException { Added: activity-monitor/trunk/model/scripts/antrun-schema.xml =================================================================== --- activity-monitor/trunk/model/scripts/antrun-schema.xml (rev 0) +++ activity-monitor/trunk/model/scripts/antrun-schema.xml 2010-03-07 19:48:11 UTC (rev 992) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ============================================================ --> +<!-- JBoss, the OpenSource J2EE webOS --> +<!-- Distributable under LGPL license. --> +<!-- See terms of license at http://www.gnu.org. --> +<!-- ============================================================ --> + +<project> + + <!-- ##################### --> + <!-- ### CREATE SCHEMA ### --> + <!-- ##################### --> + + <target name="create-schema"> + <taskdef name="schemaexport" + classname="org.hibernate.tool.hbm2ddl.SchemaExportTask" + classpathref="maven.compile.classpath" /> + + <mkdir dir="${project.output.dir}" /> + + <!--create-ddl db="hsqldb" /> + <create-ddl db="oracle" /> + <create-ddl db="postgresql" /--> + <create-ddl db="mysql" /> + <!--replace file="${project.output.dir}/jbpm.mysql.create.sql" + token="BLOB_VALUE_ blob" + value="BLOB_VALUE_ longblob" /--> + </target> + + <macrodef name="create-ddl"> + <attribute name="db" /> + + <sequential> + <echo /> + <echo>=====================</echo> + <echo>Schema Create @{db}</echo> + <echo>=====================</echo> + + <schemaexport output=&quot;${project.output.dir}/bpaf.(a){db}.create.sql&quot; + create="yes" + drop="no" + config="src/main/resources/hibernate.cfg.xml" + text="yes" + delimiter=";" + quiet="yes" /> + + <echo /> + <echo>=====================</echo> + <echo>Schema Drop @{db}</echo> + <echo>=====================</echo> + <schemaexport output=&quot;${project.output.dir}/bpaf.(a){db}.drop.sql&quot; + create="no" + drop="yes" + config="src/main/resources/hibernate.cfg.xml" + text="yes" + delimiter=";" + quiet="yes" /> + + </sequential> + </macrodef> + +</project> Modified: activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/bpaf/Event.java =================================================================== --- activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/bpaf/Event.java 2010-03-07 19:34:43 UTC (rev 991) +++ activity-monitor/trunk/model/src/main/java/org/jboss/bpm/monitor/model/bpaf/Event.java 2010-03-07 19:48:11 UTC (rev 992) @@ -1,11 +1,3 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2010.03.05 at 08:26:33 PM CET -// - - package org.jboss.bpm.monitor.model.bpaf; import java.util.ArrayList; @@ -81,8 +73,7 @@ /** * A globally unique identifier for the individual event */ - @XmlAttribute(name = "EventID", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlAttribute(name = "EventID", required = true) protected long eventID; /**