[jboss-svn-commits] JBL Code SVN: r32929 - in labs/jbossrules/trunk/drools-process/drools-bpmn2: src/main/resources/META-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon May 17 18:15:53 EDT 2010
Author: KrisVerlaenen
Date: 2010-05-17 18:15:51 -0400 (Mon, 17 May 2010)
New Revision: 32929
Added:
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BPMNDI.xsd
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/orm.xml
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/persistence.xml
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/jndi.properties
Removed:
labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BpmnDi.xsd
Modified:
labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
Log:
- updated bpmn2 test dependencies
Modified: labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-05-17 20:23:50 UTC (rev 32928)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/pom.xml 2010-05-17 22:15:51 UTC (rev 32929)
@@ -84,7 +84,37 @@
<version>1.1.117</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.4.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.4.0.GA</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-commons-annotations</artifactId>
+ <version>3.1.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>3.3.0.SP1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.btm</groupId>
<artifactId>btm</artifactId>
<version>1.3.3</version>
@@ -106,7 +136,30 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.6.0.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Copied: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BPMNDI.xsd (from rev 32924, labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BpmnDi.xsd)
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BPMNDI.xsd (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BPMNDI.xsd 2010-05-17 22:15:51 UTC (rev 32929)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/BPMNDI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/BPMN/20100524/BPMNDI" elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+ <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" />
+ <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DI" schemaLocation="DI.xsd" />
+
+ <xsd:element name="BPMNDiagram" type="bpmndi:BPMNDiagram" />
+ <xsd:element name="BPMNPlane" type="bpmndi:BPMNPlane" />
+ <xsd:element name="BPMNLabelStyle" type="bpmndi:BPMNLabelStyle" />
+ <xsd:element name="BPMNShape" type="bpmndi:BPMNShape" substitutionGroup="di:DiagramElement" />
+ <xsd:element name="BPMNLabel" type="bpmndi:BPMNLabel" />
+ <xsd:element name="BPMNEdge" type="bpmndi:BPMNEdge" substitutionGroup="di:DiagramElement" />
+
+ <xsd:complexType name="BPMNDiagram">
+ <xsd:complexContent>
+ <xsd:extension base="di:Diagram">
+ <xsd:sequence>
+ <xsd:element ref="bpmndi:BPMNPlane" />
+ <xsd:element ref="bpmndi:BPMNLabelStyle" maxOccurs="unbounded" minOccurs="0" />
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="BPMNPlane">
+ <xsd:complexContent>
+ <xsd:extension base="di:Plane">
+ <xsd:attribute name="bpmnElement" type="xsd:QName" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="BPMNEdge">
+ <xsd:complexContent>
+ <xsd:extension base="di:LabeledEdge">
+ <xsd:sequence>
+ <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="bpmnElement" type="xsd:QName" />
+ <xsd:attribute name="sourceElement" type="xsd:QName" />
+ <xsd:attribute name="targetElement" type="xsd:QName" />
+ <xsd:attribute name="messageVisibleKind" type="bpmndi:MessageVisibleKind" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="BPMNShape">
+ <xsd:complexContent>
+ <xsd:extension base="di:LabeledShape">
+ <xsd:sequence>
+ <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="bpmnElement" type="xsd:QName" />
+ <xsd:attribute name="isHorizontal" type="xsd:boolean" />
+ <xsd:attribute name="isExpanded" type="xsd:boolean" />
+ <xsd:attribute name="isMarkerVisible" type="xsd:boolean" />
+ <xsd:attribute name="isMessageVisible" type="xsd:boolean" />
+ <xsd:attribute name="participantBandKind" type="bpmndi:ParticipantBandKind" />
+ <xsd:attribute name="choreographyActivityShape" type="xsd:QName"/>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="BPMNLabel">
+ <xsd:complexContent>
+ <xsd:extension base="di:Label">
+ <xsd:attribute name="labelStyle" type="xsd:QName" />
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:complexType name="BPMNLabelStyle">
+ <xsd:complexContent>
+ <xsd:extension base="di:Style">
+ <xsd:sequence>
+ <xsd:element ref="dc:Font" />
+ </xsd:sequence>
+ </xsd:extension>
+ </xsd:complexContent>
+ </xsd:complexType>
+
+ <xsd:simpleType name="ParticipantBandKind">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="top_initiating" />
+ <xsd:enumeration value="middle_initiating" />
+ <xsd:enumeration value="bottom_initiating" />
+ <xsd:enumeration value="top_non_initiating" />
+ <xsd:enumeration value="middle_non_initiating" />
+ <xsd:enumeration value="bottom_non_initiating" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="MessageVisibleKind">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="initiating" />
+ <xsd:enumeration value="non_initiating" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
Property changes on: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BPMNDI.xsd
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BpmnDi.xsd
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BpmnDi.xsd 2010-05-17 20:23:50 UTC (rev 32928)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/main/resources/META-INF/BpmnDi.xsd 2010-05-17 22:15:51 UTC (rev 32929)
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/BPMNDI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" targetNamespace="http://www.omg.org/spec/BPMN/20100524/BPMNDI" elementFormDefault="qualified" attributeFormDefault="unqualified">
-
- <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DC" schemaLocation="DC.xsd" />
- <xsd:import namespace="http://www.omg.org/spec/DD/20100524/DI" schemaLocation="DI.xsd" />
-
- <xsd:element name="BPMNDiagram" type="bpmndi:BPMNDiagram" />
- <xsd:element name="BPMNPlane" type="bpmndi:BPMNPlane" />
- <xsd:element name="BPMNLabelStyle" type="bpmndi:BPMNLabelStyle" />
- <xsd:element name="BPMNShape" type="bpmndi:BPMNShape" substitutionGroup="di:DiagramElement" />
- <xsd:element name="BPMNLabel" type="bpmndi:BPMNLabel" />
- <xsd:element name="BPMNEdge" type="bpmndi:BPMNEdge" substitutionGroup="di:DiagramElement" />
-
- <xsd:complexType name="BPMNDiagram">
- <xsd:complexContent>
- <xsd:extension base="di:Diagram">
- <xsd:sequence>
- <xsd:element ref="bpmndi:BPMNPlane" />
- <xsd:element ref="bpmndi:BPMNLabelStyle" maxOccurs="unbounded" minOccurs="0" />
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BPMNPlane">
- <xsd:complexContent>
- <xsd:extension base="di:Plane">
- <xsd:attribute name="bpmnElement" type="xsd:QName" />
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BPMNEdge">
- <xsd:complexContent>
- <xsd:extension base="di:LabeledEdge">
- <xsd:sequence>
- <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="bpmnElement" type="xsd:QName" />
- <xsd:attribute name="sourceElement" type="xsd:QName" />
- <xsd:attribute name="targetElement" type="xsd:QName" />
- <xsd:attribute name="messageVisibleKind" type="bpmndi:MessageVisibleKind" />
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BPMNShape">
- <xsd:complexContent>
- <xsd:extension base="di:LabeledShape">
- <xsd:sequence>
- <xsd:element ref="bpmndi:BPMNLabel" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="bpmnElement" type="xsd:QName" />
- <xsd:attribute name="isHorizontal" type="xsd:boolean" />
- <xsd:attribute name="isExpanded" type="xsd:boolean" />
- <xsd:attribute name="isMarkerVisible" type="xsd:boolean" />
- <xsd:attribute name="isMessageVisible" type="xsd:boolean" />
- <xsd:attribute name="participantBandKind" type="bpmndi:ParticipantBandKind" />
- <xsd:attribute name="choreographyActivityShape" type="xsd:QName"/>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BPMNLabel">
- <xsd:complexContent>
- <xsd:extension base="di:Label">
- <xsd:attribute name="labelStyle" type="xsd:QName" />
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="BPMNLabelStyle">
- <xsd:complexContent>
- <xsd:extension base="di:Style">
- <xsd:sequence>
- <xsd:element ref="dc:Font" />
- </xsd:sequence>
- </xsd:extension>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:simpleType name="ParticipantBandKind">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="top_initiating" />
- <xsd:enumeration value="middle_initiating" />
- <xsd:enumeration value="bottom_initiating" />
- <xsd:enumeration value="top_non_initiating" />
- <xsd:enumeration value="middle_non_initiating" />
- <xsd:enumeration value="bottom_non_initiating" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="MessageVisibleKind">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="initiating" />
- <xsd:enumeration value="non_initiating" />
- </xsd:restriction>
- </xsd:simpleType>
-
-</xsd:schema>
Added: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/orm.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/orm.xml (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/orm.xml 2010-05-17 22:15:51 UTC (rev 32929)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
+ version="1.0">
+ <named-query name="ProcessInstancesWaitingForEvent">
+ <query>
+select
+ processInstanceInfo.processInstanceId
+from
+ ProcessInstanceInfo processInstanceInfo
+where
+ :type in elements(processInstanceInfo.eventTypes)
+ </query>
+ </named-query>
+</entity-mappings>
Added: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/persistence.xml
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/persistence.xml (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/META-INF/persistence.xml 2010-05-17 22:15:51 UTC (rev 32929)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd">
+ <!--persistence-unit name="ProcessService">
+ <jta-data-source>java:/DefaultDS</jta-data-source>
+ <properties>
+ <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+ </properties>
+ </persistence-unit-->
+ <persistence-unit name="org.drools.persistence.jpa" transaction-type="JTA">
+ <provider>org.hibernate.ejb.HibernatePersistence</provider>
+ <jta-data-source>jdbc/testDS1</jta-data-source>
+ <class>org.drools.persistence.session.SessionInfo</class>
+ <class>org.drools.persistence.processinstance.ProcessInstanceInfo</class>
+ <class>org.drools.persistence.processinstance.variabletypes.JPAPersistedVariable</class>
+ <class>org.drools.persistence.processinstance.variabletypes.VariableInstanceInfo</class>
+ <class>org.drools.persistence.processinstance.variabletypes.SerializablePersistedVariable</class>
+ <class>org.drools.persistence.processinstance.WorkItemInfo</class>
+ <properties>
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ <property name="hibernate.max_fetch_depth" value="3"/>
+ <property name="hibernate.hbm2ddl.auto" value="update" />
+ <property name="hibernate.show_sql" value="false" />
+ <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.BTMTransactionManagerLookup" />
+ </properties>
+ </persistence-unit>
+</persistence>
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/jndi.properties
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/jndi.properties (rev 0)
+++ labs/jbossrules/trunk/drools-process/drools-bpmn2/src/test/resources/jndi.properties 2010-05-17 22:15:51 UTC (rev 32929)
@@ -0,0 +1 @@
+java.naming.factory.initial=bitronix.tm.jndi.BitronixInitialContextFactory
\ No newline at end of file
More information about the jboss-svn-commits
mailing list