JBoss JBPM SVN: r4249 - jbpm4/branches/tbaeyens/modules/api.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-16 10:24:08 -0400 (Mon, 16 Mar 2009)
New Revision: 4249
Modified:
jbpm4/branches/tbaeyens/modules/api/pom.xml
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/api/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/api/pom.xml 2009-03-16 12:42:32 UTC (rev 4248)
+++ jbpm4/branches/tbaeyens/modules/api/pom.xml 2009-03-16 14:24:08 UTC (rev 4249)
@@ -38,24 +38,10 @@
<!-- Profiles -->
<profiles>
<profile>
- <id>distro</id>
+ <id>apidocs</id>
<build>
<plugins>
<plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>javadoc</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <show>public</show>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -66,7 +52,7 @@
</goals>
<configuration>
<tasks>
- <echo message="basedir: ${basedir}" />
+ <echo message="creating schemadocs in ${basedir}/target/schemadocs" />
<mkdir dir="target/schemadocs" />
<taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" />
<xsddoc out="${basedir}/target/schemadocs" title="jBPM 4 Schema's" verbose="false">
17 years, 1 month
JBoss JBPM SVN: r4248 - jbpm4/branches/tbaeyens.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-16 08:42:32 -0400 (Mon, 16 Mar 2009)
New Revision: 4248
Modified:
jbpm4/branches/tbaeyens/
Log:
work
Property changes on: jbpm4/branches/tbaeyens
___________________________________________________________________
Name: svn:ignore
+ target
17 years, 1 month
JBoss JBPM SVN: r4247 - jbpm4/branches/tbaeyens/modules/pvm/src/test/resources.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-16 08:40:55 -0400 (Mon, 16 Mar 2009)
New Revision: 4247
Removed:
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.cfg.xml
Modified:
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml
Log:
work
Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.cfg.xml 2009-03-16 12:40:55 UTC (rev 4247)
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd">
- <realms>
- <realm>
- <id>realm://jbpm-identity</id>
- <repository-id-ref>jBPM Identity DB</repository-id-ref>
- <identity-type-mappings>
- <identity-mapping>IDENTITY</identity-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
-
- <repositories>
- <repository>
- <id>jBPM Identity DB</id>
- <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- </repositories>
-
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>Hibernate Identity Store</id>
- <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>IDENTITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>SECURITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>PROJECT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>PEOPLE</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes>
- <attribute>
- <name>picture</name>
- <mapping>user.picture</mapping>
- <type>binary</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- </attributes>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION_UNIT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PEOPLE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PROJECT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DIVISION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DEPARTMENT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PROJECT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PEOPLE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ADMINISTRATION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>COMMUNITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>OFFICE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SECURITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SYSTEM</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>SECURITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>persistenceUnit</name>
- <value>jboss-identity-jbpm</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 11:29:22 UTC (rev 4246)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 12:40:55 UTC (rev 4247)
@@ -1,57 +1,57 @@
-<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
-
-<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
-
- <!-- ### USER ########################################################### -->
- <class name="UserImpl" table="JBPM_ID_USER">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_" />
- <property name="givenName" column="GIVENNAME_" />
- <property name="familyName" column="FAMILYNAME_" />
- </class>
-
- <!-- ### MEMBERSHIP ##################################################### -->
- <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <many-to-one name="user"
- column="USER_"
- class="UserImpl"
- foreign-key="FK_MEM_USER"
- index="IDX_MEM_USER"/>
-
- <many-to-one name="group"
- column="GROUP_"
- class="GroupImpl"
- foreign-key="FK_MEM_GROUP"
- index="IDX_MEM_GROUP"/>
-
- <property name="role" column="NAME_" />
- </class>
-
- <!-- ### GROUP ########################################################### -->
- <class name="GroupImpl" table="JBPM_ID_GROUP">
- <id name="dbid" column="DBID_">
- <generator class="native" />
- </id>
- <version name="dbversion" column="DBVERSION_" />
-
- <property name="name" column="NAME_" />
- <property name="type" column="TYPE_" />
-
- <many-to-one name="parent"
- column="PARENT_"
- class="GroupImpl"
- foreign-key="FK_GROUP_PARENT"
- index="IDX_GROUP_PARENT"/>
- </class>
-
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
</hibernate-mapping>
\ No newline at end of file
17 years, 1 month
JBoss JBPM SVN: r4246 - in jbpm4/branches/tbaeyens/modules: distro/src/main/resources/config-tool/hibernate/mapping.files and 6 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-16 07:29:22 -0400 (Mon, 16 Mar 2009)
New Revision: 4246
Added:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.include.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml
Removed:
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/META-INF/
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.cfg.xml
Modified:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project name="jbpm.config.tool" default="create.configuration.files" basedir=".">
@@ -11,9 +10,10 @@
<condition property="is.jpdl.included">
<equals arg1="${jpdl}" arg2="include" />
</condition>
- <condition property="is.identity.included">
+
+ <!-- condition property="is.identity.included">
<equals arg1="${identity}" arg2="include" />
- </condition>
+ </condition -->
<!-- public targets -->
@@ -29,6 +29,7 @@
<file name="hibernate/cache/${cache}.xml"/>
<file name="hibernate/mapping.references/pvm.xml"/>
<file name="hibernate/mapping.references/jpdl.${jpdl}.xml"/>
+ <file name="hibernate/mapping.references/identity.${identity}.xml"/>
<file name="hibernate/cfg/part2.jbpm.hibernate.cfg.xml" />
</filelist>
</concat>
@@ -51,7 +52,7 @@
<file name="jbpm/cfg/identity.service.${identity}.xml" />
<file name="jbpm/cfg/command.service.${deployment.type}.xml" />
<file name="jbpm/cfg/part2.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.session.factory.${identity}.xml" />
+ <!-- file name="jbpm/cfg/identity.session.factory.${identity}.xml" / -->
<file name="jbpm/cfg/jpdl.deployers.${jpdl}.xml" />
<file name="jbpm/cfg/part3.jbpm.cfg.xml" />
<file name="jbpm/cfg/identity.session.${identity}.xml" />
@@ -74,7 +75,7 @@
</concat>
<antcall target="internal.jpdl.hibernate.mapping.files" />
- <antcall target="internal.identity.config.files" />
+ <!-- antcall target="internal.identity.config.files" / -->
<antcall target="internal.jdk.logging" />
<echo>Created jbpm configuration files in ${config.files.dir}</echo>
@@ -201,6 +202,7 @@
<property file="${tmp.dir}/hibernate.properties" />
</target>
+ <!--
<target name="internal.identity.config.files" if="is.identity.included">
<mkdir dir="${tmp.dir}/identity" />
<mkdir dir="${config.files.dir}/META-INF" />
@@ -227,6 +229,7 @@
</concat>
<copy file="identity/jbpm.identity.cfg.xml" todir="${config.files.dir}" overwrite="true" />
</target>
+ -->
<target name="internal.jpdl.hibernate.mapping.files" if="is.jpdl.included">
<copy todir="${config.files.dir}">
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
+</hibernate-mapping>
\ No newline at end of file
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.files/jbpm.identity.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.exclude.xml
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.exclude.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.include.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.include.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -0,0 +1 @@
+ <mapping resource="jbpm.identity.hbm.xml" />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/hibernate/mapping.references/identity.include.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -1 +1 @@
- <identity-session realm="realm://jbpm-identity" />
+ <identity-session />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -9,7 +9,7 @@
<history-service />
<management-service />
<task-service />
-
+ <identity-service />
<command-service>
<retry-interceptor />
<environment-interceptor />
@@ -66,6 +66,7 @@
<message-session />
<timer-session />
<history-session />
+ <identity-session />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -20,5 +20,6 @@
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
<mapping resource="jbpm.jpdl.hbm.xml" />
+ <mapping resource="jbpm.identity.hbm.xml" />
</session-factory>
</hibernate-configuration>
Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-identity xmlns="urn:jboss:identity:idm:config:v1_0_alpha"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:identity:idm:config:v1_0_alpha identity-config.xsd">
- <realms>
- <realm>
- <id>realm://jbpm-identity</id>
- <repository-id-ref>jBPM Identity DB</repository-id-ref>
- <identity-type-mappings>
- <identity-mapping>IDENTITY</identity-mapping>
- </identity-type-mappings>
- </realm>
- </realms>
-
- <repositories>
- <repository>
- <id>jBPM Identity DB</id>
- <class>org.jboss.identity.idm.impl.repository.WrapperIdentityStoreRepository</class>
- <external-config/>
- <default-identity-store-id>Hibernate Identity Store</default-identity-store-id>
- <default-attribute-store-id>Hibernate Identity Store</default-attribute-store-id>
- <options>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </repository>
- </repositories>
-
- <stores>
- <attribute-stores/>
- <identity-stores>
- <identity-store>
- <id>Hibernate Identity Store</id>
- <class>org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl</class>
- <external-config/>
- <supported-relationship-types>
- <relationship-type>JBOSS_IDENTITY_MEMBERSHIP</relationship-type>
- <relationship-type>JBOSS_IDENTITY_ROLE</relationship-type>
- </supported-relationship-types>
- <supported-identity-object-types>
- <identity-object-type>
- <name>IDENTITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>SECURITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>PROJECT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_ROLE</relationship-type-ref>
- <identity-object-type-ref>PEOPLE</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials>
- <credential-type>PASSWORD</credential-type>
- </credentials>
- <attributes>
- <attribute>
- <name>picture</name>
- <mapping>user.picture</mapping>
- <type>binary</type>
- <isRequired>false</isRequired>
- <isMultivalued>false</isMultivalued>
- <isReadOnly>false</isReadOnly>
- </attribute>
- </attributes>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ORGANIZATION_UNIT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DIVISION</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>OFFICE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PEOPLE</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>PROJECT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DIVISION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>DEPARTMENT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>DEPARTMENT</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION_UNIT</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PROJECT</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>PEOPLE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>ADMINISTRATION</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>COMMUNITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>OFFICE</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SECURITY</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- <identity-object-type>
- <name>SYSTEM</name>
- <relationships>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>IDENTITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>SECURITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>COMMUNITY</identity-object-type-ref>
- </relationship>
- <relationship>
- <relationship-type-ref>JBOSS_IDENTITY_MEMBERSHIP</relationship-type-ref>
- <identity-object-type-ref>ORGANIZATION</identity-object-type-ref>
- </relationship>
- </relationships>
- <credentials/>
- <attributes/>
- <options/>
- </identity-object-type>
- </supported-identity-object-types>
- <options>
- <option>
- <name>persistenceUnit</name>
- <value>jboss-identity-jbpm</value>
- </option>
- <option>
- <name>populateRelationshipTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>populateIdentityObjectTypes</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- <option>
- <name>isRealmAware</name>
- <value>true</value>
- </option>
- <option>
- <name>allowNotDefinedAttributes</name>
- <value>true</value>
- </option>
- </options>
- </identity-store>
- </identity-stores>
- </stores>
-</jboss-identity>
\ No newline at end of file
Added: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
+</hibernate-mapping>
\ No newline at end of file
Property changes on: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -9,7 +9,7 @@
<history-service />
<management-service />
<task-service />
-
+ <identity-service />
<command-service>
<retry-interceptor />
<environment-interceptor />
@@ -66,6 +66,7 @@
<message-session />
<timer-session />
<history-session />
+ <identity-session />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -20,5 +20,6 @@
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
<mapping resource="jbpm.jpdl.hbm.xml" />
+ <mapping resource="jbpm.identity.hbm.xml" />
</session-factory>
</hibernate-configuration>
Added: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
+</hibernate-mapping>
\ No newline at end of file
Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -10,7 +10,6 @@
<management-service />
<task-service />
<identity-service />
-
<command-service>
<retry-interceptor />
<environment-interceptor />
@@ -25,8 +24,6 @@
<hibernate-session-factory />
- <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
<deployer-manager>
<check-process />
<check-problems />
@@ -65,7 +62,7 @@
<message-session />
<timer-session />
<history-session />
- <identity-session realm="realm://jbpm-identity" />
+ <identity-session />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -9,7 +9,7 @@
<history-service />
<management-service />
<task-service />
-
+ <identity-service />
<command-service>
<retry-interceptor />
<environment-interceptor />
@@ -66,6 +66,7 @@
<message-session />
<timer-session />
<history-session />
+ <identity-session />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -20,5 +20,6 @@
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
<mapping resource="jbpm.jpdl.hbm.xml" />
+ <mapping resource="jbpm.identity.hbm.xml" />
</session-factory>
</hibernate-configuration>
Added: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 11:29:22 UTC (rev 4246)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
+</hibernate-mapping>
\ No newline at end of file
Property changes on: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBoss JBPM SVN: r4245 - in jbpm4/branches/tbaeyens/modules/pvm/src: main/java/org/jbpm/pvm/internal/wire/binding and 3 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-16 05:55:22 -0400 (Mon, 16 Mar 2009)
New Revision: 4245
Added:
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml
Modified:
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionBinding.java
jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionDescriptor.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -33,8 +33,17 @@
private static final long serialVersionUID = 1L;
+ protected long dbid;
+ protected int dbversion;
+
+ protected GroupImpl parent;
+
protected String name;
+ protected String type;
+ public GroupImpl() {
+ }
+
public GroupImpl(String name) {
this.name = name;
}
@@ -42,4 +51,19 @@
public String getName() {
return name;
}
-}
+ public void setName(String name) {
+ this.name = name;
+ }
+ public GroupImpl getParent() {
+ return parent;
+ }
+ public void setParent(GroupImpl parent) {
+ this.parent = parent;
+ }
+ public String getType() {
+ return type;
+ }
+ public void setType(String type) {
+ this.type = type;
+ }
+}
\ No newline at end of file
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -1,291 +1,128 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.internal.identity.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.identity.idm.api.Attribute;
-import org.jboss.identity.idm.api.AttributesManager;
-import org.jboss.identity.idm.api.GroupType;
-import org.jboss.identity.idm.api.Identity;
-import org.jboss.identity.idm.api.IdentitySearchControl;
-import org.jboss.identity.idm.api.IdentitySession;
-import org.jboss.identity.idm.api.Role;
-import org.jboss.identity.idm.api.RoleType;
-import org.jboss.identity.idm.exception.IdentityException;
-import org.jboss.identity.idm.impl.api.NameFilterSearchControl;
-import org.jboss.identity.idm.impl.api.SimpleAttribute;
-import org.jboss.identity.idm.impl.api.model.SimpleGroupType;
-import org.jboss.identity.idm.p3p.P3PConstants;
-import org.jbpm.JbpmException;
-import org.jbpm.env.Environment;
-import org.jbpm.identity.Group;
-import org.jbpm.identity.User;
-import org.jbpm.pvm.internal.tx.StandardTransaction;
-
-
-/**
- * @author Tom Baeyens
- */
-public class IdentitySessionImpl implements org.jbpm.pvm.internal.identity.spi.IdentitySession {
-
- protected IdentitySession identitySession;
-
- public IdentitySessionImpl(IdentitySession identitySession) {
- this.identitySession = identitySession;
-
- StandardTransaction transaction = Environment.getFromCurrent(StandardTransaction.class);
- IdentitySessionResource identitySessionResource = new IdentitySessionResource(identitySession);
- transaction.enlistResource(identitySessionResource);
- }
-
- public void createUser(String userName, String givenName, String lastName) {
- try {
- Identity identity = identitySession.getPersistenceManager().createIdentity(userName);
- Attribute[] attributes = new Attribute[] {
- new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[] { givenName }),
- new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[] { lastName })
- };
- identitySession.getAttributesManager().addAttributes(identity, attributes);
- } catch (IdentityException e) {
- throw new JbpmException("couldn't create user "+userName, e);
- }
- }
-
- public List<User> getUsers() {
- try {
- Collection<Identity> identities = identitySession
- .getPersistenceManager()
- .findIdentity((IdentitySearchControl[])null);
-
- List<User> users = new ArrayList<User>();
- for (Identity identity : identities) {
- String name = identity.getName();
- String givenName = getAttributeString(identity, null, P3PConstants.INFO_USER_NAME_GIVEN);
- String familyName = getAttributeString(identity, P3PConstants.INFO_USER_NAME_FAMILY);
-
- UserImpl user = new UserImpl(name, givenName, familyName);
- users.add(user);
- }
-
- return users;
-
- } catch (IdentityException e) {
- throw new JbpmException("couldn't get users from identity component", e);
- }
- }
-
- public void deleteUser(String userName) {
- try {
- org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
-
- if (identity==null) {
- return;
- }
-
- identitySession
- .getPersistenceManager()
- .removeIdentity(identity, true);
-
- } catch (IdentityException e) {
- throw new JbpmException("couldn't delete group "+userName, e);
- }
- }
-
- public void createGroup(String groupName, String groupType, String parentGroupName) {
- try {
- GroupType simpleGroupType = new SimpleGroupType(groupType);
- org.jboss.identity.idm.api.Group group = identitySession.getPersistenceManager().createGroup(groupName, simpleGroupType);
-
- if (parentGroupName!=null) {
- org.jboss.identity.idm.api.Group parentGroup = findGroup(parentGroupName, groupType);
- if (parentGroup==null) {
- throw new JbpmException("parent group "+parentGroupName+" doesn't exist");
- }
- identitySession.getRelationshipManager().associateGroups(parentGroup, group);
- }
-
- } catch (IdentityException e) {
- throw new JbpmException("couldn't create group "+groupName, e);
- }
- }
-
- public List<Group> getGroups(String groupType) {
- try {
- GroupType simpleGroupType = new SimpleGroupType(groupType);
- Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession
- .getPersistenceManager()
- .findGroup(simpleGroupType);
-
- List<Group> groups = new ArrayList<Group>();
- for (org.jboss.identity.idm.api.Group idGroup: idGroups) {
- String groupName = idGroup.getName();
-
- GroupImpl group = new GroupImpl(groupName);
- groups.add(group);
- }
-
- return groups;
-
- } catch (IdentityException e) {
- throw new JbpmException("couldn't get users from identity component", e);
- }
- }
-
- public void deleteGroup(String groupName, String groupType) {
- try {
- org.jboss.identity.idm.api.Group group = findGroup(groupName, groupType);
-
- if (group==null) {
- return;
- }
-
- identitySession
- .getPersistenceManager()
- .removeGroup(group, true);
-
- } catch (IdentityException e) {
- throw new JbpmException("couldn't delete group "+groupName, e);
- }
- }
-
- public void createMembership(String userName, String groupName, String groupType, String role) {
- try {
- org.jboss.identity.idm.api.Group group = findGroup(groupName, groupType);
- if (group==null) {
- throw new JbpmException("group "+groupName+" doesn't exist");
- }
-
- org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
- if (identity==null) {
- throw new JbpmException("user "+userName+" doesn't exist");
- }
-
-
- if (role!=null) {
- RoleType roleType = identitySession.getRoleManager().getRoleType(role);
- if (roleType==null) {
- roleType = identitySession.getRoleManager().createRoleType(role);
- }
-
- identitySession.getRoleManager().createRole(roleType, identity, group);
-
- } else {
- identitySession.getRelationshipManager().associateIdentities(group, identity);
- }
-
- } catch (Exception e) {
- throw new JbpmException("couldn't create membership "+userName+", "+groupName+", "+role, e);
- }
- }
-
- public List<Group> findGroupsByUserAndGroupType(String userName, String groupType) {
- try {
- org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
- if (identity==null) {
- return Collections.EMPTY_LIST;
- }
-
- List<Group> groups = new ArrayList<Group>();
-
- GroupType identityGroupType = new SimpleGroupType(groupType);
- Collection<org.jboss.identity.idm.api.Group> identityGroups = identitySession
- .getRoleManager()
- .findGroupsWithRelatedRole(identity, identityGroupType, null);
-
- for (org.jboss.identity.idm.api.Group identityGroup: identityGroups) {
- String groupName = identityGroup.getName();
- GroupImpl group = new GroupImpl(groupName);
- groups.add(group);
- }
-
- return groups;
-
- } catch (Exception e) {
- throw new JbpmException("couldn't get groups for user "+userName+" and groupType "+groupType, e);
- }
- }
-
- protected org.jboss.identity.idm.api.Identity findIdentity(String userName) throws IdentityException {
- Collection<org.jboss.identity.idm.api.Identity> identities = identitySession
- .getPersistenceManager()
- .findIdentity(new IdentitySearchControl[]{
- new NameFilterSearchControl(userName)
- } );
-
- if ( (identities==null) || (identities.size()==0) ) {
- return null;
- }
-
- return identities.iterator().next();
- }
-
- protected org.jboss.identity.idm.api.Group findGroup(String groupName, String groupType) throws IdentityException {
- GroupType groupIdType = new SimpleGroupType(groupType);
-
- Collection<org.jboss.identity.idm.api.Group> groups = identitySession
- .getPersistenceManager()
- .findGroup(groupIdType, new IdentitySearchControl[]{
- new NameFilterSearchControl(groupName)
- } );
-
- if ( (groups==null) || (groups.size()==0) ) {
- return null;
- }
-
- return groups.iterator().next();
- }
-
- protected String getAttributeString(Identity identity, String attributeName) throws IdentityException {
- return getAttributeString(identity, null, attributeName);
- }
-
- protected String getAttributeString(org.jboss.identity.idm.api.Group idGroup, String attributeName) throws IdentityException {
- return getAttributeString(null, idGroup, attributeName);
- }
-
- protected String getAttributeString(Identity identity, org.jboss.identity.idm.api.Group idGroup, String attributeName) throws IdentityException {
- AttributesManager attributesManager = identitySession.getAttributesManager();
- Attribute attribute = null;
- if (identity!=null) {
- attribute = attributesManager.getAttribute(identity, attributeName);
- } else {
- attribute = attributesManager.getAttribute(idGroup, attributeName);
- }
- if (attribute!=null) {
- return (String) attribute.getValue();
- }
- return null;
- }
-
-
- public IdentitySession getIdentitySession() {
- return identitySession;
- }
-
- public void setIdentitySession(IdentitySession identitySession) {
- this.identitySession = identitySession;
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.identity.impl;
+
+import java.util.List;
+
+import org.hibernate.Query;
+import org.hibernate.Session;
+import org.jbpm.identity.Group;
+import org.jbpm.identity.User;
+import org.jbpm.pvm.internal.identity.spi.IdentitySession;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class IdentitySessionImpl implements IdentitySession {
+
+ protected Session session;
+
+ public void createGroup(String groupName, String groupType, String parentGroupName) {
+ GroupImpl group = new GroupImpl();
+ group.setName(groupName);
+ group.setType(groupType);
+
+ if (parentGroupName!=null) {
+ GroupImpl parentGroup = findGroup(parentGroupName, null);
+ group.setParent(parentGroup);
+ }
+
+ session.save(group);
+ }
+
+ protected GroupImpl findGroup(String name, String type) {
+ GroupImpl group = (GroupImpl) session.createQuery(
+ "select group " +
+ "from "+GroupImpl.class.getName()+" as group " +
+ "where group.name = '"+name+"'" +
+ (type!=null ? " and group.type = '"+type+"'" : "")
+ ).uniqueResult();
+ return group;
+ }
+
+ protected UserImpl findUser(String name) {
+ UserImpl user = (UserImpl) session.createQuery(
+ "select user " +
+ "from "+UserImpl.class.getName()+" as user " +
+ "where user.name = '"+name+"'"
+ ).uniqueResult();
+ return user;
+ }
+
+ public void createMembership(String userName, String groupName, String groupType, String role) {
+ UserImpl user = findUser(userName);
+ GroupImpl group = findGroup(groupName, groupType);
+
+ MembershipImpl membership = new MembershipImpl();
+ membership.setUser(user);
+ membership.setGroup(group);
+ membership.setRole(role);
+
+ session.save(membership);
+ }
+
+ public void createUser(String userName, String givenName, String familyName) {
+ UserImpl user = new UserImpl();
+ user.setName(userName);
+ user.setGivenName(givenName);
+ user.setFamilyName(familyName);
+
+ session.save(user);
+ }
+
+ public void deleteGroup(String groupName, String groupType) {
+ GroupImpl group = findGroup(groupName, groupType);
+ session.delete(group);
+ }
+
+ public void deleteUser(String userName) {
+ UserImpl user = findUser(userName);
+ session.delete(user);
+ }
+
+ public List<Group> findGroupsByUserAndGroupType(String userName, String groupType) {
+ Query query = session.createQuery(
+ "select distinct membership.group " +
+ "from "+MembershipImpl.class.getName()+" as membership, " +
+ "where membership.user.name = '"+userName+"'" +
+ " and membership.group.type = '"+groupType+"'"
+ );
+ return query.list();
+ }
+
+ public List<Group> getGroups(String groupType) {
+ return session.createQuery(
+ "from "+GroupImpl.class.getName()
+ ).list();
+ }
+
+ public List<User> getUsers() {
+ return session.createQuery(
+ "from "+UserImpl.class.getName()
+ ).list();
+ }
+
+ public void setSession(Session session) {
+ this.session = session;
+ }
+}
Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java (from rev 4244, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java)
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -0,0 +1,290 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.identity.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.identity.idm.api.Attribute;
+import org.jboss.identity.idm.api.AttributesManager;
+import org.jboss.identity.idm.api.GroupType;
+import org.jboss.identity.idm.api.Identity;
+import org.jboss.identity.idm.api.IdentitySearchControl;
+import org.jboss.identity.idm.api.IdentitySession;
+import org.jboss.identity.idm.api.RoleType;
+import org.jboss.identity.idm.exception.IdentityException;
+import org.jboss.identity.idm.impl.api.NameFilterSearchControl;
+import org.jboss.identity.idm.impl.api.SimpleAttribute;
+import org.jboss.identity.idm.impl.api.model.SimpleGroupType;
+import org.jboss.identity.idm.p3p.P3PConstants;
+import org.jbpm.JbpmException;
+import org.jbpm.env.Environment;
+import org.jbpm.identity.Group;
+import org.jbpm.identity.User;
+import org.jbpm.pvm.internal.tx.StandardTransaction;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JBossIdmIdentitySessionImpl implements org.jbpm.pvm.internal.identity.spi.IdentitySession {
+
+ protected IdentitySession identitySession;
+
+ public JBossIdmIdentitySessionImpl(IdentitySession identitySession) {
+ this.identitySession = identitySession;
+
+ StandardTransaction transaction = Environment.getFromCurrent(StandardTransaction.class);
+ IdentitySessionResource identitySessionResource = new IdentitySessionResource(identitySession);
+ transaction.enlistResource(identitySessionResource);
+ }
+
+ public void createUser(String userName, String givenName, String lastName) {
+ try {
+ Identity identity = identitySession.getPersistenceManager().createIdentity(userName);
+ Attribute[] attributes = new Attribute[] {
+ new SimpleAttribute(P3PConstants.INFO_USER_NAME_GIVEN, new String[] { givenName }),
+ new SimpleAttribute(P3PConstants.INFO_USER_NAME_FAMILY, new String[] { lastName })
+ };
+ identitySession.getAttributesManager().addAttributes(identity, attributes);
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't create user "+userName, e);
+ }
+ }
+
+ public List<User> getUsers() {
+ try {
+ Collection<Identity> identities = identitySession
+ .getPersistenceManager()
+ .findIdentity((IdentitySearchControl[])null);
+
+ List<User> users = new ArrayList<User>();
+ for (Identity identity : identities) {
+ String name = identity.getName();
+ String givenName = getAttributeString(identity, null, P3PConstants.INFO_USER_NAME_GIVEN);
+ String familyName = getAttributeString(identity, P3PConstants.INFO_USER_NAME_FAMILY);
+
+ UserImpl user = new UserImpl(name, givenName, familyName);
+ users.add(user);
+ }
+
+ return users;
+
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't get users from identity component", e);
+ }
+ }
+
+ public void deleteUser(String userName) {
+ try {
+ org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
+
+ if (identity==null) {
+ return;
+ }
+
+ identitySession
+ .getPersistenceManager()
+ .removeIdentity(identity, true);
+
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't delete group "+userName, e);
+ }
+ }
+
+ public void createGroup(String groupName, String groupType, String parentGroupName) {
+ try {
+ GroupType simpleGroupType = new SimpleGroupType(groupType);
+ org.jboss.identity.idm.api.Group group = identitySession.getPersistenceManager().createGroup(groupName, simpleGroupType);
+
+ if (parentGroupName!=null) {
+ org.jboss.identity.idm.api.Group parentGroup = findGroup(parentGroupName, groupType);
+ if (parentGroup==null) {
+ throw new JbpmException("parent group "+parentGroupName+" doesn't exist");
+ }
+ identitySession.getRelationshipManager().associateGroups(parentGroup, group);
+ }
+
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't create group "+groupName, e);
+ }
+ }
+
+ public List<Group> getGroups(String groupType) {
+ try {
+ GroupType simpleGroupType = new SimpleGroupType(groupType);
+ Collection<org.jboss.identity.idm.api.Group> idGroups = identitySession
+ .getPersistenceManager()
+ .findGroup(simpleGroupType);
+
+ List<Group> groups = new ArrayList<Group>();
+ for (org.jboss.identity.idm.api.Group idGroup: idGroups) {
+ String groupName = idGroup.getName();
+
+ GroupImpl group = new GroupImpl(groupName);
+ groups.add(group);
+ }
+
+ return groups;
+
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't get users from identity component", e);
+ }
+ }
+
+ public void deleteGroup(String groupName, String groupType) {
+ try {
+ org.jboss.identity.idm.api.Group group = findGroup(groupName, groupType);
+
+ if (group==null) {
+ return;
+ }
+
+ identitySession
+ .getPersistenceManager()
+ .removeGroup(group, true);
+
+ } catch (IdentityException e) {
+ throw new JbpmException("couldn't delete group "+groupName, e);
+ }
+ }
+
+ public void createMembership(String userName, String groupName, String groupType, String role) {
+ try {
+ org.jboss.identity.idm.api.Group group = findGroup(groupName, groupType);
+ if (group==null) {
+ throw new JbpmException("group "+groupName+" doesn't exist");
+ }
+
+ org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
+ if (identity==null) {
+ throw new JbpmException("user "+userName+" doesn't exist");
+ }
+
+
+ if (role!=null) {
+ RoleType roleType = identitySession.getRoleManager().getRoleType(role);
+ if (roleType==null) {
+ roleType = identitySession.getRoleManager().createRoleType(role);
+ }
+
+ identitySession.getRoleManager().createRole(roleType, identity, group);
+
+ } else {
+ identitySession.getRelationshipManager().associateIdentities(group, identity);
+ }
+
+ } catch (Exception e) {
+ throw new JbpmException("couldn't create membership "+userName+", "+groupName+", "+role, e);
+ }
+ }
+
+ public List<Group> findGroupsByUserAndGroupType(String userName, String groupType) {
+ try {
+ org.jboss.identity.idm.api.Identity identity = findIdentity(userName);
+ if (identity==null) {
+ return Collections.EMPTY_LIST;
+ }
+
+ List<Group> groups = new ArrayList<Group>();
+
+ GroupType identityGroupType = new SimpleGroupType(groupType);
+ Collection<org.jboss.identity.idm.api.Group> identityGroups = identitySession
+ .getRoleManager()
+ .findGroupsWithRelatedRole(identity, identityGroupType, null);
+
+ for (org.jboss.identity.idm.api.Group identityGroup: identityGroups) {
+ String groupName = identityGroup.getName();
+ GroupImpl group = new GroupImpl(groupName);
+ groups.add(group);
+ }
+
+ return groups;
+
+ } catch (Exception e) {
+ throw new JbpmException("couldn't get groups for user "+userName+" and groupType "+groupType, e);
+ }
+ }
+
+ protected org.jboss.identity.idm.api.Identity findIdentity(String userName) throws IdentityException {
+ Collection<org.jboss.identity.idm.api.Identity> identities = identitySession
+ .getPersistenceManager()
+ .findIdentity(new IdentitySearchControl[]{
+ new NameFilterSearchControl(userName)
+ } );
+
+ if ( (identities==null) || (identities.size()==0) ) {
+ return null;
+ }
+
+ return identities.iterator().next();
+ }
+
+ protected org.jboss.identity.idm.api.Group findGroup(String groupName, String groupType) throws IdentityException {
+ GroupType groupIdType = new SimpleGroupType(groupType);
+
+ Collection<org.jboss.identity.idm.api.Group> groups = identitySession
+ .getPersistenceManager()
+ .findGroup(groupIdType, new IdentitySearchControl[]{
+ new NameFilterSearchControl(groupName)
+ } );
+
+ if ( (groups==null) || (groups.size()==0) ) {
+ return null;
+ }
+
+ return groups.iterator().next();
+ }
+
+ protected String getAttributeString(Identity identity, String attributeName) throws IdentityException {
+ return getAttributeString(identity, null, attributeName);
+ }
+
+ protected String getAttributeString(org.jboss.identity.idm.api.Group idGroup, String attributeName) throws IdentityException {
+ return getAttributeString(null, idGroup, attributeName);
+ }
+
+ protected String getAttributeString(Identity identity, org.jboss.identity.idm.api.Group idGroup, String attributeName) throws IdentityException {
+ AttributesManager attributesManager = identitySession.getAttributesManager();
+ Attribute attribute = null;
+ if (identity!=null) {
+ attribute = attributesManager.getAttribute(identity, attributeName);
+ } else {
+ attribute = attributesManager.getAttribute(idGroup, attributeName);
+ }
+ if (attribute!=null) {
+ return (String) attribute.getValue();
+ }
+ return null;
+ }
+
+
+ public IdentitySession getIdentitySession() {
+ return identitySession;
+ }
+
+ public void setIdentitySession(IdentitySession identitySession) {
+ this.identitySession = identitySession;
+ }
+}
Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/JBossIdmIdentitySessionImpl.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.identity.impl;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class MembershipImpl {
+
+ protected long dbid;
+ protected int dbversion;
+
+ protected UserImpl user;
+ protected GroupImpl group;
+ protected String role;
+
+ public UserImpl getUser() {
+ return user;
+ }
+
+ public void setUser(UserImpl user) {
+ this.user = user;
+ }
+
+ public GroupImpl getGroup() {
+ return group;
+ }
+
+ public void setGroup(GroupImpl group) {
+ this.group = group;
+ }
+
+ public String getRole() {
+ return role;
+ }
+
+ public void setRole(String role) {
+ this.role = role;
+ }
+}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -33,10 +33,16 @@
private static final long serialVersionUID = 1L;
+ protected long dbid;
+ protected int dbversion;
+
protected String name;
protected String givenName;
protected String familyName;
+ public UserImpl() {
+ }
+
public UserImpl(String name, String givenName, String familyName) {
this.name = name;
this.givenName = givenName;
@@ -61,4 +67,14 @@
}
return name;
}
+
+ public void setName(String name) {
+ this.name = name;
+ }
+ public void setGivenName(String givenName) {
+ this.givenName = givenName;
+ }
+ public void setFamilyName(String familyName) {
+ this.familyName = familyName;
+ }
}
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionBinding.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionBinding.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/IdentitySessionBinding.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -21,7 +21,7 @@
*/
package org.jbpm.pvm.internal.wire.binding;
-import org.jbpm.pvm.internal.wire.descriptor.IdentitySessionDescriptor;
+import org.jbpm.pvm.internal.wire.descriptor.JbossIdmIdentitySessionDescriptor;
import org.jbpm.pvm.internal.xml.Parse;
import org.jbpm.pvm.internal.xml.Parser;
import org.w3c.dom.Element;
@@ -37,7 +37,7 @@
}
public Object parse(Element element, Parse parse, Parser parser) {
- IdentitySessionDescriptor descriptor = new IdentitySessionDescriptor();
+ JbossIdmIdentitySessionDescriptor descriptor = new JbossIdmIdentitySessionDescriptor();
if (element.hasAttribute("realm")) {
descriptor.setRealmName(element.getAttribute("realm"));
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionDescriptor.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionDescriptor.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionDescriptor.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -1,53 +1,69 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.pvm.internal.wire.descriptor;
-
-import org.jboss.identity.idm.api.IdentitySession;
-import org.jboss.identity.idm.api.IdentitySessionFactory;
-import org.jbpm.env.Environment;
-import org.jbpm.pvm.internal.identity.impl.IdentitySessionImpl;
-import org.jbpm.pvm.internal.wire.WireContext;
-import org.jbpm.pvm.internal.wire.WireDefinition;
-
-
-/**
- * @author Tom Baeyens
- */
-public class IdentitySessionDescriptor extends AbstractDescriptor {
-
- private static final long serialVersionUID = 1L;
-
- protected String realmName;
-
- public Object construct(WireContext wireContext) {
- IdentitySessionFactory identitySessionFactory = Environment.getFromCurrent(IdentitySessionFactory.class);
- return new IdentitySessionImpl(identitySessionFactory.createIdentitySession(realmName));
- }
-
- public Class< ? > getType(WireDefinition wireDefinition) {
- return org.jbpm.pvm.internal.identity.spi.IdentitySession.class;
- }
-
- public void setRealmName(String realmName) {
- this.realmName = realmName;
- }
-}
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire.descriptor;
+
+import org.hibernate.Session;
+import org.jbpm.pvm.internal.identity.impl.IdentitySessionImpl;
+import org.jbpm.pvm.internal.identity.spi.IdentitySession;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.WireDefinition;
+import org.jbpm.pvm.internal.wire.WireException;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class IdentitySessionDescriptor extends AbstractDescriptor {
+
+ private static final long serialVersionUID = 1L;
+
+ String sessionName;
+
+ public Object construct(WireContext wireContext) {
+ return new IdentitySessionImpl();
+ }
+
+ public void initialize(Object object, WireContext wireContext) {
+ // get the hibernate-session
+ Session session = null;
+ if (sessionName!=null) {
+ session = (Session) wireContext.get(sessionName);
+ } else {
+ session = wireContext.get(Session.class);
+ }
+
+ if (session==null) {
+ throw new WireException("couldn't find hibernate-session "+(sessionName!=null ? "'"+sessionName+"'" : "by type ")+"to create identity-session");
+ }
+
+ // inject the session
+ ((IdentitySessionImpl)object).setSession(session);
+ }
+
+ public Class<?> getType(WireDefinition wireDefinition) {
+ return IdentitySession.class;
+ }
+
+ public void setSessionName(String sessionName) {
+ this.sessionName = sessionName;
+ }
+}
Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java (from rev 4244, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/IdentitySessionDescriptor.java)
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.pvm.internal.wire.descriptor;
+
+import org.jboss.identity.idm.api.IdentitySessionFactory;
+import org.jbpm.env.Environment;
+import org.jbpm.pvm.internal.identity.impl.JBossIdmIdentitySessionImpl;
+import org.jbpm.pvm.internal.wire.WireContext;
+import org.jbpm.pvm.internal.wire.WireDefinition;
+
+
+/**
+ * @author Tom Baeyens
+ */
+public class JbossIdmIdentitySessionDescriptor extends AbstractDescriptor {
+
+ private static final long serialVersionUID = 1L;
+
+ protected String realmName;
+
+ public Object construct(WireContext wireContext) {
+ IdentitySessionFactory identitySessionFactory = Environment.getFromCurrent(IdentitySessionFactory.class);
+ return new JBossIdmIdentitySessionImpl(identitySessionFactory.createIdentitySession(realmName));
+ }
+
+ public Class< ? > getType(WireDefinition wireDefinition) {
+ return org.jbpm.pvm.internal.identity.spi.IdentitySession.class;
+ }
+
+ public void setRealmName(String realmName) {
+ this.realmName = realmName;
+ }
+}
Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/JbossIdmIdentitySessionDescriptor.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java 2009-03-16 09:55:22 UTC (rev 4245)
@@ -21,7 +21,6 @@
*/
package org.jbpm.pvm.internal.identity;
-import java.util.Collection;
import java.util.List;
import org.jbpm.IdentityService;
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-14 14:28:09 UTC (rev 4244)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-03-16 09:55:22 UTC (rev 4245)
@@ -19,5 +19,6 @@
<mapping resource="jbpm.execution.hbm.xml" />
<mapping resource="jbpm.history.hbm.xml" />
<mapping resource="jbpm.task.hbm.xml" />
+ <mapping resource="jbpm.identity.hbm.xml" />
</session-factory>
</hibernate-configuration>
Added: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-03-16 09:55:22 UTC (rev 4245)
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+<hibernate-mapping package="org.jbpm.pvm.internal.identity.impl" default-access="field">
+
+ <!-- ### USER ########################################################### -->
+ <class name="UserImpl" table="JBPM_ID_USER">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="givenName" column="GIVENNAME_" />
+ <property name="familyName" column="FAMILYNAME_" />
+ </class>
+
+ <!-- ### MEMBERSHIP ##################################################### -->
+ <class name="MembershipImpl" table="JBPM_ID_MEMBERSHIP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <many-to-one name="user"
+ column="USER_"
+ class="UserImpl"
+ foreign-key="FK_MEM_USER"
+ index="IDX_MEM_USER"/>
+
+ <many-to-one name="group"
+ column="GROUP_"
+ class="GroupImpl"
+ foreign-key="FK_MEM_GROUP"
+ index="IDX_MEM_GROUP"/>
+
+ <property name="role" column="NAME_" />
+ </class>
+
+ <!-- ### GROUP ########################################################### -->
+ <class name="GroupImpl" table="JBPM_ID_GROUP">
+ <id name="dbid" column="DBID_">
+ <generator class="native" />
+ </id>
+ <version name="dbversion" column="DBVERSION_" />
+
+ <property name="name" column="NAME_" />
+ <property name="type" column="TYPE_" />
+
+ <many-to-one name="parent"
+ column="PARENT_"
+ class="GroupImpl"
+ foreign-key="FK_GROUP_PARENT"
+ index="IDX_GROUP_PARENT"/>
+ </class>
+
+</hibernate-mapping>
\ No newline at end of file
17 years, 1 month
JBoss JBPM SVN: r4244 - jbpm4/branches/tbaeyens/modules/examples.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-14 10:28:09 -0400 (Sat, 14 Mar 2009)
New Revision: 4244
Added:
jbpm4/branches/tbaeyens/modules/examples/build.xml
Log:
work
Added: jbpm4/branches/tbaeyens/modules/examples/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/build.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/examples/build.xml 2009-03-14 14:28:09 UTC (rev 4244)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="test" default="test" basedir=".">
+
+ <target name="test">
+ <mkdir dir="target/test-results"/>
+ <junit printsummary="yes" haltonfailure="yes">
+
+ <classpath>
+ <fileset dir="C:/Software/jboss-5.0.0.GA/client">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="C:/wsjbpm4/jbpm4/modules/distro/target/deploy-artifacts/lib">
+ <include name="*.jar" />
+ </fileset>
+ <pathelement location="target/test-classes"/>
+ </classpath>
+
+ <formatter type="plain"/>
+
+ <batchtest fork="yes" todir="target/test-results">
+ <fileset dir="src/test/java">
+ <include name="**/*Test.java"/>
+ <exclude name="**/TestCase.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+</project>
Property changes on: jbpm4/branches/tbaeyens/modules/examples/build.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 1 month
JBoss JBPM SVN: r4243 - jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-14 09:52:14 -0400 (Sat, 14 Mar 2009)
New Revision: 4243
Modified:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part2.persistence.xml
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml 2009-03-13 23:01:22 UTC (rev 4242)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part1.persistence.xml 2009-03-14 13:52:14 UTC (rev 4243)
@@ -10,16 +10,3 @@
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class>
- <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class>
-
- <exclude-unlisted-classes>true</exclude-unlisted-classes>
-
- <properties>
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part2.persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part2.persistence.xml 2009-03-13 23:01:22 UTC (rev 4242)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part2.persistence.xml 2009-03-14 13:52:14 UTC (rev 4243)
@@ -1,5 +1,13 @@
- </properties>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredentialType</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectAttribute</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType</class>
+ <class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipName</class>
- </persistence-unit>
-
-</persistence>
\ No newline at end of file
+ <exclude-unlisted-classes>true</exclude-unlisted-classes>
+
+ <properties>
17 years, 1 month
JBoss JBPM SVN: r4242 - in jbpm4/branches/tbaeyens/modules: distro/.settings and 3 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-13 19:01:22 -0400 (Fri, 13 Mar 2009)
New Revision: 4242
Modified:
jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
jbpm4/branches/tbaeyens/modules/distro/pom.xml
jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 21:58:53 UTC (rev 4241)
+++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 23:01:22 UTC (rev 4242)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Fri Mar 13 17:58:37 CET 2009
+#Fri Mar 13 22:58:08 CET 2009
Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-13 21:58:53 UTC (rev 4241)
+++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-03-13 23:01:22 UTC (rev 4242)
@@ -187,6 +187,8 @@
<property name="product.short.name" value="${artifactId}" />
<property name="product.version" value="${project.version}" />
<property name="user.home" value="${user.home}" />
+ <property name="user.dir" value="${user.dir}" />
+
<ant antfile="scripts/antrun-installer.xml" target="build-installer" />
</tasks>
</configuration>
Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 21:58:53 UTC (rev 4241)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 23:01:22 UTC (rev 4242)
@@ -35,12 +35,15 @@
<mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
<echo message="creating hsqldb db" />
- <ant antfile="build.xml"
+
+ <echo message="USER DIR: ${user.dir}/target/db" />
+ <mkdir dir="${user.dir}/target/db" />
+
+ <ant antfile="src/main/resources/config-tool/build.xml"
target="db.create"
- inheritall="false"
- dir="src/main/resources/config-tool">
+ inheritall="false">
<property name="database" value="hsqldb.url" />
- <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:../../../../target/deploy-artifacts/resources/hypersonic/Jbpm4DB" />
+ <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/Jbpm4DB" />
<property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
<property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" />
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
@@ -48,7 +51,7 @@
</ant>
<sql driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB"
+ url="jdbc:hsqldb:file:target/db/Jbpm4DB"
userid="sa"
password=""
onerror="continue">
@@ -60,6 +63,12 @@
</classpath>
</sql>
+ <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
+ <copy todir="${deploy.artifacts.dir}/resources/hsqldb">
+ <fileset dir="${user.dir}/target/db" />
+ </copy>
+
+
<echo message="creating db configurations" />
<ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
<property name="database" value="hsqldb" />
@@ -88,8 +97,8 @@
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
<property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
</ant>
-
+
<!-- the next copy depends on previous config-tool execution -->
<mkdir dir="${deploy.artifacts.dir}/resources/datasources" />
<copy todir="${deploy.artifacts.dir}/resources/datasources">
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 21:58:53 UTC (rev 4241)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 23:01:22 UTC (rev 4242)
@@ -264,10 +264,10 @@
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-hsqldb-config"
targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
condition="isHypersonic" />
- <fileset dir="@{deploy.artifacts.dir}/resources"
- targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data"
+ <fileset dir="@{deploy.artifacts.dir}/resources/hsqldb"
+ targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/hypersonic"
condition="isHypersonic">
- <include name="hypersonic/Jbpm4DB.*" />
+ <include name="Jbpm4DB.*" />
</fileset>
<!-- Database MySQL -->
Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 21:58:53 UTC (rev 4241)
+++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 23:01:22 UTC (rev 4242)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Fri Mar 13 20:59:08 CET 2009
+#Fri Mar 13 23:53:42 CET 2009
17 years, 1 month
JBoss JBPM SVN: r4241 - in jbpm4/branches/tbaeyens: modules/examples/src/test/resources and 5 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-13 17:58:53 -0400 (Fri, 13 Mar 2009)
New Revision: 4241
Modified:
jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml
jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
jbpm4/branches/tbaeyens/windows/test.distro.bat
Log:
work
Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -35,11 +35,12 @@
<mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
<echo message="creating hsqldb db" />
- <ant antfile="src/main/resources/config-tool/build.xml"
+ <ant antfile="build.xml"
target="db.create"
- inheritall="false">
+ inheritall="false"
+ dir="src/main/resources/config-tool">
<property name="database" value="hsqldb.url" />
- <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/deploy-artifacts/resources/hypersonic/Jbpm4DB" />
+ <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:../../../../target/deploy-artifacts/resources/hypersonic/Jbpm4DB" />
<property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
<property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" />
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
<history-service />
<management-service />
<task-service />
- <identity-service />
<command-service>
<retry-interceptor />
@@ -25,8 +24,6 @@
<hibernate-session-factory />
- <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
<deployer-manager>
<assign-file-type>
<file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
<message-session />
<timer-session />
<history-session />
- <identity-session realm="realm://jbpm-identity" />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
<history-service />
<management-service />
<task-service />
- <identity-service />
<command-service>
<retry-interceptor />
@@ -25,8 +24,6 @@
<hibernate-session-factory />
- <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
<deployer-manager>
<assign-file-type>
<file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
<message-session />
<timer-session />
<history-session />
- <identity-session realm="realm://jbpm-identity" />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -18,6 +18,12 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
+ <many-to-one name="processDefinition"
+ class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
+ column="PROCDEF_"
+ foreign-key="FK_HISTPI_PROCDEF"
+ index="IDX_HISTPI_PROCDEF" />
+
<set name="historyActivityInstances"
cascade="all">
<key>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/META-INF/persistence.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,7 @@
<persistence-unit name="jboss-identity-jbpm" transaction-type="RESOURCE_LOCAL">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
-
+
<class>org.jboss.identity.idm.impl.model.hibernate.HibernateRealm</class>
<class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject</class>
<class>org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectCredential</class>
Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -18,6 +18,12 @@
<property name="state" column="STATE_" />
<property name="endActivityName" column="ENDACTIVITY_" />
+ <many-to-one name="processDefinition"
+ class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl"
+ column="PROCDEF_"
+ foreign-key="FK_HISTPI_PROCDEF"
+ index="IDX_HISTPI_PROCDEF" />
+
<set name="historyActivityInstances"
cascade="all">
<key>
Modified: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-03-13 21:58:53 UTC (rev 4241)
@@ -9,7 +9,6 @@
<history-service />
<management-service />
<task-service />
- <identity-service />
<command-service>
<retry-interceptor />
@@ -25,8 +24,6 @@
<hibernate-session-factory />
- <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
<deployer-manager>
<assign-file-type>
<file extension=".jpdl.xml" type="jpdl" />
@@ -69,7 +66,6 @@
<message-session />
<timer-session />
<history-session />
- <identity-session realm="realm://jbpm-identity" />
</transaction-context>
</jbpm-configuration>
Modified: jbpm4/branches/tbaeyens/windows/test.distro.bat
===================================================================
--- jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 20:22:24 UTC (rev 4240)
+++ jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 21:58:53 UTC (rev 4241)
@@ -13,5 +13,5 @@
cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
rmdir /S /Q %JBOSS_HOME%
unzip -q %JBOSS_DISTRO_FILE% -d c:\Software
-java -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
+java -DTRACE -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
start "JBoss" %JBOSS_HOME%\bin\run.bat
17 years, 1 month
JBoss JBPM SVN: r4240 - in jbpm4/branches/tbaeyens: modules/distro/.settings and 9 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-03-13 16:22:24 -0400 (Fri, 13 Mar 2009)
New Revision: 4240
Added:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml
Removed:
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml
Modified:
jbpm4/branches/tbaeyens/build.xml
jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml
jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
jbpm4/branches/tbaeyens/modules/userguide/
jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
jbpm4/branches/tbaeyens/windows/test.distro.bat
Log:
work
Modified: jbpm4/branches/tbaeyens/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/build.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/build.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -139,7 +139,6 @@
<property name="config.files.dir" value="${basedir}/modules/pvm/src/test/resources" />
<property name="tmp.dir" value="${basedir}/modules/pvm/target/config-tmp" />
<property name="jpdl" value="exclude" />
- <property name="identity" value="include" />
</ant>
<ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false">
<property name="config.files.dir" value="${basedir}/modules/jpdl/src/test/resources" />
@@ -155,6 +154,13 @@
</ant>
</target>
+ <target name="test.configuration" description="create test configuration in target/config">
+ <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" target="create.configuration.files" inheritall="false">
+ <property name="config.files.dir" value="${basedir}/target/config" />
+ <property name="tmp.dir" value="${basedir}/target/config.tmp" />
+ </ant>
+ </target>
+
<target name="db.create">
<fail unless="database" message="property database must be specified. E.g. ant -Ddatabase=oracle db.create"/>
<exec dir="modules/db" executable="${mvn.executable}">
Modified: jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/.settings/attachedFile.properties 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Thu Mar 12 08:40:10 CET 2009
+#Fri Mar 13 17:58:37 CET 2009
Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/scripts/antrun-installer.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -63,6 +63,7 @@
<ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
<property name="database" value="hsqldb" />
<property name="connection.type" value="datasource" />
+ <property name="deployment.type" value="ejb.local" />
<property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
<property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
@@ -71,6 +72,7 @@
<ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
<property name="database" value="mysql" />
<property name="connection.type" value="datasource" />
+ <property name="deployment.type" value="ejb.local" />
<property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-mysql-config" />
<property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
@@ -79,6 +81,7 @@
<ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
<property name="database" value="oracle" />
<property name="connection.type" value="datasource" />
+ <property name="deployment.type" value="ejb.local" />
<property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-oracle-config" />
<property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
<property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.properties 2009-03-13 20:22:24 UTC (rev 4240)
@@ -8,7 +8,8 @@
cache=hashtable
connection.type=jdbc
+deployment.type=standalone
+jpdl=include
+identity=include
format.sql=include
-jpdl=include
-identity=exclude
log.cfg=logging.properties
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/build.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -48,12 +48,13 @@
<concat destfile="${config.files.dir}/jbpm.cfg.xml">
<filelist dir=".">
<file name="jbpm/cfg/part1.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" />
+ <file name="jbpm/cfg/identity.service.${identity}.xml" />
+ <file name="jbpm/cfg/command.service.${deployment.type}.xml" />
<file name="jbpm/cfg/part2.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.session.factory.${identity}.jbpm.cfg.xml" />
- <file name="jbpm/cfg/jpdl.deployers.${jpdl}.jbpm.cfg.xml" />
+ <file name="jbpm/cfg/identity.session.factory.${identity}.xml" />
+ <file name="jbpm/cfg/jpdl.deployers.${jpdl}.xml" />
<file name="jbpm/cfg/part3.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.session.${identity}.jbpm.cfg.xml" />
+ <file name="jbpm/cfg/identity.session.${identity}.xml" />
<file name="jbpm/cfg/part4.jbpm.cfg.xml" />
</filelist>
</concat>
@@ -67,6 +68,7 @@
<filelist dir=".">
<file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" />
<file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/>
+ <file name="jbpm/wire.bindings/deployment.type.${deployment.type}.xml"/>
<file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
</filelist>
</concat>
@@ -90,15 +92,15 @@
<filelist dir=".">
<file name="jbpm/wire.bindings/part1.jbpm.wire.bindings.xml" />
<file name="jbpm/wire.bindings/jpdl.${jpdl}.xml"/>
- <file name="jbpm/wire.bindings/enterprise.bindings.xml"/>
+ <file name="jbpm/wire.bindings/deployment.type.ejb.remote.xml" />
<file name="jbpm/wire.bindings/part2.jbpm.wire.bindings.xml" />
</filelist>
</concat>
<concat destfile="${config.files.dir}/jbpm.cfg.xml">
<filelist dir="${resolved.dir}">
<file name="jbpm/cfg/part1.jbpm.cfg.xml" />
- <file name="jbpm/cfg/identity.service.${identity}.jbpm.cfg.xml" />
- <file name="jbpm/cfg/remote.command.service.xml" />
+ <file name="jbpm/cfg/identity.service.${identity}.xml" />
+ <file name="jbpm/cfg/command.service.ejb.remote.xml" />
</filelist>
</concat>
<echo>Created remote jbpm configuration files in ${config.files.dir}</echo>
@@ -217,8 +219,10 @@
<concat destfile="${config.files.dir}/META-INF/persistence.xml">
<filelist dir="${tmp.dir}/identity">
<file name="part1.persistence.xml" />
+ <file name="connectiontype.${connection.type}.xml"/>
+ <file name="part2.persistence.xml" />
<file name="identity.persistence.properties.xml"/>
- <file name="part2.persistence.xml"/>
+ <file name="part3.persistence.xml"/>
</filelist>
</concat>
<copy file="identity/jbpm.identity.cfg.xml" todir="${config.files.dir}" overwrite="true" />
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1 @@
+ <non-jta-data-source>java:DefaultDS</non-jta-data-source>
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.datasource.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/connectiontype.jdbc.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,5 @@
+ </properties>
+
+ </persistence-unit>
+
+</persistence>
\ No newline at end of file
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/identity/META-INF/part3.persistence.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,3 @@
+ <ejb-local-command-service>
+ <home jndi-name="java:jbpm/CommandExecutor"/>
+ </ejb-local-command-service>
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.local.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,10 @@
+
+ <ejb-remote-command-service
+ initial-context-factory="org.jnp.interfaces.NamingContextFactory"
+ provider-url="jnp://@jboss.bind.address@"
+ url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces">
+ <retry-interceptor />
+ </ejb-remote-command-service>
+
+ </process-engine-context>
+</jbpm-configuration>
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.ejb.remote.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,5 @@
+ <command-service>
+ <retry-interceptor />
+ <environment-interceptor />
+ <standard-transaction-interceptor />
+ </command-service>
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/command.service.standalone.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml
===================================================================
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.jbpm.cfg.xml)
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.exclude.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1 +0,0 @@
- <identity-service />
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.jbpm.cfg.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1 @@
+ <identity-service />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.service.include.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml
===================================================================
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.jbpm.cfg.xml)
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.exclude.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml
===================================================================
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.jbpm.cfg.xml)
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.exclude.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,2 +0,0 @@
- <identity-session-factory resource="jbpm.identity.cfg.xml" />
-
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.jbpm.cfg.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,2 @@
+ <identity-session-factory resource="jbpm.identity.cfg.xml" />
+
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.factory.include.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1 +0,0 @@
- <identity-session realm="realm://jbpm-identity" />
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.jbpm.cfg.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1 @@
+ <identity-session realm="realm://jbpm-identity" />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/identity.session.include.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1 +0,0 @@
- <deployer-manager>
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.jbpm.cfg.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1 @@
+ <deployer-manager>
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.exclude.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,5 +0,0 @@
- <deployer-manager>
- <assign-file-type>
- <file extension=".jpdl.xml" type="jpdl" />
- </assign-file-type>
- <parse-jpdl />
Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml (from rev 4236, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.jbpm.cfg.xml)
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,5 @@
+ <deployer-manager>
+ <assign-file-type>
+ <file extension=".jpdl.xml" type="jpdl" />
+ </assign-file-type>
+ <parse-jpdl />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/jpdl.deployers.include.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/part2.jbpm.cfg.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,9 +1,3 @@
-
- <command-service>
- <retry-interceptor />
- <environment-interceptor />
- <standard-transaction-interceptor />
- </command-service>
<hibernate-configuration>
<cfg resource="jbpm.hibernate.cfg.xml" />
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/cfg/remote.command.service.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,10 +0,0 @@
-
- <ejb-remote-command-service
- initial-context-factory="org.jnp.interfaces.NamingContextFactory"
- provider-url="jnp://@jboss.bind.address@"
- url-pkg-prefixes="org.jboss.naming:org.jnp.interfaces">
- <retry-interceptor />
- </ejb-remote-command-service>
-
- </process-engine-context>
-</jbpm-configuration>
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,5 @@
+
+ <!-- enterprise bindings -->
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.local.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml (rev 0)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -0,0 +1,5 @@
+
+ <!-- enterprise bindings -->
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
+ <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.ejb.remote.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml
===================================================================
Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.standalone.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/enterprise.bindings.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,3 +0,0 @@
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
- <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />
Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/installer/install-definition.xml 2009-03-13 20:22:24 UTC (rev 4240)
@@ -160,7 +160,6 @@
<!-- jbpm/jbpm-service.sar , enterprise config-->
<fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
- <include name="jbpm.cfg.xml"/>
<include name="jbpm-users.properties"/>
<include name="jbpm-roles.properties"/>
</fileset>
@@ -179,6 +178,7 @@
<include name="jbpm-task.jar" />
<include name="idm*.jar" />
<include name="livetribe-jsr223.jar" />
+ <include name="juel*.jar" />
</fileset>
<!-- jbpm/jbpm-enterprise.jar -->
Property changes on: jbpm4/branches/tbaeyens/modules/userguide
___________________________________________________________________
Name: svn:ignore
+ target
Modified: jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties
===================================================================
--- jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/modules/userguide/.settings/attachedFile.properties 2009-03-13 20:22:24 UTC (rev 4240)
@@ -1,2 +1,2 @@
## index of importer -> set(imports)
-#Thu Mar 12 08:40:18 CET 2009
+#Fri Mar 13 20:59:08 CET 2009
Modified: jbpm4/branches/tbaeyens/windows/test.distro.bat
===================================================================
--- jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 16:11:50 UTC (rev 4239)
+++ jbpm4/branches/tbaeyens/windows/test.distro.bat 2009-03-13 20:22:24 UTC (rev 4240)
@@ -4,7 +4,7 @@
set DOWNLOAD_DIR=C:\Downloads\jboss
set JBOSS_VERSION=5.0.0.GA
set CONTAINER=jboss500
-set DATABASE=mysql
+set DATABASE=hsqldb
set JBOSS_DISTRO_FILE=C:\Downloads\jboss\jboss-%JBOSS_VERSION%.zip
set JBOSS_HOME=C:\Software\jboss-%JBOSS_VERSION%
@@ -12,5 +12,6 @@
cd %JBPM4_ROOT%
cmd /C mvn -DskipTests -Pdistro -Ddatabase=%DATABASE% -Djbpm.target.container=%CONTAINER% -Djboss.home=%JBOSS_HOME% clean install
rmdir /S /Q %JBOSS_HOME%
-unzip %JBOSS_DISTRO_FILE% -d c:\Software
-java -DTRACE=true -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
+unzip -q %JBOSS_DISTRO_FILE% -d c:\Software
+java -jar modules\distro\target\jbpm-installer-%JBPM_VERSION%.jar modules\distro\target\resources\auto-install-template.xml
+start "JBoss" %JBOSS_HOME%\bin\run.bat
17 years, 1 month