December 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3314 - in jbpm4/trunk: modules and 32 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-12-10 07:36:46 -0500 (Wed, 10 Dec 2008) New Revision: 3314 Added: jbpm4/trunk/modules/examples/ jbpm4/trunk/modules/examples/.classpath jbpm4/trunk/modules/examples/.project jbpm4/trunk/modules/examples/pom.xml jbpm4/trunk/modules/examples/src/ jbpm4/trunk/modules/examples/src/eclipse/ jbpm4/trunk/modules/examples/src/eclipse/.classpath jbpm4/trunk/modules/examples/src/eclipse/.project jbpm4/trunk/modules/examples/src/test/ jbpm4/trunk/modules/examples/src/test/java/ jbpm4/trunk/modules/examples/src/test/java/org/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/StatesTest.java jbpm4/trunk/modules/examples/src/test/resources/ jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/examples/src/test/resources/logging.properties jbpm4/trunk/modules/examples/src/test/resources/org/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/states.jpdl.xml jbpm4/trunk/modules/examples/target/ jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT-sources.jar jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT.jar jbpm4/trunk/modules/examples/target/maven-archiver/ jbpm4/trunk/modules/examples/target/maven-archiver/pom.properties jbpm4/trunk/modules/examples/target/test-classes/ jbpm4/trunk/modules/examples/target/test-classes/hibernate.properties jbpm4/trunk/modules/examples/target/test-classes/jbpm.cfg.xml jbpm4/trunk/modules/examples/target/test-classes/logging.properties jbpm4/trunk/modules/examples/target/test-classes/org/ jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/ jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/ jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/ jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/StatesTest.class jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/states.jpdl.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionCondition.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionConditionDescriptor.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionDescriptor.java jbpm4/trunk/modules/test-db/src/test/resources/log4j.xml Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/distro/assembly-distro-package.xml jbpm4/trunk/modules/distro/pom.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ExclusiveBinding.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ExclusiveTest.java jbpm4/trunk/modules/userguide/.settings/attachedFile.properties jbpm4/trunk/pom.xml Log: introduced exclusive conditions and examples module Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/build.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -19,6 +19,7 @@ <property name="linux.browser" value="mozilla" /> <property name="distro.installation.dir" value="c:/software" /> <property name="distro.version" value="4.0.0-SNAPSHOT" /> + <property name="distro.eclipse" value="c:/downloads/eclipse/eclipse-SDK-3.4.1-win32.zip" /> <target name="clean"> <exec executable="cmd"> @@ -59,12 +60,16 @@ </antcall> </target> - <target name="distro.install" depends="distro.package"> + <target name="distro.install" > <delete dir="${distro.installation.dir}/jbpm-${distro.version}" /> <unzip dest="${distro.installation.dir}" src="modules/distro/target/jbpm-${distro.version}.zip"/> + <unzip dest="${distro.installation.dir}/jbpm-${distro.version}" src="${distro.eclipse}"/> <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> - <arg value="/C start "${windows.browser}" "file://${distro.installation.dir}/jbpm-${distro.version}"" /> + <arg line="/C start "${distro.installation.dir}/jbpm-${distro.version}/eclipse/eclipse.exe" "-data" "${distro.installation.dir}/jbpm-${distro.version}/workspace"" /> </exec> + <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98"> + <arg line="/C start "${windows.browser}" "file://${distro.installation.dir}/jbpm-${distro.version}"" /> + </exec> </target> <target name="schemadocs"> Modified: jbpm4/trunk/modules/distro/assembly-distro-package.xml =================================================================== --- jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/distro/assembly-distro-package.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -22,6 +22,15 @@ <exclude>jbpm-*</exclude> </excludes> </dependencySet> +  </dependencySets> <fileSets> @@ -106,13 +115,16 @@ <outputDirectory>src</outputDirectory> </fileSet> <fileSet> - <directory>../test-db/src/test/resources</directory> - <includes> - <include>jbpm.cfg.xml</include> - <include>logging.properties</include> - <include>hibernate.properties</include> - </includes> - <outputDirectory>config</outputDirectory> + <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> \ No newline at end of file Modified: jbpm4/trunk/modules/distro/pom.xml =================================================================== --- jbpm4/trunk/modules/distro/pom.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/distro/pom.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -71,6 +71,14 @@ <artifactId>jbpm-test-db</artifactId> <version>${version}</version> </dependency> +  </dependencies>  Added: jbpm4/trunk/modules/examples/.classpath =================================================================== --- jbpm4/trunk/modules/examples/.classpath (rev 0) +++ jbpm4/trunk/modules/examples/.classpath 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/test-classes"/> +</classpath> Added: jbpm4/trunk/modules/examples/.project =================================================================== --- jbpm4/trunk/modules/examples/.project (rev 0) +++ jbpm4/trunk/modules/examples/.project 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>examples</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Added: jbpm4/trunk/modules/examples/pom.xml =================================================================== --- jbpm4/trunk/modules/examples/pom.xml (rev 0) +++ jbpm4/trunk/modules/examples/pom.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + +<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 - Examples</name> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-examples</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm</artifactId> + <version>4.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <dependencies> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-api</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-test-base</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> + + </dependencies> + +  + <build> + <plugins> + </plugins> + </build> + +</project> \ No newline at end of file Property changes on: jbpm4/trunk/modules/examples/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/examples/src/eclipse/.classpath =================================================================== --- jbpm4/trunk/modules/examples/src/eclipse/.classpath (rev 0) +++ jbpm4/trunk/modules/examples/src/eclipse/.classpath 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="JBPM_HOME/lib/antlr-2.7.6.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/asm-1.5.3.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/asm-attrs-1.5.3.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/cglib-2.1_3.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/commons-collections-2.1.1.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/commons-logging-1.0.4.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/dom4j-1.6.1.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/ehcache-1.2.3.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/hibernate-3.2.6.ga.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/hsqldb-1.8.0.7.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/jboss-j2ee-4.2.1.GA.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/jta-1.0.1B.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/juel-2.1.0.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/juel-engine-2.1.0.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/juel-impl-2.1.0.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/junit-3.8.1.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/livetribe-jsr223-2.0.3.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/log4j-1.2.14.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/servlet-api-2.5.jar"/> + <classpathentry kind="var" path="JBPM_HOME/lib/spring-2.5.4.jar"/> + <classpathentry kind="var" path="JBPM_HOME/jbpm.jar"/> + <classpathentry kind="output" path="bin"/> +</classpath> Added: jbpm4/trunk/modules/examples/src/eclipse/.project =================================================================== --- jbpm4/trunk/modules/examples/src/eclipse/.project (rev 0) +++ jbpm4/trunk/modules/examples/src/eclipse/.project 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>examples</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/StatesTest.java =================================================================== --- jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/StatesTest.java (rev 0) +++ jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/StatesTest.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,47 @@ +/* + * 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.examples.states; + +import org.jbpm.Execution; +import org.jbpm.test.DbTestCase; + + +/** + * @author Tom Baeyens + */ +public class StatesTest extends DbTestCase { + + public void testWaitStatesSequence() { + deployJpdlResource("org/jbpm/examples/states/states.jpdl.xml"); + + Execution execution = executionService.startExecutionByKey("states"); + assertEquals("a", execution.getNodeName()); + + String executionId = execution.getId(); + execution = executionService.signalExecutionById(executionId); + assertEquals("b", execution.getNodeName()); + + execution = executionService.signalExecutionById(executionId); + assertEquals("c", execution.getNodeName()); + } + +} Property changes on: jbpm4/trunk/modules/examples/src/test/java/org/jbpm/examples/states/StatesTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/hibernate.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,11 @@ +hibernate.dialect org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.url jdbc:hsqldb:mem:. +hibernate.connection.username sa +hibernate.connection.password +hibernate.hbm2ddl.auto create-drop +hibernate.cache.use_second_level_cache true +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider +# hibernate.show_sql true +# hibernate.format_sql true +# hibernate.use_sql_comments true Added: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <properties resource="hibernate.properties" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> + </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="com.sun.script.juel.JuelScriptEngineFactory" /> + </script-manager> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <variable-types resource="jbpm.pvm.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> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <message-session /> + <timer-session /> + </environment> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/examples/src/test/resources/jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/examples/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/logging.properties (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/logging.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,28 @@ +handlers= java.util.logging.ConsoleHandler +# to add the error triggered file handler +# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler + +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter + +# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 +# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF +# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log + +# For example, set the com.xyz.foo logger to only log SEVERE messages: +# com.xyz.foo.level = SEVERE + +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 + +org.hibernate.level=INFO +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST Added: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/states.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/states.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/states.jpdl.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="states" xmlns="http://jbpm.org/4/jpdl"> + + <start> + <flow to="a" /> + </start> + + <state name="a"> + <flow to="b" /> + </state> + + <state name="b"> + <flow to="c" /> + </state> + + <state name="c" /> + +</process> Property changes on: jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/states/states.jpdl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT-sources.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/examples/target/jbpm-examples-4.0.0-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/examples/target/maven-archiver/pom.properties =================================================================== --- jbpm4/trunk/modules/examples/target/maven-archiver/pom.properties (rev 0) +++ jbpm4/trunk/modules/examples/target/maven-archiver/pom.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Dec 10 13:19:07 CET 2008 +version=4.0.0-SNAPSHOT +groupId=org.jbpm.jbpm4 +artifactId=jbpm-examples Added: jbpm4/trunk/modules/examples/target/test-classes/hibernate.properties =================================================================== --- jbpm4/trunk/modules/examples/target/test-classes/hibernate.properties (rev 0) +++ jbpm4/trunk/modules/examples/target/test-classes/hibernate.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,11 @@ +hibernate.dialect org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.url jdbc:hsqldb:mem:. +hibernate.connection.username sa +hibernate.connection.password +hibernate.hbm2ddl.auto create-drop +hibernate.cache.use_second_level_cache true +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider +# hibernate.show_sql true +# hibernate.format_sql true +# hibernate.use_sql_comments true Added: jbpm4/trunk/modules/examples/target/test-classes/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/examples/target/test-classes/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/examples/target/test-classes/jbpm.cfg.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> + + <process-engine> + + <deployer-manager> + <assign-file-type> + <file extension=".jpdl.xml" type="jpdl" /> + </assign-file-type> + <parse-jpdl /> + <check-process /> + <check-problems /> + <save /> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <properties resource="hibernate.properties" /> + <mapping resource="jbpm.pvm.typedefs.hbm.xml" /> + <mapping resource="jbpm.pvm.wire.hbm.xml" /> + <mapping resource="jbpm.pvm.definition.hbm.xml" /> + <mapping resource="jbpm.pvm.execution.hbm.xml" /> + <mapping resource="jbpm.pvm.variable.hbm.xml" /> + <mapping resource="jbpm.pvm.job.hbm.xml" /> + <mapping resource="jbpm.jpdl.hbm.xml" /> + <cache-configuration resource="jbpm.pvm.cache.xml" + usage="nonstrict-read-write" /> + </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="com.sun.script.juel.JuelScriptEngineFactory" /> + </script-manager> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <variable-types resource="jbpm.pvm.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> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <message-session /> + <timer-session /> + </environment> + +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/examples/target/test-classes/jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/examples/target/test-classes/logging.properties =================================================================== --- jbpm4/trunk/modules/examples/target/test-classes/logging.properties (rev 0) +++ jbpm4/trunk/modules/examples/target/test-classes/logging.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,28 @@ +handlers= java.util.logging.ConsoleHandler +# to add the error triggered file handler +# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler + +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter + +# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 +# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF +# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log + +# For example, set the com.xyz.foo logger to only log SEVERE messages: +# com.xyz.foo.level = SEVERE + +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 + +org.hibernate.level=INFO +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST Added: jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/StatesTest.class =================================================================== (Binary files differ) Property changes on: jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/StatesTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/states.jpdl.xml =================================================================== --- jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/states.jpdl.xml (rev 0) +++ jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/states.jpdl.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<process name="states" xmlns="http://jbpm.org/4/jpdl"> + + <start> + <flow to="a" /> + </start> + + <state name="a"> + <flow to="b" /> + </state> + + <state name="b"> + <flow to="c" /> + </state> + + <state name="c" /> + +</process> Property changes on: jbpm4/trunk/modules/examples/target/test-classes/org/jbpm/examples/states/states.jpdl.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/activity/ExclusiveConditionActivity.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -25,7 +25,6 @@ import org.jbpm.activity.ActivityExecution; import org.jbpm.jpdl.JpdlException; -import org.jbpm.jpdl.JpdlExecution; import org.jbpm.model.Condition; import org.jbpm.model.Node; import org.jbpm.model.Transition; Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ExclusiveBinding.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ExclusiveBinding.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/ExclusiveBinding.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -23,13 +23,15 @@ import java.util.List; +import org.jbpm.jpdl.activity.ExclusiveConditionActivity; import org.jbpm.jpdl.activity.ExclusiveExpressionActivity; import org.jbpm.jpdl.activity.ExclusiveHandlerActivity; +import org.jbpm.pvm.internal.model.ExpressionCondition; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.TransitionImpl; import org.jbpm.pvm.internal.util.XmlUtil; import org.jbpm.pvm.internal.wire.binding.ObjectBinding; -import org.jbpm.pvm.internal.wire.descriptor.ExpressionDescriptor; +import org.jbpm.pvm.internal.wire.descriptor.ExpressionConditionDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor; import org.jbpm.pvm.internal.wire.descriptor.ReferenceDescriptor; import org.jbpm.pvm.internal.xml.Parse; @@ -84,28 +86,30 @@ Element conditionElement = XmlUtil.element(transitionElement, "condition"); if (conditionElement!=null) { hasConditions = true; - } - - if (conditionElement.hasAttribute("expr")) { - String expr = conditionElement.getAttribute("expr"); - ExpressionDescriptor expressionDescriptor = new ExpressionDescriptor(expr); - transition.setConditionDescriptor(expressionDescriptor); - } else if (conditionElement.hasAttribute("ref")) { - String expr = conditionElement.getAttribute("ref"); - ReferenceDescriptor refDescriptor = new ReferenceDescriptor(expr); - transition.setConditionDescriptor(refDescriptor); - - } else if (ObjectBinding.isObjectDescriptor(conditionElement)) { - ObjectDescriptor conditionDescriptor = (ObjectDescriptor) objectBinding.parse(conditionElement, parse, parser); - transition.setConditionDescriptor(conditionDescriptor); - - } else { - parse.addProblem("decision must have one of {expr attribute, handler-ref attribute, handler element or transition conditions}: "+XmlUtil.toString(element)); + if (conditionElement.hasAttribute("expr")) { + String expr = conditionElement.getAttribute("expr"); + String lang = XmlUtil.attribute(conditionElement, "expr-lang"); + ExpressionConditionDescriptor expressionConditionDescriptor = new ExpressionConditionDescriptor(expr, lang); + transition.setConditionDescriptor(expressionConditionDescriptor); + + } else if (conditionElement.hasAttribute("ref")) { + String expr = conditionElement.getAttribute("ref"); + ReferenceDescriptor refDescriptor = new ReferenceDescriptor(expr); + transition.setConditionDescriptor(refDescriptor); + + } else if (ObjectBinding.isObjectDescriptor(conditionElement)) { + ObjectDescriptor conditionDescriptor = (ObjectDescriptor) objectBinding.parse(conditionElement, parse, parser); + transition.setConditionDescriptor(conditionDescriptor); + } } } - parse.addProblem("decision '"+element.getAttribute("name")+"' must have one of: expr attribute, handler attribute, handler element or condition expressions"); + if (hasConditions) { + return new ExclusiveConditionActivity(); + } else { + parse.addProblem("exclusive '"+element.getAttribute("name")+"' must have one of: expr attribute, handler attribute, handler element or condition expressions"); + } return null; } Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionCondition.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionCondition.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionCondition.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,47 @@ +/* + * 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.model; + +import org.jbpm.model.Condition; +import org.jbpm.model.OpenExecution; +import org.jbpm.pvm.internal.script.ScriptManager; + +/** + * @author Tom Baeyens + */ +public class ExpressionCondition implements Condition { + + private static final long serialVersionUID = 1L; + + protected String expr; + protected String lang; + + public ExpressionCondition(String expr, String lang) { + this.expr = expr; + this.lang = lang; + } + + public boolean evaluate(OpenExecution execution) { + ScriptManager scriptManager = ScriptManager.getScriptManager(); + return (Boolean) scriptManager.evaluateExpression(expr, execution, lang); + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExpressionCondition.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -30,6 +30,7 @@ import org.jbpm.Execution; import org.jbpm.JbpmException; import org.jbpm.env.Environment; +import org.jbpm.log.Log; import org.jbpm.pvm.internal.env.ExecutionContext; import org.jbpm.pvm.internal.env.ExecutionEnvironment; import org.jbpm.pvm.internal.wire.WireContext; @@ -40,7 +41,8 @@ * @author Tom Baeyens */ public class ScriptManager { - + + private static Log log = Log.getLog(ScriptManager.class.getName()); private static final ScriptManager defaultScriptManager = createDefault(); protected String defaultExpressionLanguage; @@ -109,6 +111,8 @@ throw new JbpmException("no scripting engine configured for language "+language); } + if (log.isDebugEnabled()) log.debug("evaluating "+language+" script :"+script); + if (execution==null) { return evaluate(scriptEngine, script); } @@ -137,7 +141,9 @@ scriptEngine.setBindings(bindings, ScriptContext.ENGINE_SCOPE); try { - return scriptEngine.eval(script); + Object result = scriptEngine.eval(script); + log.debug("script evaluated to "+result); + return result; } catch (ScriptException e) { throw new JbpmException("script evaluation error: "+e.getMessage(), e); } Copied: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionConditionDescriptor.java (from rev 3305, jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionDescriptor.java) =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionConditionDescriptor.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionConditionDescriptor.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -0,0 +1,50 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.wire.descriptor; + +import org.jbpm.pvm.internal.model.ExpressionCondition; +import org.jbpm.pvm.internal.wire.WireContext; + + +/** + * @author Tom Baeyens + */ +public class ExpressionConditionDescriptor extends AbstractDescriptor { + + private static final long serialVersionUID = 1L; + + String expr; + String lang; + + public ExpressionConditionDescriptor() { + } + + public ExpressionConditionDescriptor(String expr, String lang) { + this.expr = expr; + this.lang = lang; + } + + public Object construct(WireContext wireContext) { + return new ExpressionCondition(expr, lang); + } + +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionConditionDescriptor.java ___________________________________________________________________ Name: svn:mergeinfo + Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionDescriptor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionDescriptor.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ExpressionDescriptor.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -1,55 +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.descriptor; - -import org.jbpm.pvm.internal.script.ScriptManager; -import org.jbpm.pvm.internal.wire.WireContext; - - -/** - * @author Tom Baeyens - */ -public class ExpressionDescriptor extends AbstractDescriptor { - - private static final long serialVersionUID = 1L; - - String expression; - String language; - - public ExpressionDescriptor() { - } - - public ExpressionDescriptor(String expression) { - this.expression = expression; - } - - public ExpressionDescriptor(String expression, String language) { - this.expression = expression; - this.language = language; - } - - public Object construct(WireContext wireContext) { - ScriptManager scriptManager = ScriptManager.getScriptManager(); - return scriptManager.evaluate(expression, null, language); - } - -} Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.pvm.wire.hbm.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -124,9 +124,9 @@ </list> </subclass> - <subclass name="ExpressionDescriptor" discriminator-value="expr"> - <property name="expression" column="TEXT_" /> - <property name="language" column="METHOD_" /> + <subclass name="ExpressionConditionDescriptor" discriminator-value="expr"> + <property name="expr" column="TEXT_" /> + <property name="lang" column="METHOD_" /> </subclass> <subclass name="ProvidedObjectDescriptor" discriminator-value="provided"> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -99,6 +99,20 @@ .deploy() .getProcessDefinitions(); + return addDeployedProcessDefinition(deployedProcessDefinitions); + } + + public ProcessDefinition deployJpdlResource(String resource) { + List<ProcessDefinition> deployedProcessDefinitions = + processService.createDeployment() + .addResource(resource) + .deploy() + .getProcessDefinitions(); + + return addDeployedProcessDefinition(deployedProcessDefinitions); + } + + protected ProcessDefinition addDeployedProcessDefinition(List<ProcessDefinition> deployedProcessDefinitions) { if (processDefinitions==null) { processDefinitions = new ArrayList<ProcessDefinition>(); } Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ExclusiveTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ExclusiveTest.java 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/activities/ExclusiveTest.java 2008-12-10 12:36:46 UTC (rev 3314) @@ -21,7 +21,6 @@ */ package org.jbpm.test.activities; -import java.text.NumberFormat; import java.util.HashMap; import java.util.Map; @@ -96,4 +95,40 @@ execution = executionService.startExecutionByKey("Poolcar", variables); assertEquals("Small car", execution.getNodeName()); } + + public void testExclusiveWithConditions() { + deployJpdlXmlString( + "<process name='Poolcar'>" + + " <start>" + + " <flow to='How far?' />" + + " </start>" + + " <exclusive name='How far?'>" + + " <flow to='Big car'>" + + " <condition expr='#{distance > 10}' />" + + " </flow>" + + " <flow to='Small car'>" + + " <condition expr='#{distance >= 3}' />" + + " </flow>" + + " <flow to='No car' />" + + " </exclusive>" + + " <state name='Big car' />" + + " <state name='Small car' />" + + " <state name='No car' />" + + "</process>" + ); + + Map<String, Object> variables = new HashMap<String, Object>(); + variables.put("distance", new Integer(69)); + Execution execution = executionService.startExecutionByKey("Poolcar", variables); + assertEquals("Big car", execution.getNodeName()); + + variables.put("distance", new Integer(6)); + execution = executionService.startExecutionByKey("Poolcar", variables); + assertEquals("Small car", execution.getNodeName()); + + variables.put("distance", new Integer(2)); + execution = executionService.startExecutionByKey("Poolcar", variables); + assertEquals("No car", execution.getNodeName()); + } + } Deleted: jbpm4/trunk/modules/test-db/src/test/resources/log4j.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/log4j.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/test-db/src/test/resources/log4j.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - <param name="Threshold" value="TRACE" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> - </layout> - </appender> - -  -  -  - - <category name="org.jbpm"> - <priority value="TRACE" /> - </category> - - <category name="org.hibernate"> - <priority value="TRACE" /> - </category> - - <root> - <appender-ref ref="CONSOLE"/> -  - </root> - -</log4j:configuration> Modified: jbpm4/trunk/modules/userguide/.settings/attachedFile.properties =================================================================== --- jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/modules/userguide/.settings/attachedFile.properties 2008-12-10 12:36:46 UTC (rev 3314) @@ -1,2 +1,2 @@ ## index of importer -> set(imports) -#Tue Dec 09 13:47:09 CET 2008 +#Wed Dec 10 09:07:34 CET 2008 Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2008-12-10 11:31:39 UTC (rev 3313) +++ jbpm4/trunk/pom.xml 2008-12-10 12:36:46 UTC (rev 3314) @@ -277,8 +277,9 @@ <modules> <module>modules/db</module> <module>modules/devguide</module> + <module>modules/distro</module> + <module>modules/examples</module> <module>modules/userguide</module> - <module>modules/distro</module> </modules> <build> <plugins>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3313 - projects/spec/trunk.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 06:31:39 -0500 (Wed, 10 Dec 2008) New Revision: 3313 Modified: projects/spec/trunk/pom.xml Log: Update pom Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-12-10 11:14:30 UTC (rev 3312) +++ projects/spec/trunk/pom.xml 2008-12-10 11:31:39 UTC (rev 3313) @@ -108,9 +108,9 @@ </dependencies> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/jbpm4</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/jbpm4</developerConnection> - <url>http://fisheye.jboss.com/browse/JbpmSvn/jbpm4</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbpm/projects/spec</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbpm/projects/spec</developerConnection> + <url>http://fisheye.jboss.com/browse/JbpmSvn/projects/spec</url> </scm>  @@ -138,6 +138,11 @@ <privateKey>/home/yourname/.ssh/id_rsa</privateKey> <passphrase>yourpass</passphrase> </server> + <server> + <id>snapshots.jboss.org</id> + <username>yourname</username> + <password>yourpass</password> + </server> </servers> --> <site>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3312 - in jbpm3/trunk/modules/integration: scripts and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 06:14:30 -0500 (Wed, 10 Dec 2008) New Revision: 3312 Added: jbpm3/trunk/modules/integration/deploy.sh jbpm3/trunk/modules/integration/scripts/ jbpm3/trunk/modules/integration/src/ Removed: jbpm3/trunk/modules/integration/spec/ Modified: jbpm3/trunk/modules/integration/pom.xml Log: Move jboss integration to spec project Copied: jbpm3/trunk/modules/integration/deploy.sh (from rev 3304, jbpm3/trunk/modules/integration/spec/deploy.sh) =================================================================== --- jbpm3/trunk/modules/integration/deploy.sh (rev 0) +++ jbpm3/trunk/modules/integration/deploy.sh 2008-12-10 11:14:30 UTC (rev 3312) @@ -0,0 +1,6 @@ +#! /bin/bash + +mvn -o install + +rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/bpm-spec-integration-jbpm3*.jar +cp target/bpm-spec-integration-jbpm3-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans Property changes on: jbpm3/trunk/modules/integration/deploy.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/integration/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/pom.xml 2008-12-10 10:53:09 UTC (rev 3311) +++ jbpm3/trunk/modules/integration/pom.xml 2008-12-10 11:14:30 UTC (rev 3312) @@ -17,8 +17,8 @@ <name>JBoss jBPM3 - Integration</name> <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration</artifactId> - <packaging>pom</packaging> + <artifactId>bpm-spec-integration-jbpm3</artifactId> + <packaging>jar</packaging>  <parent> @@ -28,11 +28,178 @@ <relativePath>../../pom.xml</relativePath> </parent> -  - <modules> - <module>spec</module> - <module>jboss42</module> - <module>jboss50</module> - </modules> +  + <properties> + <mvel.version>1.3.7-java1.5</mvel.version> + </properties> +  + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-api</artifactId> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-identity</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-identity</artifactId> + <classifier>config</classifier> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.mvel</groupId> + <artifactId>mvel</artifactId> + <version>${mvel.version}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-dialect-api10</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <scope>test</scope> + <type>zip</type> + </dependency> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/cts/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/cts</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>build-test-jars</id> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}" /> + <property name="tests.resources.dir" value="${basedir}/src/test/resources" /> + <ant antfile="scripts/antrun-test-jars.xml" target="build-test-jars" /> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-config</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <finalName>${project.build.finalName}</finalName> + <appendAssemblyId>true</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-config.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <configuration> + <filesets> + <fileset> + <directory>src/cts</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-cts</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/cts</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <excludes> + <exclude>jbpm-cfg-beans.xml</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jboss/bpm/test/incubator/**/*Test.java</exclude> + <exclude>org/jboss/bpm/test/pattern/**/*Test.java</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </build> + </project> Copied: jbpm3/trunk/modules/integration/scripts (from rev 3304, jbpm3/trunk/modules/integration/spec/scripts) Property changes on: jbpm3/trunk/modules/integration/scripts ___________________________________________________________________ Name: svn:mergeinfo + Copied: jbpm3/trunk/modules/integration/src (from rev 3304, jbpm3/trunk/modules/integration/spec/src) Property changes on: jbpm3/trunk/modules/integration/src ___________________________________________________________________ Name: svn:ignore + cts Name: svn:mergeinfo +

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3311 - in projects/gwt-console/trunk: rpc/src/main/java/org/jboss/bpm/console/client/model and 11 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-12-10 05:53:09 -0500 (Wed, 10 Dec 2008) New Revision: 3311 Added: projects/gwt-console/trunk/server/src/test/ projects/gwt-console/trunk/server/src/test/java/ projects/gwt-console/trunk/server/src/test/java/org/ projects/gwt-console/trunk/server/src/test/java/org/jboss/ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/AuthorizationTest.java projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java Modified: projects/gwt-console/trunk/gwt-parent.iml projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/RoleAssignmentRef.java projects/gwt-console/trunk/server/gwt-server.iml projects/gwt-console/trunk/server/pom.xml projects/gwt-console/trunk/war/gwt-war.iml projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java Log: Start work on server module test suite Modified: projects/gwt-console/trunk/gwt-parent.iml =================================================================== --- projects/gwt-console/trunk/gwt-parent.iml 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/gwt-parent.iml 2008-12-10 10:53:09 UTC (rev 3311) @@ -7,6 +7,7 @@ <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/war/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/war/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/war/src/test/java" isTestSource="true" /> @@ -14,9 +15,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="jbpm3-toplevel" /> - <orderEntry type="module" module-name="gwt-rpc" /> - <orderEntry type="module" module-name="jbpm3-identity" /> + <orderEntry type="module" module-name="jbpm3-toplevel" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -198,15 +197,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided"> - <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.resteasy:jaxrs-api:jar:1.0-beta-8:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0-beta-8/jaxrs-api-1.0-beta-8.jar!/" /> @@ -656,6 +646,51 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </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 /> + </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> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/RoleAssignmentRef.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/RoleAssignmentRef.java 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/RoleAssignmentRef.java 2008-12-10 10:53:09 UTC (rev 3311) @@ -31,17 +31,17 @@ public class RoleAssignmentRef { private String role; - private boolean isAssigned; + private boolean assigned; public RoleAssignmentRef() { } - public RoleAssignmentRef(String role, boolean assigned) + public RoleAssignmentRef(String role, boolean isAssigned) { this.role = role; - isAssigned = assigned; + this.assigned = isAssigned; } @XmlElement(name = "role") @@ -55,14 +55,15 @@ this.role = role; } - @XmlElement(name = "isAssigned") + @XmlElement(name = "assigned") public boolean isAssigned() { - return isAssigned; + return assigned; } public void setAssigned(boolean assigned) { - isAssigned = assigned; + this.assigned = assigned; } + } Modified: projects/gwt-console/trunk/server/gwt-server.iml =================================================================== --- projects/gwt-console/trunk/server/gwt-server.iml 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/server/gwt-server.iml 2008-12-10 10:53:09 UTC (rev 3311) @@ -6,12 +6,12 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="jbpm3-toplevel" exported="" /> - <orderEntry type="module" module-name="jbpm3-identity" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="jbpm3-toplevel" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> <CLASSES> @@ -193,15 +193,6 @@ </library> </orderEntry> <orderEntry type="module-library" exported=""> - <library name="M2 Dep: commons-collections:commons-collections:jar:2.1.1:provided"> - <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.resteasy:jaxrs-api:jar:1.0-beta-8:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0-beta-8/jaxrs-api-1.0-beta-8.jar!/" /> @@ -624,6 +615,51 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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 /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <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"> + <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> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/trunk/server/pom.xml =================================================================== --- projects/gwt-console/trunk/server/pom.xml 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/server/pom.xml 2008-12-10 10:53:09 UTC (rev 3311) @@ -21,6 +21,7 @@ <properties> <jboss.bpm.spec.version>1.0.0-SNAPSHOT</jboss.bpm.spec.version> <balalaika.version>1.0.0-SNAPSHOT</balalaika.version> + <json-lib.version>2.2.3</json-lib.version> </properties> <dependencies> @@ -86,6 +87,12 @@ <artifactId>gson</artifactId> </dependency> <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>${json-lib.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </dependency> Added: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/AuthorizationTest.java =================================================================== --- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/AuthorizationTest.java (rev 0) +++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/AuthorizationTest.java 2008-12-10 10:53:09 UTC (rev 3311) @@ -0,0 +1,80 @@ +/* + * 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.server; + +import net.sf.json.JSONObject; +import net.sf.json.util.JSONUtils; +import net.sf.ezmorph.Morpher; +import net.sf.ezmorph.MorpherRegistry; +import net.sf.ezmorph.bean.BeanMorpher; +import org.jboss.bpm.console.client.model.*; +import org.apache.commons.beanutils.PropertyUtils; + +import java.util.List; +import java.util.ArrayList; +import java.util.Iterator; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class AuthorizationTest extends BaseTC +{ + public void testAuthorisation() throws Exception + { + String json = HTTP.get( + SERVER_URL + "/identity/user/roles?roleCheck=admin,user", DEFAULT_CREDENTIALS + ); + + JSONObject jsonObject = JSONObject.fromObject( json ); + System.out.println(json); + RoleAssignmentRefWrapper dto = (RoleAssignmentRefWrapper) + JSONObject.toBean( jsonObject, RoleAssignmentRefWrapper.class ); + + // -- + // Postprocessing required: + // See http://json-lib.sourceforge.net/usage.html + MorpherRegistry morpherRegistry = JSONUtils.getMorpherRegistry(); + Morpher dynaMorpher = new BeanMorpher( RoleAssignmentRef.class, morpherRegistry); + morpherRegistry.registerMorpher( dynaMorpher ); + List roles = new ArrayList(); + for( Iterator i = dto.getRoles().iterator(); i.hasNext(); ){ + roles.add( morpherRegistry.morph( RoleAssignmentRef.class, i.next() ) ); + } + dto.setRoles(roles); + // -- + + RoleAssignmentRef adminRole = null; + for(int i=0; i<dto.getRoles().size(); i++) + { + RoleAssignmentRef ref = dto.getRoles().get(i); + if(ref.getRole().equals("admin")) + { + adminRole = ref; + break; + } + } + + assertNotNull(adminRole); + assertTrue(adminRole.isAssigned()); + + } +} Added: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java =================================================================== --- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java (rev 0) +++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/BaseTC.java 2008-12-10 10:53:09 UTC (rev 3311) @@ -0,0 +1,33 @@ +/* + * 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.server; + +import junit.framework.TestCase; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public abstract class BaseTC extends TestCase +{ + protected final static String[] DEFAULT_CREDENTIALS = new String[] {"admin", "admin"}; + protected String SERVER_URL = "http://localhost:8080/gwt-console-server/rs"; +} Added: projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java =================================================================== --- projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java (rev 0) +++ projects/gwt-console/trunk/server/src/test/java/org/jboss/bpm/console/server/HTTP.java 2008-12-10 10:53:09 UTC (rev 3311) @@ -0,0 +1,207 @@ +/* + * 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.server; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.UUID; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class HTTP +{ + public static String post(String urlString, InputStream inputStream, String[] credentials) + throws Exception + { + + HttpURLConnection conn = null; + BufferedReader br = null; + DataOutputStream dos = null; + DataInputStream inStream = null; + + InputStream is = null; + OutputStream os = null; + boolean ret = false; + String StrMessage = ""; + + + String lineEnd = "\r\n"; + String twoHyphens = "--"; + String boundary = "*****"; + + + int bytesRead, bytesAvailable, bufferSize; + + byte[] buffer; + + int maxBufferSize = 1*1024*1024; + + String responseFromServer = ""; + + try + { + //------------------ CLIENT REQUEST + + // open a URL connection to the Servlet + + URL url = new URL(urlString); + + + // Open a HTTP connection to the URL + + conn = (HttpURLConnection) url.openConnection(); + + if(credentials!=null) + applyCredentials(credentials, conn); + + // Allow Inputs + conn.setDoInput(true); + + // Allow Outputs + conn.setDoOutput(true); + + // Don't use a cached copy. + conn.setUseCaches(false); + + // Use a post method. + conn.setRequestMethod("POST"); + + conn.setRequestProperty("Connection", "Keep-Alive"); + + conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+boundary); + + dos = new DataOutputStream( conn.getOutputStream() ); + + dos.writeBytes(twoHyphens + boundary + lineEnd); + dos.writeBytes("Content-Disposition: form-data; name=\"upload\";" + + " filename=\"" + UUID.randomUUID().toString() +"\"" + lineEnd); + dos.writeBytes(lineEnd); + + // create a buffer of maximum size + bytesAvailable = inputStream.available(); + bufferSize = Math.min(bytesAvailable, maxBufferSize); + buffer = new byte[bufferSize]; + + // read file and write it into form... + bytesRead = inputStream.read(buffer, 0, bufferSize); + + while (bytesRead > 0) + { + dos.write(buffer, 0, bufferSize); + bytesAvailable = inputStream.available(); + bufferSize = Math.min(bytesAvailable, maxBufferSize); + bytesRead = inputStream.read(buffer, 0, bufferSize); + } + + // send multipart form data necesssary after file data... + + dos.writeBytes(lineEnd); + dos.writeBytes(twoHyphens + boundary + twoHyphens + lineEnd); + + // close streams + + inputStream.close(); + dos.flush(); + dos.close(); + + } + catch (MalformedURLException ex) + { + throw ex; + } + + catch (IOException ioe) + { + throw ioe; + } + + + //------------------ read the SERVER RESPONSE + + StringBuffer sb = new StringBuffer(); + + try + { + inStream = new DataInputStream ( conn.getInputStream() ); + String str; + while (( str = inStream.readLine()) != null) + { + sb.append(str).append(""); + } + inStream.close(); + + } + catch (IOException ioex) + { + System.out.println("From (ServerResponse): "+ioex); + + } + + + return sb.toString(); + + } + + private static void applyCredentials(String[] credentials, HttpURLConnection conn) + { + String userPassword = credentials[0]+":"+credentials[1]; + String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes()); + conn.setRequestProperty ("Authorization", "Basic " + encoding); + } + + public static String get(String urlString, String[] credentials) + { + StringBuffer sb = new StringBuffer(); + try + { + URL url = new URL(urlString); + HttpURLConnection conn = (HttpURLConnection) url.openConnection(); + if(credentials!=null) + applyCredentials(credentials, conn); + + BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream())); + String str; + + + while ((str = in.readLine()) != null) + { + sb.append(str); + } + + in.close(); + } + catch (MalformedURLException e) + { + throw new RuntimeException(e); + } + catch (IOException e) + { + throw new RuntimeException(e); + } + + return sb.toString(); + } +} + Modified: projects/gwt-console/trunk/war/gwt-war.iml =================================================================== --- projects/gwt-console/trunk/war/gwt-war.iml 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/war/gwt-war.iml 2008-12-10 10:53:09 UTC (rev 3311) @@ -11,7 +11,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-rpc" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> <CLASSES> Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-12-10 10:49:06 UTC (rev 3310) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-12-10 10:53:09 UTC (rev 3311) @@ -62,7 +62,7 @@ for (int i = 0; i < array.size(); ++i) { JSONObject item = array.get(i).isObject(); - boolean assigned = JSONWalk.on(item).next("isAssigned").asBool(); + boolean assigned = JSONWalk.on(item).next("assigned").asBool(); String roleName = JSONWalk.on(item).next("role").asString(); if(assigned)

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3310 - in projects/spec/trunk: modules and 3 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 05:49:06 -0500 (Wed, 10 Dec 2008) New Revision: 3310 Added: projects/spec/trunk/modules/integration/ projects/spec/trunk/modules/integration/jboss42/ projects/spec/trunk/modules/integration/jboss50/ projects/spec/trunk/modules/integration/pom.xml Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml projects/spec/trunk/modules/integration/jboss50/pom.xml projects/spec/trunk/pom.xml Log: Add jboss integration Copied: projects/spec/trunk/modules/integration/jboss42 (from rev 3304, jbpm3/trunk/modules/integration/jboss42) Property changes on: projects/spec/trunk/modules/integration/jboss42 ___________________________________________________________________ Name: svn:ignore + .settings target Name: svn:mergeinfo + Modified: projects/spec/trunk/modules/integration/jboss42/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/pom.xml 2008-12-09 22:16:01 UTC (rev 3304) +++ projects/spec/trunk/modules/integration/jboss42/pom.xml 2008-12-10 10:49:06 UTC (rev 3310) @@ -15,16 +15,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM3 - Integration JBoss42</name> + <name>JBoss BPM Spec - Integration JBoss42</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>bpm-spec-integration-jboss42</artifactId> <packaging>jar</packaging>  <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration</artifactId> - <version>3.3.1-SNAPSHOT</version> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-integration</artifactId> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> @@ -32,6 +32,7 @@ <properties> <jboss.version>4.2.2.GA</jboss.version> <jboss.common.version>1.2.1.GA</jboss.common.version> + <jbpm3.version>3.3.1-SNAPSHOT</jbpm3.version> </properties>  @@ -40,6 +41,7 @@ <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>bpm-spec-api</artifactId> + <version>${version}</version> </dependency> <dependency> @@ -82,12 +84,13 @@ <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>bpm-spec-integration-jbpm3</artifactId> - <version>${version}</version> + <version>${jbpm3.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.client</groupId> <artifactId>jbossall-client</artifactId> + <version>${jboss.version}</version> <scope>test</scope> </dependency> <dependency> Copied: projects/spec/trunk/modules/integration/jboss50 (from rev 3304, jbpm3/trunk/modules/integration/jboss50) Property changes on: projects/spec/trunk/modules/integration/jboss50 ___________________________________________________________________ Name: svn:ignore + .settings target Name: svn:mergeinfo + Modified: projects/spec/trunk/modules/integration/jboss50/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss50/pom.xml 2008-12-09 22:16:01 UTC (rev 3304) +++ projects/spec/trunk/modules/integration/jboss50/pom.xml 2008-12-10 10:49:06 UTC (rev 3310) @@ -15,16 +15,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBoss jBPM3 - Integration JBoss50</name> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration-jboss50</artifactId> + <name>JBoss BPM Spec - Integration JBoss50</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-integration-jboss50</artifactId> <packaging>jar</packaging>  <parent> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-integration</artifactId> - <version>3.3.1-SNAPSHOT</version> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-integration</artifactId> + <version>1.0.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Added: projects/spec/trunk/modules/integration/pom.xml =================================================================== --- projects/spec/trunk/modules/integration/pom.xml (rev 0) +++ projects/spec/trunk/modules/integration/pom.xml 2008-12-10 10:49:06 UTC (rev 3310) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <name>JBoss BPM Spec - Integration</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec-integration</artifactId> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>bpm-spec</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../pom.xml</relativePath> + </parent> + +  + <modules> + <module>jboss42</module> + <module>jboss50</module> + </modules> + +</project> + Property changes on: projects/spec/trunk/modules/integration/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/pom.xml =================================================================== --- projects/spec/trunk/pom.xml 2008-12-10 10:23:06 UTC (rev 3309) +++ projects/spec/trunk/pom.xml 2008-12-10 10:49:06 UTC (rev 3310) @@ -35,6 +35,7 @@ <modules> <module>modules/api</module> <module>modules/dialects</module> + <module>modules/integration</module> <module>modules/ri</module> <module>modules/cts</module>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3309 - jbpm3/trunk/modules/integration.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 05:23:06 -0500 (Wed, 10 Dec 2008) New Revision: 3309 Removed: jbpm3/trunk/modules/integration/jboss42/ jbpm3/trunk/modules/integration/jboss50/ Log: Move container integration to spec project

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3308 - jbpm3/trunk/modules/distribution/src/main/resources/installer.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 05:17:00 -0500 (Wed, 10 Dec 2008) New Revision: 3308 Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml Log: Autoinstall GWT-Console Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-12-10 09:29:15 UTC (rev 3307) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-template.xml 2008-12-10 10:17:00 UTC (rev 3308) @@ -9,7 +9,7 @@ <pack name="Optional Components" index="2" selected="false"/> <pack name="Download JBoss-4.2.2" index="3" selected="false"/> <pack name="Download Eclipse-3.4.0" index="4" selected="false"/> - <pack name="GWT-Console" index="5" selected="false"/> + <pack name="GWT-Console" index="5" selected="true"/> </com.izforge.izpack.panels.TreePacksPanel> <com.izforge.izpack.panels.UserInputPanel> <userInput>

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3307 - jbpm3/trunk/modules/enterprise.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 04:29:15 -0500 (Wed, 10 Dec 2008) New Revision: 3307 Removed: jbpm3/trunk/modules/enterprise/jar/ Log: Remove unwanted jar dir

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3306 - in jbpm3/trunk/modules/enterprise: src/test/java/org/jbpm/enterprise/config and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 04:10:00 -0500 (Wed, 10 Dec 2008) New Revision: 3306 Added: jbpm3/trunk/modules/enterprise/.classpath Modified: jbpm3/trunk/modules/enterprise/.project jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java Log: Update ContainerProvidedJarsTest to work with mvn artefacts Added: jbpm3/trunk/modules/enterprise/.classpath =================================================================== --- jbpm3/trunk/modules/enterprise/.classpath (rev 0) +++ jbpm3/trunk/modules/enterprise/.classpath 2008-12-10 09:10:00 UTC (rev 3306) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Modified: jbpm3/trunk/modules/enterprise/.project =================================================================== --- jbpm3/trunk/modules/enterprise/.project 2008-12-10 07:18:34 UTC (rev 3305) +++ jbpm3/trunk/modules/enterprise/.project 2008-12-10 09:10:00 UTC (rev 3306) @@ -6,12 +6,18 @@ </projects> <buildSpec> <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> <name>org.maven.ide.eclipse.maven2Builder</name> <arguments> </arguments> </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.jdt.core.javanature</nature> <nature>org.maven.ide.eclipse.maven2Nature</nature> </natures> </projectDescription> Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java =================================================================== --- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-10 07:18:34 UTC (rev 3305) +++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/config/ContainerProvidedJarsTest.java 2008-12-10 09:10:00 UTC (rev 3306) @@ -79,20 +79,21 @@ // Iterate over the known server provided jars List<String> matchingJars = new ArrayList<String>(); BufferedReader br = new BufferedReader(new FileReader(jbossJars)); - String line = br.readLine(); - while (line != null) + String jbossJar = br.readLine(); + while (jbossJar != null) { - if (line.length() == 0 || line.startsWith("#")) + if (jbossJar.length() == 0 || jbossJar.startsWith("#")) { - line = br.readLine(); + jbossJar = br.readLine(); continue; } - if (deployedJars.contains(line)) + for (String deployedJar : deployedJars) { - matchingJars.add(line); + if (deployedJar.startsWith(jbossJar)) + matchingJars.add(jbossJar); } - line = br.readLine(); + jbossJar = br.readLine(); } assertEquals("Invalid deployed jars: " + matchingJars, 0, matchingJars.size()); @@ -112,7 +113,6 @@ String fileName = file.getName(); if (fileName.endsWith(".jar")) { - fileName = fileName.substring(0, fileName.length() - 4); deployedJars.add(fileName); } }

17 years, 4 months

1
0
0 / 0

JBoss JBPM SVN: r3305 - jbpm3/trunk/modules/core/scripts.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-12-10 02:18:34 -0500 (Wed, 10 Dec 2008) New Revision: 3305 Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml Log: echo hibernate.properties Modified: jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml =================================================================== --- jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-12-09 22:16:01 UTC (rev 3304) +++ jbpm3/trunk/modules/core/scripts/antrun-jbpm-config.xml 2008-12-10 07:18:34 UTC (rev 3305) @@ -100,6 +100,11 @@ <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" /> <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/> + + <loadfile property="hibernate.properties.xml" srcFile="${build.resources.directory}/hibernate.properties.${database}.xml"/> + <echo message="${hibernate.properties.xml}"/> + <echo/> + </target> </project> \ No newline at end of file

17 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits December 2008