April 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r4614 - in jbpm4/branches/tbaeyens: modules/db and 7 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-24 11:51:43 -0400 (Fri, 24 Apr 2009) New Revision: 4614 Added: jbpm4/branches/tbaeyens/modules/db/scripts/ jbpm4/branches/tbaeyens/modules/db/src/main/config/ jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties Removed: jbpm4/branches/tbaeyens/modules/db/src/main/ant/ Modified: jbpm4/branches/tbaeyens/modules/db/ jbpm4/branches/tbaeyens/modules/db/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml jbpm4/branches/tbaeyens/pom.xml jbpm4/branches/tbaeyens/qa/build.xml Log: adding database schema creation Property changes on: jbpm4/branches/tbaeyens/modules/db ___________________________________________________________________ Name: svn:ignore - *.iml target .settings + *.iml target .settings Modified: jbpm4/branches/tbaeyens/modules/db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-04-24 13:38:29 UTC (rev 4613) +++ jbpm4/branches/tbaeyens/modules/db/pom.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -51,112 +51,29 @@ </dependency> </dependencies> - <profiles> -  + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>create-db-schemas</id> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="maven.runtime.classpath" refid="maven.runtime.classpath"/> + <ant antfile="scripts/antrun-schema.xml" + target="create-schema"> + </ant> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <profile> - <id>drop-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="db.drop" - inheritall="false"> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - - <property name="database" value="${database}" /> - <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> - <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> - <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" /> - <property name="libs.dir" value="${basedir}/target/libs" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>create-tables</id> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>create-drop-tables</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant antfile="../distro/src/main/resources/config-tool/build.xml" - target="db.create" - inheritall="false"> - - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - - <property name="database" value="${database}" /> - <property name="config.files.dir" value="${basedir}/target/config.tool/config.files" /> - <property name="tmp.dir" value="${basedir}/target/config.tool/tmp" /> - <property name="db.scripts.dir" value="${basedir}/target/config.tool/db.scripts" /> - <property name="libs.dir" value="${basedir}/target/libs" /> - </ant> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - - </profiles> - </project> \ No newline at end of file Added: jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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> Property changes on: jbpm4/branches/tbaeyens/modules/db/src/main/config/hsqldb.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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> Property changes on: jbpm4/branches/tbaeyens/modules/db/src/main/config/mysql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9Dialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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> Property changes on: jbpm4/branches/tbaeyens/modules/db/src/main/config/oracle.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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> Property changes on: jbpm4/branches/tbaeyens/modules/db/src/main/config/postgresql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-24 13:38:29 UTC (rev 4613) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -121,6 +121,13 @@ <outputDirectory>doc/schemadocs</outputDirectory> </fileSet> <fileSet> + <directory>../db/target</directory> + <outputDirectory>db/schema.scripts</outputDirectory> + <includes> + <include>*.sql</include> + </includes> + </fileSet> + <fileSet> <directory>../devguide/target/docbook/publish/en</directory> <outputDirectory>doc/devguide</outputDirectory> <excludes> Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.db.install"> + +  + <property file="jdbc.properties" /> + + <property name="jbpm.home" value="c:/software/jbpm-4.0.0-SNAPSHOT" /> + <property name="database" value="hsqldb" /> + +  + <target name="create.jbpm.schema"> + <sql driver="${jdbc.driver}" + url="${jdbc.url}" + userid="${jdbc.username}" + password="${jdbc.password}" + onerror="continue"> + <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.create.sql"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +  + <target name="drop.jbpm.schema"> + <sql driver="${jdbc.driver}" + url="${jdbc.url}" + userid="${jdbc.username}" + password="${jdbc.password}" + onerror="continue"> + <transaction src="${jbpm.home}/db/schema.scripts/jbpm.${database}.drop.sql"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="*.jar"/> + </fileset> + </classpath> + </sql> + </target> + +  + <target name="hsqldb.databasemanager"> + <java classname="org.hsqldb.util.DatabaseManager"> + <arg line="-url jdbc:hsqldb:hsql://localhost/jbpm4DB"/> + <classpath> + <fileset dir="${jbpm.home}/lib"> + <include name="hsqldb.jar"/> + </fileset> + </classpath> + </java> + </target> + +</project> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties 2009-04-24 15:51:43 UTC (rev 4614) @@ -0,0 +1,4 @@ +jdbc.driver=org.hsqldb.jdbcDriver +jdbc.url=jdbc:hsqldb:hsql://localhost/jbpm4DB +jdbc.username=sa +jdbc.password= Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/db/jdbc.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-24 13:38:29 UTC (rev 4613) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -29,7 +29,7 @@  - <target name="install.jbpm.into.jboss"> + <target name="install.jbpm.into.jboss" description="installs jBPM into JBoss"> <antcall target="install.jbpm.into.jboss.generics" /> <antcall target="install.jbpm.into.jboss.500specifics" /> <antcall target="install.jbpm.into.jboss.db.hsqldb" /> @@ -152,4 +152,24 @@ <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" /> </target> +  + <target name="jboss.start" description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> + <taskdef name="start-jboss" + classname="org.jbpm.pvm.internal.ant.StartJBossTask"> + <classpath> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + </classpath> + </taskdef> + <start-jboss jbosshome="${jboss.home}" /> + </target> + +  + <target name="jboss.stop" description="signals jboss to stop, but doesn't wait till its finished"> + <exec executable="${jboss.home}/bin/shutdown.bat" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="-S"/> + </exec> + </target> + </project> Modified: jbpm4/branches/tbaeyens/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/pom.xml 2009-04-24 13:38:29 UTC (rev 4613) +++ jbpm4/branches/tbaeyens/pom.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -430,6 +430,7 @@ <id>distro</id> <modules> <module>modules/enterprise</module> + <module>modules/db</module> <module>modules/devguide</module> <module>modules/userguide</module> <module>modules/distro</module> Modified: jbpm4/branches/tbaeyens/qa/build.xml =================================================================== --- jbpm4/branches/tbaeyens/qa/build.xml 2009-04-24 13:38:29 UTC (rev 4613) +++ jbpm4/branches/tbaeyens/qa/build.xml 2009-04-24 15:51:43 UTC (rev 4614) @@ -12,6 +12,7 @@ <property name="jbpm.distro.url" value="${maven.repository}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> <property name="tmp.dir" value="c:/temp/jbpmqa" /> <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" /> + <property name="jboss.home" value="c:/software/jboss-5.0.0.GA" /> <target name="check.jbpm.home" unless="jbpm.home"> <fail message="specify jbpm.home like this: ant -Djbpm.home=... targetname" /> @@ -28,5 +29,11 @@ </target> <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> + + <target name="reinstall.jboss"> + <ant antfile="${jbpm.home}/jboss/build.xml" target="reinstall.jboss"> + <property name="jboss.home" value="${jboss.home}" /> + </ant> + </target> </project>

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4613 - in jbpm4/branches/tbaeyens: hudson/jboss and 8 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-24 09:38:29 -0400 (Fri, 24 Apr 2009) New Revision: 4613 Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html jbpm4/branches/tbaeyens/qa/ jbpm4/branches/tbaeyens/qa/build.xml Removed: jbpm4/branches/tbaeyens/hudson/jboss/build.xml jbpm4/branches/tbaeyens/modules/distro/src/main/resources/jboss.eula.txt jbpm4/branches/tbaeyens/modules/distro/src/main/resources/license.txt jbpm4/branches/tbaeyens/modules/distro/src/main/resources/readme.html Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml Log: added ant based jboss installer Deleted: jbpm4/branches/tbaeyens/hudson/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/hudson/jboss/build.xml 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/hudson/jboss/build.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project name="jbpm.jboss.install"> - - <property file="build.properties" /> - - <property name="jboss.version" value="5.0.0.GA" /> - <property name="jboss.distro" value="C:/Downloads/jboss/jboss-${jboss.version}.zip" /> - <property name="jboss.home" value="C:/Software/jboss-${jboss.version}" /> - - <target name="clean.install" - depends="delete.jboss.installation, install.jboss, install.jbpm" - description="re-installs jboss and then installs jbpm in there" /> - - <target name="delete.jboss.installation"> - <delete dir="${jboss.home}" /> - </target> - - <target name="install.jboss"> - <unzip src="${jboss.distro}" dest="${jboss.home}/.." /> - </target> - - <target name="install.jbpm"> - <copy todir="${jboss.home}"> - <fileset dir="C:/Software/jbpm-4.0.0-before/jboss-5.0.0.GA" /> - </copy> - </target> - -</project> Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -175,12 +175,13 @@ <executions> <execution> - <id>generate-jbpm-single-jar</id> + <id>create-jbpm-single-jar</id> <phase>process-resources</phase> <goals> <goal>single</goal> </goals> <configuration> + <finalName>jbpm</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> @@ -190,12 +191,13 @@ </execution> <execution> - <id>prepare-files-for-installer</id> + <id>create-distribution-package</id> <phase>package</phase> <goals> <goal>single</goal> </goals> <configuration> + <finalName>jbpm-${version}</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -16,22 +16,42 @@  <dependencySets>  - <dependencySet> +  <dependencySet> <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> + <unpack>false</unpack> <scope>test</scope> - <unpack>false</unpack> + <excludes> + <exclude>org.jbpm.jbpm4:jbpm-api:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-log:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-test-base:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-pvm:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-jpdl:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-enterprise:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-distro:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-examples:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-gpd:zip</exclude> + <exclude>org.jbpm.jbpm4:jbpm-test-db:jar</exclude> + <exclude>org.jbpm.jbpm4:jbpm-jboss*:jar</exclude> + </excludes> </dependencySet> <dependencySet> <includes> + <include>org.jbpm.jbpm4:jbpm-jboss*:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <outputDirectory>jboss/lib</outputDirectory> + </dependencySet> + <dependencySet> + <includes> <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> </includes> <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> @@ -39,7 +59,7 @@ </dependencySet>  <dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <outputDirectory>jboss/jbpm-enterprise-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> <include>*:jbpm-enterprise:jar:config</include> @@ -47,7 +67,7 @@ <unpack>true</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-spi-config</outputDirectory> + <outputDirectory>jboss/jbpm-spi-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> <include>*:jbpm-spi:jar:config</include> @@ -55,7 +75,7 @@ <unpack>true</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-console-config</outputDirectory> + <outputDirectory>jboss/jbpm-console-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> <include>*:jbpm-console-integration:jar:config</include> @@ -63,7 +83,7 @@ <unpack>true</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> + <outputDirectory>jboss/jbpm-jboss5-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> <include>*:jbpm-jboss5:jar:config</include> @@ -71,7 +91,7 @@ <unpack>true</unpack> </dependencySet> <dependencySet> - <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> + <outputDirectory>jboss/jbpm-jboss4-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> <include>*:jbpm-jboss4:jar:config</include> @@ -82,21 +102,23 @@ <fileSets> <fileSet> - <directory>src/main/resources</directory> + <directory>src/main/files</directory> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>target</directory> + <outputDirectory></outputDirectory> <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> + <include>jbpm.jar</include> </includes> - <outputDirectory></outputDirectory> </fileSet> <fileSet> <directory>../api/target/apidocs</directory> <outputDirectory>doc/javadocs</outputDirectory> </fileSet> <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> </fileSet> <fileSet> <directory>../devguide/target/docbook/publish/en</directory> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - <id>jbpm.all.jar</id> + <id>jbpm.single.jar</id> <finalName>jbpm</finalName> <formats> @@ -49,5 +49,12 @@ <unpack>true</unpack> <outputDirectory></outputDirectory> </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-enterprise</include> + </includes> + <unpack>true</unpack> + <outputDirectory></outputDirectory> + </dependencySet> </dependencySets> </assembly> Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml (from rev 4607, jbpm4/branches/tbaeyens/hudson/jboss/build.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.jboss.install"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <property name="tmp.dir" value="c:/temp/jbpmqa" /> + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jboss.filename" value="jboss-${jboss.version}.zip" /> + <property name="jboss.distro.url" value="file:///c:/downloads/jboss/${jboss.filename}" /> + <property name="jboss.distro.local.path" value="${tmp.dir}/${jboss.filename}" /> + <property name="jboss.home" value="c:/software/jboss-${jboss.version}" /> + <property name="jboss.server.configuration" value="default" /> + <property name="jboss.server.config.dir" value="${jboss.home}/server/${jboss.server.configuration}" /> + + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" /> + + <property name="database" value="hsqldb" /> + + <condition property="jboss.version.500"> + <equals arg1="${jboss.version}" arg2="5.0.0.GA" /> + </condition> + <condition property="database.hsqldb"> + <equals arg1="${database}" arg2="hsqldb" /> + </condition> + + +  + <target name="install.jbpm.into.jboss"> + <antcall target="install.jbpm.into.jboss.generics" /> + <antcall target="install.jbpm.into.jboss.500specifics" /> + <antcall target="install.jbpm.into.jboss.db.hsqldb" /> + </target> + +  + <target name="install.jbpm.into.jboss.generics"> + <copy todir="${jboss.server.config.dir}/lib" overwrite="true"> + <fileset dir="${jbpm.home}"> + <include name="jbpm.jar" /> + </fileset> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console-server-integration.jar" /> + <include name="gwt-console-rpc.jar" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="gwt-console.war" /> + <include name="gwt-console-server.war" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="jbpm-console-integration.jar" /> + <include name="livetribe-jsr223.jar" /> + <include name="juel*.jar" /> + <include name="jbpm-spi.jar"/> + <include name="jbpm-jboss5.jar"/> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/META-INF" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/jbpm-console-config"> + <include name="jboss-service.xml" /> + </fileset> + </copy> + + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/jbpm-enterprise-config"> + <include name="jbpm-destinations-service.xml"/> + </fileset> + </copy> + + <mkdir dir="${jboss.home}/docs/examples/jbpm" /> + <copy todir="${jboss.home}/docs/examples/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources" /> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.500specifics" if="jboss.version.500"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/lib"> + <include name="jbpm-jboss5.jar"/> + </fileset> + <fileset dir="${jbpm.home}/lib"> + <include name="jbpm-spi.jar"/> + </fileset> + <fileset dir="${jbpm.home}/jboss/jbpm-jboss5-config"> + <include name="jbpm-service-jboss-beans.xml"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.hsqldb" if="database.hsqldb"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources"> + <include name="jbpm-hsqldb-ds.xml"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.mysql" if="database.mysql"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> + <fileset dir="${jbpm.home}/jboss/datasources"> +  + <include name="jbpm-mysql-ds.xml"/> + </fileset> + </copy> + <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true"> + <fileset dir="${jbpm.home}/lib"> + <include name="mysql-connector-java.jar"/> + </fileset> + </copy> + </target> + +  + <target name="install.jbpm.into.jboss.db.oracle" if="database.oracle"> + <copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true"> +  + <fileset dir="${jbpm.home}/jboss/datasources"> + <include name="jbpm-oracle-ds.xml"/> + </fileset> + </copy> + </target> + + +  + <target name="reinstall.jboss" + depends="delete.jboss.installation, install.jboss" + description="re-installs jboss and then installs jbpm in there" /> + + <target name="delete.jboss.installation"> + <delete dir="${jboss.home}" /> + </target> + + <target name="install.jboss"> + <available file="${jboss.distro.local.path}" property="jboss.available.locally" /> + <antcall target="get.jboss" /> + <unzip src="${jboss.distro.local.path}" dest="${jboss.home}/.." /> + </target> + + <target name="get.jboss" unless="jboss.available.locally"> + <mkdir dir="${tmp.dir}" /> + <get src="${jboss.distro.url}" dest="${jboss.distro.local.path}" /> + </target> + +</project> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <local-tx-datasource> + <jndi-name>JbpmDS</jndi-name> + + <connection-url>jdbc:hsqldb:hsql://localhost/jbpm4DB</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + +  + <min-pool-size>1</min-pool-size> + <max-pool-size>5</max-pool-size> + +  + <idle-timeout-minutes>0</idle-timeout-minutes> +  + <track-statements /> +  + <prepared-statement-cache-size>32</prepared-statement-cache-size> + +  + <metadata> + <type-mapping>Hypersonic SQL</type-mapping> + </metadata> + +  + <depends>jboss:service=Hypersonic,database=jbpm4DB</depends> + </local-tx-datasource> + + <mbean code="org.jboss.jdbc.HypersonicDatabase" name="jboss:service=Hypersonic,database=jbpm4DB"> + <attribute name="Database">jbpm4DB</attribute> + <attribute name="InProcessMode">false</attribute> + </mbean> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-hsqldb-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">@jdbc.mysql.server@</xa-datasource-property> + <xa-datasource-property name="PortNumber">@jdbc.mysql.port@</xa-datasource-property> + <xa-datasource-property name="DatabaseName">@jdbc.mysql.database@</xa-datasource-property> + <user-name>@jdbc.mysql.username@</user-name> + <password>@jdbc.mysql.password@</password> + +  + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> +  + <no-tx-separate-pools /> +  + <track-connection-by-tx /> + +  + <exception-sorter-class-name> + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + </exception-sorter-class-name> + <valid-connection-checker-class-name> + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + </valid-connection-checker-class-name> + +  + <metadata> + <type-mapping>mySQL</type-mapping> + </metadata> + </xa-datasource> + +</datasources> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-mysql-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + +<datasources> + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + <track-connection-by-tx/> +  + <isSameRM-override-value>false</isSameRM-override-value> + <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class> + <xa-datasource-property name="URL">jdbc:oracle:thin:@jdbc.oracle.username@/@jdbc.oracle.password@@@jdbc.oracle.server@:@jdbc.oracle.port@:@jdbc.oracle.database@</xa-datasource-property> + <xa-datasource-property name="User">@jdbc.oracle.username@</xa-datasource-property> + <xa-datasource-property name="Password">@jdbc.oracle.password@</xa-datasource-property> +  +  +  + <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name> +  + <no-tx-separate-pools/> + +  + <metadata> + <type-mapping>Oracle9i</type-mapping> + </metadata> + </xa-datasource> + + <mbean code="org.jboss.resource.adapter.jdbc.vendor.OracleXAExceptionFormatter" + name="jboss.jca:service=OracleXAExceptionFormatter"> + <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> + </mbean> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-oracle-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class> + <xa-datasource-property name="ServerName">@jdbc.postgresql.server@</xa-datasource-property> + <xa-datasource-property name="PortNumber">@jdbc.postgresql.port@</xa-datasource-property> + <xa-datasource-property name="DatabaseName">@jdbc.postgresql.database@</xa-datasource-property> + <user-name>@jdbc.postgresql.username@</user-name> + <password>@jdbc.postgresql.password@</password> + +  + <track-connection-by-tx /> + +  + <metadata> + <type-mapping>PostgreSQL 8.0</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-postgresql-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<datasources> + + <xa-datasource> + <jndi-name>JbpmDS</jndi-name> + + <xa-datasource-class>@jdbc.sybase.datasource@</xa-datasource-class> + <xa-datasource-property name="ServerName">@jdbc.sybase.server@</xa-datasource-property> + <xa-datasource-property name="PortNumber">@jdbc.sybase.port@</xa-datasource-property> + <xa-datasource-property name="DatabaseName">@jdbc.sybase.database@</xa-datasource-property> + <user-name>@jdbc.sybase.username@</user-name> + <password>@jdbc.sybase.password@</password> + +  + <track-connection-by-tx /> + + <exception-sorter-class-name> + org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter + </exception-sorter-class-name> + +  + <metadata> + <type-mapping>Sybase</type-mapping> + </metadata> + </xa-datasource> + +</datasources> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss/datasources/jbpm-sybase-ds.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt (from rev 4603, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/jboss.eula.txt) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/jboss.eula.txt 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,107 @@ +LICENSE AGREEMENT +JBOSS(r) + +This License Agreement governs the use of the Software Packages and any updates to the Software +Packages, regardless of the delivery mechanism. Each Software Package is a collective work +under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to +the user ("Client") a license to the applicable collective work(s) pursuant to the +GNU Lesser General Public License v. 2.1 except for the following Software Packages: +(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the +GNU General Public License v.2; + +(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; + +(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the +(open source) Sleepycat License (if Client does not wish to use the open source version of this database, +it may purchase a license from Sleepycat Software); + +and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, +and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various +royalty-free patent licenses. + +Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. + +1. The Software. "Software Packages" refer to the various software modules that are created and made available +for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages +may be comprised of hundreds of software components. The end user license agreement for each component is located in +the component's source code. With the exception of certain image files identified in Section 2 below, +the license terms for the components permit Client to copy, modify, and redistribute the component, +in both source code and binary code forms. This agreement does not limit Client's rights under, +or grant Client rights that supersede, the license terms of any particular component. + +2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright +and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall +remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the +individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates +in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages +using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's +trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by +these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. +If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at +http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. +Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. + +3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular +component, to the maximum extent permitted under applicable law, the Software Packages and the +components are provided and licensed "as is" without warranty of any kind, expressed or implied, +including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. +Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in +materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. +Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements +or that the operation of the Software Packages will be entirely error free or appear precisely as described +in the accompanying documentation. This warranty extends only to the party that purchases the Services +pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. + +4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies +described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's +exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of +delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or +refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, +Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential +damages, including lost profits or lost savings arising out of the use or inability to use the Software, +even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall +Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this +Agreement during the twelve months preceding the action. + +5. Export Control. As required by U.S. law, Client represents and warrants that it: +(a) understands that the Software Packages are subject to export controls under the +U.S. Commerce Department's Export Administration Regulations ("EAR"); + +(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations +(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); + +(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, +or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; + +(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or +biological weapons, or missile technology end-uses unless authorized by the U.S. Government by +regulation or specific license; + +(e) understands and agrees that if it is in the United States and exports or transfers the Software +Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual +reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and +address (including country) of each transferee; + +and (f) understands that countries other than the United States may restrict the import, use, or +export of encryption products and that it shall be solely responsible for compliance with any such +import, use, or export restrictions. + +6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages +that are not part of the Software Packages and which Client must install separately. These third party +programs are subject to their own license terms. The license terms either accompany the programs or +can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable +license terms for such programs, then Client may not install them. If Client wishes to install the programs +on more than one system or transfer the programs to another party, then Client must contact the licensor +of the programs. + +7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the +enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the +State of North Carolina and of the United States, without regard to any conflict of laws provisions, +except that the United Nations Convention on the International Sale of Goods shall not apply. + +Copyright 2006 Red Hat, Inc. All rights reserved. +"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. +All other trademarks are the property of their respective owners. + + Page 1 of 1 18 October 2006 + Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt (from rev 4603, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/license.txt) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/license.txt 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library 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 library 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 library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + Copied: jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html (from rev 4603, jbpm4/branches/tbaeyens/modules/distro/src/main/resources/readme.html) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,143 @@ +<html> + <head> + <title>jBPM 4 Readme and Release Notes</title> + </head> + <body> + <h1>Readme</h1> + + <p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>. + We'll fix this in one of the next versions. + See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>. + </p> + + <table> + <tr> + <th>Link</th> + <th>Description</th> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/userguide/html_single/index.html">User guide</a></td> + <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/javadocs/index.html">Javadocs</a></td> + <td>Javadocs describing the stable and supported API</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/schemadocs/index.html">Schemadocs</a></td> + <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> + </tr> + <tr> + <td valign="top" style="white-space:nowrap;"><a href="doc/devguide/html_single/index.html">Developers guide</a></td> + <td>Describes more configuration, usage and tweaking options. + Unleash all the flexibility in jBPM. But beware, the parts documented in this dev + guide are not guaranteed to be forward compatible.</td> + </tr> + </table> + + <h1>Release notes for jBPM 4.0.0.Alpha2</h1> + +<h2> Bug +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1980'>JBPM-1980</a>] - Failed to initialze ScriptEngineManager on JDK 1.5 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1981'>JBPM-1981</a>] - Example tests fail +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2049'>JBPM-2049</a>] - hbm2ddl.auto doesn't work within AS +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2072'>JBPM-2072</a>] - ConnectionManager deadlock running XA transaction on AS 4 +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1946'>JBPM-1946</a>] - IzPack installer for jBPM4 that supports JBoss +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1993'>JBPM-1993</a>] - Interface with the JBoss identity component +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1998'>JBPM-1998</a>] - Dinstinction between candiadate-groups and candidate-users in Task API and model +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1246'>JBPM-1246</a>] - document build +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1280'>JBPM-1280</a>] - build out job executor basic test coverage +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1411'>JBPM-1411</a>] - migrate enterprise into separate module +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1753'>JBPM-1753</a>] - review event names +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1759'>JBPM-1759</a>] - cleanup excluded tests +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1861'>JBPM-1861</a>] - complete taskservice api +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1967'>JBPM-1967</a>] - rename flow to transition +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1971'>JBPM-1971</a>] - fix test-load hudson job in qa lab +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1972'>JBPM-1972</a>] - introduce process definition attachments +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1973'>JBPM-1973</a>] - finish programmatic process definition creation +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1974'>JBPM-1974</a>] - rename node to activity +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1977'>JBPM-1977</a>] - Provide process management through the GWT console on jbpm4 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1978'>JBPM-1978</a>] - configure pvm2 user for hudson job jbpm4-load +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1983'>JBPM-1983</a>] - rename context environment to transaction +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1986'>JBPM-1986</a>] - rename ExecutionService.startExecutionXxx methods to startProcessInstanceXxx +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1997'>JBPM-1997</a>] - API package refactoring +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2003'>JBPM-2003</a>] - document release procedure in a wiki page +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2020'>JBPM-2020</a>] - fix timer mapping +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2032'>JBPM-2032</a>] - verify blob caching +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2039'>JBPM-2039</a>] - initial history infrastructure +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2041'>JBPM-2041</a>] - move task mgmt into pvm module +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2044'>JBPM-2044</a>] - Distribute GPD through the installer +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2063'>JBPM-2063</a>] - examples hibernate configuration file +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2064'>JBPM-2064</a>] - re-introduce schema sql scripts in distro +</li> +</ul> + +<h2> Sub-task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2011'>JBPM-2011</a>] - Move non public classes to **/internal +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2012'>JBPM-2012</a>] - Split jars into *-api.jar and *-impl.jar +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-281'>GPD-281</a>] - Release jBPM Designer 4.0.0 Alpha2 +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-283'>GPD-283</a>] - Implement a tree structured details view for graphical entities +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-287'>GPD-287</a>] - XML preservation +</li> +<li>[<a href='https://jira.jboss.org/jira/browse/GPD-294'>GPD-294</a>] - Update to new icons +</li> +</ul> + + + <h1>Release notes for jBPM 4.0.0.Alpha1</h1> + <p>Finally.. phew !</p> + </body> +</html> Property changes on: jbpm4/branches/tbaeyens/modules/distro/src/main/files/readme.html ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/jboss.eula.txt =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/jboss.eula.txt 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/jboss.eula.txt 2009-04-24 13:38:29 UTC (rev 4613) @@ -1,107 +0,0 @@ -LICENSE AGREEMENT -JBOSS(r) - -This License Agreement governs the use of the Software Packages and any updates to the Software -Packages, regardless of the delivery mechanism. Each Software Package is a collective work -under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to -the user ("Client") a license to the applicable collective work(s) pursuant to the -GNU Lesser General Public License v. 2.1 except for the following Software Packages: -(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the -GNU General Public License v.2; - -(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0; - -(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the -(open source) Sleepycat License (if Client does not wish to use the open source version of this database, -it may purchase a license from Sleepycat Software); - -and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1, -and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various -royalty-free patent licenses. - -Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php. - -1. The Software. "Software Packages" refer to the various software modules that are created and made available -for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages -may be comprised of hundreds of software components. The end user license agreement for each component is located in -the component's source code. With the exception of certain image files identified in Section 2 below, -the license terms for the components permit Client to copy, modify, and redistribute the component, -in both source code and binary code forms. This agreement does not limit Client's rights under, -or grant Client rights that supersede, the license terms of any particular component. - -2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright -and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall -remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the -individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates -in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages -using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's -trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by -these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified. -If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at -http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted. -Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages. - -3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular -component, to the maximum extent permitted under applicable law, the Software Packages and the -components are provided and licensed "as is" without warranty of any kind, expressed or implied, -including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. -Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in -materials and manufacture under normal use for a period of 30 days from the date of delivery to Client. -Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements -or that the operation of the Software Packages will be entirely error free or appear precisely as described -in the accompanying documentation. This warranty extends only to the party that purchases the Services -pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor. - -4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies -described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's -exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of -delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or -refund the money paid by Client for the Software. To the maximum extent permitted by applicable law, -Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential -damages, including lost profits or lost savings arising out of the use or inability to use the Software, -even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall -Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this -Agreement during the twelve months preceding the action. - -5. Export Control. As required by U.S. law, Client represents and warrants that it: -(a) understands that the Software Packages are subject to export controls under the -U.S. Commerce Department's Export Administration Regulations ("EAR"); - -(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations -(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria); - -(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity, -or individual without the necessary export license(s) or authorizations(s) from the U.S. Government; - -(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or -biological weapons, or missile technology end-uses unless authorized by the U.S. Government by -regulation or specific license; - -(e) understands and agrees that if it is in the United States and exports or transfers the Software -Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual -reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and -address (including country) of each transferee; - -and (f) understands that countries other than the United States may restrict the import, use, or -export of encryption products and that it shall be solely responsible for compliance with any such -import, use, or export restrictions. - -6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages -that are not part of the Software Packages and which Client must install separately. These third party -programs are subject to their own license terms. The license terms either accompany the programs or -can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable -license terms for such programs, then Client may not install them. If Client wishes to install the programs -on more than one system or transfer the programs to another party, then Client must contact the licensor -of the programs. - -7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the -enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the -State of North Carolina and of the United States, without regard to any conflict of laws provisions, -except that the United Nations Convention on the International Sale of Goods shall not apply. - -Copyright 2006 Red Hat, Inc. All rights reserved. -"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc. -All other trademarks are the property of their respective owners. - - Page 1 of 1 18 October 2006 - Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/license.txt =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/license.txt 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/license.txt 2009-04-24 13:38:29 UTC (rev 4613) @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library 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 library 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 library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - Deleted: jbpm4/branches/tbaeyens/modules/distro/src/main/resources/readme.html =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/src/main/resources/readme.html 2009-04-24 12:43:17 UTC (rev 4612) +++ jbpm4/branches/tbaeyens/modules/distro/src/main/resources/readme.html 2009-04-24 13:38:29 UTC (rev 4613) @@ -1,143 +0,0 @@ -<html> - <head> - <title>jBPM 4 Readme and Release Notes</title> - </head> - <body> - <h1>Readme</h1> - - <p>Currently the userguide and devguide only show well in <a href="http://www.mozilla.com/firefox">firefox</a>. - We'll fix this in one of the next versions. - See <a href="https://jira.jboss.org/jira/browse/JBPM-1895">JBPM-1895</a>. - </p> - - <table> - <tr> - <th>Link</th> - <th>Description</th> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/userguide/html_single/index.html">User guide</a></td> - <td>Userguide docs describing the stable and supported ways of how to work with jBPM.</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/javadocs/index.html">Javadocs</a></td> - <td>Javadocs describing the stable and supported API</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/schemadocs/index.html">Schemadocs</a></td> - <td>Javadoc-like documentation of the jPDL XML schema and the jBPM configuration file XML schema</td> - </tr> - <tr> - <td valign="top" style="white-space:nowrap;"><a href="doc/devguide/html_single/index.html">Developers guide</a></td> - <td>Describes more configuration, usage and tweaking options. - Unleash all the flexibility in jBPM. But beware, the parts documented in this dev - guide are not guaranteed to be forward compatible.</td> - </tr> - </table> - - <h1>Release notes for jBPM 4.0.0.Alpha2</h1> - -<h2> Bug -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1980'>JBPM-1980</a>] - Failed to initialze ScriptEngineManager on JDK 1.5 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1981'>JBPM-1981</a>] - Example tests fail -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2049'>JBPM-2049</a>] - hbm2ddl.auto doesn't work within AS -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2072'>JBPM-2072</a>] - ConnectionManager deadlock running XA transaction on AS 4 -</li> -</ul> - -<h2> Feature Request -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1946'>JBPM-1946</a>] - IzPack installer for jBPM4 that supports JBoss -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1993'>JBPM-1993</a>] - Interface with the JBoss identity component -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1998'>JBPM-1998</a>] - Dinstinction between candiadate-groups and candidate-users in Task API and model -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1246'>JBPM-1246</a>] - document build -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1280'>JBPM-1280</a>] - build out job executor basic test coverage -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1411'>JBPM-1411</a>] - migrate enterprise into separate module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1753'>JBPM-1753</a>] - review event names -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1759'>JBPM-1759</a>] - cleanup excluded tests -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1861'>JBPM-1861</a>] - complete taskservice api -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1967'>JBPM-1967</a>] - rename flow to transition -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1971'>JBPM-1971</a>] - fix test-load hudson job in qa lab -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1972'>JBPM-1972</a>] - introduce process definition attachments -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1973'>JBPM-1973</a>] - finish programmatic process definition creation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1974'>JBPM-1974</a>] - rename node to activity -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1977'>JBPM-1977</a>] - Provide process management through the GWT console on jbpm4 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1978'>JBPM-1978</a>] - configure pvm2 user for hudson job jbpm4-load -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1983'>JBPM-1983</a>] - rename context environment to transaction -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1986'>JBPM-1986</a>] - rename ExecutionService.startExecutionXxx methods to startProcessInstanceXxx -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-1997'>JBPM-1997</a>] - API package refactoring -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2003'>JBPM-2003</a>] - document release procedure in a wiki page -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2020'>JBPM-2020</a>] - fix timer mapping -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2032'>JBPM-2032</a>] - verify blob caching -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2039'>JBPM-2039</a>] - initial history infrastructure -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2041'>JBPM-2041</a>] - move task mgmt into pvm module -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2044'>JBPM-2044</a>] - Distribute GPD through the installer -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2063'>JBPM-2063</a>] - examples hibernate configuration file -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2064'>JBPM-2064</a>] - re-introduce schema sql scripts in distro -</li> -</ul> - -<h2> Sub-task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2011'>JBPM-2011</a>] - Move non public classes to **/internal -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/JBPM-2012'>JBPM-2012</a>] - Split jars into *-api.jar and *-impl.jar -</li> -</ul> - -<h2> Task -</h2> -<ul> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-281'>GPD-281</a>] - Release jBPM Designer 4.0.0 Alpha2 -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-283'>GPD-283</a>] - Implement a tree structured details view for graphical entities -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-287'>GPD-287</a>] - XML preservation -</li> -<li>[<a href='https://jira.jboss.org/jira/browse/GPD-294'>GPD-294</a>] - Update to new icons -</li> -</ul> - - - <h1>Release notes for jBPM 4.0.0.Alpha1</h1> - <p>Finally.. phew !</p> - </body> -</html> Added: jbpm4/branches/tbaeyens/qa/build.xml =================================================================== --- jbpm4/branches/tbaeyens/qa/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/qa/build.xml 2009-04-24 13:38:29 UTC (rev 4613) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.install"> + +  + <property file="${user.home}/.jbpm4/build.properties" /> + +  + <property name="maven.repository" value="file:///c:/Documents and Settings/tom/.m2/repository" /> + <property name="jbpm.version" value="4.0.0-SNAPSHOT" /> + <property name="jbpm.filename" value="jbpm-distro-${jbpm.version}.zip" /> + <property name="jbpm.distro.url" value="${maven.repository}/org/jbpm/jbpm4/jbpm-distro/${jbpm.version}/${jbpm.filename}" /> + <property name="tmp.dir" value="c:/temp/jbpmqa" /> + <property name="jbpm.home" value="c:/software/jbpm-${jbpm.version}" /> + + <target name="check.jbpm.home" unless="jbpm.home"> + <fail message="specify jbpm.home like this: ant -Djbpm.home=... targetname" /> + </target> + + <target name="delete.jbpm.installation" depends="check.jbpm.home"> + <delete dir="${jbpm.home}" /> + </target> + + <target name="install.jbpm" depends="check.jbpm.home"> + <mkdir dir="${tmp.dir}" /> + <get src="${jbpm.distro.url}" dest="${tmp.dir}/${jbpm.filename}" /> + <unzip src="${tmp.dir}/${jbpm.filename}" dest="${jbpm.home}/.." /> + </target> + + <target name="reinstall.jbpm" depends="delete.jbpm.installation, install.jbpm" /> + +</project> Property changes on: jbpm4/branches/tbaeyens/qa/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4612 - jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-24 08:43:17 -0400 (Fri, 24 Apr 2009) New Revision: 4612 Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java Log: Adopt task form url Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-24 12:40:44 UTC (rev 4611) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-24 12:43:17 UTC (rev 4612) @@ -121,7 +121,6 @@ // TODO: weird API task.setProcessId( execution.getProcessInstance().getProcessInstance().getId() ); - // participations for(Participation p0 : cast.getParticipations()) { @@ -150,10 +149,9 @@ } - if(t0.getURL()==null) - task.setUrl( "http://google.de" ); - else - task.setUrl( t0.getURL().toExternalForm() ); + // task form url + String url = t0.getURL()!=null ? t0.getURL().toExternalForm() : ""; + task.setUrl( url ); return task; }

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4611 - in projects/gwt-console/trunk: plugin-api and 8 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-24 08:40:44 -0400 (Fri, 24 Apr 2009) New Revision: 4611 Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/plugin-api/plugin.iml projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/plugin-example/plugin-example.iml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java projects/gwt-console/trunk/server-integration/gwt-server-integration.iml projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java projects/gwt-console/trunk/war/gwt-war.iml projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java Log: Add task form window Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -22,7 +22,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module" module-name="plugin" exported="" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -152,35 +151,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -228,15 +198,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> @@ -328,6 +289,71 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/trunk/plugin-api/plugin.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/plugin-api/plugin.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -11,15 +11,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> @@ -111,6 +102,80 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-24 12:40:44 UTC (rev 4611) @@ -120,6 +120,7 @@ String assignee = JSONWalk.on(item).next("assignee").asString(); boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool(); boolean isSignalling = JSONWalk.on(item).next("isSignalling").asBool(); + String url = JSONWalk.on(item).next("url").asString(); TaskRef ref = new TaskRef( id, executionId, @@ -127,6 +128,8 @@ name, assignee, isSignalling, isBlocking ); + + ref.setUrl(url); // participant users JSONArray arrUsers = JSONWalk.on(item).next("participantUsers").asArray(); Modified: projects/gwt-console/trunk/plugin-example/plugin-example.iml =================================================================== --- projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -11,10 +11,12 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module" module-name="plugin-api" /> + <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="plugin" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -23,7 +25,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -32,7 +34,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -41,7 +43,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -50,18 +52,19 @@ <orderEntry type="module-library"> <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> </SOURCES> </library> </orderEntry> <orderEntry type="module-library"> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -70,7 +73,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -79,7 +82,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -88,7 +91,7 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -97,21 +100,86 @@ <orderEntry type="module-library"> <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-04-24 12:40:44 UTC (rev 4611) @@ -48,7 +48,9 @@ private List<ParticipantRef> participantUsers = new ArrayList<ParticipantRef>(); private List<ParticipantRef> participantGroups = new ArrayList<ParticipantRef>(); - + + private String url; + public TaskRef() { initOrUpdateState(); @@ -186,6 +188,16 @@ return currentState; } + public String getUrl() + { + return url; + } + + public void setUrl(String url) + { + this.url = url; + } + public String toString() { return "TaskRef{id:"+id+",state:"+currentState+"}"; Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/server/gwt-server.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -10,8 +10,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="gwt-server-integration" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-04-24 12:40:44 UTC (rev 4611) @@ -114,11 +114,4 @@ getTaskManagement().completeTask(taskId, outcome); return Response.ok().build(); } - - private Response createJsonResponse(Object wrapper) - { - Gson gson = GsonFactory.createInstance(); - String json = gson.toJson(wrapper); - return Response.ok(json).type("application/json").build(); - } } Modified: projects/gwt-console/trunk/server-integration/gwt-server-integration.iml =================================================================== --- projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/server-integration/gwt-server-integration.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -8,7 +8,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> <CLASSES> Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/war/gwt-war.iml 2009-04-24 12:40:44 UTC (rev 4611) @@ -11,8 +11,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="plugin" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="plugin" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> @@ -70,15 +70,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" /> @@ -141,6 +132,80 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-24 12:38:53 UTC (rev 4610) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-24 12:40:44 UTC (rev 4611) @@ -21,20 +21,19 @@ */ package org.jboss.bpm.console.client.task; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.Frame; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Event; +import org.gwt.mosaic.ui.client.*; import org.gwt.mosaic.ui.client.layout.BoxLayout; import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; import org.gwt.mosaic.ui.client.list.DefaultListModel; import org.jboss.bpm.console.client.model.TaskRef; -import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.ClickListener; -import com.mvc4g.client.Event; +import org.jboss.bpm.console.client.util.WindowUtil; import java.util.List; @@ -120,19 +119,17 @@ toolBar.addSeparator(); toolBar.add( - new ToolButton("Release", new ClickListener() { + new ToolButton("View form", new ClickListener() { public void onClick(Widget sender) { TaskRef selection = getSelection(); if(selection!=null) { - controller.handleEvent( - new Event( - ReleaseTaskAction.ID, - new TaskIdentityEvent(getAssignedIdentity(), selection) - ) - ); + if(selection.getUrl()!=null && !selection.getUrl().equals("")) + createTaskFormWindow(selection); + else + MessageBox.alert("Invalid operation", "The task doesn't reference a form"); } else { @@ -143,7 +140,9 @@ ) ); + toolBar.addSeparator(); + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); @@ -155,6 +154,28 @@ } } + private void createTaskFormWindow(TaskRef task) + { + WindowPanel windowPanel = new WindowPanel(task.getName()); + //windowPanel.getHeader().add( new Image("images/icons/error.png") ); + windowPanel.setAnimationEnabled(true); + windowPanel.setSize("320px", "240px"); + + // iframe + Frame frame = new Frame(); + frame.setUrl(task.getUrl().toString()); + DOM.setStyleAttribute(frame.getElement(), "border", "none"); + + + windowPanel.setWidget(frame); + + WindowUtil.addMaximizeButton(windowPanel, Caption.CaptionRegion.RIGHT); + WindowUtil.addMinimizeButton(windowPanel, Caption.CaptionRegion.RIGHT); + + // display + windowPanel.center(); + } + public void update(String identity, List<TaskRef> tasks) {

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4610 - in jbpm4/trunk/modules: db and 9 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-24 08:38:53 -0400 (Fri, 24 Apr 2009) New Revision: 4610 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java jbpm4/trunk/modules/db/jbpm4-db.iml jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml jbpm4/trunk/modules/examples/jbpm4-examples.iml jbpm4/trunk/modules/integration/console/integration-console.iml jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml jbpm4/trunk/modules/integration/spi/integration-spi.iml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java jbpm4/trunk/modules/test-base/test-base.iml jbpm4/trunk/modules/test-db/jbpm4-test-db.iml Log: Add URL property to Task for referencing external forms Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java 2009-04-24 12:38:53 UTC (rev 4610) @@ -23,6 +23,7 @@ import java.io.Serializable; import java.util.Date; +import java.net.URL; /** runtime task. * @@ -49,4 +50,7 @@ int getPriority(); void setPriority(int priority); + URL getURL(); + void setURL(URL url); + } \ No newline at end of file Modified: jbpm4/trunk/modules/db/jbpm4-db.iml =================================================================== --- jbpm4/trunk/modules/db/jbpm4-db.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/db/jbpm4-db.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,9 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module" module-name="api" /> + <orderEntry type="module" module-name="jpdl" /> + <orderEntry type="module" module-name="test-base" /> <orderEntry type="module" module-name="pvm" /> - <orderEntry type="module" module-name="toplevel" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:compile"> <CLASSES> @@ -161,15 +163,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> @@ -215,15 +208,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -233,24 +217,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> @@ -367,14 +333,72 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.mail:mail:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml =================================================================== --- jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/enterprise/jbpm4-enterprise.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -11,8 +11,1724 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> - <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ws.native:jbossws-native-saaj:jar:3.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-saaj/3.0.5.GA/jbossws-native-saaj-3.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cl:jboss-classloader:jar:2.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cl/jboss-classloader/2.0.3.GA/jboss-classloader-2.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs/2.0.5.GA/jboss-deployers-vfs-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.metadata:jboss-metadata:jar:1.0.0.CR16:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/metadata/jboss-metadata/1.0.0.CR16/jboss-metadata-1.0.0.CR16.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: oswego-concurrent:concurrent:jar:1.3.4-jboss-update1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.security:jacc:jar:1.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/security/jacc/1.0/jacc-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ws.native:jbossws-native-jaxrpc:jar:3.0.4.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-ext-api:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-profileservice:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-profileservice/5.0.1.GA/jboss-as-profileservice-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.web:servlet-api:jar:2.1.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-corba-ots-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-corba-ots-spi/5.0.3.GA/jboss-corba-ots-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-corba-ots-spi/5.0.3.GA/jboss-corba-ots-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: xerces:xercesImpl:jar:2.6.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-reflect:jar:2.0.2.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-jaspi-api:jar:1.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-integration:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-integration/5.0.3.GA/jboss-integration-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-integration/5.0.3.GA/jboss-integration-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: aspectj:aspectjrt:jar:1.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/aspectj/aspectjrt/1.2.1/aspectjrt-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-common:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-httpclient:commons-httpclient:jar:2.0.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.man:jboss-managed:jar:2.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/man/jboss-managed/2.0.0.GA/jboss-managed-2.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-main:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-main/5.0.1.GA/jboss-as-main-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-structure-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-structure-spi/2.0.5.GA/jboss-deployers-structure-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.profiler.jvmti:jboss-profiler-jvmti:jar:1.0.0.CR5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: stax:stax-api:jar:1.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: ant:ant:jar:1.5.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/ant/ant/1.5.4/ant-1.5.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.security:jbosssx:jar:2.0.2.SP6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.security:jbosssx-client:jar:2.0.2.SP6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/security/jbosssx-client/2.0.2.SP6/jbosssx-client-2.0.2.SP6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.0/slf4j-api-1.5.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.0/slf4j-api-1.5.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:jboss-aop-asintegration-core:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/jboss-aop-asintegration-core/2.0.1.GA/jboss-aop-asintegration-core-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.jbossws:jboss-jaxws:jar:3.0.1-native-2.0.4.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: gnu-getopt:getopt:jar:1.0.12-brew:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: log4j:log4j:jar:1.2.14:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.man:jboss-metatype:jar:2.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/man/jboss-metatype/2.0.0.GA/jboss-metatype-2.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-transaction-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-transaction-spi/5.0.3.GA/jboss-transaction-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javassist:javassist:jar:3.9.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.9.0.GA/javassist-3.9.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cactus:cactus:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus/13-1.7.1/cactus-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.11.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.11.GA/jboss-common-core-2.2.11.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aspects:jboss-remoting-aspects:jar:1.0.1.CR4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aspects/jboss-remoting-aspects/1.0.1.CR4/jboss-remoting-aspects-1.0.1.CR4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cluster:jboss-ha-client:jar:1.1.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-client/1.1.1.GA/jboss-ha-client-1.1.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-system:jar:client:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system/5.0.1.GA/jboss-as-system-5.0.1.GA-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-system-jmx:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-system-jmx/5.0.1.GA/jboss-as-system-jmx-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.0/jboss-ejb3-proxy-clustered-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-engine:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-engine/2.1.0/juel-engine-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:jboss-aop:jar:client:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/jboss-aop/2.0.1.GA/jboss-aop-2.0.1.GA-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: xml-security:xmlsec:jar:1.3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xml-security/xmlsec/1.3.0/xmlsec-1.3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.remoting:jboss-remoting:jar:2.5.0.SP2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/remoting/jboss-remoting/2.5.0.SP2/jboss-remoting-2.5.0.SP2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/remoting/jboss-remoting/2.5.0.SP2/jboss-remoting-2.5.0.SP2-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.microcontainer:jboss-dependency:jar:2.0.4.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-dependency/2.0.4.GA/jboss-dependency-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-security:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-security/5.0.1.GA/jboss-as-security-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-management:jar:jsr77-client:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-management/5.0.1.GA/jboss-as-management-5.0.1.GA-jsr77-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-jad-api:jar:1.2.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-vfs:jar:2.1.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-vfs/2.1.0.GA/jboss-vfs-2.1.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-deployment-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-deployment-spi/5.0.3.GA/jboss-deployment-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-deployment-spi/5.0.3.GA/jboss-deployment-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel-impl:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel-impl/2.1.0/juel-impl-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ws.native:jbossws-native-jaxws:jar:3.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ws/native/jbossws-native-jaxws/3.0.5.GA/jbossws-native-jaxws-3.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: apache-xerces:xercesImpl:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-deployment:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-deployment/5.0.1.GA/jboss-as-deployment-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jpa:jboss-jpa-deployers:jar:1.0.0-CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jpa/jboss-jpa-deployers/1.0.0-CR1/jboss-jpa-deployers-1.0.0-CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core/2.0.5.GA/jboss-deployers-core-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:pluggable-instrumentor:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/pluggable-instrumentor/2.0.1.GA/pluggable-instrumentor-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jbossxb:jar:2.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossxb/2.0.0.GA/jbossxb-2.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-log4j:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-log4j/2.0.5.GA/jboss-logging-log4j-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jtidy:jtidy:jar:4aug2000r7-dev:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-core:jar:client:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-core/1.0.0/jboss-ejb3-core-1.0.0-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: sun-jaxws:jaxws-api:jar:2.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: quartz:quartz:jar:1.6.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/quartz/quartz/1.6.0/quartz-1.6.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: httpunit:httpunit:jar:1.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/httpunit/httpunit/1.6/httpunit-1.6-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-mc-int:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-mc-int/1.0.0/jboss-ejb3-mc-int-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.microcontainer:jboss-aop-mc-int:jar:2.0.4.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-aop-mc-int/2.0.4.GA/jboss-aop-mc-int-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: xerces:xmlParserAPIs:jar:2.2.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/xerces/xmlParserAPIs/2.2.1/xmlParserAPIs-2.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-jca-api:jar:1.5.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cluster:jboss-ha-server-cache-jbc:jar:1.1.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-server-cache-jbc/1.1.0.GA/jboss-ha-server-cache-jbc-1.1.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-server-cache-jbc/1.1.0.GA/jboss-ha-server-cache-jbc-1.1.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-cluster:jar:jboss-ha-legacy-client:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-cluster/5.0.1.GA/jboss-as-cluster-5.0.1.GA-jboss-ha-legacy-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-jdk:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-jdk/2.0.5.GA/jboss-logging-jdk-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-jdk/2.0.5.GA/jboss-logging-jdk-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.microcontainer:jboss-kernel:jar:2.0.4.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/microcontainer/jboss-kernel/2.0.4.GA/jboss-kernel-2.0.4.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-javaee:jar:5.0.1.GA:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-javaee/5.0.1.GA/jboss-javaee-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.security:jaas:jar:1.0.01:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/security/jaas/1.0.01/jaas-1.0.01.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-async:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-async/1.0.0/jboss-ejb3-async-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.0.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-ejb3:jar:client:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-ejb3/5.0.1.GA/jboss-as-ejb3-5.0.1.GA-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-cache:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aspects:jboss-security-aspects:jar:1.0.0.Beta1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aspects/jboss-security-aspects/1.0.0.Beta1/jboss-security-aspects-1.0.0.Beta1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-spi/2.0.5.GA/jboss-deployers-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.ant:ant-junit:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-entitymanager:jar:3.4.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.naming:jnp-client:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/naming/jnp-client/5.0.1.GA/jnp-client-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client-spi/2.0.5.GA/jboss-deployers-client-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.test:jboss-test:jar:1.1.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-ext-api-impl:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: trove:trove:jar:2.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/trove/trove/2.1.1/trove-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: apache-avalon:avalon-framework:jar:4.1.5:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-avalon/avalon-framework/4.1.5/avalon-framework-4.1.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-iiop:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-iiop/5.0.1.GA/jboss-as-iiop-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jpl-pattern:jpl-pattern:jar:1.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ws:jbossws-spi:jar:1.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jacorb:jacorb:jar:2.3.0jboss.patch5-brew:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jacorb/jacorb/2.3.0jboss.patch5-brew/jacorb-2.3.0jboss.patch5-brew.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cluster:jboss-ha-server-cache-spi:jar:1.1.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-server-cache-spi/1.1.0.GA/jboss-ha-server-cache-spi-1.1.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-server-cache-spi/1.1.0.GA/jboss-ha-server-cache-spi-1.1.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.sun.xml.bind:jaxb-impl:jar:2.1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/sun/xml/bind/jaxb-impl/2.1.8/jaxb-impl-2.1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.naming:jnpserver:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/naming/jnpserver/5.0.1.GA/jnpserver-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: sun-jaxws:jsr181-api:jar:2.1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxws/jsr181-api/2.1.1/jsr181-api-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.livetribe:livetribe-jsr223:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/livetribe/livetribe-jsr223/2.0.5/livetribe-jsr223-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cactus:cactus-ant:jar:13-1.7.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cactus/cactus-ant/13-1.7.1/cactus-ant-13-1.7.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cluster:jboss-ha-server-api:jar:1.1.0.CR4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cluster/jboss-ha-server-api/1.1.0.CR4/jboss-ha-server-api-1.1.0.CR4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: apache-xerces:xml-apis:jar:2.9.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: sun-jaxb:jaxb-api:jar:2.1.9:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-core-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-core-spi/2.0.5.GA/jboss-deployers-core-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-as-int:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-as-int/1.0.0/jboss-ejb3-as-int-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:jboss-aop-asintegration-jmx:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/jboss-aop-asintegration-jmx/2.0.1.GA/jboss-aop-asintegration-jmx-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss.messaging:jboss-messaging:jar:1.4.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/messaging/jboss-messaging/1.4.1.GA/jboss-messaging-1.4.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/messaging/jboss-messaging/1.4.1.GA/jboss-messaging-1.4.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-mbeans:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-mbeans/5.0.1.GA/jboss-as-mbeans-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-server-manager:jar:1.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-server-manager/1.0.0.GA/jboss-server-manager-1.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-server:jar:client:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-server/5.0.1.GA/jboss-as-server-5.0.1.GA-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-transactions:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-transactions/1.0.0/jboss-ejb3-transactions-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jpl-util:jpl-util:jar:1.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jpl-util/jpl-util/1.0/jpl-util-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aspects:jboss-transaction-aspects:jar:1.0.0.Beta1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aspects/jboss-transaction-aspects/1.0.0.Beta1/jboss-transaction-aspects-1.0.0.Beta1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: bcel:bcel:jar:5.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/bcel/bcel/5.1/bcel-5.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:jboss-aop-aspects:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/jboss-aop-aspects/2.0.1.GA/jboss-aop-aspects-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-jmx:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-jmx/5.0.1.GA/jboss-as-jmx-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.slf4j:slf4j-jboss-logging:jar:1.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/slf4j/slf4j-jboss-logging/1.0.0.GA/slf4j-jboss-logging-1.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/slf4j/slf4j-jboss-logging/1.0.0.GA/slf4j-jboss-logging-1.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-core:jar:3.3.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-core/3.3.1.GA/hibernate-core-3.3.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-interceptors:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.0/jboss-ejb3-interceptors-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.ant:ant-launcher:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cargo:cargo:jar:0.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cargo/cargo/0.5/cargo-0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-proxy:jar:client:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-proxy/1.0.0/jboss-ejb3-proxy-1.0.0-client.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.apache.ant:ant:jar:1.7.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: nekohtml:nekohtml:jar:0.9.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/nekohtml/nekohtml/0.9.1/nekohtml-0.9.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-security:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-mdr:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-jacc-api:jar:1.1.0.GA_SP1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-ejb-api:jar:3.0.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss:jboss-serialization:jar:1.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-aspects:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-aspects/5.0.1.GA/jboss-as-aspects-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: wutka-dtdparser:dtdparser121:jar:1.2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.servlet:servlet-api:jar:2.5:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cl:jboss-classloading-vfs:jar:2.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading-vfs/2.0.3.GA/jboss-classloading-vfs-2.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-client:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-client/2.0.5.GA/jboss-deployers-client-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-connector:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-connector/5.0.1.GA/jboss-as-connector-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-jca-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-metadata:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cache:jbosscache-core:jar:3.0.0.CR4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cache/jbosscache-core/3.0.0.CR4/jbosscache-core-3.0.0.CR4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.ejb3:jboss-ejb3-deployers:jar:1.0.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/ejb3/jboss-ejb3-deployers/1.0.0/jboss-ejb3-deployers-1.0.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate-annotations:jar:3.3.1.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate-annotations/3.3.1.GA/hibernate-annotations-3.3.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.security:jboss-security-spi:jar:2.0.2.SP6:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/security/jboss-security-spi/2.0.2.SP6/jboss-security-spi-2.0.2.SP6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-transaction-api:jar:1.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: rhino:js:jar:1.5R4.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.5R4.1/js-1.5R4.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-vfs-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.5.GA/jboss-deployers-vfs-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aop:jboss-aop-asintegration-mc:jar:2.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aop/jboss-aop-asintegration-mc/2.0.1.GA/jboss-aop-asintegration-mc-2.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.cl:jboss-classloading:jar:2.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/cl/jboss-classloading/2.0.3.GA/jboss-classloading-2.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.deployers:jboss-deployers-impl:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/deployers/jboss-deployers-impl/2.0.5.GA/jboss-deployers-impl-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: qdox:qdox:jar:1.6.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/qdox/qdox/1.6.1/qdox-1.6.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-classloading-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-classloading-spi/5.0.3.GA/jboss-classloading-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.jbossas:jboss-as-bootstrap:jar:5.0.1.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jbossas/jboss-as-bootstrap/5.0.1.GA/jboss-as-bootstrap-5.0.1.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.javaee:jboss-jms-api:jar:1.1.0.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.aspects:jboss-current-invocation-aspects:jar:1.0.0.CR1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.integration:jboss-profileservice-spi:jar:5.0.3.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/integration/jboss-profileservice-spi/5.0.3.GA/jboss-profileservice-spi-5.0.3.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/examples/jbpm4-examples.iml =================================================================== --- jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/examples/jbpm4-examples.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,9 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="pvm" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> @@ -78,15 +80,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> @@ -159,15 +152,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -177,24 +161,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel:jar:2.1.0:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> @@ -330,17 +296,19 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.hibernate:hibernate:jar:3.2.6.ga:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/hibernate/hibernate/3.2.6.ga/hibernate-3.2.6.ga.jar!/" /> </CLASSES> @@ -348,8 +316,8 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: antlr:antlr:jar:2.7.6:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: antlr:antlr:jar:2.7.6:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/antlr/antlr/2.7.6/antlr-2.7.6.jar!/" /> </CLASSES> @@ -357,8 +325,8 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm:jar:1.5.3:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm:jar:1.5.3:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm/1.5.3/asm-1.5.3.jar!/" /> </CLASSES> @@ -366,18 +334,36 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime"> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ehcache:ehcache:jar:1.2.3:runtime"> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime"> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: dom4j:dom4j:jar:1.6.1:runtime"> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar!/" /> </CLASSES> <JAVADOC /> @@ -386,8 +372,8 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: cglib:cglib:jar:2.1_3:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: cglib:cglib:jar:2.1_3:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/cglib/cglib/2.1_3/cglib-2.1_3.jar!/" /> </CLASSES> @@ -395,8 +381,8 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: asm:asm-attrs:jar:1.5.3:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar!/" /> </CLASSES> @@ -404,16 +390,53 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:test"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:runtime"> <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:runtime"> + <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="test-base" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/integration/console/integration-console.iml =================================================================== --- jbpm4/trunk/modules/integration/console/integration-console.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/integration/console/integration-console.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,11 +9,12 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="pvm" exported="" /> + <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="toplevel" exported="" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> @@ -62,15 +63,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> @@ -152,15 +144,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -170,15 +153,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel:jar:2.1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> @@ -197,15 +171,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> @@ -361,6 +326,62 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java 2009-04-24 12:38:53 UTC (rev 4610) @@ -21,11 +21,6 @@ */ package org.jbpm.integration.console; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; - import org.jboss.bpm.console.client.model.ParticipantRef; import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.client.model.ProcessInstanceRef; @@ -40,6 +35,11 @@ import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.internal.task.TaskImpl; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ @@ -54,7 +54,7 @@ def.setKey( processDefinition.getKey() ); // def.setDescription(p0.getDescription()); // def.setPackageName(p0.getPackageName()); - + return def; } @@ -64,7 +64,7 @@ ProcessInstanceRef ref = new ProcessInstanceRef(); ref.setId( e0.getId() ); ref.setKey(e0.getKey()); - ref.setDefinitionId(e0.getProcessDefinition().getId() ); + ref.setDefinitionId(e0.getProcessDefinition().getId() ); ref.setStartDate( new Date() ); // TODO: FIXME OpenExecution topLevelExecution = e0.getProcessInstance(); @@ -81,7 +81,7 @@ } ref.setRootToken(tok); - + return ref; } @@ -90,7 +90,7 @@ TokenReference tok = new TokenReference(); tok.setName(topLevelExecution.getName()); tok.setId(topLevelExecution.getId()); - tok.setCurrentNodeName( topLevelExecution.getActivityName() ); + tok.setCurrentNodeName( topLevelExecution.getActivityName() ); // transitions List<String> availableSignals = new ArrayList<String>(); @@ -150,6 +150,11 @@ } + if(t0.getURL()==null) + task.setUrl( "http://google.de" ); + else + task.setUrl( t0.getURL().toExternalForm() ); + return task; } } Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java =================================================================== --- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java 2009-04-24 12:38:53 UTC (rev 4610) @@ -125,7 +125,6 @@ taskService.completeTask(taskId, outcome); } - public void completeTask(long taskId) { TaskService taskService = this.processEngine.get(TaskService.class); Modified: jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml =================================================================== --- jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/integration/jboss5/integration-jboss5.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,20 +9,13 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="pvm" /> - <orderEntry type="module" module-name="toplevel" /> - <orderEntry type="module" module-name="integration-spi" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="integration-spi" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="pvm" exported="" /> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:hibernate-commons-annotations:jar:3.0.0.ga:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar!/" /> @@ -297,15 +290,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: jgroups:jgroups:jar:2.6.7.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jgroups/jgroups/2.6.7.GA/jgroups-2.6.7.GA.jar!/" /> @@ -504,15 +488,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.test:jboss-test:jar:1.1.3.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/test/jboss-test/1.1.3.GA/jboss-test-1.1.3.GA.jar!/" /> @@ -542,15 +517,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: jpl-pattern:jpl-pattern:jar:1.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar!/" /> @@ -1066,32 +1032,92 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1.1:compile"> + <library name="M2 Dep: stax:stax-api:jar:1.0:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1.1/activation-1.1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: stax:stax-api:jar:1.0:provided"> + <library name="M2 Dep: javax.transaction:jta:jar:1.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/stax/stax-api/1.0/stax-api-1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.1/jta-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/integration/spi/integration-spi.iml =================================================================== --- jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/integration/spi/integration-spi.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,9 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> + <orderEntry type="module" module-name="test-base" exported="" /> <orderEntry type="module" module-name="pvm" exported="" /> - <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: hsqldb:hsqldb:jar:1.8.0.7:test"> <CLASSES> @@ -22,15 +24,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> @@ -121,15 +114,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -139,15 +123,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel:jar:2.1.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> @@ -157,15 +132,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.hibernate:ejb3-persistence:jar:1.0.1.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/hibernate/ejb3-persistence/1.0.1.GA/ejb3-persistence-1.0.1.GA.jar!/" /> @@ -1091,6 +1057,62 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-04-24 12:38:53 UTC (rev 4610) @@ -21,25 +21,12 @@ */ package org.jbpm.pvm.internal.task; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import org.jbpm.api.Execution; import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; import org.jbpm.api.model.Comment; import org.jbpm.api.session.TaskDbSession; -import org.jbpm.api.task.Assignable; -import org.jbpm.api.task.OpenTask; -import org.jbpm.api.task.Participation; -import org.jbpm.api.task.Swimlane; -import org.jbpm.api.task.Task; -import org.jbpm.api.task.TaskHandler; +import org.jbpm.api.task.*; import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.history.events.TaskCancel; import org.jbpm.pvm.internal.history.events.TaskComplete; @@ -52,6 +39,10 @@ import org.jbpm.pvm.internal.util.Priority; import org.jbpm.pvm.internal.wire.WireContext; +import java.io.Serializable; +import java.net.URL; +import java.util.*; + /** * is one task instance that can be assigned to an actor (read: put in * someones task list) and that can trigger the continuation of execution @@ -97,7 +88,9 @@ protected Long executionDbid; protected Long superTaskDbid; - + + private URL url; + public TaskImpl() { } @@ -488,4 +481,14 @@ public void setSignalling(boolean isSignalling) { this.isSignalling = isSignalling; } + + public URL getURL() + { + return this.url; + } + + public void setURL(URL url) + { + this.url=url; + } } Modified: jbpm4/trunk/modules/test-base/test-base.iml =================================================================== --- jbpm4/trunk/modules/test-base/test-base.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/test-base/test-base.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -8,8 +8,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="api" /> - <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.transaction:jta:jar:1.0.1B:compile"> <CLASSES> Modified: jbpm4/trunk/modules/test-db/jbpm4-test-db.iml =================================================================== --- jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-04-24 09:55:39 UTC (rev 4609) +++ jbpm4/trunk/modules/test-db/jbpm4-test-db.iml 2009-04-24 12:38:53 UTC (rev 4610) @@ -9,9 +9,11 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="test-base" exported="" /> + <orderEntry type="module" module-name="toplevel" exported="" /> + <orderEntry type="module" module-name="api" exported="" /> + <orderEntry type="module" module-name="jpdl" exported="" /> <orderEntry type="module" module-name="pvm" exported="" /> - <orderEntry type="module" module-name="api" exported="" /> - <orderEntry type="module" module-name="toplevel" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: jboss:jboss-j2ee:jar:4.2.2.GA:compile"> <CLASSES> @@ -31,15 +33,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0-SNAPSHOT/idm-spi-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> @@ -150,15 +143,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0-SNAPSHOT/idm-api-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.persistence:persistence-api:jar:1.0:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar!/" /> @@ -168,24 +152,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0-SNAPSHOT/idm-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0-SNAPSHOT:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0-SNAPSHOT/idm-common-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: juel:juel:jar:2.1.0:runtime"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/juel/juel/2.1.0/juel-2.1.0.jar!/" /> @@ -350,7 +316,62 @@ </SOURCES> </library> </orderEntry> - <orderEntry type="module" module-name="test-base" /> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-common:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-common/1.0.0.Alpha2/idm-common-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm/1.0.0.Alpha2/idm-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.mail:mail:jar:1.4:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/mail/mail/1.4/mail-1.4-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-spi:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-spi/1.0.0.Alpha2/idm-spi-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.identity:idm-api:jar:1.0.0.Alpha2:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/identity/idm-api/1.0.0.Alpha2/idm-api-1.0.0.Alpha2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-email:commons-email:jar:1.2-SNAPSHOT:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-email/commons-email/1.2-SNAPSHOT/commons-email-1.2-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module>

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4609 - in jbpm4/trunk/hudson/hudson-home/jobs: jBPM4-Database-Matrix and 1 other directory.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-24 05:55:39 -0400 (Fri, 24 Apr 2009) New Revision: 4609 Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml Log: Fix email notifications Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml =================================================================== --- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-04-23 18:57:59 UTC (rev 4608) +++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Container-Matrix/config.xml 2009-04-24 09:55:39 UTC (rev 4609) @@ -97,7 +97,7 @@ <testResults>jbpm4/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients>hbraun(a)redhat.com</recipients> + <recipients>tbaeyens@redhat.com,aguizar@redhat.com,koen.aers(a)jboss.com</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer> Modified: jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml =================================================================== --- jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-04-23 18:57:59 UTC (rev 4608) +++ jbpm4/trunk/hudson/hudson-home/jobs/jBPM4-Database-Matrix/config.xml 2009-04-24 09:55:39 UTC (rev 4609) @@ -97,7 +97,7 @@ <testResults>jbpm4/modules/**/target/surefire-reports/TEST-*.xml</testResults> </hudson.tasks.junit.JUnitResultArchiver> <hudson.tasks.Mailer> - <recipients>hbraun(a)redhat.com</recipients> + <recipients>tbaeyens@redhat.com,aguizar@redhat.com,koen.aers(a)jboss.com</recipients> <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> <sendToIndividuals>false</sendToIndividuals> </hudson.tasks.Mailer>

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4608 - in jbpm4/branches/tbaeyens: modules/distro and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-23 14:57:59 -0400 (Thu, 23 Apr 2009) New Revision: 4608 Added: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml Removed: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml Modified: jbpm4/branches/tbaeyens/build.xml jbpm4/branches/tbaeyens/modules/distro/pom.xml jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml Log: zip file distro Modified: jbpm4/branches/tbaeyens/build.xml =================================================================== --- jbpm4/branches/tbaeyens/build.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/build.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -134,7 +134,7 @@ </exec> </target> - <target name="update.configurations" description="update the pvm, jpdl, example and test-db test resources by running the config tool"> +  <target name="test.configuration" description="create test configuration in target/config"> <ant antfile="modules/distro/src/main/resources/config-tool/build.xml" Modified: jbpm4/branches/tbaeyens/modules/distro/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/pom.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -10,7 +10,9 @@   -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>jBPM 4 - Distro</name> @@ -169,37 +171,35 @@ <plugins> <plugin> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-2</version> + <version>2.2-beta-3</version> <executions> <execution> - <id>prepare-files-for-installer</id> + <id>generate-jbpm-single-jar</id> <phase>process-resources</phase> <goals> - <goal>directory-single</goal> + <goal>single</goal> </goals> <configuration> - <finalName>deploy-artifacts</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-deploy-artifacts.xml</descriptor> + <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> </descriptors> </configuration> </execution> <execution> - <id>generate-jbpm-single-jar</id> + <id>prepare-files-for-installer</id> <phase>package</phase> <goals> - <goal>assembly</goal> + <goal>single</goal> </goals> <configuration> - <finalName>jbpm</finalName> <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-jbpm-single-jar.xml</descriptor> + <descriptor>scripts/assembly-distro.xml</descriptor> </descriptors> </configuration> </execution> @@ -207,7 +207,7 @@ </executions> </plugin> - <plugin> +  </plugins> </build> Deleted: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -1,177 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>deploy-artifacts</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>compile</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - </dependencySet> - <dependencySet> - <includes> - <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> - </includes> - <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> - <outputDirectory>gpd</outputDirectory> - </dependencySet> -  - <dependencySet> - <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-enterprise:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-spi-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-spi:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-console-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-console-integration:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss5:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-jboss4:jar:config</include> - </includes> - <unpack>true</unpack> - </dependencySet> - </dependencySets> - - <fileSets> - <fileSet> - <directory>src/main/resources</directory> - <includes> - <include>jboss.eula.txt</include> - <include>license.txt</include> - <include>readme.html</include> - </includes> - <outputDirectory></outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/apidocs</directory> - <outputDirectory>doc/javadocs</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/target/schemadoc</directory> - <outputDirectory>doc/schemadoc</outputDirectory> - </fileSet> - <fileSet> - <directory>../devguide/target/docbook/publish/en</directory> - <outputDirectory>doc/devguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../userguide/target/docbook/publish/en</directory> - <outputDirectory>doc/userguide</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/target/schemadocs</directory> - <outputDirectory>doc/schemadocs</outputDirectory> - <excludes> - <exclude>**/*.fo</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>../api/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../api/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../log/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../pvm/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../jpdl/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../task/src/main/resources</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../test-base/src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/java</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/test/resources</directory> - <outputDirectory>examples/src</outputDirectory> - </fileSet> - <fileSet> - <directory>../examples/src/eclipse</directory> - <outputDirectory>examples</outputDirectory> - </fileSet> - </fileSets> -</assembly> Copied: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-deploy-artifacts.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-distro.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -0,0 +1,175 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.distribution</id> + <finalName>jbpm-${version}</finalName> + + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>true</includeBaseDirectory> + <baseDirectory>jbpm-${version}</baseDirectory> + +  + <dependencySets> +  + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>provided</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <scope>test</scope> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>org.jbpm.jbpm4:jbpm-gpd:zip</include> + </includes> + <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping> + <outputDirectory>gpd</outputDirectory> + </dependencySet> +  + <dependencySet> + <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-enterprise:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-spi-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-spi:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-console-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-console-integration:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-jboss5-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss5:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + <dependencySet> + <outputDirectory>resources/jbpm-jboss4-config</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jbpm-jboss4:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>src/main/resources</directory> + <includes> + <include>jboss.eula.txt</include> + <include>license.txt</include> + <include>readme.html</include> + </includes> + <outputDirectory></outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/apidocs</directory> + <outputDirectory>doc/javadocs</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/target/schemadoc</directory> + <outputDirectory>doc/schemadoc</outputDirectory> + </fileSet> + <fileSet> + <directory>../devguide/target/docbook/publish/en</directory> + <outputDirectory>doc/devguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../userguide/target/docbook/publish/en</directory> + <outputDirectory>doc/userguide</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/target/schemadocs</directory> + <outputDirectory>doc/schemadocs</outputDirectory> + <excludes> + <exclude>**/*.fo</exclude> + </excludes> + </fileSet> + <fileSet> + <directory>../api/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../api/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../log/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../pvm/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../jpdl/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../task/src/main/resources</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../test-base/src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/java</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/test/resources</directory> + <outputDirectory>examples/src</outputDirectory> + </fileSet> + <fileSet> + <directory>../examples/src/eclipse</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> +</assembly> Modified: jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-23 15:16:20 UTC (rev 4607) +++ jbpm4/branches/tbaeyens/modules/distro/scripts/assembly-jbpm-single-jar.xml 2009-04-23 18:57:59 UTC (rev 4608) @@ -1,5 +1,12 @@ -<assembly> - <id>package</id> +<?xml version="1.0" encoding="UTF-8"?> + +<assembly xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>jbpm.all.jar</id> + <finalName>jbpm</finalName> + <formats> <format>jar</format> </formats>

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4607 - in jbpm4/branches/tbaeyens: hudson/jboss and 26 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-04-23 11:16:20 -0400 (Thu, 23 Apr 2009) New Revision: 4607 Added: jbpm4/branches/tbaeyens/hudson/goals.txt jbpm4/branches/tbaeyens/hudson/jboss/build.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java Removed: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml Modified: jbpm4/branches/tbaeyens/hudson/ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java jbpm4/branches/tbaeyens/modules/examples/pom.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/examples/src/test/resources/logging.properties 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/pom.xml jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java jbpm4/branches/tbaeyens/modules/test-db/pom.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: config file simplifications Property changes on: jbpm4/branches/tbaeyens/hudson ___________________________________________________________________ Name: svn:ignore - *.iml ant.properties target + *.iml ant.properties target Added: jbpm4/branches/tbaeyens/hudson/goals.txt =================================================================== --- jbpm4/branches/tbaeyens/hudson/goals.txt (rev 0) +++ jbpm4/branches/tbaeyens/hudson/goals.txt 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,96 @@ +################## +### jbpm4-base ### +################## + +goal: +----- +* watch over the smoke tests that all developers should do before checking in +* should run every hour if there was svn commits + +script: +------- +mvn clean install + +configuration: +-------------- +* direct db access +* hsqldb in memory + + +#################### +### jbpm4-distro ### +#################### + +goal: +----- +build the distribution for the other hudson jobs + +script: +------- +mvn -Pdistro clean install + + +################### +### jbpm4-jboss ### +################### + +goal: +----- +QA for SOA-platform +release criterium. + + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE {mysql, oracle, postgresql} x JBOSS_VERSION {5.0.0.GA} + +script: +------- +get distro from repository +unzip jbpm distro +create jBPM schema +overwrite ${jbpm.home}/jboss/build.properties (includes database property) +ant -f ${jbpm.home}/jboss/build.xml reinstall.jboss +ant -f ${jbpm.home}/jboss/build.xml start.jboss +mvn -Djboss.bind.address=localhost clean install (should only execute tests for examples and test-db) +stop jboss +drop jBPM schema + + +client configuration: +--------------------- +* remote ejb command service + +server configuration: +--------------------- +* jmx interceptor command service + + + +################ +### jbpm4-db ### +################ + +depends: +-------- +job jbpm-distro + +axis: +----- +DATABASE + +script: +------- +get jbpm distro from repository +unzip jbpm distro +create jBPM schema +mvn -Ddatabase=${database} clean install +drop jBPM schema + +configuration: +-------------- +* direct db access \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/hudson/goals.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/hudson/jboss/build.xml =================================================================== --- jbpm4/branches/tbaeyens/hudson/jboss/build.xml (rev 0) +++ jbpm4/branches/tbaeyens/hudson/jboss/build.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="jbpm.jboss.install"> + + <property file="build.properties" /> + + <property name="jboss.version" value="5.0.0.GA" /> + <property name="jboss.distro" value="C:/Downloads/jboss/jboss-${jboss.version}.zip" /> + <property name="jboss.home" value="C:/Software/jboss-${jboss.version}" /> + + <target name="clean.install" + depends="delete.jboss.installation, install.jboss, install.jbpm" + description="re-installs jboss and then installs jbpm in there" /> + + <target name="delete.jboss.installation"> + <delete dir="${jboss.home}" /> + </target> + + <target name="install.jboss"> + <unzip src="${jboss.distro}" dest="${jboss.home}/.." /> + </target> + + <target name="install.jbpm"> + <copy todir="${jboss.home}"> + <fileset dir="C:/Software/jbpm-4.0.0-before/jboss-5.0.0.GA" /> + </copy> + </target> + +</project> Property changes on: jbpm4/branches/tbaeyens/hudson/jboss/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java =================================================================== --- jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/api/src/main/java/org/jbpm/api/Deployment.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,6 +21,7 @@ */ package org.jbpm.api; +import java.io.File; import java.io.InputStream; import java.net.URL; import java.util.zip.ZipInputStream; @@ -43,6 +44,7 @@ Deployment addResourceFromClasspath(String resourceName); Deployment addResourceFromUrl(URL url); Deployment addResourcesFromZipInputStream(ZipInputStream zipInputStream); + Deployment addResourceFromFile(File file); /** @return deploymentId */ long deploy(); Modified: jbpm4/branches/tbaeyens/modules/examples/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -29,6 +29,7 @@  <dependencies> + <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +0,0 @@ -<?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.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +0,0 @@ -<?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.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +0,0 @@ -<?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"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <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> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <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 Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings> Deleted: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/jndi.properties 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -java.naming.provider.url=jnp\://${jboss.bind.address}\:1099 Modified: jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/examples/src/test/resources/logging.properties 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,10 +1,10 @@ handlers= java.util.logging.ConsoleHandler redirect.commons.logging = enabled -java.util.logging.ConsoleHandler.level = FINE +java.util.logging.ConsoleHandler.level = FINEST java.util.logging.ConsoleHandler.formatter = org.jbpm.internal.log.LogFormatter -org.jbpm.level=FINE +org.jbpm.level=FINEST # org.jbpm.pvm.internal.tx.level=FINE # org.jbpm.pvm.internal.wire.level=FINE # org.jbpm.pvm.internal.util.level=FINE Added: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <deployer-manager> + <jpdl-deployer /> + </deployer-manager> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.deployermgr.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,17 @@ +<activities> + <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> + <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> +</activities> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.activities.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,8 @@ +<eventlisteners> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> + <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> +</eventlisteners> Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.eventlisteners.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,123 @@ +<?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 default-access="field"> + +  + + <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" + extends="org.jbpm.pvm.internal.model.ExecutionImpl" + discriminator-value="jpdl"> + + <map name="swimlanes" + cascade="all-delete-orphan"> + <key foreign-key="FK_SWIMLANE_EXEC"> + <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> + </key> + <map-key type="string" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> + </map> + </subclass> + +  + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/jpdl/src/main/resources/jbpm.jpdl.hbm.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +0,0 @@ -<?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.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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/jpdl/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +0,0 @@ -<?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.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +0,0 @@ -<?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"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <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> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <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 Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/jpdl/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings> Modified: jbpm4/branches/tbaeyens/modules/pvm/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -57,6 +57,10 @@ </dependency> <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> + <dependency> <groupId>commons-email</groupId> <artifactId>commons-email</artifactId> </dependency> Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,63 @@ +/* + * 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.ant; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jbpm.api.Configuration; +import org.jbpm.api.ProcessEngine; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; + +/** + * common strategy for jbpm ant tasks to obtain a hibernate SessionFactory. + */ +public class AntHelper { + + final static Map<String, ProcessEngine> processEngines = new HashMap<String, ProcessEngine>(); + + private static final Log log = LogFactory.getLog(AntHelper.class); + + private AntHelper() { + // prevent instantiation + } + + public static ProcessEngine getProcessEnging(String jbpmCfgXml) { + ProcessEngine processEngine = (JbpmConfiguration) processEngines.get(jbpmCfgXml); + if (processEngine == null) { + Configuration configuration = new Configuration(); + if (jbpmCfgXml!=null) { + log.debug("using jbpm configuration "+jbpmCfgXml); + configuration.setResource(jbpmCfgXml); + } else { + log.debug("using default jbpm.cfg.xml configuration"); + } + + processEngine = configuration.buildProcessEngine(); + + processEngines.put(jbpmCfgXml, processEngine); + } + return processEngine; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/AntHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,115 @@ +/* + * 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.ant; + +import java.io.File; +import java.io.FileInputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.zip.ZipInputStream; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.taskdefs.MatchingTask; +import org.apache.tools.ant.types.FileSet; +import org.jbpm.api.Deployment; +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.RepositoryService; + +/** + * ant task for deploying process archives. + */ +public class DeployProcessTask extends MatchingTask { + + String jbpmCfg = null; + File process = null; + List fileSets = new ArrayList(); + boolean failOnError = true; + + public void execute() throws BuildException { + // get the JbpmConfiguration + ProcessEngine processEngine = AntHelper.getProcessEnging(jbpmCfg); + + // if attribute process is set, deploy that process file + if (process!=null) { + deployProcessArchive(processEngine, process); + } + + // loop over all files that are specified in the filesets + Iterator iter = fileSets.iterator(); + while (iter.hasNext()) { + FileSet fileSet = (FileSet) iter.next(); + DirectoryScanner dirScanner = fileSet.getDirectoryScanner(getProject()); + File baseDir = dirScanner.getBasedir(); + String[] includedFiles = dirScanner.getIncludedFiles(); + List excludedFiles = Arrays.asList(dirScanner.getExcludedFiles()); + + for (int i = 0; i < includedFiles.length; i++) { + String fileName = includedFiles[i]; + if (!excludedFiles.contains(fileName)) { + File file = new File(baseDir, fileName); + deployProcessArchive(processEngine, file); + } + } + } + } + + private void deployProcessArchive(ProcessEngine processEngine, File processFile) { + RepositoryService repositoryService = processEngine.getRepositoryService(); + Deployment deployment = repositoryService.createDeployment(); + + if (processFile.getName().endsWith(".xml")) { + log("deploying process file "+processFile.getName()); + deployment.addResourceFromFile(processFile); + + } else if (processFile.getName().endsWith("ar")) { + log("deploying business archive "+processFile.getName()); + try { + FileInputStream fileInputStream = new FileInputStream(processFile); + ZipInputStream zipInputStream = new ZipInputStream(fileInputStream); + deployment.addResourcesFromZipInputStream(zipInputStream); + } catch (Exception e) { + throw new BuildException("couldn't read business archive "+processFile, e); + } + + } else { + throw new BuildException("unsupported extension: "+processFile+" Only .xml files and .*ar archives are supported"); + } + + deployment.deploy(); + } + + public void addFileset(FileSet fileSet) { + this.fileSets.add(fileSet); + } + public void setJbpmCfg(String jbpmCfg) { + this.jbpmCfg = jbpmCfg; + } + public void setProcess(File process) { + this.process = process; + } + public void setFailOnError(boolean failOnError) { + this.failOnError = failOnError; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/DeployProcessTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,59 @@ +/* + * 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.ant; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class Launcher extends Thread { + + Task task; + String command; + String endMsg; + + public Launcher(Task task, String command, String endMsg) { + this.task = task; + this.command = command; + this.endMsg = endMsg; + } + + public void run() { + try { + task.log("starting '" + command + "'..."); + Process process = Runtime.getRuntime().exec(command); + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line = ""; + while (line.indexOf(endMsg) == -1) { + line = reader.readLine(); + task.log(line); + } + task.log("'" + command + "' started."); + } catch (IOException e) { + throw new BuildException("couldn't start '" + command + "'", e); + } + } + +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/Launcher.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,82 @@ +/* + * 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.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Task; + +public class StartJBossTask extends Task { + + private static final String END_MESSAGE = " Started in "; + + String configuration = null; + String jbosshome = null; + + public void execute() throws BuildException { + try { + // get some environment variableInstances + String fileSeparator = System.getProperty( "file.separator" ); + String os = getProject().getProperty( "os.name" ).toLowerCase(); + + // build the command string + String command = null; + if ( os.indexOf( "windows" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.bat " + getConfigParameter(); + } else if ( os.indexOf( "linux" ) != -1 ) { + command = getJBossHome() + fileSeparator + "bin" + fileSeparator + "run.sh " + getConfigParameter(); + } else { + throw new BuildException( "os '" + os + "' not supported in the startjboss task." ); + } + + // launch the command and wait till the END_MESSAGE appears + Thread launcher = new Launcher(this, command, END_MESSAGE); + launcher.start(); + launcher.join(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + String getJBossHome() { + if (jbosshome!=null) { + return jbosshome; + } + String jbossHomeSysProp = getProject().getProperty( "jboss.home" ); + if (jbossHomeSysProp!=null) { + return jbossHomeSysProp; + } + throw new BuildException("startjboss couldn't figure out which jboss to start: jbosshome not specified and property jboss.home was not set"); + } + + String getConfigParameter() { + if (configuration==null) return ""; + return "-c "+configuration; + } + + public void setConfiguration(String configuration) { + this.configuration = configuration; + } + public void setJbosshome(String jbosshome) { + this.jbosshome = jbosshome; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/ant/StartJBossTask.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -33,7 +33,6 @@ import org.jbpm.api.IdentityService; import org.jbpm.api.ManagementService; import org.jbpm.api.ProcessEngine; -import org.jbpm.api.ProcessService; import org.jbpm.api.RepositoryService; import org.jbpm.api.TaskService; import org.jbpm.api.env.Context; @@ -41,8 +40,8 @@ import org.jbpm.api.env.EnvironmentFactory; import org.jbpm.api.env.WireObject; import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.env.PvmEnvironment; -import org.jbpm.pvm.internal.env.JbpmConfigurationParser; import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; @@ -87,7 +86,6 @@ private static final long serialVersionUID = 1L; private static final Log log = Log.getLog(JbpmConfiguration.class.getName()); - protected static JbpmConfigurationParser pvmEnvironmentFactoryParser = new JbpmConfigurationParser(); protected boolean isConfigured = false; protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE); @@ -101,6 +99,24 @@ if (!isConfigured) { setResource("jbpm.cfg.xml"); } + log.debug("created ProcessEngine "+System.identityHashCode(this)); + if ( (processEngineWireContext!=null) + && (processEngineWireContext.getWireDefinition()!=null) + && (processEngineWireContext.getWireDefinition().getDescriptorTypes()!=null) + ) { + log.debug(" process-engine-context "+System.identityHashCode(processEngineWireContext)); + for (Class<?> descriptorType: processEngineWireContext.getWireDefinition().getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } + if ( (transactionWireDefinition!=null) + && (transactionWireDefinition.getDescriptorTypes()!=null) + ) { + log.debug(" transaction-context:"); + for (Class<?> descriptorType: transactionWireDefinition.getDescriptorTypes()) { + log.debug(" "+descriptorType.getName()); + } + } return this; } @@ -135,11 +151,18 @@ return this; } + + public static EnvironmentFactory parseXmlString(String xmlString) { + JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); + jbpmConfiguration.setXmlString(xmlString); + return jbpmConfiguration; + } + protected void parse(StreamInput streamSource) { isConfigured = true; JbpmConfigurationParser.getInstance() .createParse() - .setDocumentObject(this) + .pushObject(this) .setStreamSource(streamSource) .execute() .checkProblems("jbpm configuration " + streamSource); @@ -164,14 +187,7 @@ return processEngineWireContext.get(RepositoryService.class); } - public static EnvironmentFactory parseXmlString(String xmlString) { - JbpmConfiguration jbpmConfiguration = new JbpmConfiguration(); - jbpmConfiguration.setXmlString(xmlString); - jbpmConfiguration.buildProcessEngine(); - return jbpmConfiguration; - } - public Environment openEnvironment() { return openEnvironment(null); } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/JbpmConfigurationParser.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,9 +21,8 @@ */ package org.jbpm.pvm.internal.env; -import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.api.JbpmException; import org.jbpm.pvm.internal.cfg.JbpmConfiguration; -import org.jbpm.pvm.internal.stream.StreamInput; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.WireDefinition; import org.jbpm.pvm.internal.wire.xml.WireParser; @@ -43,9 +42,11 @@ public class JbpmConfigurationParser extends Parser { private static final long serialVersionUID = 1L; + + // private static Log log = Log.getLog(JbpmConfigurationParser.class.getName()); - Parser environmentFactoryXmlParser = new WireParser(); - Parser environmentXmlParser = new WireParser(); + Parser processEngineContextParser = new WireParser(); + Parser transactionContextParser = new WireParser(); protected static JbpmConfigurationParser INSTANCE = new JbpmConfigurationParser(); @@ -53,25 +54,13 @@ return INSTANCE; } - /** parses the given stream source with {@link #getInstance() the current parser}. */ - static EnvironmentFactory parse(StreamInput streamSource) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) getInstance() - .createParse() - .setStreamSource(streamSource) - .execute() - .checkProblems("environment configuration "+streamSource) - .getDocumentObject(); - return environmentFactory; - } - public Object parseDocument(Document document, Parse parse) { Element documentElement = document.getDocumentElement(); // if the default environment factory was already set in the parse - JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.getDocumentObject(); + JbpmConfiguration jbpmConfiguration = (JbpmConfiguration) parse.findObject(JbpmConfiguration.class); if (jbpmConfiguration==null) { jbpmConfiguration = new JbpmConfiguration(); - parse.setDocumentObject(jbpmConfiguration); } for (Element importElement : XmlUtil.elements(documentElement, "import")) { @@ -79,12 +68,12 @@ String resource = importElement.getAttribute("resource"); Parse importParse = createParse() .setResource(resource) + .pushObject(jbpmConfiguration) .execute(); - importParse.addProblems(importParse.getProblems()); - + parse.addProblems(importParse.getProblems()); JbpmConfiguration importedConfiguration = (JbpmConfiguration) importParse.getDocumentObject(); - + WireDefinition importedProcessEngineWireDefinition = importedConfiguration.getProcessEngineWireContext().getWireDefinition(); jbpmConfiguration.addProcessEngineWireDefinition(importedProcessEngineWireDefinition); @@ -100,14 +89,14 @@ jbpmConfiguration.addTransactionWireDefinition(transactionWireDefinition); parse.setDocumentObject(jbpmConfiguration); - + return jbpmConfiguration; } WireDefinition getProcessEngineWireDefinition(Element documentElement, Parse parse) { Element processEngineElement = XmlUtil.element(documentElement, "process-engine-context"); if (processEngineElement != null) { - return (WireDefinition) environmentFactoryXmlParser.parseDocumentElement(processEngineElement, parse); + return (WireDefinition) processEngineContextParser.parseDocumentElement(processEngineElement, parse); } return null; } @@ -115,21 +104,21 @@ WireDefinition getTransactionWireDefinition(Element documentElement, Parse parse) { Element txCtxElement = XmlUtil.element(documentElement, "transaction-context"); if (txCtxElement != null) { - return (WireDefinition) environmentXmlParser.parseDocumentElement(txCtxElement, parse); + return (WireDefinition) transactionContextParser.parseDocumentElement(txCtxElement, parse); } return null; } - public Parser getEnvironmentFactoryXmlParser() { - return environmentFactoryXmlParser; + public Parser getProcessEngineContextParser() { + return processEngineContextParser; } - public void setEnvironmentFactoryXmlParser(Parser applicationWireXmlParser) { - this.environmentFactoryXmlParser = applicationWireXmlParser; + public void setProcessEngineContextParser(Parser applicationWireXmlParser) { + this.processEngineContextParser = applicationWireXmlParser; } - public Parser getEnvironmentXmlParser() { - return environmentXmlParser; + public Parser getTransactionContextParser() { + return transactionContextParser; } - public void setEnvironmentXmlParser(Parser blockWireXmlParser) { - this.environmentXmlParser = blockWireXmlParser; + public void setTransactionContextParser(Parser blockWireXmlParser) { + this.transactionContextParser = blockWireXmlParser; } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorMessageSession.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -21,7 +21,6 @@ */ package org.jbpm.pvm.internal.jobexecutor; -import org.jbpm.api.JbpmException; import org.jbpm.api.env.Environment; import org.jbpm.api.env.Transaction; import org.jbpm.api.job.Message; @@ -53,13 +52,12 @@ if (!isNotificationAdded) { isNotificationAdded = true; - // notify the job executor after the transaction is completed - log.trace("registering job executor notifier with "+transaction); JobExecutor jobExecutor = Environment.getCurrent().get(JobExecutor.class); - if (jobExecutor==null) { - throw new JbpmException("no job executor configured to execute "+message); + if (jobExecutor!=null) { + // notify the job executor after the transaction is completed + log.trace("registering job executor notifier with "+transaction); + transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorTimerSession.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -18,7 +18,6 @@ import org.jbpm.api.job.Timer; import org.jbpm.api.session.TimerSession; import org.jbpm.internal.log.Log; -import org.jbpm.pvm.internal.job.TimerImpl; /** * Timers created with this service are committed at the end of the transaction, @@ -28,29 +27,31 @@ * @author Tom Baeyens, Pascal Verdage */ public class JobExecutorTimerSession implements TimerSession { - - private static final Log log = Log.getLog(TimerSession.class.getName()); - + + private static final Log log = Log.getLog(TimerSession.class.getName()); + /* injected */ Transaction transaction; - /* injected */ - JobExecutor jobExecutor; - /* injected */ + JobExecutor jobExecutor; + + /* injected */ JobDbSession jobDbSession; boolean jobExecutorNotificationScheduled = false; - public void schedule(Timer timer) { - log.debug("scheduling "+timer); + public void schedule(Timer timer) { + log.debug("scheduling " + timer); validate(timer); jobDbSession.save(timer); - if (!jobExecutorNotificationScheduled) { + if ( (!jobExecutorNotificationScheduled) + && (jobExecutor!=null) + ) { jobExecutorNotificationScheduled = true; transaction.registerSynchronization(new JobAddedNotification(jobExecutor)); } - } + } protected void validate(Timer timer) { if (timer == null) @@ -58,9 +59,7 @@ if (timer.getExecution() == null) { throw new JbpmException("timer has no execution specified"); } - if ( (timer.getSignalName() == null) - && (timer.getEventName() == null) - ) + if ((timer.getSignalName() == null) && (timer.getEventName() == null)) throw new JbpmException("timer has no signalName or eventName specified"); if (timer.getDueDate() == null) throw new JbpmException("timer scheduled at null date"); @@ -68,12 +67,12 @@ throw new JbpmException("timer scheduled with a negative date"); } - public void cancel(Timer timer) { - log.debug("canceling "+timer); - if (timer != null) { - jobDbSession.delete(timer); - } else { - throw new JbpmException("timer is null"); - } - } + public void cancel(Timer timer) { + log.debug("canceling " + timer); + if (timer != null) { + jobDbSession.delete(timer); + } else { + throw new JbpmException("timer is null"); + } + } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -22,6 +22,8 @@ package org.jbpm.pvm.internal.repository; import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; import java.io.InputStream; import java.io.ObjectStreamException; import java.net.URL; @@ -40,6 +42,7 @@ import org.jbpm.pvm.internal.cmd.DeployCmd; import org.jbpm.pvm.internal.lob.Lob; import org.jbpm.pvm.internal.stream.ByteArrayStreamInput; +import org.jbpm.pvm.internal.stream.FileStreamInput; import org.jbpm.pvm.internal.stream.InputStreamInput; import org.jbpm.pvm.internal.stream.ResourceStreamInput; import org.jbpm.pvm.internal.stream.StreamInput; @@ -115,11 +118,23 @@ return this; } + public Deployment addResourceFromFile(File file) { + addResourceFromStreamInput(file.getPath(), new FileStreamInput(file)); + return this; + } + public Deployment addResourceFromStreamInput(String name, StreamInput streamInput) { if (resources==null) { resources = new HashMap<String, Lob>(); } - byte[] bytes = IoUtil.readBytes(streamInput.openStream()); + byte[] bytes = null; + try { + InputStream inputStream = streamInput.openStream(); + bytes = IoUtil.readBytes(inputStream); + inputStream.close(); + } catch (IOException e) { + throw new JbpmException("couldn't read from "+streamInput, e); + } Lob lob = new Lob(bytes); resources.put(name, lob); return this; Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -703,8 +703,11 @@ if (wireDefinition!=null) { String name = wireDefinition.getDescriptorName(type); if (name!=null) { + log.trace("found "+type.getName()+" in "+this); return type.cast(get(name)); - } + } else { + log.trace(type.getName()+" not found in "+this+" "+System.identityHashCode(this)); + } } return null; } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireDefinition.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -26,9 +26,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.jbpm.api.env.WireObject; -import org.jbpm.internal.log.Log; import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ProvidedObjectDescriptor; @@ -42,7 +42,7 @@ public class WireDefinition implements Serializable { private static final long serialVersionUID = 1L; - private static Log log = Log.getLog(WireDefinition.class.getName()); + // static Log log = Log.getLog(WireDefinition.class.getName()); transient ClassLoader classLoader; /** maps object names to {@link Descriptor}s */ @@ -207,7 +207,10 @@ } } } - + + public Set<Class<?>> getDescriptorTypes() { + return (descriptorNames!=null ? descriptorNames.keySet() : null); + } public Map<String, Descriptor> getDescriptors() { return descriptors; } Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.wire.binding; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.descriptor.EnvironmentFactoryDescriptor; -import org.jbpm.pvm.internal.xml.Parse; -import org.jbpm.pvm.internal.xml.Parser; -import org.w3c.dom.Element; - -/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. - * - * See schema docs for more details. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryRefBinding extends WireDescriptorBinding { - - public EnvironmentFactoryRefBinding() { - super("process-engine-ref"); - } - - public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); - return new EnvironmentFactoryDescriptor(environmentFactory); - } -} \ No newline at end of file Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentInterceptorBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -22,6 +22,7 @@ package org.jbpm.pvm.internal.wire.binding; import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.cfg.JbpmConfiguration; import org.jbpm.pvm.internal.wire.descriptor.EnvironmentInterceptorDescriptor; import org.jbpm.pvm.internal.xml.Parse; import org.jbpm.pvm.internal.xml.Parser; @@ -37,7 +38,7 @@ } public Object parse(Element element, Parse parse, Parser parser) { - EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.getDocumentObject(); + EnvironmentFactory environmentFactory = (EnvironmentFactory) parse.findObject(JbpmConfiguration.class); return new EnvironmentInterceptorDescriptor(environmentFactory); } Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,48 @@ +/* + * 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.binding; + +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.descriptor.ProcessEngineDescriptor; +import org.jbpm.pvm.internal.xml.Parse; +import org.jbpm.pvm.internal.xml.Parser; +import org.w3c.dom.Element; + +/**parses a descriptor for obtaining a reference to the {@link EnvironmentFactory}. + * + * See schema docs for more details. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineRefBinding extends WireDescriptorBinding { + + public ProcessEngineRefBinding() { + super("process-engine-ref"); + } + + public Object parse(Element element, Parse parse, Parser parser) { + ProcessEngine processEngine = (ProcessEngine) parse.findObject(ProcessEngine.class); + return new ProcessEngineDescriptor(processEngine); + } +} \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/ProcessEngineRefBinding.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,24 +0,0 @@ -package org.jbpm.pvm.internal.wire.descriptor; - -import org.jbpm.api.env.EnvironmentFactory; -import org.jbpm.pvm.internal.wire.WireContext; - -/** the {@link EnvironmentFactory} of the current {@link WireContext}. - * - * @author Tom Baeyens - * @author Guillaume Porcher (documentation) - */ -public class EnvironmentFactoryDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - EnvironmentFactory environmentFactory; - - public EnvironmentFactoryDescriptor(EnvironmentFactory environmentFactory) { - this.environmentFactory = environmentFactory; - } - - public Object construct(WireContext wireContext) { - return environmentFactory; - } -} Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ObjectDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -267,6 +267,7 @@ for (Field field: declaredFields) { if (! Modifier.isStatic(field.getModifiers())) { String fieldName = field.getName(); + Class<?> fieldType = field.getType(); Object autoWireValue = null; if ("environment".equals(fieldName)) { @@ -281,7 +282,7 @@ autoWireValue = wireContext.get(fieldName); } else { - autoWireValue = wireContext.get(field.getType()); + autoWireValue = wireContext.get(fieldType); } // if auto wire value has not been found in current context, // search in environment @@ -290,7 +291,7 @@ if (currentEnvironment != null) { autoWireValue = currentEnvironment.get(fieldName); if (autoWireValue == null) { - autoWireValue = currentEnvironment.get(field.getType()); + autoWireValue = currentEnvironment.get(fieldType); } } } @@ -301,7 +302,7 @@ ReflectUtil.set(field, object, autoWireValue); } catch (JbpmException e) { if(e.getCause() instanceof IllegalArgumentException) { - log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+field.getType().getName()+") " + + log.info("WARNING: couldn't auto wire "+fieldName+" (of type "+fieldType.getName()+") " + "with value "+autoWireValue + " (of type "+autoWireValue.getClass().getName()+")"); } else { log.info("WARNING: couldn't auto wire "+fieldName+" with value "+autoWireValue); Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/EnvironmentFactoryDescriptor.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,25 @@ +package org.jbpm.pvm.internal.wire.descriptor; + +import org.jbpm.api.ProcessEngine; +import org.jbpm.api.env.EnvironmentFactory; +import org.jbpm.pvm.internal.wire.WireContext; + +/** the {@link EnvironmentFactory} of the current {@link WireContext}. + * + * @author Tom Baeyens + * @author Guillaume Porcher (documentation) + */ +public class ProcessEngineDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + protected ProcessEngine processEngine; + + public ProcessEngineDescriptor(ProcessEngine processEngine) { + this.processEngine = processEngine; + } + + public Object construct(WireContext wireContext) { + return processEngine; + } +} Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ProcessEngineDescriptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/xml/BindingParser.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -49,7 +49,7 @@ Class<?> bindingClass = ReflectUtil.loadClass(classLoader, bindingClassName); binding = (Binding) bindingClass.newInstance(); } catch (Exception e) { - parse.addProblem("couldn't instantiate binding "+bindingClassName, e); + log.trace("couldn't instantiate binding "+bindingClassName); } } else { parse.addProblem("class is a required attribute in a binding "+XmlUtil.toString(bindingElement)); @@ -58,8 +58,6 @@ if (binding!=null) { Bindings bindings = parse.findObject(Bindings.class); bindings.addBinding(binding); - } else { - log.info("WARNING: binding for "+bindingClassName+" could not be parsed. See parsing problems for more details."); } } Modified: jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/java/org/jbpm/pvm/internal/xml/Parse.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -37,7 +37,6 @@ import org.jbpm.pvm.internal.stream.StringStreamInput; import org.jbpm.pvm.internal.stream.UrlStreamInput; import org.w3c.dom.Document; -import org.w3c.dom.Element; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; @@ -50,7 +49,7 @@ public class Parse extends ProblemList implements ErrorHandler { private static final long serialVersionUID = 1L; - + protected Parser parser; protected ClassLoader classLoader; Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <task-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <cfg resource="jbpm.hibernate.cfg.xml" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel" + read-contexts="execution, environment, process-engine" + write-context=""> + <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> + </script-manager> + + <authentication /> + + <id-generator /> + <types resource="jbpm.variable.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </process-engine-context> + + <transaction-context> + <repository-session /> + <pvm-db-session /> + <job-db-session /> + <task-db-session /> + <message-session /> + <timer-session /> + <history-session /> + <transaction /> + <hibernate-session /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.default.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,358 @@ +<?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.model" default-access="field"> + +  + <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> + <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> + <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> + <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> + <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> + <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> + <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> + <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> + <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> + <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> + </typedef> + +  + <class name="ExecutionImpl" + table="JBPM_EXECUTION" + discriminator-value="pvm"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator><column name="CLASS_" /></discriminator> + <version name="dbversion" column="DBVERSION_" /> + + <property name="activityName" column="ACTIVITYNAME_" /> + <property name="processDefinitionId" column="PROCDEFID_" /> + + <property name="hasVariables" column="HASVARS_" /> + <map name="variables" + cascade="all-delete-orphan"> + <key foreign-key="FK_VAR_EXECUTION"> + <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> + </key> + <map-key type="string" column="KEY_" /> + <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> + </map> + + <property name="hasTimers" column="HASTIMERS_" /> + <set name="timers" + cascade="all-delete-orphan"> + <key foreign-key="FK_TMR_EXECUTION"> + <column name="EXECUTION_" /> + </key> + <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> + </set> + + <property name="name" column="NAME_" /> + <property name="key" column="KEY_" /> + <property name="id" column="ID_" unique="true" /> + + <property name="state" column="STATE_" /> + + <property name="priority" column="PRIORITY_" /> + <property name="historyActivityInstanceDbid" column="HISACTINST_" /> + +  + +  + + <list name="executions" + cascade="all-delete-orphan" + inverse="false" + lazy="false"> + <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="ExecutionImpl" /> + </list> + + <many-to-one name="parent" + column="PARENT_" + class="ExecutionImpl" + foreign-key="FK_EXEC_PARENT" + index="IDX_EXEC_PARENT" /> + + <many-to-one name="processInstance" + class="ExecutionImpl" + column="INSTANCE_" + foreign-key="FK_EXEC_INSTANCE" + index="IDX_EXEC_INSTANCE" /> + + <many-to-one name="superProcessExecution" + column="SUPEREXEC_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUPEREXEC" + index="IDX_EXEC_SUPEREXEC" /> + + <many-to-one name="subProcessInstance" + column="SUBPROCINST_" + class="ExecutionImpl" + foreign-key="FK_EXEC_SUBPI" + index="IDX_EXEC_SUBPI" /> + + </class> + +  + <class name="CommentImpl" table="JBPM_COMMENT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="userId" column="USERID_" /> + <property name="time" column="TIME_" /> + <property name="message" column="MESSAGE_" /> + + <list name="comments" + cascade="all-delete-orphan" + inverse="false"> + <key column="PARENT_" foreign-key="none" /> + <list-index column="PARENT_IDX_" /> + <one-to-many class="CommentImpl" /> + </list> + </class> + +  + <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> +  + + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="key" column="KEY_"/> + <property name="queryText" column="QUERYTEXT_" /> + <property name="converter" type="converter" column="CONVERTER_" /> + <many-to-one name="processInstance" + column="PROCINST_" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + foreign-key="FK_VAR_PROCINST" + index="IDX_VAR_PROCINST"/> + </class> + + <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> + <property name="date" column="DATE_VALUE_" type="timestamp"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> + <property name="d" column="DOUBLE_VALUE_" type="double"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> + <property name="hibernatable" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> + <property name="l" column="LONG_VALUE_" type="long"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> + <property name="hibernatable" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> + <property name="string" column="STRING_VALUE_" type="string"/> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="FK_VAR_LOB" + index="IDX_VAR_LOB" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> + <many-to-one name="lob" + column="LOB_" + cascade="all" + class="org.jbpm.pvm.internal.lob.Lob" + foreign-key="none"/> + </subclass> + +  + <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> + <property name="bytes" type="binary" column="BINARY_VALUE_"/> + <property name="clob" type="clob" column="CLOB_VALUE_" /> + <property name="text" type="text" column="TEXT_VALUE_"/> + </class> + + <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> + <property name="isSuspended" column="ISSUSPENDED_" /> + <property name="isExclusive" column="ISEXCLUSIVE_" /> + <property name="lockOwner" column="LOCKOWNER_" /> + <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> + <property name="info" column="INFO_" /> + <property name="exception" column="EXCEPTION_" type="text" /> + <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCESSINSTANCE_" + cascade="none" + foreign-key="FK_JOB_PRINST" + index="IDX_JOB_PRINST"/> + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + cascade="none" + foreign-key="FK_JOB_EXE" + index="IDX_JOB_EXE"/> + +  + + <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> + <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> + <property name="signalName" column="SIGNAL_" /> +  + </subclass> + <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> + <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> + <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> + </subclass> + + <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> + <property name="signalName" column="SIGNAL_" /> + <property name="eventName" column="EVENT_" /> + <property name="repeat" column="REPEAT_" /> + </subclass> + + </class> + +  + + <query name="findTimers"> + <![CDATA[ + select t + from org.jbpm.pvm.internal.job.TimerImpl as t + order by dueDate asc + ]]> + </query> + + <query name="findMessages"> + <![CDATA[ + select m + from org.jbpm.pvm.internal.job.MessageImpl as m + ]]> + </query> + + <query name="findJobsWithException"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.retries = 0 + order by dueDate asc + ]]> + </query> + +  + <query name="findFirstAcquirableJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where ( ( (job.lockExpirationTime is null) + or (job.lockExpirationTime <= :now) + ) + and + ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + and + ( job.retries > 0 ) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findExclusiveJobs"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.processInstance = :processInstance + and job.isExclusive = true + and job.retries > 0 + and ( (job.dueDate is null) + or (job.dueDate <= :now) + ) + order by job.dueDate asc + ]]> + </query> + + <query name="findFirstDueJob"> + <![CDATA[ + select job + from org.jbpm.pvm.internal.job.JobImpl as job + where job.lockOwner is null + and job.retries > 0 + order by job.dueDate asc + ]]> + </query> + +  + <query name="findExecutionById"> + <![CDATA[ + select execution + from org.jbpm.pvm.internal.model.ExecutionImpl as execution + where execution.id = :id + ]]> + </query> + + <query name="findProcessInstanceById"> + <![CDATA[ + select processInstance + from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance + where processInstance.id = :processInstanceId + and processInstance.parent is null + ]]> + </query> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.execution.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,75 @@ +<?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.history.model" default-access="field"> + +  + <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> + <id name="processInstanceId" column="ID_"> + <generator class="assigned" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="processDefinitionId" column="PROCDEFID_" /> + <property name="key" column="KEY_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="state" column="STATE_" /> + <property name="endActivityName" column="ENDACTIVITY_" /> + +  + + <set name="historyActivityInstances" + cascade="all"> + <key> + <column name="HPI_" /> + </key> + <one-to-many class="HistoryActivityInstanceImpl" /> + </set> + + </class> + +  + <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator column="CLASS_" /> + <version name="dbversion" column="DBVERSION_" /> + + <many-to-one name="historyProcessInstance" + class="HistoryProcessInstanceImpl" + column="HPI_" + foreign-key="FK_HAI_HPI" + index="IDX_HAI_HPI" /> + +  + + <property name="type" column="TYPE_" /> + <property name="executionId" column="EXECUTION_" /> + <property name="activityName" column="ACTIVITY_NAME_" /> + <property name="startTime" column="START_" type="timestamp" /> + <property name="endTime" column="END_" type="timestamp" /> + <property name="duration" column="DURATION_" /> + <property name="transitionName" column="TRANSITION_" /> + + <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> + <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> + </subclass> + + <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> + <property name="assignee" column="ASSIGNEE_" /> + <property name="state" column="STATE_" /> + </subclass> + </class> + +</hibernate-mapping> \ No newline at end of file Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.history.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + <identity-service /> + </process-engine-context> + + <transaction-context> + <identity-session /> + </transaction-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,59 @@ +<?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"> + +  + <class name="UserImpl" table="JBPM_ID_USER"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <property name="password" column="PASSWORD_" /> + <property name="givenName" column="GIVENNAME_" /> + <property name="familyName" column="FAMILYNAME_" /> + </class> + +  + <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> + +  + <class name="GroupImpl" table="JBPM_ID_GROUP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" /> + <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/pvm/src/main/resources/jbpm.identity.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine-context> + + <job-executor /> + + </process-engine-context> + +</jbpm-configuration> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.jobexecutor.cfg.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,50 @@ +<?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 default-access="field"> + +  + <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" + table="JBPM_DEPLOYMENT"> + +  + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + + <property name="name" type="text" column="NAME_" /> + <property name="timestamp" column="TIMESTAMP_" /> + + <map name="resources" cascade="all-delete-orphan"> + <key foreign-key="FK_LOB_DEPLOYMENT"> + <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> + </key> + <map-key type="text" column="NAME_" /> + <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> + </map> + + <set name="objectProperties" + table="JBPM_DEPLOYPROPS" + cascade="all"> + <key column="DEPLOYMENT_" /> + <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> + </set> + + </class> + + <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <many-to-one name="deployment" + class="org.jbpm.pvm.internal.repository.DeploymentImpl" + column="DEPLOYMENT_" + foreign-key="FK_DEPLPROP_DEPL" + index="IDX_DEPLPROP_DEPL" /> + <property name="objectName" column="OBJNAME_" /> + <property name="key" column="KEY_" /> + <property name="stringValue" column="STRINGVAL_" /> + <property name="longValue" column="LONGVAL_" /> + </class> + +</hibernate-mapping> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.repository.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,197 @@ +<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> + +  + +  + +  + <class name="TaskImpl" + table="JBPM_TASK" + discriminator-value="T"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <discriminator type="char" column="CLASS_"/> + <version name="dbversion" column="DBVERSION_" /> + + <property name="id" column="ID_" unique="true" /> + <property name="name" column="NAME_"/> + <property name="description" column="DESCR_"/> + <property name="assignee" column="ASSIGNEE_"/> + + <set name="participations" cascade="all-delete-orphan"> + <key column="TASK_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + <property name="priority" column="PRIORITY_"/> + <property name="create" column="CREATE_"/> + <property name="dueDate" column="DUEDATE_"/> + <property name="progress" column="PROGRESS_"/> + <property name="isSignalling" column="SIGNALLING_"/> + +  + + <many-to-one name="superTask" + class="TaskImpl" + column="SUPERTASK_" + foreign-key="FK_TASK_SUPERTASK" + index="IDX_TASK_SUPERTASK" /> + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <many-to-one name="processInstance" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="PROCINST_" + foreign-key="none" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_TASK_SWIML" /> + + <property name="taskDefinitionName" column="TASKDEFNAME_"/> + + <list name="comments" cascade="all-delete-orphan"> + <key column="TASK_" /> + <list-index column="TASK_IDX_" /> + <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> + </list> + + <set name="subTasks" cascade="all-delete-orphan"> + <key column="SUPERTASK_" /> + <one-to-many class="TaskImpl" /> + </set> + + </class> + +  + <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="groupId" column="GROUPID_"/> + <property name="userId" column="USERID_"/> + <property name="type" column="TYPE_" /> + + <many-to-one name="task" + class="TaskImpl" + column="TASK_" + index="IDX_PART_TASK" + foreign-key="FK_PART_TASK" /> + + <many-to-one name="swimlane" + class="SwimlaneImpl" + column="SWIMLANE_" + foreign-key="FK_PART_SWIMLANE" /> + + </class> + +  + <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> + <id name="dbid" column="DBID_"> + <generator class="native" /> + </id> + <version name="dbversion" column="DBVERSION_" /> + + <property name="name" column="NAME_"/> + <property name="assignee" column="ASSIGNEE_"/> + +  + + <many-to-one name="execution" + class="org.jbpm.pvm.internal.model.ExecutionImpl" + column="EXECUTION_" + foreign-key="none" /> + + <set name="participations" cascade="all-delete-orphan"> + <key column="SWIMLANE_" /> + <one-to-many class="ParticipationImpl" /> + </set> + + </class> + + +  + + <query name="findTasks"> + <![CDATA[ + select task + from org.jbpm.pvm.internal.task.TaskImpl as task + ]]> + </query> + +</hibernate-mapping> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.hbm.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,13 @@ +<task-lifecycle initial="open"> + <state name="open"> + <transition name="complete" to="completed" /> + <transition name="suspend" to="suspended" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="suspended"> + <transition name="resume" to="open" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="cancelled" /> + <state name="completed" /> +</task-lifecycle> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.task.lifecycle.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,34 @@ +<types> + +  + <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + +  + <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> + +  + <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> + +  + <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> + +  + <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> + + <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> + <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> + + <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> + +  +  +  + +</types> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.variable.types.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml) =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml (rev 0) +++ jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,100 @@ +<wire-bindings> + +  +  +  +  + <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.ProcessEngineRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> +  + <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> + +  + <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> + <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> + +  + <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" /> + +  + <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> + +</wire-bindings> Property changes on: jbpm4/branches/tbaeyens/modules/pvm/src/main/resources/jbpm.wire.bindings.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -13,26 +13,26 @@ public void testEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<environment-scopes>" + - " <process-engine-context /> " + - " <transaction-context>" + - " <env-ref name='e' />" + - " </transaction-context>" + - "</environment-scopes>" - ); + "<environment-scopes>" + + " <process-engine-context /> " + + " <transaction-context>" + + " <env-ref name='e' />" + + " </transaction-context>" + + "</environment-scopes>" + ); - Environment environment = environmentFactory.openEnvironment(); + Environment environment = environmentFactory.openEnvironment(); - try{ - Object e = environment.get("e"); + try{ + Object e = environment.get("e"); - assertNotNull(e); - assertEquals(environment, e); - assertEquals(e, ((Environment) e).get("e")); - } finally { - environment.close(); - } - environmentFactory.close(); + assertNotNull(e); + assertEquals(environment, e); + assertEquals(e, ((Environment) e).get("e")); + } finally { + environment.close(); + } + environmentFactory.close(); } public void testEnvironmentFactoryWire(){ Modified: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,66 +2,6 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +0,0 @@ -<?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.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,19 +6,19 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + </session-factory> </hibernate-configuration> Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +0,0 @@ -<?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.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +0,0 @@ -<?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"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <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> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <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 Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/pvm/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,93 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - - -</wire-bindings> Modified: jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java =================================================================== --- jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -87,6 +87,8 @@ } processEngine = configuration.buildProcessEngine(); + + log.debug("using ProcessEngine "+System.identityHashCode(processEngine)); repositoryService = processEngine.get(RepositoryService.class); executionService = processEngine.getExecutionService(); Modified: jbpm4/branches/tbaeyens/modules/test-db/pom.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/pom.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -32,12 +32,21 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-api</artifactId> </dependency> - <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-jpdl</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <scope>test</scope> + </dependency> </dependencies> Copied: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (from rev 4603, jbpm4/branches/tbaeyens/modules/pvm/src/test/java/org/jbpm/pvm/internal/identity/IdentityTest.java) =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java (rev 0) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java 2009-04-23 15:16:20 UTC (rev 4607) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.test.identity; + +import java.util.List; + +import org.jbpm.api.IdentityService; +import org.jbpm.api.identity.Group; +import org.jbpm.api.identity.User; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Tom Baeyens + */ +public class IdentityTest extends JbpmTestCase { + + public void testSingleUser() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + + List<User> users = identityService.findUsers(); + assertNotNull(users); + assertEquals(1, users.size()); + + User johndoe = users.get(0); + assertEquals("johndoe", johndoe.getId()); + assertEquals("John", johndoe.getGivenName()); + assertEquals("Doe", johndoe.getFamilyName()); + assertEquals("John Doe", johndoe.toString()); + + identityService.deleteUser("johndoe"); + + assertEquals(0, identityService.findUsers().size()); + } + + public void testSingleGroup() throws Exception { + IdentityService identityService = processEngine.get(IdentityService.class); + + identityService.createUser("johndoe", "johndoe", "John", "Doe"); + identityService.createUser("joesmoe", "joesmoe", "Joe", "Smoe"); + identityService.createUser("jackblack", "jackblack", "Jack", "Black"); + + String redhatId = identityService.createGroup("redhat", Group.TYPE_UNIT, null); + String jbossId = identityService.createGroup("jboss", Group.TYPE_UNIT, "redhat"); + String jbpmId = identityService.createGroup("jbpm", Group.TYPE_UNIT, "jboss"); + + identityService.createMembership("johndoe", jbpmId, "developer"); + identityService.createMembership("joesmoe", jbpmId, "developer"); + identityService.createMembership("jackblack", jbossId, "manager"); + + List<Group> groups = identityService.findGroupsByUserAndGroupType("jackblack", Group.TYPE_UNIT); + + assertEquals(1, groups.size()); + Group group = groups.get(0); + assertEquals("unit.jboss", group.getId()); + } +} Property changes on: jbpm4/branches/tbaeyens/modules/test-db/src/test/java/org/jbpm/test/identity/IdentityTest.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cache.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,39 +0,0 @@ -<hibernate-cache> - - <class-cache class="org.jbpm.pvm.internal.model.ProcessDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ActivityImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TransitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.EventImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ExceptionHandlerImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.ObjectReference" /> - <class-cache class="org.jbpm.pvm.internal.model.VariableDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.model.TimerDefinitionImpl" /> - <class-cache class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ProcessDefinitionImpl.attachments" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.events" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.activities" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.variableDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.timerDefinitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.incomingTransitions" /> - <collection-cache collection="org.jbpm.pvm.internal.model.ActivityImpl.outgoingTransitions" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.TransitionImpl.events" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.exceptionHandlers" /> - <collection-cache collection="org.jbpm.pvm.internal.model.EventImpl.listenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.model.ExceptionHandlerImpl.eventListenerReferences" /> - - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.argDescriptors" /> - <collection-cache collection="org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor.operations" /> - -</hibernate-cache> 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -2,67 +2,8 @@ <jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <process-engine-context> - - <repository-service /> - <repository-cache /> - <execution-service /> - <history-service /> - <management-service /> - <task-service /> - <identity-service /> - <command-service> - <retry-interceptor /> - <environment-interceptor /> - <standard-transaction-interceptor /> - </command-service> - - <hibernate-configuration> - <cfg resource="jbpm.hibernate.cfg.xml" /> - </hibernate-configuration> + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.deployermgr.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> - <hibernate-session-factory /> - - <deployer-manager> - <jpdl-deployer /> - </deployer-manager> - - <script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> - </script-manager> - - <authentication /> - - <job-executor auto-start="false" /> - - <id-generator /> - <types resource="jbpm.variable.types.xml" /> - - <business-calendar> - <monday hours="9:00-12:00 and 12:30-17:00"/> - <tuesday hours="9:00-12:00 and 12:30-17:00"/> - <wednesday hours="9:00-12:00 and 12:30-17:00"/> - <thursday hours="9:00-12:00 and 12:30-17:00"/> - <friday hours="9:00-12:00 and 12:30-17:00"/> - <holiday period="01/07/2008 - 31/08/2008"/> - </business-calendar> - - </process-engine-context> - - <transaction-context> - <repository-session /> - <pvm-db-session /> - <job-db-session /> - <task-db-session /> - <message-session /> - <timer-session /> - <history-session /> - <transaction /> - <hibernate-session /> - <identity-session /> - </transaction-context> - </jbpm-configuration> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.execution.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,358 +0,0 @@ -<?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.model" default-access="field"> - -  - <typedef name="converter" class="org.jbpm.pvm.internal.hibernate.ConverterType"> - <param name="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" >bool-str</param> - <param name="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" >byte-long</param> - <param name="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" >char-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToLongConverter" >date-long</param> - <param name="org.jbpm.pvm.internal.type.converter.DateToStringConverter" >date-str</param> - <param name="org.jbpm.pvm.internal.type.converter.DoubleToStringConverter" >double-str</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" >float-double</param> - <param name="org.jbpm.pvm.internal.type.converter.FloatToStringConverter" >float-str</param> - <param name="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" >int-long</param> - <param name="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter">ser-bytes</param> - <param name="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" >short-long</param> - </typedef> - -  - <class name="ExecutionImpl" - table="JBPM_EXECUTION" - discriminator-value="pvm"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator><column name="CLASS_" /></discriminator> - <version name="dbversion" column="DBVERSION_" /> - - <property name="activityName" column="ACTIVITYNAME_" /> - <property name="processDefinitionId" column="PROCDEFID_" /> - - <property name="hasVariables" column="HASVARS_" /> - <map name="variables" - cascade="all-delete-orphan"> - <key foreign-key="FK_VAR_EXECUTION"> - <column name="EXECUTION_" index="IDX_VAR_EXECUTION"/> - </key> - <map-key type="string" column="KEY_" /> - <one-to-many class="org.jbpm.pvm.internal.type.Variable" /> - </map> - - <property name="hasTimers" column="HASTIMERS_" /> - <set name="timers" - cascade="all-delete-orphan"> - <key foreign-key="FK_TMR_EXECUTION"> - <column name="EXECUTION_" /> - </key> - <one-to-many class="org.jbpm.pvm.internal.job.TimerImpl" /> - </set> - - <property name="name" column="NAME_" /> - <property name="key" column="KEY_" /> - <property name="id" column="ID_" unique="true" /> - - <property name="state" column="STATE_" /> - - <property name="priority" column="PRIORITY_" /> - <property name="historyActivityInstanceDbid" column="HISACTINST_" /> - -  - -  - - <list name="executions" - cascade="all-delete-orphan" - inverse="false" - lazy="false"> - <key column="PARENT_" foreign-key="FK_EXEC_PARENT" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="ExecutionImpl" /> - </list> - - <many-to-one name="parent" - column="PARENT_" - class="ExecutionImpl" - foreign-key="FK_EXEC_PARENT" - index="IDX_EXEC_PARENT" /> - - <many-to-one name="processInstance" - class="ExecutionImpl" - column="INSTANCE_" - foreign-key="FK_EXEC_INSTANCE" - index="IDX_EXEC_INSTANCE" /> - - <many-to-one name="superProcessExecution" - column="SUPEREXEC_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUPEREXEC" - index="IDX_EXEC_SUPEREXEC" /> - - <many-to-one name="subProcessInstance" - column="SUBPROCINST_" - class="ExecutionImpl" - foreign-key="FK_EXEC_SUBPI" - index="IDX_EXEC_SUBPI" /> - - </class> - -  - <class name="CommentImpl" table="JBPM_COMMENT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="userId" column="USERID_" /> - <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> - - <list name="comments" - cascade="all-delete-orphan" - inverse="false"> - <key column="PARENT_" foreign-key="none" /> - <list-index column="PARENT_IDX_" /> - <one-to-many class="CommentImpl" /> - </list> - </class> - -  - <class name="org.jbpm.pvm.internal.type.Variable" abstract="true" discriminator-value=" " table="JBPM_VARIABLE"> -  - - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="key" column="KEY_"/> - <property name="queryText" column="QUERYTEXT_" /> - <property name="converter" type="converter" column="CONVERTER_" /> - <many-to-one name="processInstance" - column="PROCINST_" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - foreign-key="FK_VAR_PROCINST" - index="IDX_VAR_PROCINST"/> - </class> - - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> - <property name="date" column="DATE_VALUE_" type="timestamp"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> - <property name="d" column="DOUBLE_VALUE_" type="double"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> - <property name="hibernatable" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> - <property name="l" column="LONG_VALUE_" type="long"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> - <property name="hibernatable" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> - <property name="string" column="STRING_VALUE_" type="string"/> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="FK_VAR_LOB" - index="IDX_VAR_LOB" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass> - -  - <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM_LOB"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> - <property name="bytes" type="binary" column="BINARY_VALUE_"/> - <property name="clob" type="clob" column="CLOB_VALUE_" /> - <property name="text" type="text" column="TEXT_VALUE_"/> - </class> - - <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM_JOB" discriminator-value="Job"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <property name="dueDate" column="DUEDATE_" type="timestamp" index="IDX_JOBDUEDATE" /> - <property name="isSuspended" column="ISSUSPENDED_" /> - <property name="isExclusive" column="ISEXCLUSIVE_" /> - <property name="lockOwner" column="LOCKOWNER_" /> - <property name="lockExpirationTime" column="LOCKEXPTIME_" index="IDX_JOBLOCKEXP" /> - <property name="info" column="INFO_" /> - <property name="exception" column="EXCEPTION_" type="text" /> - <property name="retries" column="RETRIES_" index="IDX_JOBRETRIES" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCESSINSTANCE_" - cascade="none" - foreign-key="FK_JOB_PRINST" - index="IDX_JOB_PRINST"/> - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - cascade="none" - foreign-key="FK_JOB_EXE" - index="IDX_JOB_EXE"/> - -  - - <subclass name="org.jbpm.pvm.internal.job.MessageImpl" discriminator-value="Msg"> - <subclass name="org.jbpm.pvm.internal.model.op.ExecuteActivityMessage" discriminator-value="ExeActivityMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.SignalMessage" discriminator-value="SignalMsg"> - <property name="signalName" column="SIGNAL_" /> -  - </subclass> - <subclass name="org.jbpm.pvm.internal.model.op.TakeTransitionMessage" discriminator-value="TakeTrMsg" /> - <subclass name="org.jbpm.pvm.internal.model.op.ProceedToDestinationMessage" discriminator-value="ProceedDestMsg" /> - <subclass name="org.jbpm.pvm.internal.job.CommandMessage" discriminator-value="CmdMsg" /> - </subclass> - - <subclass name="org.jbpm.pvm.internal.job.TimerImpl" discriminator-value="Timer"> - <property name="signalName" column="SIGNAL_" /> - <property name="eventName" column="EVENT_" /> - <property name="repeat" column="REPEAT_" /> - </subclass> - - </class> - -  - - <query name="findTimers"> - <![CDATA[ - select t - from org.jbpm.pvm.internal.job.TimerImpl as t - order by dueDate asc - ]]> - </query> - - <query name="findMessages"> - <![CDATA[ - select m - from org.jbpm.pvm.internal.job.MessageImpl as m - ]]> - </query> - - <query name="findJobsWithException"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.retries = 0 - order by dueDate asc - ]]> - </query> - -  - <query name="findFirstAcquirableJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where ( ( (job.lockExpirationTime is null) - or (job.lockExpirationTime <= :now) - ) - and - ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - and - ( job.retries > 0 ) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findExclusiveJobs"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.processInstance = :processInstance - and job.isExclusive = true - and job.retries > 0 - and ( (job.dueDate is null) - or (job.dueDate <= :now) - ) - order by job.dueDate asc - ]]> - </query> - - <query name="findFirstDueJob"> - <![CDATA[ - select job - from org.jbpm.pvm.internal.job.JobImpl as job - where job.lockOwner is null - and job.retries > 0 - order by job.dueDate asc - ]]> - </query> - -  - <query name="findExecutionById"> - <![CDATA[ - select execution - from org.jbpm.pvm.internal.model.ExecutionImpl as execution - where execution.id = :id - ]]> - </query> - - <query name="findProcessInstanceById"> - <![CDATA[ - select processInstance - from org.jbpm.pvm.internal.model.ExecutionImpl as processInstance - where processInstance.id = :processInstanceId - and processInstance.parent is null - ]]> - </query> - -</hibernate-mapping> \ No newline at end of file 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-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.hibernate.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -6,20 +6,21 @@ <hibernate-configuration> <session-factory> - <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> - <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> - <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> - <property name="hibernate.connection.username">sa</property> - <property name="hibernate.connection.password"></property> - <property name="hibernate.hbm2ddl.auto">create-drop</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.cache.use_second_level_cache">true</property> - <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <mapping resource="jbpm.repository.hbm.xml" /> - <mapping resource="jbpm.execution.hbm.xml" /> - <mapping resource="jbpm.history.hbm.xml" /> - <mapping resource="jbpm.task.hbm.xml" /> - <mapping resource="jbpm.jpdl.hbm.xml" /> - <mapping resource="jbpm.identity.hbm.xml" /> + + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + <property name="hibernate.hbm2ddl.auto">create-drop</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <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/test-db/src/test/resources/jbpm.history.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.history.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,75 +0,0 @@ -<?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.history.model" default-access="field"> - -  - <class name="HistoryProcessInstanceImpl" table="JBPM_HIST_PROCINST"> - <id name="processInstanceId" column="ID_"> - <generator class="assigned" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="processDefinitionId" column="PROCDEFID_" /> - <property name="key" column="KEY_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="state" column="STATE_" /> - <property name="endActivityName" column="ENDACTIVITY_" /> - -  - - <set name="historyActivityInstances" - cascade="all"> - <key> - <column name="HPI_" /> - </key> - <one-to-many class="HistoryActivityInstanceImpl" /> - </set> - - </class> - -  - <class name="HistoryActivityInstanceImpl" table="JBPM_HIST_ACTINST" discriminator-value="ACT"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator column="CLASS_" /> - <version name="dbversion" column="DBVERSION_" /> - - <many-to-one name="historyProcessInstance" - class="HistoryProcessInstanceImpl" - column="HPI_" - foreign-key="FK_HAI_HPI" - index="IDX_HAI_HPI" /> - -  - - <property name="type" column="TYPE_" /> - <property name="executionId" column="EXECUTION_" /> - <property name="activityName" column="ACTIVITY_NAME_" /> - <property name="startTime" column="START_" type="timestamp" /> - <property name="endTime" column="END_" type="timestamp" /> - <property name="duration" column="DURATION_" /> - <property name="transitionName" column="TRANSITION_" /> - - <subclass name="HistoryAutomaticInstanceImpl" discriminator-value="AUT"> - <subclass name="HistoryDecisionInstanceImpl" discriminator-value="EXCL" /> - </subclass> - - <subclass name="HistoryTaskInstanceImpl" discriminator-value="TASK"> - <property name="assignee" column="ASSIGNEE_" /> - <property name="state" column="STATE_" /> - </subclass> - </class> - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.cfg.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -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 Deleted: 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 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.identity.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,59 +0,0 @@ -<?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"> - -  - <class name="UserImpl" table="JBPM_ID_USER"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <property name="password" column="PASSWORD_" /> - <property name="givenName" column="GIVENNAME_" /> - <property name="familyName" column="FAMILYNAME_" /> - </class> - -  - <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> - -  - <class name="GroupImpl" table="JBPM_ID_GROUP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" /> - <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 Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.activities.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,17 +0,0 @@ -<activities> - <activity binding="org.jbpm.jpdl.internal.activity.StartBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.StateBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.DecisionBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndCancelBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EndErrorBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ForkBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JoinBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.TaskBinding" /> - <activity binding="org.jbpm.jpdl.internal.activity.SubProcessBinding" /> -</activities> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.eventlisteners.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,8 +0,0 @@ -<eventlisteners> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EventListenerBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.JavaBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.EsbBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.HqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.SqlBinding" /> - <eventlistener binding="org.jbpm.jpdl.internal.activity.ScriptBinding" /> -</eventlisteners> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.jpdl.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,123 +0,0 @@ -<?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 default-access="field"> - -  - - <subclass name="org.jbpm.jpdl.internal.model.JpdlExecution" - extends="org.jbpm.pvm.internal.model.ExecutionImpl" - discriminator-value="jpdl"> - - <map name="swimlanes" - cascade="all-delete-orphan"> - <key foreign-key="FK_SWIMLANE_EXEC"> - <column name="EXECUTION_" index="IDX_SWIMLANE_EXEC"/> - </key> - <map-key type="string" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.task.SwimlaneImpl" /> - </map> - </subclass> - -  - -</hibernate-mapping> \ No newline at end of file Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.repository.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,50 +0,0 @@ -<?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 default-access="field"> - -  - <class name="org.jbpm.pvm.internal.repository.DeploymentImpl" - table="JBPM_DEPLOYMENT"> - -  - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - - <property name="name" type="text" column="NAME_" /> - <property name="timestamp" column="TIMESTAMP_" /> - - <map name="resources" cascade="all-delete-orphan"> - <key foreign-key="FK_LOB_DEPLOYMENT"> - <column name="DEPLOYMENT_" index="IDX_LOB_DEPLOYMENT" /> - </key> - <map-key type="text" column="NAME_" /> - <one-to-many class="org.jbpm.pvm.internal.lob.Lob"/> - </map> - - <set name="objectProperties" - table="JBPM_DEPLOYPROPS" - cascade="all"> - <key column="DEPLOYMENT_" /> - <one-to-many class="org.jbpm.pvm.internal.repository.DeploymentProperty" /> - </set> - - </class> - - <class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM_DEPLOYPROP"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <many-to-one name="deployment" - class="org.jbpm.pvm.internal.repository.DeploymentImpl" - column="DEPLOYMENT_" - foreign-key="FK_DEPLPROP_DEPL" - index="IDX_DEPLPROP_DEPL" /> - <property name="objectName" column="OBJNAME_" /> - <property name="key" column="KEY_" /> - <property name="stringValue" column="STRINGVAL_" /> - <property name="longValue" column="LONGVAL_" /> - </class> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.hbm.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,197 +0,0 @@ -<?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 auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field"> - -  - -  - -  - <class name="TaskImpl" - table="JBPM_TASK" - discriminator-value="T"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <discriminator type="char" column="CLASS_"/> - <version name="dbversion" column="DBVERSION_" /> - - <property name="id" column="ID_" unique="true" /> - <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> - <property name="assignee" column="ASSIGNEE_"/> - - <set name="participations" cascade="all-delete-orphan"> - <key column="TASK_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - <property name="priority" column="PRIORITY_"/> - <property name="create" column="CREATE_"/> - <property name="dueDate" column="DUEDATE_"/> - <property name="progress" column="PROGRESS_"/> - <property name="isSignalling" column="SIGNALLING_"/> - -  - - <many-to-one name="superTask" - class="TaskImpl" - column="SUPERTASK_" - foreign-key="FK_TASK_SUPERTASK" - index="IDX_TASK_SUPERTASK" /> - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <many-to-one name="processInstance" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="PROCINST_" - foreign-key="none" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_TASK_SWIML" /> - - <property name="taskDefinitionName" column="TASKDEFNAME_"/> - - <list name="comments" cascade="all-delete-orphan"> - <key column="TASK_" /> - <list-index column="TASK_IDX_" /> - <one-to-many class="org.jbpm.pvm.internal.model.CommentImpl" /> - </list> - - <set name="subTasks" cascade="all-delete-orphan"> - <key column="SUPERTASK_" /> - <one-to-many class="TaskImpl" /> - </set> - - </class> - -  - <class name="ParticipationImpl" table="JBPM_PARTICIPATION"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="groupId" column="GROUPID_"/> - <property name="userId" column="USERID_"/> - <property name="type" column="TYPE_" /> - - <many-to-one name="task" - class="TaskImpl" - column="TASK_" - index="IDX_PART_TASK" - foreign-key="FK_PART_TASK" /> - - <many-to-one name="swimlane" - class="SwimlaneImpl" - column="SWIMLANE_" - foreign-key="FK_PART_SWIMLANE" /> - - </class> - -  - <class name="SwimlaneImpl" table="JBPM_SWIMLANE"> - <id name="dbid" column="DBID_"> - <generator class="native" /> - </id> - <version name="dbversion" column="DBVERSION_" /> - - <property name="name" column="NAME_"/> - <property name="assignee" column="ASSIGNEE_"/> - -  - - <many-to-one name="execution" - class="org.jbpm.pvm.internal.model.ExecutionImpl" - column="EXECUTION_" - foreign-key="none" /> - - <set name="participations" cascade="all-delete-orphan"> - <key column="SWIMLANE_" /> - <one-to-many class="ParticipationImpl" /> - </set> - - </class> - - -  - - <query name="findTasks"> - <![CDATA[ - select task - from org.jbpm.pvm.internal.task.TaskImpl as task - ]]> - </query> - -</hibernate-mapping> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.task.lifecycle.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.variable.types.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,34 +0,0 @@ -<types> - -  - <type name="string" class="java.lang.String" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="long" class="java.lang.Long" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="double" class="java.lang.Double" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="date" class="java.util.Date" converter="org.jbpm.pvm.internal.type.converter.DateToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="boolean" class="java.lang.Boolean" converter="org.jbpm.pvm.internal.type.converter.BooleanToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - <type name="char" class="java.lang.Character" converter="org.jbpm.pvm.internal.type.converter.CharacterToStringConverter" variable-class="org.jbpm.pvm.internal.type.variable.StringVariable" /> - -  - <type name="byte" class="java.lang.Byte" converter="org.jbpm.pvm.internal.type.converter.ByteToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="short" class="java.lang.Short" converter="org.jbpm.pvm.internal.type.converter.ShortToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - <type name="integer" class="java.lang.Integer" converter="org.jbpm.pvm.internal.type.converter.IntegerToLongConverter" variable-class="org.jbpm.pvm.internal.type.variable.LongVariable" /> - -  - <type name="float" class="java.lang.Float" converter="org.jbpm.pvm.internal.type.converter.FloatToDoubleConverter" variable-class="org.jbpm.pvm.internal.type.variable.DoubleVariable" /> - -  - <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> - - <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> - <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> - - <type name="serializable" class="serializable" converter="org.jbpm.pvm.internal.type.converter.SerializableToBytesConverter" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - -  -  -  - -</types> Deleted: jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml =================================================================== --- jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-22 14:00:15 UTC (rev 4606) +++ jbpm4/branches/tbaeyens/modules/test-db/src/test/resources/jbpm.wire.bindings.xml 2009-04-23 15:16:20 UTC (rev 4607) @@ -1,95 +0,0 @@ -<wire-bindings> - -  -  -  -  - <binding class="org.jbpm.pvm.internal.wire.binding.TrueBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FalseBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.CharBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.DoubleBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FloatBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IntBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ShortBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ByteBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.LongBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StringBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.NullBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ClassBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ObjectBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JndiBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.ListBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SetBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MapBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.PropertiesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentFactoryRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnvBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ContextRefBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionRefBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.TransactionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobExecutorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobTestHelperBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ScriptManagerBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.BusinessCalendarBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdGeneratorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthenticationBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateConfigurationBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SeamHibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HibernateSessionFactoryBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.MessageSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TimerSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionFactoryBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JbossIdmIdentitySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositorySessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.MailTemplateBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PvmDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.JobDbSessionBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskDbSessionBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.TypesBinding" /> -  - <binding class="org.jbpm.pvm.internal.wire.binding.CommandServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ExecutionServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.ManagementServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.IdentityServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.HistoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.TaskServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryServiceBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RepositoryCacheBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.DeployerManagerBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.EnvironmentInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.AuthorizationInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.RetryInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.StandardTransactionInterceptorBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SerializeInterceptorBinding" /> - -  - <binding class="org.jbpm.pvm.internal.wire.binding.PropertyBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.FieldBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.InvokeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.SubscribeBinding" /> - <binding class="org.jbpm.pvm.internal.wire.binding.EnlistBinding" /> - -  - <binding class="org.jbpm.jpdl.internal.xml.JpdlDeployerBinding" /> - -</wire-bindings>

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4606 - in projects/gwt-console/trunk: plugin-api and 23 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-22 10:00:15 -0400 (Wed, 22 Apr 2009) New Revision: 4606 Added: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/LazyPanel.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoadingStatusAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java projects/gwt-console/trunk/war/src/main/resources/mvc4g-conf.xml projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/error.png projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/loading-circle.gif projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/loading.gif projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/js/ox.ajast.js Removed: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/DateRenderer.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelChangeListener.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelListenerRegistry.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelModificationCallback.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/report/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/js/ext/ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/plugin-api/plugin.iml projects/gwt-console/trunk/plugin-api/pom.xml projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java projects/gwt-console/trunk/plugin-example/plugin-example.iml projects/gwt-console/trunk/plugin-example/pom.xml projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java projects/gwt-console/trunk/pom.xml projects/gwt-console/trunk/rpc/gwt-rpc.iml projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/war/gwt-war.iml projects/gwt-console/trunk/war/pom.xml projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/Application.html projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: svn merge -r4358:HEAD https://svn.jboss.org/repos/jbpm/projects/gwt-console/branches/hbraun Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/gwt-parent.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -20,9 +20,9 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" /> - <orderEntry type="module" module-name="gwt-server-integration" /> - <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="plugin" exported="" /> + <orderEntry type="module" module-name="gwt-server-integration" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -51,15 +51,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -134,15 +125,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> @@ -237,15 +219,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> @@ -292,6 +265,69 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-api/plugin.iml =================================================================== --- projects/gwt-console/trunk/plugin-api/plugin.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/plugin.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -20,15 +20,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> @@ -75,6 +66,51 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-api/pom.xml =================================================================== --- projects/gwt-console/trunk/plugin-api/pom.xml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -38,17 +38,47 @@ <version>${gwt.version}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>com.google.code.gwt-log</groupId> + <artifactId>gwt-log</artifactId> + </dependency> <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + </dependency> <dependency> - <groupId>com.google.code.gwt-log</groupId> - <artifactId>gwt-log</artifactId> + <groupId>com.googlecode.mvc4g</groupId> + <artifactId>mvc4g</artifactId> </dependency> +  + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + + </dependencies> <build> Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,10 +21,11 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Viewport; +import com.mvc4g.client.Controller; +import org.gwt.mosaic.ui.client.Viewport; /** - * Provides context information to console compoments and plugins. + * Provides context information to console components and plugins. * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ @@ -39,5 +40,9 @@ Authentication getAuthentication(); ConsoleConfig getConfig(); - + + Controller getController(); + + Viewport getViewport(); + } Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Editor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,83 +21,74 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Panel; +import com.mvc4g.client.Controller; +import com.google.gwt.user.client.Window; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.layout.BorderLayout; +import org.jboss.bpm.console.client.LazyPanel; -import java.util.List; -import java.util.ArrayList; /** - * An editor can be plugged into a {@link org.jboss.bpm.console.client.Workspace} + * <h2>Composition</h2> + * An editor can be plugged into a {@link org.jboss.bpm.console.client.Workspace}. + * Editors do aggregate {@link com.mvc4g.client.ViewInterface}'s and {@link com.mvc4g.client.ActionInterface}'s, + * which are maintained through a {@link com.mvc4g.client.Controller}. + + * <h2>Event handling</h2> + * Views and actions communicate though a hirarchical controller chain by issuing events:<p> + * <code> + * Controller.handleEvent( new Event(...)); + * </code> + * <p/> + * By default every editor get's it's own controller that delegates to the main {@link org.jboss.bpm.console.client.ApplicationContext} + * controller as it's parent. * + * <h2>Layout</h2> + * Each Editor uses a {@link org.gwt.mosaic.ui.client.layout.BorderLayout} by default. + * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public abstract class Editor extends Panel +public abstract class Editor extends LayoutPanel implements LazyPanel { protected ApplicationContext appContext; - protected List<String> managedTabs; - public Editor(ApplicationContext applicationContext) - { - super(); - this.appContext = applicationContext; - this.managedTabs = new ArrayList<String>(); - this.setPaddings(10); - } + protected Controller controller; - public abstract String getEditorId(); + protected boolean isInitialized; - public abstract String getTitle(); - - public abstract String getIconCSS(); - - public abstract MenuSection provideMenuSection(); - - public boolean hasView(String viewId) + public Editor(ApplicationContext appContext) { - final String tabId = viewId + ".tab"; - return appContext.getWorkpace().hasItem(tabId); + super(new BorderLayout()); + this.appContext = appContext; + + // hmvc controller chain. + this.controller = new Controller(); + this.controller.setParent(appContext.getController()); } - public void showView(String viewId) + public boolean isInitialized() { - final String tabId = viewId + ".tab"; - appContext.getWorkpace().setActiveTab(tabId); + return this.isInitialized; } - public void addView(View view, boolean closable) - { - String tabId = view.getViewId() + ".tab"; + public abstract void initialize(); + + public abstract String getEditorId(); - view.setId(tabId); // tabId != viewId - view.setClosable(closable); - view.setIconCls(view.getIconCSS()); - view.setAutoScroll(true); + public abstract String getTitle(); - appContext.getWorkpace().add(view); - appContext.getWorkpace().setActiveTab(view.getId()); + public abstract String getIconCSS(); + + public abstract MenuSection provideMenuSection(); - managedTabs.add(tabId); - - } - - public void closeViews() + /** + * hack in order to correctly display widgets that have + * been rendered hidden + */ + protected void refreshView() { - for(String tabId : managedTabs) - { - Panel tab = appContext.getWorkpace().getItem(tabId); - if(tab!=null) - { - tab.collapse(); - } - } + final int width = Window.getClientWidth(); + final int height = Window.getClientHeight(); + appContext.getViewport().onWindowResized(width, height); } - - class WrapperPanel extends Panel - { - public WrapperPanel(String id) - { - super(); - setId(id); - } - } } Copied: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/LazyPanel.java (from rev 4605, projects/gwt-console/branches/hbraun/plugin-api/src/main/java/org/jboss/bpm/console/client/LazyPanel.java) =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/LazyPanel.java (rev 0) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/LazyPanel.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,35 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public interface LazyPanel +{ + boolean isInitialized(); + + /** + * Expected to be an idempotent implementation + */ + void initialize(); +} Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Menu.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,11 +21,13 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.layout.AccordionLayout; -import java.util.ArrayList; -import java.util.List; +import org.gwt.mosaic.ui.client.StackLayoutPanel; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.Controller; /** * The main menu on the left hand. @@ -33,29 +35,29 @@ * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public class Menu extends Panel -{ - private final ApplicationContext mainView; - private List<Panel> sections = new ArrayList<Panel>(); +public class Menu extends LayoutPanel implements ViewInterface +{ + private StackLayoutPanel stack; + private Controller controller; - public Menu(final ApplicationContext view) + public Menu() { - super(); - this.mainView = view; + super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - final AccordionLayout accordion = new AccordionLayout(true); + this.setWidgetSpacing(5); - this.setTitle(""); - this.setCollapsible(true); - this.setWidth(200); - this.setLayout(accordion); + this.stack = new StackLayoutPanel(); + //stack.showStack(0); // todo: loading event + this.add(stack, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH, true)); + } + public void addSection(MenuSection menuSection) + { + this.stack.add(menuSection, menuSection.getMenuTitle()); } - public void addSection(MenuSection menuSection) + public void setController(Controller controller) { - this.sections.add(menuSection); - this.add(menuSection); + this.controller = controller; } - } Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,27 +21,34 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Component; +import com.google.gwt.user.client.ui.Tree; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; + /** * One section in the lefthand main menu. * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public class MenuSection extends Panel +public class MenuSection extends LayoutPanel { - public MenuSection(String title, String iconClass, Component tree) + private String menuTitle; + private String iconClass; + + public MenuSection(String title, String iconClass, Tree tree) { - super(); + super(); - setTitle(title); - setBorder(false); - setHideBorders(true); - setIconCls(iconClass); + this.menuTitle = title; + this.iconClass = iconClass; if (tree != null) add(tree); } + + public String getMenuTitle() + { + return menuTitle; + } } Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -86,7 +86,7 @@ public String getStateChangeURL(String instanceId, ProcessInstanceRef.STATE state) { - return getConsoleServerUrl() + "/rs/process/instances/" + adoptExecutionId(instanceId) + "/state/" + state; + return getConsoleServerUrl() + "/rs/process/instances/" + instanceId + "/state/" + state; } public String getStartNewInstanceURL(String processId) @@ -132,21 +132,15 @@ public String getExecutionSignalUrl(TokenReference tok) { - return getConsoleServerUrl() + "/rs/process/tokens/" + adoptExecutionId(tok.getId()) + "/transition/default"; + return getConsoleServerUrl() + "/rs/process/tokens/" + tok.getId() + "/transition/default"; } public String getExecutionSignalUrl(TokenReference tok, String signal) { String encodedSignal = URL.encode(signal); - return getConsoleServerUrl() + "/rs/process/tokens/" + adoptExecutionId(tok.getId()) + "/transition?signal=" + encodedSignal; + return getConsoleServerUrl() + "/rs/process/tokens/" + tok.getId() + "/transition?signal=" + encodedSignal; } - private String adoptExecutionId(String actual) - { - // TDOD: https://jira.jboss.org/jira/browse/JBPM-2054 - return actual.replace("/", "_"); - } - public String getAvailableActorsUrl(String actorId) { return getConsoleServerUrl() + "/rs/identity/user/" + actorId + "/actors"; Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/View.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,46 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client; - -import com.gwtext.client.widgets.Panel; - -/** - * View's are {@link org.jboss.bpm.console.client.Editor} components - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public abstract class View extends Panel -{ - - protected ApplicationContext mainMenu; - - protected View(ApplicationContext main) - { - super(); - this.mainMenu = main; - this.setPaddings(10); - } - - public abstract String getViewId(); - - public abstract String getIconCSS(); -} Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/Workspace.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,90 +21,86 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Component; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.TabPanel; +import org.gwt.mosaic.ui.client.DeckLayoutPanel; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; /** - * Maintains {@link org.jboss.bpm.console.client.Workspace}'s + * Maintains {@link Editor}'s * * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public class Workspace extends TabPanel +public class Workspace extends DeckLayoutPanel { - protected ApplicationContext view; + protected ApplicationContext appContext; private Menu menu; - + public Workspace(Menu menu) { super(); this.menu = menu; + this.setPadding(5); - this.setResizeTabs(true); - this.setMinTabWidth(115); - this.setTabWidth(135); - this.setEnableTabScroll(true); - this.setAutoScroll(true); - this.setActiveTab(0); } - private Panel createTab(Editor editor, boolean closeable) - { - Panel tab = new WrapperPanel(editor.getId() + ".tab"); - tab.setTitle(editor.getTitle()); - tab.setIconCls(editor.getIconCSS()); - tab.setClosable(closeable); - tab.setAutoScroll(true); - tab.setBorder(false); - tab.setFrame(false); - tab.setHideBorders(true); - return tab; - } - public void addEditor(Editor editor, boolean closeable) { // Menu menu.addSection(editor.provideMenuSection()); - // Editor pane - Panel tab = createTab(editor, closeable); - tab.add(editor); - this.add(tab); - this.setActiveTab(tab.getId()); - this.doLayout(); + // Editor deck + EditorDeck deck = createDeck(editor); + deck.index = this.getWidgetCount(); + this.add(deck); } public boolean hasEditor(String id) { - boolean b = false; - final String tabId = id + ".tab"; + return findEditor(id)!=null; + } - Component[] tabs = this.getItems(); - for (int i = 0; i < tabs.length; i++) + public void showEditor(String id) + { + EditorDeck deck = findEditor(id); + if(null==deck) + throw new IllegalArgumentException("No such editor: " +id); + this.showWidget(deck.index); + + deck.editor.initialize(); + } + + private EditorDeck createDeck(Editor editor) + { + EditorDeck deck = new EditorDeck(editor); + deck.add(editor); + return deck; + } + + private EditorDeck findEditor(String id) + { + EditorDeck match = null; + for(int i=0; i<this.getWidgetCount(); i++) { - Component tab = tabs[i]; - if (tab.getId().equals(tabId)) + EditorDeck deck = (EditorDeck) this.getWidget(i); + if(id.equals( deck.editor.getEditorId())) { - b = true; + match = deck; break; } } - return b; + return match; } - public void showEditor(String id) + private class EditorDeck extends LayoutPanel { - final String tabId = id + ".tab"; - this.setActiveTab(tabId); - } + Editor editor; + int index; - class WrapperPanel extends Panel - { - public WrapperPanel(String id) + public EditorDeck(Editor editor) { super(); - setId(id); + this.editor = editor; } + } } Modified: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -22,14 +22,13 @@ package org.jboss.bpm.console.client.model; import com.google.gwt.json.client.*; +import org.jboss.bpm.console.client.model.jbpm3.TokenReference; import org.jboss.bpm.console.client.util.ConsoleLog; -import org.jboss.bpm.console.client.model.jbpm3.TokenReference; import org.jboss.bpm.console.client.util.JSONWalk; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * TODO: run integrated (gwt-console-server) test @@ -38,9 +37,20 @@ */ public class DTOParser { - public static ProcessDefinitionRef parseProcessDefinition(String json) + public static List<ProcessDefinitionRef> parseProcessDefinitions(JSONValue jso) { - JSONValue root = JSONParser.parse(json); + List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(); + + JSONArray arr = JSONWalk.on(jso).next("definitions").asArray(); + for(int i=0; i<arr.size(); i++) + { + results.add(parseProcessDefinition(arr.get(i))); + } + return results; + } + + public static ProcessDefinitionRef parseProcessDefinition(JSONValue root) + { String id = JSONWalk.on(root).next("id").asString(); Long version = JSONWalk.on(root).next("version").asLong(); String name = JSONWalk.on(root).next("name").asString(); @@ -48,6 +58,12 @@ return new ProcessDefinitionRef(id, name, version); } + public static ProcessDefinitionRef parseProcessDefinition(String json) + { + JSONValue root = JSONParser.parse(json); + return parseProcessDefinition(root); + } + public static List<String> parseRolesAssigned(String json) { // parse roles @@ -161,8 +177,20 @@ return p; } - public static ProcessInstanceRef parseProcessInstance(JSONObject root) + public static List<ProcessInstanceRef> parseProcessInstances(JSONValue jso) { + List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(); + + JSONArray arr = JSONWalk.on(jso).next("instances").asArray(); + for(int i=0; i<arr.size(); i++) + { + results.add(parseProcessInstance(arr.get(i))); + } + return results; + } + + public static ProcessInstanceRef parseProcessInstance(JSONValue root) + { ConsoleLog.debug("parse " + root); // {"id":"StateSequence/8", "definitionId":"StateSequence:1", @@ -251,4 +279,5 @@ return result; } + } Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/DateRenderer.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/DateRenderer.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/DateRenderer.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import com.gwtext.client.widgets.grid.Renderer; -import com.gwtext.client.widgets.grid.CellMetadata; -import com.gwtext.client.data.Store; -import com.gwtext.client.data.Record; - -import java.util.Date; - -import org.jboss.bpm.console.client.model.util.SimpleDateFormat; - -/** - * Renders a Date according to {@link org.jboss.bpm.console.client.model.util.SimpleDateFormat#DEFAULT_FORMAT} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class DateRenderer implements Renderer -{ - private String fieldName; - - public DateRenderer(String fieldName) - { - this.fieldName = fieldName; - } - - /** - * Returns an empty string (field is null) or a formatted date (field is set). - */ - public String render(Object value, CellMetadata cellMetadata, Record record, - int rowIndex, int colNum, Store store) - { - String s = ""; - SimpleDateFormat df = new SimpleDateFormat(); - Date d = record.getAsDate(fieldName); - if (d != null) - s = df.format(d); - - return s; - } -} \ No newline at end of file Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -/** - * Request helper, to bypass SOP restrictions.<br> - * Can only be used to retrieve Json data, wrapped in a script tag. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class JSONRequest -{ - public static void get(String url, JSONRequestHandler handler) - { - String callbackName = "JSONCallback" + handler.hashCode(); - get(url + "?callback=" + callbackName, callbackName, handler); - } - - public static void get(String url, String callbackName, JSONRequestHandler handler) - { - createCallbackFunction(handler, callbackName); - addScript(url); - } - - public static native void addScript(String url) /*-{ - var scr = document.createElement("script"); - scr.setAttribute("language", "JavaScript"); - scr.setAttribute("src", url); - document.getElementsByTagName("body")[0].appendChild(scr); - }-*/; - - private native static void createCallbackFunction(JSONRequestHandler obj, String callbackName)/*-{ - tmpcallback = function(j) { - obj.@org.jboss.bpm.console.client.util.JSONRequestHandler::onRequestComplete(Lcom/google/gwt/core/client/JavaScriptObject;)(j); - }; - eval( "window." + callbackName + "=tmpcallback" ); - }-*/; -} Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import com.google.gwt.core.client.JavaScriptObject; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public interface JSONRequestHandler -{ - void onRequestComplete(JavaScriptObject json); -} Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelChangeListener.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelChangeListener.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelChangeListener.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,38 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import com.gwtext.client.data.Record; - -/** - * Get's notified when model change events are fire on {@link ModelListenerRegistry} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public interface ModelChangeListener -{ - void onModelChange(ModelListenerRegistry parent, Object changeEvent); - - void onRecordChange(ModelListenerRegistry parent, Record record); - - void onReset(); -} Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelListenerRegistry.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelListenerRegistry.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelListenerRegistry.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import com.gwtext.client.data.Record; - -import java.util.List; -import java.util.ArrayList; - -/** - * Utility to propagate model change events to {@link ModelChangeListener} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class ModelListenerRegistry -{ - private List<ModelChangeListener> listeners = new ArrayList<ModelChangeListener>(); - - public void addListener(ModelChangeListener listener) - { - this.listeners.add(listener); - } - - public void fireRecordChangeEvent(Record record) - { - for (ModelChangeListener l : listeners) - { - l.onRecordChange(this, record); - } - } - - public void fireModelChangeEvent(Object event) - { - for (ModelChangeListener l : listeners) - { - l.onModelChange(this, event); - } - } - - public void fireResetEvent() - { - for (ModelChangeListener l : listeners) - { - l.onReset(); - } - } -} Deleted: projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelModificationCallback.java =================================================================== --- projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelModificationCallback.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/util/ModelModificationCallback.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import org.jboss.bpm.console.client.model.ProcessInstanceRef; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public interface ModelModificationCallback -{ - void onStaleModel(); -} Modified: projects/gwt-console/trunk/plugin-example/plugin-example.iml =================================================================== --- projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-example/plugin-example.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -9,73 +9,109 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" /> - <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> + <orderEntry type="module" module-name="toplevel" /> + <orderEntry type="module" module-name="plugin-api" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:provided"> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/plugin-example/pom.xml =================================================================== --- projects/gwt-console/trunk/plugin-example/pom.xml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-example/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -17,7 +17,7 @@ <properties> <gwt-console.version>1.0.0-SNAPSHOT</gwt-console.version> - <gwt-ext.version>2.0.5</gwt-ext.version> + <gwt-mosaic.version>0.1.9</gwt-mosaic.version> </properties>  @@ -32,16 +32,30 @@ <dependency> <groupId>com.google.gwt</groupId> - <artifactId>gwt-user</artifactId> + <artifactId>gwt-user</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>${gwt-ext.version}</version> - <scope>provided</scope> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + <version>${gwt-mosaic.version}</version> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> <dependency> <groupId>org.jboss.bpm</groupId> Modified: projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java =================================================================== --- projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,11 +21,13 @@ */ package org.jboss.bpm.console.client.mapsplugin; +import com.google.gwt.user.client.ui.Frame; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.DOM; +import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.Editor; import org.jboss.bpm.console.client.MenuSection; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.View; -import com.google.gwt.user.client.ui.Frame; +import org.gwt.mosaic.ui.client.ScrollLayoutPanel; /** * An example editor that embeds google maps into the console @@ -33,39 +35,30 @@ */ public class MapsEditor extends Editor { - public final static String ID = "org.jboss.bpm.console.plugin.MapsEditor"; + public final static String ID = MapsEditor.class.getName(); public MapsEditor(ApplicationContext appContext) { super(appContext); + } - // an example view component added to the editor - final View defaultView = new View(appContext) { - public String getViewId() - { - return ID+".defaultView"; - } + public void initialize() + { + if(!isInitialized) + { + // keep it simple, just use an iframe + Frame frame = new Frame(); + frame.setWidth("660"); + frame.setHeight("448"); + frame.setUrl("http://maps.google.com"); - public String getIconCSS() - { - return ""; - } - }; - - // keep it simple, just use an iframe - Frame frame = new Frame(); - frame.setWidth("660"); - frame.setHeight("448"); - frame.setUrl("http://maps.google.com"); - - // assemble the view - defaultView.add(frame); - defaultView.setPaddings(10,0,0,0); - defaultView.setTitle("Maps"); - - // add it to the editor - addView(defaultView, false); + //DOM.setStyleAttribute(frame.getElement(), "border", "none"); + + this.add(frame); + + isInitialized = true; + } } public String getEditorId() Modified: projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java =================================================================== --- projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,45 +21,48 @@ */ package org.jboss.bpm.console.client.mapsplugin; -import com.gwtext.client.widgets.tree.TreePanel; -import com.gwtext.client.widgets.tree.TreeNode; -import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter; -import com.gwtext.client.data.Node; -import com.gwtext.client.core.EventObject; +import com.google.gwt.user.client.ui.Tree; +import com.google.gwt.user.client.ui.TreeItem; +import com.google.gwt.user.client.ui.TreeListener; import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Workspace; -class MapsNavigationTree extends TreePanel +class MapsNavigationTree extends Tree { + + public MapsNavigationTree() + { + super(); + } + public MapsNavigationTree(final ApplicationContext appContext) { - TreeNode root = new TreeNode("Google Maps"); + TreeItem root = new TreeItem("Maps plugin menu"); - TreeNode navEntry = new TreeNode("Open maps"); - navEntry.setExpanded(true); - navEntry.addListener( - new TreeNodeListenerAdapter() + TreeItem navEntry = new TreeItem("Open maps"); + root.addItem(navEntry); + + addTreeListener( + new TreeListener() { - public void onClick(Node node, EventObject eventObject) + public void onTreeItemSelected(TreeItem treeItem) { - if (appContext.getWorkpace().hasEditor(MapsEditor.ID)) + if("Open maps".equals(treeItem.getText())) { - appContext.getWorkpace().showEditor(MapsEditor.ID); + Workspace workspace = appContext.getWorkpace(); + workspace.showEditor(MapsEditor.ID); } - else - { - appContext.getWorkpace().addEditor(new MapsEditor(appContext), false); - } + } + public void onTreeItemStateChanged(TreeItem treeItem) + { + } } ); - root.appendChild(navEntry); - - setRootVisible(true); - setRootNode(root); - root.setExpanded(true); + addItem(root); } } Modified: projects/gwt-console/trunk/pom.xml =================================================================== --- projects/gwt-console/trunk/pom.xml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -19,9 +19,12 @@ <commons.fileupload.version>1.2.1</commons.fileupload.version> <commons.io.version>1.3.2</commons.io.version> <commons.logging.version>1.1.1</commons.logging.version> + <commons-lang.version>2.4</commons-lang.version> + <commons-config.version>1.6</commons-config.version> <gson.version>1.2.2</gson.version> - <gwt.version>1.5.2</gwt.version> - <gwtext.version>2.0.5</gwtext.version> + <gwt.version>1.5.3</gwt.version> + + <gwt-mosaic.version>0.1.9</gwt-mosaic.version> <gwt-log.version>2.5.2</gwt-log.version> <jaf.version>1.1</jaf.version> <javax.ejb.version>3.0</javax.ejb.version> @@ -29,6 +32,7 @@ <jboss.common.version>2.2.7.GA</jboss.common.version> <jbpm.version>3.3.1.GA</jbpm.version> <junit.version>3.8.1</junit.version> + <mvc4g.version>1.0.0-jboss</mvc4g.version> <resteasy.version>1.0.2.GA</resteasy.version> <stax-api.version>1.0-2</stax-api.version> </properties> @@ -45,8 +49,20 @@ <dependencyManagement> <dependencies> -  <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang.version}</version> + </dependency> + + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + <version>${commons-config.version}</version> + </dependency> + +  + <dependency> <groupId>com.google.gwt</groupId> <artifactId>gwt-servlet</artifactId> <version>${gwt.version}</version> @@ -58,11 +74,6 @@ </dependency> <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - <version>${gwtext.version}</version> - </dependency> - <dependency> <groupId>com.google.gwt</groupId> <artifactId>gchart</artifactId> <version>${gchart.version}</version> @@ -78,6 +89,33 @@ <version>${gwt-log.version}</version> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + <version>${gwt-mosaic.version}</version> + </dependency> + + <dependency> + <groupId>com.googlecode.mvc4g</groupId> + <artifactId>mvc4g</artifactId> + <version>${mvc4g.version}</version> + </dependency> +  <dependency> <groupId>commons-logging</groupId> Modified: projects/gwt-console/trunk/rpc/gwt-rpc.iml =================================================================== --- projects/gwt-console/trunk/rpc/gwt-rpc.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/rpc/gwt-rpc.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -27,15 +27,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -55,6 +46,15 @@ </SOURCES> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/server/gwt-server.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -10,8 +10,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-server-integration" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="gwt-server-integration" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -22,15 +22,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> @@ -49,15 +40,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -243,6 +225,24 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -134,11 +134,9 @@ @PathParam("next") String next) { - String actualExecutionId = adoptExecutionId(executionId); - log.debug("Change instance (ID "+actualExecutionId+") to state " +next); - - //ProcessInstanceRef.STATE state = ProcessInstanceRef.STATE.valueOf(next); - getProcessManagement().setProcessState(actualExecutionId, ProcessInstanceRef.STATE.ENDED); + ProcessInstanceRef.STATE state = ProcessInstanceRef.STATE.valueOf(next); + log.debug("Change instance (ID "+executionId+") to state " +state); + getProcessManagement().setProcessState(executionId, state); return Response.ok().type("application/json").build(); } @@ -156,7 +154,7 @@ if ("default transition".equals(signalName)) signalName = null; - getProcessManagement().signalExecution(adoptExecutionId(id), signalName); + getProcessManagement().signalExecution(id, signalName); return Response.ok().type("application/json").build(); } @@ -169,16 +167,10 @@ { log.debug("Signal token " + id); - getProcessManagement().signalExecution(adoptExecutionId(id), null); + getProcessManagement().signalExecution(id, null); return Response.ok().type("application/json").build(); } - private String adoptExecutionId(String modified) - { - // TODO: https://jira.jboss.org/jira/browse/JBPM-2054 - return modified.replace("_", "/"); - } - @POST @Path("definitions/new") @Produces("application/json") Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/gwt-war.iml 2009-04-22 14:00:15 UTC (rev 4606) @@ -11,8 +11,8 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="plugin" exported="" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-rpc" /> + <orderEntry type="module" module-name="plugin" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> @@ -41,70 +41,106 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.2:provided"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.2/gwt-dev-1.5.2-mac.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.2:provided"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.2/gwt-user-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> </CLASSES> <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.2:runtime"> + <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <library name="M2 Dep: com.google.gwt:gwt-dev:jar:mac:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-dev/1.5.3/gwt-dev-1.5.3-mac.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> - </SOURCES> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: com.gwtext:gwtext:jar:2.0.5:compile"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/war/pom.xml =================================================================== --- projects/gwt-console/trunk/war/pom.xml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/pom.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -72,17 +72,46 @@  <dependency> - <groupId>com.gwtext</groupId> - <artifactId>gwtext</artifactId> - </dependency> - <dependency> <groupId>com.google.code.gwt-log</groupId> <artifactId>gwt-log</artifactId> </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-dnd</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-incubator</artifactId> + </dependency> + <dependency> + <groupId>com.googlecode.gwtmosaic</groupId> + <artifactId>gwt-mosaic-gwtx</artifactId> + </dependency> + + <dependency> + <groupId>com.googlecode.mvc4g</groupId> + <artifactId>mvc4g</artifactId> + + </dependency> +  <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-configuration</groupId> + <artifactId>commons-configuration</artifactId> + </dependency> + + <dependency> <groupId>javax.xml.stream</groupId> <artifactId>stax-api</artifactId> <scope>provided</scope> Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,168 +0,0 @@ -package org.jboss.bpm.console.client; - -import com.google.gwt.core.client.EntryPoint; -import com.google.gwt.core.client.GWT; -import com.google.gwt.user.client.Command; -import com.google.gwt.user.client.DeferredCommand; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.Response; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Window; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.form.FormPanel; -import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.layout.VerticalLayout; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.layout.BorderLayoutData; -import com.gwtext.client.core.EventObject; -import com.gwtext.client.core.RegionPosition; -import org.jboss.bpm.console.client.util.ConsoleLog; - -/** - * Entry point classes define <code>onModuleLoad()</code>. - * Does the authentication and reads the comfiguration before launching - * the {@link org.jboss.bpm.console.client.MainView} - */ -public class Application implements EntryPoint -{ - private ApplicationContext mainView; - private Authentication auth; - private ConsoleConfig config; - private URLBuilder urlBuilder; - - public final static String[] KNOWN_ROLES = {"admin", "manager", "user"}; - - /** - * Note, we defer all application initialization code to - * {@link #onModuleLoad2()} so that the UncaughtExceptionHandler - * can catch any unexpected exceptions. - */ - public void onModuleLoad() - { - - ConsoleLog.setEnabled(true); - - /* Install an UncaughtExceptionHandler which will - * produce <code>FATAL</code> log messages - */ - ConsoleLog.setUncaughtExceptionHandler(); - - /* Use a deferred command so that the UncaughtExceptionHandler - * catches any exceptions in onModuleLoad2() - */ - DeferredCommand.addCommand(new Command() - { - public void execute() - { - onModuleLoad2(); - } - }); - } - - /** - * This is the entry point method. - */ - public void onModuleLoad2() - { - config = new ConsoleConfig(); - - // setup - - if (!GWT.isScript()) - { - String proxyUrl = GWT.getModuleBaseURL() + "xhp"; - config.setConsoleServerUrl(proxyUrl); - } - - ConsoleLog.debug("Console server: " + config.getConsoleServerUrl()); - ConsoleLog.debug("Report server: " + config.getReportServerUrl()); - - urlBuilder = new URLBuilder(config); - - // authentiction - forceLogin(); - } - - public ApplicationContext getConsoleView() - { - return mainView; - } - - private void forceLogin() - { - Panel panel = new Panel(); - panel.setPaddings(20); - panel.setStyleName("login-panel-content"); - panel.setLayout(new VerticalLayout(10)); - panel.add(new HTML("Welcome, please login.")); - - final Window window = new Window(); - window.setTitle("GWT-Console"); - window.setClosable(false); - window.setResizable(false); - window.setWidth(300); - window.setHeight(180); - window.setLayout(new BorderLayout()); - window.setCloseAction(Window.CLOSE); - - final FormPanel loginForm = new FormPanel(); - loginForm.setBorder(false); - loginForm.add(new TextField("Username", "user")); - TextField passwordField = new TextField("Password", "pass"); - passwordField.setPassword(true); - loginForm.add(passwordField); - - final Button submitBtn = new Button("Login", - new ButtonListenerAdapter() - { - public void onClick(Button button, EventObject e) - { - String user = loginForm.getForm().findField("user").getValueAsString(); - String pass = loginForm.getForm().findField("pass").getValueAsString(); - - String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES); - auth = new Authentication(url); - auth.setCallback( - new Authentication.AuthCallback() - { - - public void onLoginSuccess(Request request, Response response) - { - // clear the form - loginForm.getForm().reset(); - - // display main console - window.close(); - - // assemble main view - mainView = new MainView(auth, urlBuilder, config); - } - - public void onLoginFailed(Request request, Throwable t) - { - // auth failed - ConsoleLog.error("Authentication failed.", t); - } - } - ); - - auth.doLogin(user, pass); - - } - }); - - loginForm.addButton(submitBtn); - panel.add(loginForm); - - BorderLayoutData centerData = new BorderLayoutData(RegionPosition.CENTER); - centerData.setMargins(3, 0, 3, 3); - - window.add(panel, centerData); - // ------------------------------------------ - - window.show(); - } - -} Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -21,70 +21,93 @@ */ package org.jboss.bpm.console.client; -import com.gwtext.client.widgets.Panel; -import com.gwtext.client.widgets.Button; -import com.gwtext.client.widgets.event.ButtonListenerAdapter; -import com.gwtext.client.widgets.layout.*; -import com.gwtext.client.core.EventObject; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.*; +import com.google.gwt.user.client.Timer; +import com.mvc4g.client.Controller; +import com.mvc4g.client.ViewInterface; import java.util.List; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; + /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ -public class Header extends Panel +public class Header extends HorizontalPanel implements ViewInterface { - private ApplicationContext view; + public final static String ID = Header.class.getName(); - public final static String ID = "org.jboss.bpm.headerPanel"; + private ApplicationContext appContext; + private Controller controller; + private Image loadingImage; - public Header(ApplicationContext view) + // avoid flickering image + final Timer turnOffLoading = new Timer() { + public void run() { + loadingImage.setVisible(false); + } + }; + + public Header(ApplicationContext appContext, String username, List<String> roles) { super(); - this.view = view; - this.setId(ID); + this.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_RIGHT); + this.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM); + this.setStyleName("bpm-header"); - this.setFrame(false); - this.setBorder(false); - this.setHeader(false); + this.appContext = appContext; - //HorizontalLayout layout = new HorizontalLayout(20); - //this.setLayout(layout); - - this.setHeight(50); - this.setBaseCls("bpm-header"); + createInfoPanel(); } - public void setUserInfo(String username, List<String> roles) + private void createInfoPanel() { - Panel userInfo = new Panel(); - userInfo.setBorder(false); - userInfo.setHeader(false); - userInfo.setFrame(false); - userInfo.setStyleName("bpm-header-userinfo"); - HorizontalLayout layout = new HorizontalLayout(10); - userInfo.setLayout(layout); + HorizontalPanel p = new HorizontalPanel(); + p.setVerticalAlignment(HasVerticalAlignment.ALIGN_BOTTOM); + p.setStyleName("bpm-header-userinfo"); - userInfo.add(new Image("images/icons/05.png")); - userInfo.add(new HTML(view.getAuthentication().getUsername())); - userInfo.add( - new Button("Logout", - new ButtonListenerAdapter() - { + // load status image + LayoutPanel loadingImageContainer = new LayoutPanel(); + loadingImageContainer.setStyleName("bpm-loading-image"); + loadingImage = new Image("images/loading.gif"); + loadingImageContainer.add(loadingImage); + + setLoading(false); - public void onClick(Button button, EventObject eventObject) - { - view.getAuthentication().doLogout(); - } - } - ) + // account info + Image img = new Image("images/icons/05.png"); + HTML html = new HTML(appContext.getAuthentication().getUsername()); + + Button btn = new Button("Logout", new ClickListener() + { + + public void onClick(Widget widget) + { + appContext.getAuthentication().doLogout(); + } + } ); - //this.clear(); - this.add(userInfo); - //this.doLayout(); + p.add(loadingImageContainer); + p.add(img); + p.add(html); + p.add(btn); + this.add(p); + } + + + public void setController(Controller controller) + { + this.controller = controller; + } + + public void setLoading(boolean doDisplay) + { + if(doDisplay) + loadingImage.setVisible(doDisplay); + else + turnOffLoading.schedule(1000); + } } Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoadingStatusAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/LoadingStatusAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoadingStatusAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoadingStatusAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.mvc4g.client.ActionInterface; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoadingStatusAction implements ActionInterface +{ + + public final static String ID = LoadingStatusAction.class.getName(); + + public final static Event ON = new Event(LoadingStatusAction.ID, true); + public final static Event OFF = new Event(LoadingStatusAction.ID, false); + + /** + * @param controller + * @param object Boolean + */ + public void execute(Controller controller, Object object) + { + Boolean b = (Boolean)object; + Header header = (Header)controller.getView(Header.ID); + header.setLoading(b); + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.mvc4g.client.ActionInterface; +import com.mvc4g.client.Controller; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoginAction implements ActionInterface +{ + + public void execute(Controller controller, Object object) + { + LoginView loginView = (LoginView)controller.getView(LoginView.NAME); + loginView.display(); + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginView.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/LoginView.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginView.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,197 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.google.gwt.http.client.Request; +import com.google.gwt.http.client.Response; +import com.google.gwt.user.client.WindowCloseListener; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.core.client.GWT; +import com.mvc4g.client.Controller; +import com.mvc4g.client.ViewInterface; +import org.gwt.mosaic.forms.client.builder.DefaultFormBuilder; +import org.gwt.mosaic.forms.client.layout.FormLayout; +import org.gwt.mosaic.ui.client.WindowPanel; +import org.gwt.mosaic.ui.client.layout.BorderLayout; +import org.gwt.mosaic.ui.client.layout.BorderLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.jboss.bpm.console.client.Authentication; +import org.jboss.bpm.console.client.ConsoleConfig; +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.MainLayout; +import org.jboss.bpm.console.client.util.ConsoleLog; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoginView implements ViewInterface +{ + public final static String NAME = "loginView"; + + private ConsoleConfig config; + private URLBuilder urlBuilder; + private Authentication auth; + + private WindowPanel window = null; + private TextBox usernameInput; + private TextBox passwordInput; + + public final static String[] KNOWN_ROLES = {"admin", "manager", "user"}; + + private Controller controller; + + public LoginView() + { + config = new ConsoleConfig(); + + // setup + + if (!GWT.isScript()) + { + String proxyUrl = GWT.getModuleBaseURL() + "xhp"; + config.setConsoleServerUrl(proxyUrl); + } + + ConsoleLog.debug("Console server: " + config.getConsoleServerUrl()); + ConsoleLog.debug("Report server: " + config.getReportServerUrl()); + + urlBuilder = new URLBuilder(config); + + } + + public void setController(Controller controller) + { + this.controller = controller; + } + + public void display() + { + createLayoutWindowPanel(); + + // remove later on + usernameInput.setText("alex"); + passwordInput.setText("password"); + + window.center(); + } + + /** + * The 'layout' window panel. + */ + private void createLayoutWindowPanel() { + window = new WindowPanel("jBPM Management Console"); + window.setAnimationEnabled(false); + window.setSize("320px", "180px"); + + LayoutPanel panel = new LayoutPanel(); + window.setWidget(panel); + createLayoutContent(panel); + + window.addWindowCloseListener(new WindowCloseListener() { + public void onWindowClosed() { + window = null; + } + + public String onWindowClosing() { + return null; + } + }); + } + + /** + * Create content for layout. + */ + private void createLayoutContent(LayoutPanel layoutPanel) { + + layoutPanel.setLayout(new BorderLayout()); + layoutPanel.setPadding(5); + + final Button submit = new Button("Submit"); + submit.addClickListener(new ClickListener() + { + + public void onClick(Widget widget) + { + String user = usernameInput.getText(); + String pass = passwordInput.getText(); + + String url = urlBuilder.getUserInRoleURL(KNOWN_ROLES); + auth = new Authentication(url); + auth.setCallback( + new Authentication.AuthCallback() + { + + public void onLoginSuccess(Request request, Response response) + { + // clear the form + usernameInput.setText(""); + passwordInput.setText(""); + + // display main console + window.hide(); + + // assemble main layout + new MainLayout(controller, auth, urlBuilder, config); + } + + public void onLoginFailed(Request request, Throwable t) + { + // auth failed + ConsoleLog.error("Authentication failed.", t); + } + } + ); + + auth.doLogin(user, pass); + } + }); + + layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200)); + layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200)); + + } + + private Widget createForm() + { + FormLayout layout = new FormLayout( + "right:pref, 10px, left:pref:grow", // 3 columns + "pref, pref, 5px, pref"); // 4 rows + + DefaultFormBuilder builder = new DefaultFormBuilder(layout); + builder.appendSeparator("Login"); + + usernameInput = new TextBox(); + builder.append("Username:", usernameInput); + builder.nextLine(); + + builder.nextLine(); // empty space + + passwordInput = new TextBox(); + builder.append("Password:", passwordInput); + builder.nextLine(); + + return builder.getPanel(); + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,167 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.RootPanel; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.Image; +import com.mvc4g.client.Controller; +import org.gwt.mosaic.ui.client.*; +import org.gwt.mosaic.ui.client.layout.BorderLayout; +import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region; +import org.gwt.mosaic.ui.client.layout.BorderLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.jboss.bpm.console.client.util.WindowUtil; + +/** + * The main composite that assembles the gwt console application. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class MainLayout extends Composite implements ApplicationContext +{ + + public final static String NAME = "mainLayout"; + + private Header header; + private Menu menu; + + private Workspace workspace; + private URLBuilder urlBuilder; + private Authentication auth; + private ConsoleConfig config; + + private Controller controller; + private Viewport viewport; + + public MainLayout(Controller controller, Authentication auth, URLBuilder urlBuilder, ConsoleConfig config) + { + this.controller = controller; + this.auth = auth; + this.config = config; + this.urlBuilder = urlBuilder; + + display(); + } + + public void display() + { + viewport = new Viewport(); + + LayoutPanel layout = createLayout(); + viewport.add(layout); + + RootPanel.get().add(viewport); + } + + private LayoutPanel createLayout() + { + final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout()); + + // header + header = new Header(this, auth.getUsername(), auth.getRolesAssigned()); + layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50)); + + // menu + menu = new Menu(); + layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200)); + + // workspace + workspace = createWorkspace(); + layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false)); + + + // register views and actions + controller.addView(Header.ID, header); + + controller.addAction(LoadingStatusAction.ID, new LoadingStatusAction()); + + return layoutPanel; + } + + private Workspace createWorkspace() + { + Workspace workspace = new Workspace(menu); + WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class); + launcher.launch(this, workspace); // calls Workspace.addEditor() + return workspace; + } + + // ---- ApplicationContext interface ---- + + + public Viewport getViewport() + { + return viewport; + } + + public Controller getController() + { + return this.controller; + } + + public URLBuilder getUrlBuilder() + { + return this.urlBuilder; + } + + public void displayMessage(final String message, final boolean isError) + { + if(isError) + { + WindowPanel err = new WindowPanel("Error"); + err.getHeader().add( new Image("images/icons/error.png") ); + err.setAnimationEnabled(true); + err.setSize("320px", "240px"); + ScrollLayoutPanel scrollLayoutPanel = new ScrollLayoutPanel(); + scrollLayoutPanel.add(new HTML(message)); + err.setWidget(scrollLayoutPanel); + + WindowUtil.addMaximizeButton(err, Caption.CaptionRegion.RIGHT); + WindowUtil.addMinimizeButton(err, Caption.CaptionRegion.RIGHT); + + err.center(); + } + else + { + InfoPanel.show("", message, ""); + } + } + + public Authentication getAuthentication() + { + return auth; + } + + public ConsoleConfig getConfig() + { + return config; + } + + public Workspace getWorkpace() + { + return workspace; + } +} + Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,174 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client; - -import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.core.client.GWT; -import com.gwtext.client.core.Margins; -import com.gwtext.client.core.RegionPosition; -import com.gwtext.client.widgets.*; -import com.gwtext.client.widgets.layout.BorderLayout; -import com.gwtext.client.widgets.layout.BorderLayoutData; -import com.gwtext.client.widgets.layout.FitLayout; -import org.jboss.bpm.console.client.util.ConsoleLog; -import org.jboss.bpm.console.client.WorkspaceLauncher; - -/** - * The main composite that assembles the gwt console application. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class MainView extends Composite implements ApplicationContext -{ - private HTML status = new HTML(); - private Header header; - private Menu menu; - private Workspace workspace; - - private URLBuilder urlBuilder; - private Viewport viewport; - private Authentication auth; - - private ConsoleConfig config; - - public MainView(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config) - { - this.auth = auth; - this.config = config; - this.urlBuilder = urlBuilder; - - Panel mainPanel = createMainPanel(); - assembleMainApplication(mainPanel); - - viewport = new Viewport(mainPanel); - } - - private Panel createMainPanel() - { - Panel mainPanel = new Panel(); - mainPanel.setBorder(false); - mainPanel.setPaddings(5); // outer most padding - mainPanel.setLayout(new FitLayout()); - mainPanel.setWidth(UIConstants.OVERALL_WIDTH); - mainPanel.setHeight(UIConstants.OVERALL_WIDTH); - mainPanel.setAutoWidth(false); - return mainPanel; - } - - private void assembleMainApplication(Panel mainPanel) - { - Panel borderPanel = new Panel(); - borderPanel.setBorder(false); - borderPanel.setLayout(new BorderLayout()); - - // ------------------------------------------ - - header = new Header(this); - borderPanel.add(header, new BorderLayoutData(RegionPosition.NORTH)); - header.setUserInfo(auth.getUsername(), auth.getRolesAssigned()); - - // ------------------------------------------ - - menu = new Menu(this); - BorderLayoutData menuData = new BorderLayoutData(RegionPosition.WEST); - menuData.setSplit(false); - menuData.setMinSize(UIConstants.MAIN_MENU_MIN); - menuData.setMaxSize(UIConstants.MAIN_MENU_MAX); - menuData.setMargins(new Margins(0, 5, 0, 0)); - borderPanel.add(menu, menuData); - - // ------------------------------------------ - - workspace = new Workspace(menu); - WorkspaceLauncher launcher = GWT.create(WorkspaceLauncher.class); - launcher.launch(this, workspace); - - borderPanel.add(workspace, new BorderLayoutData(RegionPosition.CENTER)); - - // ------------------------------------------ - - mainPanel.add(borderPanel); - } - - public void addEditor(Editor editor) - { - ConsoleLog.debug("Add editor " + editor.getEditorId()); - workspace.addEditor(editor, true); - } - - public boolean hasEditor(String id) - { - return workspace.hasEditor(id); - } - - public void showEditor(String id) - { - workspace.showEditor(id); - } - - public URLBuilder getUrlBuilder() - { - return this.urlBuilder; - } - - public void displayMessage(final String message, final boolean isError) - { - status.setText(message); - - MessageBox.show(new MessageBoxConfig() - { - { - String title = isError ? "Error" : "System Message"; - setTitle(title); - setMsg(message); - setButtons(MessageBox.OK); - setCallback(new MessageBox.PromptCallback() - { - public void execute(String btnID, String text) - { - } - }); - } - }); - } - - public Authentication getAuthentication() - { - return auth; - } - - public ConsoleConfig getConfig() - { - return config; - } - - public Viewport getViewport() - { - return viewport; - } - - public Workspace getWorkpace() - { - return workspace; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/common) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,132 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.common; - -import com.google.gwt.http.client.*; -import com.google.gwt.user.client.Timer; -import com.mvc4g.client.ActionInterface; -import com.mvc4g.client.Controller; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.LoadingStatusAction; - -import java.io.IOException; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public abstract class AbstractRESTAction implements ActionInterface -{ - protected ApplicationContext appContext; - - protected AbstractRESTAction(ApplicationContext appContetext) - { - this.appContext = appContetext; - } - - public abstract String getId(); - public abstract String getUrl(Object event); - public abstract RequestBuilder.Method getRequestMethod(); - public abstract void handleSuccessfulResponse(final Controller controller, final Object event, Response response); - - public void execute(final Controller controller, final Object object) - { - final String url = getUrl(object); - RequestBuilder builder = new RequestBuilder(getRequestMethod(), URL.encode(url)); - - try - { - controller.handleEvent( LoadingStatusAction.ON ); - - final Request request = builder.sendRequest(null, - new RequestCallback() - { - public void onError(Request request, Throwable exception) { - // Couldn't connect to server (could be timeout, SOP violation, etc.) - handleError(url, exception); - controller.handleEvent( LoadingStatusAction.OFF ); - } - - public void onResponseReceived(Request request, Response response) { - try - { - if (200 == response.getStatusCode()) - { - handleSuccessfulResponse(controller, object, response); - } - else - { - final String msg = response.getText().equals("") ? "Unknown error" : response.getText(); - handleError( - url, - new RequestException("HTTP "+ response.getStatusCode()+ ": " + msg) - ); - } - } - finally - { - controller.handleEvent( LoadingStatusAction.OFF ); - } - } - } - ); - - // Timer to handle pending request - Timer t = new Timer() { - - public void run() - { - if(request.isPending()) - { - request.cancel(); - handleError( - url, - new IOException("Request timeout") - ); - } - - } - }; - t.schedule(5000); - - } - catch (RequestException e) - { - // Couldn't connect to server - handleError(url, e); - controller.handleEvent( LoadingStatusAction.OFF ); - } - } - - protected void handleError(String url, Throwable t) - { - final String out = - "<ul>"+ - "<li>URL: '" + url + "'\n"+ - "<li>Action: '" + getId() + "'\n" + - "<li>Exception: '" + t.getClass() + - "</ul>'\n\n"+ - t.getMessage(); - - appContext.displayMessage(out, true); - - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,132 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.common; + +import com.google.gwt.http.client.*; +import com.google.gwt.user.client.Timer; +import com.mvc4g.client.ActionInterface; +import com.mvc4g.client.Controller; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.LoadingStatusAction; + +import java.io.IOException; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public abstract class AbstractRESTAction implements ActionInterface +{ + protected ApplicationContext appContext; + + protected AbstractRESTAction(ApplicationContext appContetext) + { + this.appContext = appContetext; + } + + public abstract String getId(); + public abstract String getUrl(Object event); + public abstract RequestBuilder.Method getRequestMethod(); + public abstract void handleSuccessfulResponse(final Controller controller, final Object event, Response response); + + public void execute(final Controller controller, final Object object) + { + final String url = getUrl(object); + RequestBuilder builder = new RequestBuilder(getRequestMethod(), URL.encode(url)); + + try + { + controller.handleEvent( LoadingStatusAction.ON ); + + final Request request = builder.sendRequest(null, + new RequestCallback() + { + public void onError(Request request, Throwable exception) { + // Couldn't connect to server (could be timeout, SOP violation, etc.) + handleError(url, exception); + controller.handleEvent( LoadingStatusAction.OFF ); + } + + public void onResponseReceived(Request request, Response response) { + try + { + if (200 == response.getStatusCode()) + { + handleSuccessfulResponse(controller, object, response); + } + else + { + final String msg = response.getText().equals("") ? "Unknown error" : response.getText(); + handleError( + url, + new RequestException("HTTP "+ response.getStatusCode()+ ": " + msg) + ); + } + } + finally + { + controller.handleEvent( LoadingStatusAction.OFF ); + } + } + } + ); + + // Timer to handle pending request + Timer t = new Timer() { + + public void run() + { + if(request.isPending()) + { + request.cancel(); + handleError( + url, + new IOException("Request timeout") + ); + } + + } + }; + t.schedule(5000); + + } + catch (RequestException e) + { + // Couldn't connect to server + handleError(url, e); + controller.handleEvent( LoadingStatusAction.OFF ); + } + } + + protected void handleError(String url, Throwable t) + { + final String out = + "<ul>"+ + "<li>URL: '" + url + "'\n"+ + "<li>Action: '" + getId() + "'\n" + + "<li>Exception: '" + t.getClass() + + "</ul>'\n\n"+ + t.getMessage(); + + appContext.displayMessage(out, true); + + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/events) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.events; - -import org.jboss.bpm.console.client.Authentication; -import org.jboss.bpm.console.client.URLBuilder; -import org.jboss.bpm.console.client.ConsoleConfig; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public final class BootstrapEvent -{ - Authentication auth; - URLBuilder urlBuilder; - ConsoleConfig config; - - public BootstrapEvent(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config) - { - this.auth = auth; - this.urlBuilder = urlBuilder; - this.config = config; - } - - public Authentication getAuth() - { - return auth; - } - - public URLBuilder getUrlBuilder() - { - return urlBuilder; - } - - public ConsoleConfig getConfig() - { - return config; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/events/BootstrapEvent.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.events; + +import org.jboss.bpm.console.client.Authentication; +import org.jboss.bpm.console.client.URLBuilder; +import org.jboss.bpm.console.client.ConsoleConfig; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class BootstrapEvent +{ + Authentication auth; + URLBuilder urlBuilder; + ConsoleConfig config; + + public BootstrapEvent(Authentication auth, URLBuilder urlBuilder, ConsoleConfig config) + { + this.auth = auth; + this.urlBuilder = urlBuilder; + this.config = config; + } + + public Authentication getAuth() + { + return auth; + } + + public URLBuilder getUrlBuilder() + { + return urlBuilder; + } + + public ConsoleConfig getConfig() + { + return config; + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,186 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; -import com.mvc4g.client.Controller; -import com.mvc4g.client.Event; -import com.mvc4g.client.ViewInterface; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.layout.BoxLayout; -import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.LazyPanel; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class DefinitionListView extends LayoutPanel - implements ViewInterface, LazyPanel -{ - public final static String ID = DefinitionListView.class.getName(); - - private Controller controller; - - private LayoutPanel definitionList = null; - - private ListBox<ProcessDefinitionRef> listBox; - - private boolean isInitialized; - - public DefinitionListView() - { - super(); - setTitle("Process Definitions"); - } - - public boolean isInitialized() - { - return isInitialized; - } - - public void initialize() - { - if(!isInitialized) - { - definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); - definitionList.setPadding(0); - definitionList.setWidgetSpacing(0); - - listBox = - new ListBox<ProcessDefinitionRef>( - new String[] { - "Process ID", "Name", "Key", "Version"} - ); - - - listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() { - public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column, - ProcessDefinitionRef item) { - switch (column) { - case 0: - listBox.setText(row, column, item.getId()); - break; - case 1: - listBox.setText(row, column, item.getName()); - break; - case 2: - listBox.setText(row, column, item.getKey()); - break; - case 3: - listBox.setText(row, column, String.valueOf(item.getVersion())); - break; - default: - throw new RuntimeException("Unexpected column size"); - } - } - }); - - listBox.addChangeListener(new ChangeListener() - { - public void onChange(Widget widget) - { - int index = listBox.getSelectedIndex(); - if(index!=-1) - { - controller.handleEvent( - new Event( - LoadInstancesAction.ID, - listBox.getItem( index ) - ) - ); - } - } - }); - - final DefaultListModel<ProcessDefinitionRef> model = - (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); - - // toolbar - - final LayoutPanel toolBox = new LayoutPanel(); - toolBox.setPadding(0); - toolBox.setWidgetSpacing(5); - //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - - final ToolBar toolBar = new ToolBar(); - toolBar.add( - new ToolButton("Refresh", new ClickListener() { - public void onClick(Widget sender) { - // force loading - controller.handleEvent( - new Event(LoadDefinitionsAction.ID, null) - ); - } - } - ) - ); - - toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - this.definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - this.definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - - this.add(definitionList); - - isInitialized = true; - } - } - - - public void setController(Controller controller) - { - this.controller = controller; - } - - public void update(List<ProcessDefinitionRef> definitions) - { - // lazy init - initialize(); - - final DefaultListModel<ProcessDefinitionRef> model = - (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); - - model.clear(); - - for(ProcessDefinitionRef def : definitions) - { - model.add(def); - } - } - - public ProcessDefinitionRef getSelection() - { - ProcessDefinitionRef selection = null; - if(isInitialized() && listBox.getSelectedIndex()!=-1) - selection = listBox.getItem( listBox.getSelectedIndex()); - return selection; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,186 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import com.mvc4g.client.ViewInterface; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.ToolButton; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.LazyPanel; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class DefinitionListView extends LayoutPanel + implements ViewInterface, LazyPanel +{ + public final static String ID = DefinitionListView.class.getName(); + + private Controller controller; + + private LayoutPanel definitionList = null; + + private ListBox<ProcessDefinitionRef> listBox; + + private boolean isInitialized; + + public DefinitionListView() + { + super(); + setTitle("Process Definitions"); + } + + public boolean isInitialized() + { + return isInitialized; + } + + public void initialize() + { + if(!isInitialized) + { + definitionList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + definitionList.setPadding(0); + definitionList.setWidgetSpacing(0); + + listBox = + new ListBox<ProcessDefinitionRef>( + new String[] { + "Process ID", "Name", "Key", "Version"} + ); + + + listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() { + public void renderCell(ListBox<ProcessDefinitionRef> listBox, int row, int column, + ProcessDefinitionRef item) { + switch (column) { + case 0: + listBox.setText(row, column, item.getId()); + break; + case 1: + listBox.setText(row, column, item.getName()); + break; + case 2: + listBox.setText(row, column, item.getKey()); + break; + case 3: + listBox.setText(row, column, String.valueOf(item.getVersion())); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + listBox.addChangeListener(new ChangeListener() + { + public void onChange(Widget widget) + { + int index = listBox.getSelectedIndex(); + if(index!=-1) + { + controller.handleEvent( + new Event( + LoadInstancesAction.ID, + listBox.getItem( index ) + ) + ); + } + } + }); + + final DefaultListModel<ProcessDefinitionRef> model = + (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); + + // toolbar + + final LayoutPanel toolBox = new LayoutPanel(); + toolBox.setPadding(0); + toolBox.setWidgetSpacing(5); + //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + final ToolBar toolBar = new ToolBar(); + toolBar.add( + new ToolButton("Refresh", new ClickListener() { + public void onClick(Widget sender) { + // force loading + controller.handleEvent( + new Event(LoadDefinitionsAction.ID, null) + ); + } + } + ) + ); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + this.definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + this.definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + this.add(definitionList); + + isInitialized = true; + } + } + + + public void setController(Controller controller) + { + this.controller = controller; + } + + public void update(List<ProcessDefinitionRef> definitions) + { + // lazy init + initialize(); + + final DefaultListModel<ProcessDefinitionRef> model = + (DefaultListModel<ProcessDefinitionRef>) listBox.getModel(); + + model.clear(); + + for(ProcessDefinitionRef def : definitions) + { + model.add(def); + } + } + + public ProcessDefinitionRef getSelection() + { + ProcessDefinitionRef selection = null; + if(isInitialized() && listBox.getSelectedIndex()!=-1) + selection = listBox.getItem( listBox.getSelectedIndex()); + return selection; + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,236 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; -import com.mvc4g.client.Controller; -import com.mvc4g.client.ViewInterface; -import com.mvc4g.client.Event; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.MessageBox; -import org.gwt.mosaic.ui.client.layout.BoxLayout; -import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.model.ProcessInstanceRef; -import org.jboss.bpm.console.client.LazyPanel; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class InstanceListView extends LayoutPanel - implements ViewInterface, LazyPanel -{ - public final static String ID = InstanceListView.class.getName(); - - private Controller controller; - - private LayoutPanel instanceList = null; - - private ListBox<ProcessInstanceRef> listBox; - - private ProcessDefinitionRef currentDefinition; - - private boolean isInitialized; - - private List<ProcessInstanceRef> cachedInstances = null; - - public InstanceListView() - { - super(); - setTitle("Process Instances"); - - } - - public boolean isInitialized() - { - return isInitialized; - } - - public void initialize() - { - if(!isInitialized) - { - instanceList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); - instanceList.setPadding(0); - instanceList.setWidgetSpacing(0); - - listBox = - new ListBox<ProcessInstanceRef>( - new String[] { - "Instance ID", "State", "Start Date"} - ); - - listBox.setCellRenderer(new ListBox.CellRenderer<ProcessInstanceRef>() { - public void renderCell(ListBox<ProcessInstanceRef> listBox, int row, int column, - ProcessInstanceRef item) { - switch (column) { - case 0: - listBox.setText(row, column, item.getId()); - break; - case 1: - listBox.setText(row, column, item.getState().toString()); - break; - case 2: - listBox.setText(row, column, item.getStartDate().toString()); - break; - default: - throw new RuntimeException("Unexpected column size"); - } - } - }); - - // toolbar - final LayoutPanel toolBox = new LayoutPanel(); - toolBox.setPadding(0); - toolBox.setWidgetSpacing(5); - - final ToolBar toolBar = new ToolBar(); - toolBar.add( - new ToolButton("Refresh", new ClickListener() { - public void onClick(Widget sender) { - controller.handleEvent( - new Event( - LoadInstancesAction.ID, - getCurrentDefinition() - ) - ); - } - } - ) - ); - - toolBar.addSeparator(); - - toolBar.add( - new ToolButton("Start new instance", new ClickListener() - { - public void onClick(Widget sender) - { - controller.handleEvent( - new Event( - StartNewInstanceAction.ID, - getCurrentDefinition() - ) - ); - } - } - ) - ); - - toolBar.addSeparator(); - - toolBar.add( - new ToolButton("Cancel execution", new ClickListener() - { - public void onClick(Widget sender) - { - ProcessInstanceRef selection = getSelection(); - if(selection!=null) - { - selection.setState(ProcessInstanceRef.STATE.ENDED); - - controller.handleEvent( - new Event( - StateChangeAction.ID, - selection - ) - ); - } - else - { - MessageBox.alert("Missing selection", "Please select an instance"); - } - } - } - ) - ); - - toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - - // cached data? - if(this.cachedInstances!=null) - bindData(this.cachedInstances); - - this.add(instanceList); - - - - isInitialized = true; - - } - } - - public ProcessInstanceRef getSelection() - { - ProcessInstanceRef selection = null; - if(listBox.getSelectedIndex()!=-1) - selection = listBox.getItem( listBox.getSelectedIndex()); - return selection; - } - - public ProcessDefinitionRef getCurrentDefinition() - { - return this.currentDefinition; - } - - public void setController(Controller controller) - { - this.controller = controller; - } - - - public void update(final ProcessDefinitionRef def, List<ProcessInstanceRef> instances) - { - this.currentDefinition = def; - this.cachedInstances = instances; - - if(isInitialized()) - { - bindData(instances); - } - } - - private void bindData(List<ProcessInstanceRef> instances) - { - final DefaultListModel<ProcessInstanceRef> model = - (DefaultListModel<ProcessInstanceRef>) listBox.getModel(); - model.clear(); - - for(ProcessInstanceRef inst : instances) - { - model.add(inst); - } - - // layout again - this.invalidate(); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,236 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Controller; +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.Event; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.ToolButton; +import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import org.jboss.bpm.console.client.LazyPanel; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class InstanceListView extends LayoutPanel + implements ViewInterface, LazyPanel +{ + public final static String ID = InstanceListView.class.getName(); + + private Controller controller; + + private LayoutPanel instanceList = null; + + private ListBox<ProcessInstanceRef> listBox; + + private ProcessDefinitionRef currentDefinition; + + private boolean isInitialized; + + private List<ProcessInstanceRef> cachedInstances = null; + + public InstanceListView() + { + super(); + setTitle("Process Instances"); + + } + + public boolean isInitialized() + { + return isInitialized; + } + + public void initialize() + { + if(!isInitialized) + { + instanceList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + instanceList.setPadding(0); + instanceList.setWidgetSpacing(0); + + listBox = + new ListBox<ProcessInstanceRef>( + new String[] { + "Instance ID", "State", "Start Date"} + ); + + listBox.setCellRenderer(new ListBox.CellRenderer<ProcessInstanceRef>() { + public void renderCell(ListBox<ProcessInstanceRef> listBox, int row, int column, + ProcessInstanceRef item) { + switch (column) { + case 0: + listBox.setText(row, column, item.getId()); + break; + case 1: + listBox.setText(row, column, item.getState().toString()); + break; + case 2: + listBox.setText(row, column, item.getStartDate().toString()); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + // toolbar + final LayoutPanel toolBox = new LayoutPanel(); + toolBox.setPadding(0); + toolBox.setWidgetSpacing(5); + + final ToolBar toolBar = new ToolBar(); + toolBar.add( + new ToolButton("Refresh", new ClickListener() { + public void onClick(Widget sender) { + controller.handleEvent( + new Event( + LoadInstancesAction.ID, + getCurrentDefinition() + ) + ); + } + } + ) + ); + + toolBar.addSeparator(); + + toolBar.add( + new ToolButton("Start new instance", new ClickListener() + { + public void onClick(Widget sender) + { + controller.handleEvent( + new Event( + StartNewInstanceAction.ID, + getCurrentDefinition() + ) + ); + } + } + ) + ); + + toolBar.addSeparator(); + + toolBar.add( + new ToolButton("Cancel execution", new ClickListener() + { + public void onClick(Widget sender) + { + ProcessInstanceRef selection = getSelection(); + if(selection!=null) + { + selection.setState(ProcessInstanceRef.STATE.ENDED); + + controller.handleEvent( + new Event( + StateChangeAction.ID, + selection + ) + ); + } + else + { + MessageBox.alert("Missing selection", "Please select an instance"); + } + } + } + ) + ); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + // cached data? + if(this.cachedInstances!=null) + bindData(this.cachedInstances); + + this.add(instanceList); + + + + isInitialized = true; + + } + } + + public ProcessInstanceRef getSelection() + { + ProcessInstanceRef selection = null; + if(listBox.getSelectedIndex()!=-1) + selection = listBox.getItem( listBox.getSelectedIndex()); + return selection; + } + + public ProcessDefinitionRef getCurrentDefinition() + { + return this.currentDefinition; + } + + public void setController(Controller controller) + { + this.controller = controller; + } + + + public void update(final ProcessDefinitionRef def, List<ProcessInstanceRef> instances) + { + this.currentDefinition = def; + this.cachedInstances = instances; + + if(isInitialized()) + { + bindData(instances); + } + } + + private void bindData(List<ProcessInstanceRef> instances) + { + final DefaultListModel<ProcessInstanceRef> model = + (DefaultListModel<ProcessInstanceRef>) listBox.getModel(); + model.clear(); + + for(ProcessInstanceRef inst : instances) + { + model.add(inst); + } + + // layout again + this.invalidate(); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; -import com.mvc4g.client.Controller; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.model.DTOParser; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; - -import java.util.List; - -/** - * Loads a process definition list. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class LoadDefinitionsAction extends AbstractRESTAction -{ - public final static String ID = LoadDefinitionsAction.class.getName(); - - public LoadDefinitionsAction(ApplicationContext appContext) - { - super(appContext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - return appContext.getUrlBuilder().getProcessDefinitionsURL(); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.GET; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - if (200 == response.getStatusCode()) - { - JSONValue json = JSONParser.parse(response.getText()); - List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); - DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID); - view.update(definitions); - - appContext.displayMessage("Loaded " + definitions.size() + " process definitions", false); - } - else - { - // Handle the error. Can get the status text from response.getStatusText() - appContext.displayMessage("Failed to load instances. " + - "HTTP " + response.getStatusCode()+ - ": " +response.getText(), - true - ); - } - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONValue; +import com.mvc4g.client.Controller; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.DTOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; + +import java.util.List; + +/** + * Loads a process definition list. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class LoadDefinitionsAction extends AbstractRESTAction +{ + public final static String ID = LoadDefinitionsAction.class.getName(); + + public LoadDefinitionsAction(ApplicationContext appContext) + { + super(appContext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + return appContext.getUrlBuilder().getProcessDefinitionsURL(); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + if (200 == response.getStatusCode()) + { + JSONValue json = JSONParser.parse(response.getText()); + List<ProcessDefinitionRef> definitions = DTOParser.parseProcessDefinitions(json); + DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID); + view.update(definitions); + + appContext.displayMessage("Loaded " + definitions.size() + " process definitions", false); + } + else + { + // Handle the error. Can get the status text from response.getStatusText() + appContext.displayMessage("Failed to load instances. " + + "HTTP " + response.getStatusCode()+ + ": " +response.getText(), + true + ); + } + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.google.gwt.json.client.JSONParser; -import com.google.gwt.json.client.JSONValue; -import com.mvc4g.client.Controller; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.model.DTOParser; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.model.ProcessInstanceRef; - -import java.util.List; - -/** - * Force loading of a process instance list. - * Triggered through {@link org.jboss.bpm.console.client.model.ProcessDefinitionRef}. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class LoadInstancesAction extends AbstractRESTAction -{ - public final static String ID = LoadInstancesAction.class.getName(); - - public LoadInstancesAction(ApplicationContext appContext) - { - super(appContext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - return appContext.getUrlBuilder().getProcessInstancesURL(def.getId()); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.GET; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - JSONValue json = JSONParser.parse(response.getText()); - - List<ProcessInstanceRef> instances = DTOParser.parseProcessInstances(json); - InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); - view.update(def, instances); - - appContext.displayMessage("Loaded " + instances.size() + " process instances", false); - - } - -} - Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.google.gwt.json.client.JSONParser; +import com.google.gwt.json.client.JSONValue; +import com.mvc4g.client.Controller; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.DTOParser; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import org.jboss.bpm.console.client.model.ProcessInstanceRef; + +import java.util.List; + +/** + * Force loading of a process instance list. + * Triggered through {@link org.jboss.bpm.console.client.model.ProcessDefinitionRef}. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class LoadInstancesAction extends AbstractRESTAction +{ + public final static String ID = LoadInstancesAction.class.getName(); + + public LoadInstancesAction(ApplicationContext appContext) + { + super(appContext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + final ProcessDefinitionRef def = (ProcessDefinitionRef)event; + return appContext.getUrlBuilder().getProcessInstancesURL(def.getId()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + final ProcessDefinitionRef def = (ProcessDefinitionRef)event; + JSONValue json = JSONParser.parse(response.getText()); + + List<ProcessInstanceRef> instances = DTOParser.parseProcessInstances(json); + InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); + view.update(def, instances); + + appContext.displayMessage("Loaded " + instances.size() + " process instances", false); + + } + +} + Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,158 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.user.client.ui.SourcesTabEvents; -import com.google.gwt.user.client.ui.TabListener; -import com.google.gwt.user.client.ui.Widget; -import com.mvc4g.client.ActionInterface; -import com.mvc4g.client.Event; -import com.mvc4g.client.ViewInterface; -import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel; -import org.gwt.mosaic.ui.client.MessageBox; -import org.gwt.mosaic.ui.client.TabLayoutPanel; -import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region; -import org.gwt.mosaic.ui.client.layout.BorderLayoutData; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.Editor; -import org.jboss.bpm.console.client.MenuSection; -import org.jboss.bpm.console.client.LazyPanel; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class ProcessEditor extends Editor -{ - public final static String ID = ProcessEditor.class.getName(); - - private TabLayoutPanel tabPanel; - - public ProcessEditor(ApplicationContext appContext) - { - super(appContext); - } - - public void initialize() - { - if(!isInitialized) - { - // create inner tab layout - tabPanel = new DecoratedTabLayoutPanel(); - tabPanel.setPadding(5); - tabPanel.addTabListener( - new TabListener() - { - public boolean onBeforeTabSelected(SourcesTabEvents sourcesTabEvents, int i) - { - boolean showTab = true; - - if(i!=0) - { - DefinitionListView view = ((DefinitionListView) controller.getView(DefinitionListView.ID)); - boolean hasSelection = view.getSelection() != null; - if(!hasSelection) - { - MessageBox.alert("Missing selection", "Please select a process"); - showTab=false; - } - } - - return showTab; - } - - public void onTabSelected(SourcesTabEvents sourcesTabEvents, int i) - { - LazyPanel lazyPanel = (LazyPanel) tabPanel.getWidget(i); - if(!lazyPanel.isInitialized()) - { - lazyPanel.initialize(); - refreshView(); // TODO: hack around rendering problems - } - } - } - ); - - this.add(tabPanel, new BorderLayoutData(Region.CENTER)); - - // create and register views - registerView(DefinitionListView.ID, new DefinitionListView()); - registerView(InstanceListView.ID, new InstanceListView()); - - // create and register actions - registerAction(LoadDefinitionsAction.ID, new LoadDefinitionsAction(appContext)); - registerAction(LoadInstancesAction.ID, new LoadInstancesAction(appContext)); - registerAction(StartNewInstanceAction.ID, new StartNewInstanceAction(appContext)); - registerAction(StateChangeAction.ID, new StateChangeAction(appContext)); - - // display tab, needs to visible for correct rendering - tabPanel.selectTab(0); - - // force loading - super.controller.handleEvent( - new Event(LoadDefinitionsAction.ID, null) - ); - - refreshView(); - - isInitialized = true; - } - } - - private void registerView(String id, Widget view) - { - // register view with controller - super.controller.addView(id, (ViewInterface)view); - - // add to tab layout - this.tabPanel.add(view, view.getTitle()); - } - - private void registerAction(String name, ActionInterface action) - { - super.controller.addAction(name, action); - } - - public String getEditorId() - { - return ID; - } - - public String getTitle() - { - return "Processes"; - } - - public String getIconCSS() - { - return "bpm-process-icon"; - } - - public MenuSection provideMenuSection() - { - return new MenuSection( - "Processes", - "bpm-process-icon", - new ProcessEditorNavigation(appContext) - ); - } -} - Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,158 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.user.client.ui.SourcesTabEvents; +import com.google.gwt.user.client.ui.TabListener; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.ActionInterface; +import com.mvc4g.client.Event; +import com.mvc4g.client.ViewInterface; +import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel; +import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.TabLayoutPanel; +import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region; +import org.gwt.mosaic.ui.client.layout.BorderLayoutData; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Editor; +import org.jboss.bpm.console.client.MenuSection; +import org.jboss.bpm.console.client.LazyPanel; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ProcessEditor extends Editor +{ + public final static String ID = ProcessEditor.class.getName(); + + private TabLayoutPanel tabPanel; + + public ProcessEditor(ApplicationContext appContext) + { + super(appContext); + } + + public void initialize() + { + if(!isInitialized) + { + // create inner tab layout + tabPanel = new DecoratedTabLayoutPanel(); + tabPanel.setPadding(5); + tabPanel.addTabListener( + new TabListener() + { + public boolean onBeforeTabSelected(SourcesTabEvents sourcesTabEvents, int i) + { + boolean showTab = true; + + if(i!=0) + { + DefinitionListView view = ((DefinitionListView) controller.getView(DefinitionListView.ID)); + boolean hasSelection = view.getSelection() != null; + if(!hasSelection) + { + MessageBox.alert("Missing selection", "Please select a process"); + showTab=false; + } + } + + return showTab; + } + + public void onTabSelected(SourcesTabEvents sourcesTabEvents, int i) + { + LazyPanel lazyPanel = (LazyPanel) tabPanel.getWidget(i); + if(!lazyPanel.isInitialized()) + { + lazyPanel.initialize(); + refreshView(); // TODO: hack around rendering problems + } + } + } + ); + + this.add(tabPanel, new BorderLayoutData(Region.CENTER)); + + // create and register views + registerView(DefinitionListView.ID, new DefinitionListView()); + registerView(InstanceListView.ID, new InstanceListView()); + + // create and register actions + registerAction(LoadDefinitionsAction.ID, new LoadDefinitionsAction(appContext)); + registerAction(LoadInstancesAction.ID, new LoadInstancesAction(appContext)); + registerAction(StartNewInstanceAction.ID, new StartNewInstanceAction(appContext)); + registerAction(StateChangeAction.ID, new StateChangeAction(appContext)); + + // display tab, needs to visible for correct rendering + tabPanel.selectTab(0); + + // force loading + super.controller.handleEvent( + new Event(LoadDefinitionsAction.ID, null) + ); + + refreshView(); + + isInitialized = true; + } + } + + private void registerView(String id, Widget view) + { + // register view with controller + super.controller.addView(id, (ViewInterface)view); + + // add to tab layout + this.tabPanel.add(view, view.getTitle()); + } + + private void registerAction(String name, ActionInterface action) + { + super.controller.addAction(name, action); + } + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return "Processes"; + } + + public String getIconCSS() + { + return "bpm-process-icon"; + } + + public MenuSection provideMenuSection() + { + return new MenuSection( + "Processes", + "bpm-process-icon", + new ProcessEditorNavigation(appContext) + ); + } +} + Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,62 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.user.client.ui.Tree; -import com.google.gwt.user.client.ui.TreeItem; -import com.google.gwt.user.client.ui.TreeListener; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.Workspace; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class ProcessEditorNavigation extends Tree -{ - - public ProcessEditorNavigation(final ApplicationContext appContext) - { - super.setTitle("Processes"); - - TreeItem root = addItem("Process Definitions"); - TreeItem definitions = root.addItem("View definitions"); - - addTreeListener( - new TreeListener() - { - public void onTreeItemSelected(TreeItem treeItem) - { - if("View definitions".equals(treeItem.getText())) - { - Workspace workspace = appContext.getWorkpace(); - workspace.showEditor(ProcessEditor.ID); - } - } - - public void onTreeItemStateChanged(TreeItem treeItem) - { - - } - } - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,62 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.user.client.ui.Tree; +import com.google.gwt.user.client.ui.TreeItem; +import com.google.gwt.user.client.ui.TreeListener; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Workspace; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class ProcessEditorNavigation extends Tree +{ + + public ProcessEditorNavigation(final ApplicationContext appContext) + { + super.setTitle("Processes"); + + TreeItem root = addItem("Process Definitions"); + TreeItem definitions = root.addItem("View definitions"); + + addTreeListener( + new TreeListener() + { + public void onTreeItemSelected(TreeItem treeItem) + { + if("View definitions".equals(treeItem.getText())) + { + Workspace workspace = appContext.getWorkpace(); + workspace.showEditor(ProcessEditor.ID); + } + } + + public void onTreeItemStateChanged(TreeItem treeItem) + { + + } + } + ); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.mvc4g.client.Controller; -import com.mvc4g.client.Event; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; - -/** - * Starts a new process instance. - * Triggered through {@link org.jboss.bpm.console.client.model.ProcessDefinitionRef} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class StartNewInstanceAction extends AbstractRESTAction -{ - public final static String ID = StartNewInstanceAction.class.getName(); - - public StartNewInstanceAction(ApplicationContext appContext) - { - super(appContext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - return appContext.getUrlBuilder().getStartNewInstanceURL(def.getId()); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.POST; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - - // force reload instance list - controller.handleEvent( - new Event(LoadInstancesAction.ID, def) - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; + +/** + * Starts a new process instance. + * Triggered through {@link org.jboss.bpm.console.client.model.ProcessDefinitionRef} + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class StartNewInstanceAction extends AbstractRESTAction +{ + public final static String ID = StartNewInstanceAction.class.getName(); + + public StartNewInstanceAction(ApplicationContext appContext) + { + super(appContext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + final ProcessDefinitionRef def = (ProcessDefinitionRef)event; + return appContext.getUrlBuilder().getStartNewInstanceURL(def.getId()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.POST; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + final ProcessDefinitionRef def = (ProcessDefinitionRef)event; + + // force reload instance list + controller.handleEvent( + new Event(LoadInstancesAction.ID, def) + ); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,73 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.process; - -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.model.ProcessInstanceRef; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import com.mvc4g.client.Controller; -import com.mvc4g.client.Event; -import com.google.gwt.http.client.*; - -/** - * Starts a new process instance. - * Triggered through {@link org.jboss.bpm.console.client.model.ProcessInstanceRef} - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class StateChangeAction extends AbstractRESTAction -{ - public final static String ID = StateChangeAction.class.getName(); - - public StateChangeAction(ApplicationContext appContext) - { - super(appContext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - final ProcessInstanceRef inst = (ProcessInstanceRef)event; - return appContext.getUrlBuilder().getStateChangeURL(inst.getId(), inst.getState()); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.POST; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - InstanceListView view = (InstanceListView) - controller.getView(InstanceListView.ID); - ProcessDefinitionRef def = view.getCurrentDefinition(); - - // force reload instance list - controller.handleEvent( new Event(LoadInstancesAction.ID, def)); - } -} - Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/StateChangeAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.process; + +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.model.ProcessInstanceRef; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import com.google.gwt.http.client.*; + +/** + * Starts a new process instance. + * Triggered through {@link org.jboss.bpm.console.client.model.ProcessInstanceRef} + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class StateChangeAction extends AbstractRESTAction +{ + public final static String ID = StateChangeAction.class.getName(); + + public StateChangeAction(ApplicationContext appContext) + { + super(appContext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + final ProcessInstanceRef inst = (ProcessInstanceRef)event; + return appContext.getUrlBuilder().getStateChangeURL(inst.getId(), inst.getState()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.POST; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + InstanceListView view = (InstanceListView) + controller.getView(InstanceListView.ID); + ProcessDefinitionRef def = view.getCurrentDefinition(); + + // force reload instance list + controller.handleEvent( new Event(LoadInstancesAction.ID, def)); + } +} + Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.gwt.mosaic.ui.client.ListBox; -import org.jboss.bpm.console.client.LazyPanel; -import org.jboss.bpm.console.client.model.TaskRef; -import com.mvc4g.client.ViewInterface; -import com.mvc4g.client.Controller; - -import java.util.List; - -/** - * Base class for task lists. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public abstract class AbstractTaskList extends LayoutPanel - implements ViewInterface, LazyPanel -{ - protected Controller controller; - protected LayoutPanel taskList = null; - protected ListBox<TaskRef> listBox; - protected boolean isInitialized; - protected String identity; - - public AbstractTaskList() - { - super(); - } - - public boolean isInitialized() - { - return isInitialized; - } - - public void setController(Controller controller) - { - this.controller = controller; - } - - public abstract void update(String identity, List<TaskRef> tasks); - - public TaskRef getSelection() - { - TaskRef selection = null; - if(isInitialized() && listBox.getSelectedIndex()!=-1) - selection = listBox.getItem( listBox.getSelectedIndex()); - return selection; - } - - public String getAssignedIdentity() - { - return identity; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.gwt.mosaic.ui.client.ListBox; +import org.jboss.bpm.console.client.LazyPanel; +import org.jboss.bpm.console.client.model.TaskRef; +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.Controller; + +import java.util.List; + +/** + * Base class for task lists. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public abstract class AbstractTaskList extends LayoutPanel + implements ViewInterface, LazyPanel +{ + protected Controller controller; + protected LayoutPanel taskList = null; + protected ListBox<TaskRef> listBox; + protected boolean isInitialized; + protected String identity; + + public AbstractTaskList() + { + super(); + } + + public boolean isInitialized() + { + return isInitialized; + } + + public void setController(Controller controller) + { + this.controller = controller; + } + + public abstract void update(String identity, List<TaskRef> tasks); + + public TaskRef getSelection() + { + TaskRef selection = null; + if(isInitialized() && listBox.getSelectedIndex()!=-1) + selection = listBox.getItem( listBox.getSelectedIndex()); + return selection; + } + + public String getAssignedIdentity() + { + return identity; + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,178 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.layout.BoxLayout; -import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.MessageBox; -import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.jboss.bpm.console.client.model.TaskRef; -import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; -import com.google.gwt.user.client.ui.ChangeListener; -import com.google.gwt.user.client.ui.Widget; -import com.google.gwt.user.client.ui.ClickListener; -import com.mvc4g.client.Event; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class AssignedTasksView extends AbstractTaskList -{ - - public final static String ID = AssignedTasksView.class.getName(); - - public AssignedTasksView() - { - super(); - setTitle("Your Tasks"); - } - - public void initialize() - { - if(!isInitialized) - { - taskList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); - taskList.setPadding(0); - taskList.setWidgetSpacing(0); - - listBox = - new ListBox<TaskRef>( - new String[] { - "Task ID", "Name", "Assignee"} - ); - - - listBox.setCellRenderer(new ListBox.CellRenderer<TaskRef>() { - public void renderCell(ListBox<TaskRef> listBox, int row, int column, - TaskRef item) { - switch (column) { - case 0: - listBox.setText(row, column, String.valueOf(item.getId())); - break; - case 1: - listBox.setText(row, column, item.getName()); - break; - case 2: - listBox.setText(row, column, item.getAssignee()); - break; - default: - throw new RuntimeException("Unexpected column size"); - } - } - }); - - listBox.addChangeListener(new ChangeListener() - { - public void onChange(Widget widget) - { - int index = listBox.getSelectedIndex(); - if(index!=-1) - { - System.out.println("Selected row "+ index); - } - } - }); - - // toolbar - final LayoutPanel toolBox = new LayoutPanel(); - toolBox.setPadding(0); - toolBox.setWidgetSpacing(5); - //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - - final ToolBar toolBar = new ToolBar(); - toolBar.add( - new ToolButton("Refresh", new ClickListener() { - public void onClick(Widget sender) { - // force loading - controller.handleEvent( - new Event(LoadTasksAction.ID, getAssignedIdentity()) - ); - } - } - ) - ); - - toolBar.addSeparator(); - - toolBar.add( - new ToolButton("Release", new ClickListener() { - public void onClick(Widget sender) { - - TaskRef selection = getSelection(); - - if(selection!=null) - { - controller.handleEvent( - new Event( - ReleaseTaskAction.ID, - new TaskIdentityEvent(getAssignedIdentity(), selection) - ) - ); - } - else - { - MessageBox.alert("Missing selection", "Please select a task"); - } - } - } - ) - ); - - - toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - - this.add(taskList); - - isInitialized = true; - } - } - - public void update(String identity, List<TaskRef> tasks) - { - - this.identity = identity; - - // lazy init - initialize(); - - final DefaultListModel<TaskRef> model = - (DefaultListModel<TaskRef>) listBox.getModel(); - - model.clear(); - - for(TaskRef task : tasks) - { - if(TaskRef.STATE.ASSIGNED ==task.getCurrentState()) - model.add(task); - } - } - -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,178 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.ToolButton; +import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.model.TaskRef; +import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; +import com.google.gwt.user.client.ui.ChangeListener; +import com.google.gwt.user.client.ui.Widget; +import com.google.gwt.user.client.ui.ClickListener; +import com.mvc4g.client.Event; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class AssignedTasksView extends AbstractTaskList +{ + + public final static String ID = AssignedTasksView.class.getName(); + + public AssignedTasksView() + { + super(); + setTitle("Your Tasks"); + } + + public void initialize() + { + if(!isInitialized) + { + taskList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + taskList.setPadding(0); + taskList.setWidgetSpacing(0); + + listBox = + new ListBox<TaskRef>( + new String[] { + "Task ID", "Name", "Assignee"} + ); + + + listBox.setCellRenderer(new ListBox.CellRenderer<TaskRef>() { + public void renderCell(ListBox<TaskRef> listBox, int row, int column, + TaskRef item) { + switch (column) { + case 0: + listBox.setText(row, column, String.valueOf(item.getId())); + break; + case 1: + listBox.setText(row, column, item.getName()); + break; + case 2: + listBox.setText(row, column, item.getAssignee()); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + listBox.addChangeListener(new ChangeListener() + { + public void onChange(Widget widget) + { + int index = listBox.getSelectedIndex(); + if(index!=-1) + { + System.out.println("Selected row "+ index); + } + } + }); + + // toolbar + final LayoutPanel toolBox = new LayoutPanel(); + toolBox.setPadding(0); + toolBox.setWidgetSpacing(5); + //toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + + final ToolBar toolBar = new ToolBar(); + toolBar.add( + new ToolButton("Refresh", new ClickListener() { + public void onClick(Widget sender) { + // force loading + controller.handleEvent( + new Event(LoadTasksAction.ID, getAssignedIdentity()) + ); + } + } + ) + ); + + toolBar.addSeparator(); + + toolBar.add( + new ToolButton("Release", new ClickListener() { + public void onClick(Widget sender) { + + TaskRef selection = getSelection(); + + if(selection!=null) + { + controller.handleEvent( + new Event( + ReleaseTaskAction.ID, + new TaskIdentityEvent(getAssignedIdentity(), selection) + ) + ); + } + else + { + MessageBox.alert("Missing selection", "Please select a task"); + } + } + } + ) + ); + + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + this.add(taskList); + + isInitialized = true; + } + } + + public void update(String identity, List<TaskRef> tasks) + { + + this.identity = identity; + + // lazy init + initialize(); + + final DefaultListModel<TaskRef> model = + (DefaultListModel<TaskRef>) listBox.getModel(); + + model.clear(); + + for(TaskRef task : tasks) + { + if(TaskRef.STATE.ASSIGNED ==task.getCurrentState()) + model.add(task); + } + } + +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.mvc4g.client.Controller; -import com.mvc4g.client.Event; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class ClaimTaskAction extends AbstractRESTAction -{ - public final static String ID = ClaimTaskAction.class.getName(); - - public ClaimTaskAction(ApplicationContext appContetext) - { - super(appContetext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - TaskIdentityEvent claimEvent = (TaskIdentityEvent)event; - - return appContext.getUrlBuilder().getTaskAssignURL( - claimEvent.getTask().getId(), claimEvent.getIdentity() - ); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.POST; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - TaskIdentityEvent claimEvent = (TaskIdentityEvent)event; - - controller.handleEvent( - new Event(LoadTasksAction.ID, claimEvent.getIdentity()) - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ClaimTaskAction extends AbstractRESTAction +{ + public final static String ID = ClaimTaskAction.class.getName(); + + public ClaimTaskAction(ApplicationContext appContetext) + { + super(appContetext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + TaskIdentityEvent claimEvent = (TaskIdentityEvent)event; + + return appContext.getUrlBuilder().getTaskAssignURL( + claimEvent.getTask().getId(), claimEvent.getIdentity() + ); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.POST; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + TaskIdentityEvent claimEvent = (TaskIdentityEvent)event; + + controller.handleEvent( + new Event(LoadTasksAction.ID, claimEvent.getIdentity()) + ); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,79 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.model.DTOParser; -import org.jboss.bpm.console.client.model.TaskRef; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.mvc4g.client.Controller; - -import java.util.List; - -/** - * Loads a task list for a particular identity. - * - * @see org.jboss.bpm.console.client.task.AssignedTasksView - * @see org.jboss.bpm.console.client.task.OpenTasksView - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class LoadTasksAction extends AbstractRESTAction -{ - public final static String ID = LoadTasksAction.class.getName(); - - public LoadTasksAction(ApplicationContext appContetext) - { - super(appContetext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - String identity = (String)event; - return appContext.getUrlBuilder().getTaskListURL(identity); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.GET; - } - - public void handleSuccessfulResponse( - final Controller controller, final Object event, Response response) - { - String identity = (String)event; - - List<TaskRef> tasks = DTOParser.parseTaskReferenceList(response.getText()); - OpenTasksView openTasks = (OpenTasksView)controller.getView(OpenTasksView.ID); - AssignedTasksView personalTasks = (AssignedTasksView)controller.getView(AssignedTasksView.ID); - - openTasks.update(identity, tasks); - personalTasks.update(identity, tasks); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.model.DTOParser; +import org.jboss.bpm.console.client.model.TaskRef; +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; + +import java.util.List; + +/** + * Loads a task list for a particular identity. + * + * @see org.jboss.bpm.console.client.task.AssignedTasksView + * @see org.jboss.bpm.console.client.task.OpenTasksView + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class LoadTasksAction extends AbstractRESTAction +{ + public final static String ID = LoadTasksAction.class.getName(); + + public LoadTasksAction(ApplicationContext appContetext) + { + super(appContetext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + String identity = (String)event; + return appContext.getUrlBuilder().getTaskListURL(identity); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.GET; + } + + public void handleSuccessfulResponse( + final Controller controller, final Object event, Response response) + { + String identity = (String)event; + + List<TaskRef> tasks = DTOParser.parseTaskReferenceList(response.getText()); + OpenTasksView openTasks = (OpenTasksView)controller.getView(OpenTasksView.ID); + AssignedTasksView personalTasks = (AssignedTasksView)controller.getView(AssignedTasksView.ID); + + openTasks.update(identity, tasks); + personalTasks.update(identity, tasks); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,163 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; -import com.mvc4g.client.Event; -import org.gwt.mosaic.ui.client.ListBox; -import org.gwt.mosaic.ui.client.MessageBox; -import org.gwt.mosaic.ui.client.ToolBar; -import org.gwt.mosaic.ui.client.ToolButton; -import org.gwt.mosaic.ui.client.layout.BoxLayout; -import org.gwt.mosaic.ui.client.layout.BoxLayoutData; -import org.gwt.mosaic.ui.client.layout.LayoutPanel; -import org.gwt.mosaic.ui.client.list.DefaultListModel; -import org.jboss.bpm.console.client.model.TaskRef; -import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; - -import java.util.List; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class OpenTasksView extends AbstractTaskList -{ - - public final static String ID = OpenTasksView.class.getName(); - - public OpenTasksView() - { - super(); - setTitle("Open Tasks"); - } - - public void initialize() - { - if(!isInitialized) - { - taskList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); - taskList.setPadding(0); - taskList.setWidgetSpacing(0); - - listBox = - new ListBox<TaskRef>( - new String[] { - "Task ID", "Name", "Status"} - ); - - - listBox.setCellRenderer(new ListBox.CellRenderer<TaskRef>() { - public void renderCell(ListBox<TaskRef> listBox, int row, int column, - TaskRef item) { - switch (column) { - case 0: - listBox.setText(row, column, String.valueOf(item.getId())); - break; - case 1: - listBox.setText(row, column, item.getName()); - break; - case 2: - listBox.setText(row, column, String.valueOf(item.getCurrentState())); - break; - default: - throw new RuntimeException("Unexpected column size"); - } - } - }); - - // toolbar - final LayoutPanel toolBox = new LayoutPanel(); - toolBox.setPadding(0); - toolBox.setWidgetSpacing(5); - - final ToolBar toolBar = new ToolBar(); - toolBar.add( - new ToolButton("Refresh", new ClickListener() { - public void onClick(Widget sender) { - // force loading - controller.handleEvent( - new Event(LoadTasksAction.ID, getAssignedIdentity()) - ); - } - } - ) - ); - - toolBar.addSeparator(); - - toolBar.add( - new ToolButton("Claim", new ClickListener() { - public void onClick(Widget sender) - { - TaskRef selection = getSelection(); - - if(selection!=null) - { - controller.handleEvent( - new Event( - ClaimTaskAction.ID, - new TaskIdentityEvent(getAssignedIdentity(), selection) - ) - ); - } - else - { - MessageBox.alert("Missing selection", "Please select a task"); - } - } - } - ) - ); - - toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - - this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - - this.add(taskList); - - isInitialized = true; - } - } - - public void update(String identity, List<TaskRef> tasks) - { - - this.identity = identity; - - // lazy init - initialize(); - - final DefaultListModel<TaskRef> model = - (DefaultListModel<TaskRef>) listBox.getModel(); - - model.clear(); - - for(TaskRef task : tasks) - { - if(TaskRef.STATE.OPEN ==task.getCurrentState()) - model.add(task); - } - } - -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,163 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.Event; +import org.gwt.mosaic.ui.client.ListBox; +import org.gwt.mosaic.ui.client.MessageBox; +import org.gwt.mosaic.ui.client.ToolBar; +import org.gwt.mosaic.ui.client.ToolButton; +import org.gwt.mosaic.ui.client.layout.BoxLayout; +import org.gwt.mosaic.ui.client.layout.BoxLayoutData; +import org.gwt.mosaic.ui.client.layout.LayoutPanel; +import org.gwt.mosaic.ui.client.list.DefaultListModel; +import org.jboss.bpm.console.client.model.TaskRef; +import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; + +import java.util.List; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class OpenTasksView extends AbstractTaskList +{ + + public final static String ID = OpenTasksView.class.getName(); + + public OpenTasksView() + { + super(); + setTitle("Open Tasks"); + } + + public void initialize() + { + if(!isInitialized) + { + taskList = new LayoutPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); + taskList.setPadding(0); + taskList.setWidgetSpacing(0); + + listBox = + new ListBox<TaskRef>( + new String[] { + "Task ID", "Name", "Status"} + ); + + + listBox.setCellRenderer(new ListBox.CellRenderer<TaskRef>() { + public void renderCell(ListBox<TaskRef> listBox, int row, int column, + TaskRef item) { + switch (column) { + case 0: + listBox.setText(row, column, String.valueOf(item.getId())); + break; + case 1: + listBox.setText(row, column, item.getName()); + break; + case 2: + listBox.setText(row, column, String.valueOf(item.getCurrentState())); + break; + default: + throw new RuntimeException("Unexpected column size"); + } + } + }); + + // toolbar + final LayoutPanel toolBox = new LayoutPanel(); + toolBox.setPadding(0); + toolBox.setWidgetSpacing(5); + + final ToolBar toolBar = new ToolBar(); + toolBar.add( + new ToolButton("Refresh", new ClickListener() { + public void onClick(Widget sender) { + // force loading + controller.handleEvent( + new Event(LoadTasksAction.ID, getAssignedIdentity()) + ); + } + } + ) + ); + + toolBar.addSeparator(); + + toolBar.add( + new ToolButton("Claim", new ClickListener() { + public void onClick(Widget sender) + { + TaskRef selection = getSelection(); + + if(selection!=null) + { + controller.handleEvent( + new Event( + ClaimTaskAction.ID, + new TaskIdentityEvent(getAssignedIdentity(), selection) + ) + ); + } + else + { + MessageBox.alert("Missing selection", "Please select a task"); + } + } + } + ) + ); + + toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + + this.taskList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); + this.taskList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); + + this.add(taskList); + + isInitialized = true; + } + } + + public void update(String identity, List<TaskRef> tasks) + { + + this.identity = identity; + + // lazy init + initialize(); + + final DefaultListModel<TaskRef> model = + (DefaultListModel<TaskRef>) listBox.getModel(); + + model.clear(); + + for(TaskRef task : tasks) + { + if(TaskRef.STATE.OPEN ==task.getCurrentState()) + model.add(task); + } + } + +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.Response; -import com.mvc4g.client.Controller; -import com.mvc4g.client.Event; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.common.AbstractRESTAction; -import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class ReleaseTaskAction extends AbstractRESTAction -{ - public final static String ID = ReleaseTaskAction.class.getName(); - - public ReleaseTaskAction(ApplicationContext appContetext) - { - super(appContetext); - } - - public String getId() - { - return ID; - } - - public String getUrl(Object event) - { - TaskIdentityEvent tie = (TaskIdentityEvent)event; - return appContext.getUrlBuilder().getTaskReleaseURL(tie.getTask().getId()); - } - - public RequestBuilder.Method getRequestMethod() - { - return RequestBuilder.POST; - } - - public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) - { - TaskIdentityEvent tie = (TaskIdentityEvent)event; - - // force refresh reload - controller.handleEvent( - new Event(LoadTasksAction.ID, tie.getIdentity()) - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/ReleaseTaskAction.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import com.google.gwt.http.client.RequestBuilder; +import com.google.gwt.http.client.Response; +import com.mvc4g.client.Controller; +import com.mvc4g.client.Event; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.common.AbstractRESTAction; +import org.jboss.bpm.console.client.task.events.TaskIdentityEvent; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ReleaseTaskAction extends AbstractRESTAction +{ + public final static String ID = ReleaseTaskAction.class.getName(); + + public ReleaseTaskAction(ApplicationContext appContetext) + { + super(appContetext); + } + + public String getId() + { + return ID; + } + + public String getUrl(Object event) + { + TaskIdentityEvent tie = (TaskIdentityEvent)event; + return appContext.getUrlBuilder().getTaskReleaseURL(tie.getTask().getId()); + } + + public RequestBuilder.Method getRequestMethod() + { + return RequestBuilder.POST; + } + + public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) + { + TaskIdentityEvent tie = (TaskIdentityEvent)event; + + // force refresh reload + controller.handleEvent( + new Event(LoadTasksAction.ID, tie.getIdentity()) + ); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,142 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import com.google.gwt.user.client.ui.SourcesTabEvents; -import com.google.gwt.user.client.ui.TabListener; -import com.google.gwt.user.client.ui.Widget; -import com.mvc4g.client.ViewInterface; -import com.mvc4g.client.ActionInterface; -import com.mvc4g.client.Event; -import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel; -import org.gwt.mosaic.ui.client.TabLayoutPanel; -import org.gwt.mosaic.ui.client.layout.BorderLayout; -import org.gwt.mosaic.ui.client.layout.BorderLayoutData; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.Editor; -import org.jboss.bpm.console.client.MenuSection; -import org.jboss.bpm.console.client.LazyPanel; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class TaskEditor extends Editor -{ - public final static String ID = TaskEditor.class.getName(); - - private TabLayoutPanel tabPanel; - - public TaskEditor(ApplicationContext appContext) - { - super(appContext); - } - - public void initialize() - { - if(!isInitialized) - { - // create inner tab layout - tabPanel = new DecoratedTabLayoutPanel(); - tabPanel.setPadding(5); - tabPanel.addTabListener( - new TabListener() - { - public boolean onBeforeTabSelected(SourcesTabEvents sourcesTabEvents, int i) - { - return true; - } - - public void onTabSelected(SourcesTabEvents sourcesTabEvents, int i) - { - LazyPanel lazyPanel = (LazyPanel) tabPanel.getWidget(i); - if(!lazyPanel.isInitialized()) - { - lazyPanel.initialize(); - refreshView(); // TODO: hack around rendering problems - } - } - } - ); - - this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER)); - - // create and register views - registerView(OpenTasksView.ID, new OpenTasksView()); - registerView(AssignedTasksView.ID, new AssignedTasksView()); - - // create and register actions - registerAction(LoadTasksAction.ID, new LoadTasksAction(appContext)); - registerAction(ClaimTaskAction.ID, new ClaimTaskAction(appContext)); - registerAction(ReleaseTaskAction.ID, new ReleaseTaskAction(appContext)); - - // display tab, needs to visible for correct rendering - tabPanel.selectTab(0); - - // force loading - super.controller.handleEvent( - new Event(LoadTasksAction.ID, appContext.getAuthentication().getUsername()) - ); - - refreshView(); - - isInitialized = true; - } - } - - private void registerView(String id, Widget view) - { - // register view with controller - super.controller.addView(id, (ViewInterface)view); - - // add to tab layout - this.tabPanel.add(view, view.getTitle()); - } - - private void registerAction(String name, ActionInterface action) - { - super.controller.addAction(name, action); - } - - public String getEditorId() - { - return ID; - } - - public String getTitle() - { - return "Task Management"; - } - - public String getIconCSS() - { - return "bpm-task-icon"; - } - - public MenuSection provideMenuSection() - { - return new MenuSection( - "Tasks", - "bpm-task-icon", - new TaskEditorNavigation(appContext) - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,142 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import com.google.gwt.user.client.ui.SourcesTabEvents; +import com.google.gwt.user.client.ui.TabListener; +import com.google.gwt.user.client.ui.Widget; +import com.mvc4g.client.ViewInterface; +import com.mvc4g.client.ActionInterface; +import com.mvc4g.client.Event; +import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel; +import org.gwt.mosaic.ui.client.TabLayoutPanel; +import org.gwt.mosaic.ui.client.layout.BorderLayout; +import org.gwt.mosaic.ui.client.layout.BorderLayoutData; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Editor; +import org.jboss.bpm.console.client.MenuSection; +import org.jboss.bpm.console.client.LazyPanel; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class TaskEditor extends Editor +{ + public final static String ID = TaskEditor.class.getName(); + + private TabLayoutPanel tabPanel; + + public TaskEditor(ApplicationContext appContext) + { + super(appContext); + } + + public void initialize() + { + if(!isInitialized) + { + // create inner tab layout + tabPanel = new DecoratedTabLayoutPanel(); + tabPanel.setPadding(5); + tabPanel.addTabListener( + new TabListener() + { + public boolean onBeforeTabSelected(SourcesTabEvents sourcesTabEvents, int i) + { + return true; + } + + public void onTabSelected(SourcesTabEvents sourcesTabEvents, int i) + { + LazyPanel lazyPanel = (LazyPanel) tabPanel.getWidget(i); + if(!lazyPanel.isInitialized()) + { + lazyPanel.initialize(); + refreshView(); // TODO: hack around rendering problems + } + } + } + ); + + this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER)); + + // create and register views + registerView(OpenTasksView.ID, new OpenTasksView()); + registerView(AssignedTasksView.ID, new AssignedTasksView()); + + // create and register actions + registerAction(LoadTasksAction.ID, new LoadTasksAction(appContext)); + registerAction(ClaimTaskAction.ID, new ClaimTaskAction(appContext)); + registerAction(ReleaseTaskAction.ID, new ReleaseTaskAction(appContext)); + + // display tab, needs to visible for correct rendering + tabPanel.selectTab(0); + + // force loading + super.controller.handleEvent( + new Event(LoadTasksAction.ID, appContext.getAuthentication().getUsername()) + ); + + refreshView(); + + isInitialized = true; + } + } + + private void registerView(String id, Widget view) + { + // register view with controller + super.controller.addView(id, (ViewInterface)view); + + // add to tab layout + this.tabPanel.add(view, view.getTitle()); + } + + private void registerAction(String name, ActionInterface action) + { + super.controller.addAction(name, action); + } + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return "Task Management"; + } + + public String getIconCSS() + { + return "bpm-task-icon"; + } + + public MenuSection provideMenuSection() + { + return new MenuSection( + "Tasks", + "bpm-task-icon", + new TaskEditorNavigation(appContext) + ); + } +} Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,61 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task; - -import com.google.gwt.user.client.ui.Tree; -import com.google.gwt.user.client.ui.TreeItem; -import com.google.gwt.user.client.ui.TreeListener; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.Workspace; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -class TaskEditorNavigation extends Tree -{ - public TaskEditorNavigation(final ApplicationContext appContext) - { - super.setTitle("Tasks"); - - TreeItem root = addItem("Task Management"); - TreeItem definitions = root.addItem("View Tasks"); - - addTreeListener( - new TreeListener() - { - public void onTreeItemSelected(TreeItem treeItem) - { - if("View Tasks".equals(treeItem.getText())) - { - Workspace workspace = appContext.getWorkpace(); - workspace.showEditor(TaskEditor.ID); - } - } - - public void onTreeItemStateChanged(TreeItem treeItem) - { - - } - } - ); - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task; + +import com.google.gwt.user.client.ui.Tree; +import com.google.gwt.user.client.ui.TreeItem; +import com.google.gwt.user.client.ui.TreeListener; +import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Workspace; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +class TaskEditorNavigation extends Tree +{ + public TaskEditorNavigation(final ApplicationContext appContext) + { + super.setTitle("Tasks"); + + TreeItem root = addItem("Task Management"); + TreeItem definitions = root.addItem("View Tasks"); + + addTreeListener( + new TreeListener() + { + public void onTreeItemSelected(TreeItem treeItem) + { + if("View Tasks".equals(treeItem.getText())) + { + Workspace workspace = appContext.getWorkpace(); + workspace.showEditor(TaskEditor.ID); + } + } + + public void onTreeItemStateChanged(TreeItem treeItem) + { + + } + } + ); + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/events) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,51 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.task.events; - -import org.jboss.bpm.console.client.model.TaskRef; - -/** - * Composite event that represents Identities working on tasks. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public final class TaskIdentityEvent -{ - private String identity; - private TaskRef task; - - public TaskIdentityEvent(String identity, TaskRef task) - { - this.identity = identity; - this.task = task; - } - - public String getIdentity() - { - return identity; - } - - public TaskRef getTask() - { - return task; - } -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,51 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.task.events; + +import org.jboss.bpm.console.client.model.TaskRef; + +/** + * Composite event that represents Identities working on tasks. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public final class TaskIdentityEvent +{ + private String identity; + private TaskRef task; + + public TaskIdentityEvent(String identity, TaskRef task) + { + this.identity = identity; + this.task = task; + } + + public String getIdentity() + { + return identity; + } + + public TaskRef getTask() + { + return task; + } +} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/util) Deleted: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java =================================================================== --- projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client.util; - -import com.google.gwt.user.client.ui.ClickListener; -import com.google.gwt.user.client.ui.Widget; -import org.gwt.mosaic.ui.client.Caption; -import org.gwt.mosaic.ui.client.ImageButton; -import org.gwt.mosaic.ui.client.WindowPanel; - - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class WindowUtil -{ - /** - * - * @param windowPanel - */ - public static void addMaximizeButton(final WindowPanel windowPanel, - Caption.CaptionRegion captionRegion) { - final ImageButton maximizeBtn = new ImageButton( - Caption.IMAGES.windowMaximize()); - maximizeBtn.addClickListener(new ClickListener() { - public void onClick(Widget sender) { - if (windowPanel.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { - windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); - } else { - windowPanel.setWindowState(WindowPanel.WindowState.MAXIMIZED); - } - } - }); - windowPanel.addWindowStateListener(new WindowPanel.WindowStateListener() { - public void onWindowStateChange(WindowPanel sender) { - if (sender.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { - maximizeBtn.setImage(Caption.IMAGES.windowRestore().createImage()); - } else { - maximizeBtn.setImage(Caption.IMAGES.windowMaximize().createImage()); - } - - } - }); - windowPanel.getHeader().add(maximizeBtn, captionRegion); - } - - /** - * - * @param windowPanel - */ - public static void addMinimizeButton(final WindowPanel windowPanel, - Caption.CaptionRegion captionRegion) { - final ImageButton minimizeBtn = new ImageButton( - Caption.IMAGES.windowMinimize()); - minimizeBtn.addClickListener(new ClickListener() { - public void onClick(Widget sender) { - windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); - } - }); - windowPanel.getHeader().add(minimizeBtn, captionRegion); - } - -} Copied: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java) =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java (rev 0) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/WindowUtil.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.client.util; + +import com.google.gwt.user.client.ui.ClickListener; +import com.google.gwt.user.client.ui.Widget; +import org.gwt.mosaic.ui.client.Caption; +import org.gwt.mosaic.ui.client.ImageButton; +import org.gwt.mosaic.ui.client.WindowPanel; + + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class WindowUtil +{ + /** + * + * @param windowPanel + */ + public static void addMaximizeButton(final WindowPanel windowPanel, + Caption.CaptionRegion captionRegion) { + final ImageButton maximizeBtn = new ImageButton( + Caption.IMAGES.windowMaximize()); + maximizeBtn.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + if (windowPanel.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { + windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); + } else { + windowPanel.setWindowState(WindowPanel.WindowState.MAXIMIZED); + } + } + }); + windowPanel.addWindowStateListener(new WindowPanel.WindowStateListener() { + public void onWindowStateChange(WindowPanel sender) { + if (sender.getWindowState() == WindowPanel.WindowState.MAXIMIZED) { + maximizeBtn.setImage(Caption.IMAGES.windowRestore().createImage()); + } else { + maximizeBtn.setImage(Caption.IMAGES.windowMaximize().createImage()); + } + + } + }); + windowPanel.getHeader().add(maximizeBtn, captionRegion); + } + + /** + * + * @param windowPanel + */ + public static void addMinimizeButton(final WindowPanel windowPanel, + Caption.CaptionRegion captionRegion) { + final ImageButton minimizeBtn = new ImageButton( + Caption.IMAGES.windowMinimize()); + minimizeBtn.addClickListener(new ClickListener() { + public void onClick(Widget sender) { + windowPanel.setWindowState(WindowPanel.WindowState.NORMAL); + } + }); + windowPanel.getHeader().add(minimizeBtn, captionRegion); + } + +} Copied: projects/gwt-console/trunk/war/src/main/resources/mvc4g-conf.xml (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/resources/mvc4g-conf.xml) =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/mvc4g-conf.xml (rev 0) +++ projects/gwt-console/trunk/war/src/main/resources/mvc4g-conf.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> + +<mvc4g> + <controller name="mainController" class="com.mvc4g.client.Controller"> + <views> + <view name="loginView" class="org.jboss.bpm.console.client.LoginView" /> + </views> + <actions> + <action name="login" class="org.jboss.bpm.console.client.LoginAction" /> + </actions> + </controller> + + <start controllerName="mainController" actionName="login" /> + +</mvc4g> \ No newline at end of file Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2009-04-22 14:00:15 UTC (rev 4606) @@ -3,12 +3,32 @@  <inherits name='com.google.gwt.user.User' /> <inherits name='com.google.gwt.json.JSON'/> - <inherits name="com.google.gwt.i18n.I18N"/> - <inherits name='com.gwtext.GwtExt' /> + <inherits name="com.google.gwt.i18n.I18N"/>  <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" /> +  +  + <inherits name='com.google.gwt.user.theme.standard.StandardResources' /> + <inherits name="com.google.gwt.user.theme.chrome.ChromeResources" /> + <inherits name="com.google.gwt.user.theme.dark.DarkResources" /> + +  + <inherits name='org.gwt.mosaic.core.Core' /> + <inherits name='org.gwt.mosaic.ui.UI'/> + <inherits name="org.gwt.mosaic.forms.Forms"/> + +  + <inherits name='com.mvc4g.Mvc4gModule'/> + +  +  +  + <inherits name='com.google.gwt.user.theme.standard.Standard' /> +  +  + <generate-with class="org.jboss.bpm.console.rebind.WorkspaceGenerator" > <when-type-assignable class="org.jboss.bpm.console.client.WorkspaceLauncher"/> </generate-with> @@ -28,15 +48,19 @@ <set-property name="log_WindowLogger" value="DISABLED" />  - <entry-point class='org.jboss.bpm.console.client.Application' /> + <entry-point class='com.mvc4g.client.Mvc4gEntryPoint' /> <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/> +  +  +  + <stylesheet src="gwt/standard/Mosaic.css" /> +  +  + +  <stylesheet src='console.css' /> - <stylesheet src="js/ext/resources/css/ext-all.css" /> - <script src="js/ext/adapter/ext/ext-base.js" /> - <script src="js/ext/ext-all.js" /> - </module> \ No newline at end of file Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/Application.html =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/Application.html 2009-04-22 14:00:15 UTC (rev 4606) @@ -31,40 +31,7 @@    -<body style="font:sans-serif;"> -<p> - <center> - <br/> - <table width=250 style="color:gray;position:relative;"> - <th colspan=3>Demo user accounts</th> - <tr style="font-weight:bold"> - <td>Role</td> - <td>Username</td> - <td>Password</td> - </tr> - <tr> - <td>Manager</td> - <td>mike</td> - <td>password</td> - </tr> - <tr> - <td>User</td> - <td>peter</td> - <td>password</td> - </tr> - <tr> - <td>User</td> - <td>mary</td> - <td>password</td> - </tr> - <tr> - <td>Administrator</td> - <td>alex</td> - <td>password</td> - </tr> - </table> - </center> - </p> +<body>  <iframe src="javascript:''" id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,44 +1,46 @@ .bpm-layout { - border: 1px solid green; - margin: 10px; + border: 1px solid green; + margin: 10px; } .bpm-header { - height: 50px; - width: 100%; - background-color:#ffffff; - background-image: url( images/Jbpm_logo_small.png); - background-repeat:no-repeat; + background-color:#ffffff; + background-image: url( images/Jbpm_logo_small.png); + background-repeat:no-repeat; } .bpm-header-userinfo { - float: right; - position:relative; top: 10px; right:20px; - font-family: sans-serif; + font-family: sans-serif; + width:150px; } +.bpm-editor-info { + font-family: sans-serif; + font-size:18px; +} + .bpm-menu { - height: 50px; - width: 100%; - border: 1px solid; + height: 50px; + width: 100%; + border: 1px solid; } .bpm-workspace { - width: 100%; - height:100%; + width: 100%; + height:100%; } .bpm-label { - font-family: sans-serif; - font-size: small; + font-family: sans-serif; + font-size: small; } .bpm-ListHeaderRow { - font-weight: bold; + font-weight: bold; } .bpm-EvenRow { - background-color: #f0f4f8; + background-color: #f0f4f8; } .bpm-FieldValue { @@ -49,131 +51,137 @@ } +.bpm-loading-image { + background-color:#ffffff; + width:16pt; + height:16pt; +} + .bpm-ProcessImage { - border: 0px; + border: 0px; } .bpm-SplitPanel { - border: 1px dashed green; - vertical-align: top; - position:relative; top:5px; left:5px; + border: 1px dashed green; + vertical-align: top; + position:relative; top:5px; left:5px; } .piechart-types { - font-size: small; - list-style-type:decimal; - font-family: sans-serif; + font-size: small; + list-style-type:decimal; + font-family: sans-serif; } .bpm-help-panel { - background-color:#F0F0F0; - font-family: sans-serif; - font-size: small; + background-color:#F0F0F0; + font-family: sans-serif; + font-size: small; } .bpm-help-icon { - background-image: url( images/icons/14.png) + background-image: url( images/icons/14.png) } .bpm-report-icon { - background-image: url( images/icons/31.png) + background-image: url( images/icons/31.png) } .bpm-process-icon { - background-image: url( images/icons/41.png) + background-image: url( images/icons/41.png) } .bpm-task-icon { - background-image: url( images/icons/29.png) + background-image: url( images/icons/29.png) } .bpm-instance-icon { - background-image: url( images/icons/05_1.png) + background-image: url( images/icons/05_1.png) } .bpm-settings-icon { - + } .bpm-tools-icon { - background-image: url( images/icons/36.png) + background-image: url( images/icons/36.png) } .bpm-switch-context-icon { - background-image: url( images/icons/13.png) + background-image: url( images/icons/13.png) } .bpm-comment-icon { - background-image: url( images/icons/27.png) + background-image: url( images/icons/27.png) } .bpm-enalrge-icon { - background-image: url( images/icons/49.png) + background-image: url( images/icons/49.png) } .login-panel-content { - text-align: center; + text-align: center; } .bpm-examine-icon { - background-image: url( images/icons/examine.png) + background-image: url( images/icons/examine.png) } .bpm-add-icon { - background-image: url( images/icons/add.png) + background-image: url( images/icons/add.png) } .bpm-lock-icon-small { - background-image: url( images/icons/lock_small.png) + background-image: url( images/icons/lock_small.png) } .bpm-remove-icon { - background-image: url( images/icons/remove.png) + background-image: url( images/icons/remove.png) } .bpm-play-icon { - background-image: url( images/icons/play.png) + background-image: url( images/icons/play.png) } .bpm-stop-icon { - background-image: url( images/icons/stop.png) + background-image: url( images/icons/stop.png) } .bpm-pause-icon { - background-image: url( images/icons/pause.png) + background-image: url( images/icons/pause.png) } div.activeNode { - position:absolute; - border-width:1px; - border-style:solid; - border-color:#6699CC; + position:absolute; + border-width:1px; + border-style:solid; + border-color:#6699CC; } div.activeNode-header { - position:absolute; - overflow:hidden; + position:absolute; + overflow:hidden; } div.activeNode-header-link { - cursor:default; - font-family:sans-serif; - font-size:10px; - white-space:nowrap; - color:#ffffff; - padding-left:3px; - padding-right:3px; - border-width:1px; - border-style:solid; - border-color:#6699CC; - background-color:#6699CC; + cursor:default; + font-family:sans-serif; + font-size:10px; + white-space:nowrap; + color:#ffffff; + padding-left:3px; + padding-right:3px; + border-width:1px; + border-style:solid; + border-color:#6699CC; + background-color:#6699CC; } div.activeNode-header-link a { - color:#ffffff; - text-decoration:none; + color:#ffffff; + text-decoration:none; } div.activeNode-header-link a:hover { - text-decoration:underline; + text-decoration:underline; } \ No newline at end of file Copied: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/error.png (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/images/icons/error.png) =================================================================== (Binary files differ) Copied: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/loading-circle.gif (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/images/loading-circle.gif) =================================================================== (Binary files differ) Copied: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/loading.gif (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/images/loading.gif) =================================================================== (Binary files differ) Copied: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/js/ox.ajast.js (from rev 4605, projects/gwt-console/branches/hbraun/war/src/main/resources/org/jboss/bpm/console/public/js/ox.ajast.js) =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/js/ox.ajast.js (rev 0) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/js/ox.ajast.js 2009-04-22 14:00:15 UTC (rev 4606) @@ -0,0 +1,123 @@ +// This file contains a simple Javascript broker that encapsulates +// the AJAST technique, allowing for cross-domain REST +// (REpresentatoinal State Transfer) calls. +// +// Copyright (c) 2008 H�vard Stranden <havard.stranden(a)gmail.com> +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the "Software"), to deal in the Software without +// restriction, including without limitation the rights to use, +// copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following +// conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +// OTHER DEALINGS IN THE SOFTWARE. + +if(typeof(OX) === 'undefined') OX = {}; +OX.AJAST = +{ + Broker : function(url, callbackparameter, optional_decode_json_response, optional_timeout_milliseconds, optional_default_params) + { + this.url = url; + this.cb = callbackparameter; + this.params = []; + this.timeout = optional_timeout_milliseconds || 5000; // Timeout in milliseconds + if(typeof(optional_default_params) !== 'undefined') + { + for(p in optional_default_params) + this.params.push(p + '=' + encodeURIComponent(optional_default_params[p])); + } + + this.jsonmode = optional_decode_json_response || false; + }, + + __callbacks__ : {}, + + __callid__ : 1, + + call: function(url, callbackparameter, callbackfunction, optional_timeout, optional_decode_json_response) + { + var callbackid = 'callback' + OX.AJAST.__callid__; + + // Append callback parameter (this also implicitly avoids caching, since the callback id is different for each call) + url += '&' + encodeURIComponent(callbackparameter) + '=' + encodeURIComponent('OX.AJAST.__callbacks__.' + callbackid); + + // Create script tag for the call + var tag = OX.AJAST.createScriptTag(url); + // Get the head of the document + var head = document.getElementsByTagName('head').item(0); + + + // Create a timeout function + var timedout = function() + { + if(OX.AJAST.__callbacks__[callbackid] !== 'undefined') // If the callback still exists... + { + // Replace original wrapped callback with a dummy that just deletes itself + OX.AJAST.__callbacks__[callbackid] = function(){ delete OX.AJAST.__callbacks__[callbackid]; }; + // Signal that the call timed out + callbackfunction(false); + // Remove the script tag (timed out) + head.removeChild(tag); + } + }; + + // Create timer for the timeout function + var timer = setTimeout(timedout, optional_timeout || 5000); + + var decode_response = optional_decode_json_response || false; + + // Create the callback function + OX.AJAST.__callbacks__[callbackid] = function(data) + { + // Clear the timeout + clearTimeout(timer); + + if(typeof(data) === 'undefined') + callbackfunction(false); // Callback with nothing + else + { + callbackfunction(true, decode_response ? eval(data) : data); + } + // Replace original callback with a dummy function + delete OX.AJAST.__callbacks__[callbackid]; + // Remove the script tag (finished) + head.removeChild(tag); + }; + + // Inject the call + head.appendChild(tag); + }, + + createScriptTag: function(url) + { + var s = document.createElement('script'); + s.setAttribute('type', 'text/javascript'); + s.setAttribute('id', 'oxajastcall' + OX.AJAST.Broker.__callid__++); + s.setAttribute('src', url); + return s; + } +}; + +OX.AJAST.Broker.prototype.call = function(params, callback) +{ + // Create arguments + var args = []; + for(p in params) + args.push(p + '=' + encodeURIComponent(params[p])); + for(p in this.params) + args.push(this.params[p]); + OX.AJAST.call(this.url + '?' + args.join('&'), this.cb, callback, this.timeout, this.jsonmode); +}; \ No newline at end of file Deleted: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/AbstractConsoleTC.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client; - -import com.google.gwt.junit.client.GWTTestCase; -import com.google.gwt.user.client.Timer; -import com.google.gwt.core.client.GWT; - -import java.util.Map; - -/** - * Base class for console tests - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class AbstractConsoleTC extends GWTTestCase -{ - - protected static Application application = null; - protected static final String GWT_TEST_HARNESS = "GWT_Test_Harness"; - protected URLBuilder urlBuilder; - - public String getModuleName() - { - return "org.jboss.bpm.console.Application"; - } - - protected void gwtSetUp() throws Exception - { - super.gwtSetUp(); - - if(null==application) - { - application = new Application(); - application.onModuleLoad2(); - } - - String proxyUrl = GWT.getModuleBaseURL() + "xhp"; - ConsoleConfig config = new ConsoleConfig(proxyUrl, proxyUrl); - urlBuilder = new URLBuilder(config); - } - - protected abstract class ChainedTimer extends Timer - { - protected Map<String,Object> context; - - protected ChainedTimer(Map<String, Object> context) - { - this.context = context; - } - - protected void proceedOrFinish() - { - - ChainedTimer next = getNext(); - if(next !=null) - { - next.schedule(2000); - delayTestFinish(5000); - } - else - { - finishTest(); - } - } - - public abstract ChainedTimer getNext(); - - } -} Deleted: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-04-22 13:23:11 UTC (rev 4605) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestProcessManagement.java 2009-04-22 14:00:15 UTC (rev 4606) @@ -1,278 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.client; - -import com.google.gwt.http.client.Request; -import com.google.gwt.http.client.RequestBuilder; -import com.google.gwt.http.client.RequestCallback; -import com.google.gwt.http.client.Response; -import com.gwtext.client.widgets.ComponentMgr; -import org.jboss.bpm.console.client.model.ProcessDefinitionRef; -import org.jboss.bpm.console.client.process.ProcessDefinitionList; -import org.jboss.bpm.console.client.process.ProcessEditor; -import org.jboss.bpm.console.client.process.ProcessInstanceListView; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class GwtTestProcessManagement extends AbstractConsoleTC -{ - public void testProcessManagement() - { - System.out.println("=== testProcessInstanceEditor ==="); - - final ProcessEditor editor = (ProcessEditor) - ComponentMgr.getComponent(ProcessEditor.ID); - - Map<String, Object> context = new HashMap<String, Object>(); - context.put("editor", editor); - - DeployTestHarnessTimer deployTimer = new DeployTestHarnessTimer(context); - AuthenticationTimer authTimer = new AuthenticationTimer(context,"admin", "admin"); - LoadTestHarnessTimer loadingTimer = new LoadTestHarnessTimer(context); - InstanceEditorTimer instanceTimer = new InstanceEditorTimer(context); - UndeployTimer undeployTimer = new UndeployTimer(context); - - context.put("deployFollow", authTimer); - context.put("authFollow", loadingTimer); - context.put("loadFollow", instanceTimer); - context.put("instanceFollow", undeployTimer); - - // trigger first timer - deployTimer.schedule(1000); - delayTestFinish(2000); - - } - - class DeployTestHarnessTimer extends ChainedTimer - { - - protected DeployTestHarnessTimer(Map<String, Object> context) - { - super(context); - } - - public void run() - { - String url = urlBuilder.getDeployTestHarnessUrl(); - RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); - try - { - rb.sendRequest("", - new RequestCallback() - { - - public void onResponseReceived(Request request, Response response) - { - if(response.getStatusCode()!=200) - throw new RuntimeException("HTTP status " + response.getStatusCode()); - - proceedOrFinish(); - } - - public void onError(Request request, Throwable t) - { - throw new RuntimeException("Connection problem", t); - } - } - ); - } - catch (Throwable e) - { - throw new RuntimeException("Failed to remove process definition", e); - } - } - - public ChainedTimer getNext() - { - return (ChainedTimer)context.get("deployFollow"); - } - } - class LoadTestHarnessTimer extends ChainedTimer - { - - public LoadTestHarnessTimer(Map<String, Object> context) - { - super(context); - } - - public ChainedTimer getNext() - { - return (ChainedTimer)context.get("loadFollow"); - } - - public void run() - { - ProcessEditor editor = (ProcessEditor) context.get("editor"); - editor.resetEditor(); - ProcessDefinitionList list = editor.getProcessDefinitionList(); - proceedOrFinish(); - } - } - - class InstanceEditorTimer extends ChainedTimer - { - public InstanceEditorTimer(Map<String, Object> context) - { - super(context); - } - - - public ChainedTimer getNext() - { - return (ChainedTimer)context.get("instanceFollow"); - } - - public void run() - { - ProcessEditor editor = (ProcessEditor)context.get("editor"); - ProcessDefinitionList list = editor.getProcessDefinitionList(); - - List<ProcessDefinitionRef> processDefinitions = list.getAvailableProcessDefinitions(); - ProcessDefinitionRef testPd = getTestProcessDefinition(processDefinitions); - assertNotNull("No test definition given: " +processDefinitions, testPd); - - list.launchInstanceView(testPd); // will create an instance editor - - // lookup instance editor - String editorId = ProcessInstanceListView.createWidgetID(testPd); - ProcessInstanceListView instanceView = (ProcessInstanceListView) - ComponentMgr.getComponent(editorId); - assertNotNull("Failed to create instance editor for process", instanceView); - - // todo: start new instance - System.out.println("FIXME: Implement instance creation test"); - - List<ProcessDefinitionRef> defs = list.getAvailableProcessDefinitions(); - assertFalse(defs.isEmpty()); - - proceedOrFinish(); - } - } - - private ProcessDefinitionRef getTestProcessDefinition(List<ProcessDefinitionRef> list) - { - ProcessDefinitionRef def =null; - for(ProcessDefinitionRef pd : list) - { - if(pd.getName().equals(GWT_TEST_HARNESS)) - { - def=pd; - break; - } - } - return def; - } - - class UndeployTimer extends ChainedTimer - { - public UndeployTimer(Map<String, Object> context) - { - super(context); - } - - public ChainedTimer getNext() - { - return (ChainedTimer)context.get("undeployFollow"); - } - - public void run() - { - String deleteUrl = urlBuilder.getUndeployTestHarnessUrl(); - RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, deleteUrl); - try - { - - rb.sendRequest("", - new RequestCallback() - { - - public void onResponseReceived(Request request, Response response) - { - if(response.getStatusCode()!=200) - throw new RuntimeException("HTTP status " + response.getStatusCode()); - } - - public void onError(Request request, Throwable t) - { - throw new RuntimeException("Connection problem", t); - } - } - ); - } - catch (Throwable e) - { - throw new RuntimeException("Failed to remove process definition", e); - } - - proceedOrFinish(); - } - } - - class AuthenticationTimer extends ChainedTimer - { - String user; - String pass; - - public AuthenticationTimer(Map<String,Object> context, String user, String pass) - { - super(context); - - this.user = user; - this.pass = pass; - } - - - public ChainedTimer getNext() - { - return (ChainedTimer)context.get("authFollow"); - } - - public void run() - { - - String inRoleURL = urlBuilder.getUserInRoleURL(Application.KNOWN_ROLES); - final Authentication auth = new Authentication(inRoleURL); - auth.setCallback( - new Authentication.AuthCallback() { - - public void onLoginSuccess(Request request, Response response) { - System.out.println("Assigned roles: " + auth.getRolesAssigned() ); - - // only proceed when authentication was successfull - proceedOrFinish(); - } - - public void onLoginFailed(Request request, Throwable t) { - - throw new RuntimeException("Login failed", t); - } - } - ); - auth.doLogin(user,pass); - } - } -}

15 years, 1 month

1
0
0 / 0

JBoss JBPM SVN: r4605 - projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-04-22 09:23:11 -0400 (Wed, 22 Apr 2009) New Revision: 4605 Modified: projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java Log: Fix the plugin-example Modified: projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java =================================================================== --- projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java 2009-04-22 13:05:43 UTC (rev 4604) +++ projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsEditor.java 2009-04-22 13:23:11 UTC (rev 4605) @@ -21,13 +21,13 @@ */ package org.jboss.bpm.console.client.mapsplugin; +import com.google.gwt.user.client.ui.Frame; +import com.google.gwt.user.client.ui.ScrollPanel; +import com.google.gwt.user.client.DOM; +import org.jboss.bpm.console.client.ApplicationContext; import org.jboss.bpm.console.client.Editor; import org.jboss.bpm.console.client.MenuSection; -import org.jboss.bpm.console.client.ApplicationContext; -import org.jboss.bpm.console.client.View; -import com.google.gwt.user.client.ui.Frame; -import com.mvc4g.client.ViewInterface; -import com.mvc4g.client.Controller; +import org.gwt.mosaic.ui.client.ScrollLayoutPanel; /** * An example editor that embeds google maps into the console @@ -35,25 +35,30 @@ */ public class MapsEditor extends Editor { - public final static String ID = "org.jboss.bpm.console.plugin.MapsEditor"; + public final static String ID = MapsEditor.class.getName(); public MapsEditor(ApplicationContext appContext) { super(appContext); - - // keep it simple, just use an iframe - Frame frame = new Frame(); - frame.setWidth("660"); - frame.setHeight("448"); - frame.setUrl("http://maps.google.com"); - - // TODO: reimplement } public void initialize() { - isInitialized = true; + if(!isInitialized) + { + // keep it simple, just use an iframe + Frame frame = new Frame(); + frame.setWidth("660"); + frame.setHeight("448"); + frame.setUrl("http://maps.google.com"); + + //DOM.setStyleAttribute(frame.getElement(), "border", "none"); + + this.add(frame); + + isInitialized = true; + } } public String getEditorId() Modified: projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java =================================================================== --- projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-22 13:05:43 UTC (rev 4604) +++ projects/gwt-console/branches/hbraun/plugin-example/src/main/java/org/jboss/bpm/console/client/mapsplugin/MapsNavigationTree.java 2009-04-22 13:23:11 UTC (rev 4605) @@ -23,7 +23,9 @@ import com.google.gwt.user.client.ui.Tree; import com.google.gwt.user.client.ui.TreeItem; +import com.google.gwt.user.client.ui.TreeListener; import org.jboss.bpm.console.client.ApplicationContext; +import org.jboss.bpm.console.client.Workspace; class MapsNavigationTree extends Tree { @@ -42,25 +44,24 @@ TreeItem navEntry = new TreeItem("Open maps"); root.addItem(navEntry); - /* - - new TreeNodeListenerAdapter() + addTreeListener( + new TreeListener() { - public void onClick(Node node, EventObject eventObject) + public void onTreeItemSelected(TreeItem treeItem) { - if (appContext.getWorkpace().hasEditor(MapsEditor.ID)) + if("Open maps".equals(treeItem.getText())) { - appContext.getWorkpace().showEditor(MapsEditor.ID); + Workspace workspace = appContext.getWorkpace(); + workspace.showEditor(MapsEditor.ID); } - else - { - appContext.getWorkpace().addEditor(new MapsEditor(appContext), false); - } + } + public void onTreeItemStateChanged(TreeItem treeItem) + { + } } - ). - */ + ); addItem(root); }

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits April 2009