[jbpm-commits] JBoss JBPM SVN: r3037 - in jbpm4/trunk: modules/api and 34 other directories.

Author: tom.baeyens(a)jboss.com Date: 2008-11-21 10:52:02 -0500 (Fri, 21 Nov 2008) New Revision: 3037 Modified: jbpm4/trunk/build.xml jbpm4/trunk/modules/api/.classpath jbpm4/trunk/modules/api/pom.xml jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java jbpm4/trunk/modules/devguide/ jbpm4/trunk/modules/jpdl/pom.xml jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch03-Architecture.xml jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Environment.xml jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Persistence.xml jbpm4/trunk/modules/pvm/pom.xml jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 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/wire/WireContext.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/schematest.xml jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/schematest.xml jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/userguide/ jbpm4/trunk/pom.xml Log: jbpm-configuration and userguide-devguide split Modified: jbpm4/trunk/build.xml =================================================================== --- jbpm4/trunk/build.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/build.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -66,16 +66,25 @@ </antcall> </target> - <target name="manual"> - <exec executable="cmd" dir="modules/manual"> + <target name="devguide"> + <exec executable="cmd" dir="modules/devguide"> <arg line="/C mvn jdocbook:resources jdocbook:generate" /> </exec> <antcall target="show.html"> - <param name="page" value="modules/manual/target/docbook/publish/en/html_single/index.html"/> + <param name="page" value="modules/devguide/target/docbook/publish/en/html_single/index.html"/> </antcall> </target> + <target name="userguide"> + <exec executable="cmd" dir="modules/userguide"> + <arg line="/C mvn jdocbook:resources jdocbook:generate" /> + </exec> + <antcall target="show.html"> + <param name="page" value="modules/userguide/target/docbook/publish/en/html_single/index.html"/> + </antcall> + </target> + <!-- HTML --> <target name="show.html"> <fail message="property page has to be specified to use this target" unless="page" /> Modified: jbpm4/trunk/modules/api/.classpath =================================================================== --- jbpm4/trunk/modules/api/.classpath 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/api/.classpath 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/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/classes"/> Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -46,6 +46,55 @@ <!-- Plugins --> <build> <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>generate-jpdlxsd-doc</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> + <mkdir dir="${basedir}/target/doc/schemadoc" /> + <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> + <fileset dir="${basedir}/src/main/resources" /> + </xsddoc> + </tasks> + </configuration> + </execution> + <!-- + <execution> + <id>generate-wirexsd-doc</id> + <phase>package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> + <mkdir dir="${basedir}/target/doc/configuration-xsd-schema" /> + <xsddoc file="${basedir}/src/main/resources/configuration.xsd" out="${basedir}/target/doc/configuration-xsd-schema" title="jBPM Configuration Schema" verbose="false" /> + </tasks> + </configuration> + </execution> + --> + </executions> + <dependencies> + <dependency> + <groupId>xsddoc</groupId> + <artifactId>xsddoc</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Context.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -30,8 +30,8 @@ */ public interface Context { - /** key of the environment-factory context in the environment */ - String CONTEXTNAME_ENVIRONMENT_FACTORY = "environment-factory"; + /** key of the process-engine context in the environment */ + String CONTEXTNAME_ENVIRONMENT_FACTORY = "process-engine"; /** key of the block context in the environment */ String CONTEXTNAME_ENVIRONMENT = "environment"; Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/env/Environment.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -40,12 +40,12 @@ * * <p>Examples of contexts are: * <ul> - * <li><b>environment-factory</b>: The environment-factory context is used to store e.g. data sources, + * <li><b>process-engine</b>: The process-engine context is used to store e.g. data sources, * session factories and other static resources needed by an application. - * The environment-factory context lives for the complete duration of the {@link EnvironmentFactory}. + * The process-engine context lives for the complete duration of the {@link EnvironmentFactory}. * So if the {@link EnvironmentFactory} is maintained in a static member field, the - * environment-factory context lives for the duration of the application. - * The same environment-factory context is shared for all the Environments produced by one + * process-engine context lives for the duration of the application. + * The same process-engine context is shared for all the Environments produced by one * EnvironmentFactory.</li> * <li><b>environment</b>: The environment context is used for e.g. a transaction * and transactional resources, user authentication. This results in an efficient and @@ -85,8 +85,8 @@ * * <p>A second purpose of the environment is to enable specific to global searching * of resources. E.g. you could search for an 'adminEmailAddress' in the contexts - * 'processDefinition-execution', 'processDefinition-definition' and 'environment-factory' in the given order. - * That way, a global adminEmailAddress can be specified in the environment-factory context + * 'processDefinition-execution', 'processDefinition-definition' and 'process-engine' in the given order. + * That way, a global adminEmailAddress can be specified in the process-engine context * and it can be refined in more specific contexts processDefinition-definition or processDefinition-execution. * </p> * Property changes on: jbpm4/trunk/modules/devguide ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm4/trunk/modules/jpdl/pom.xml =================================================================== --- jbpm4/trunk/modules/jpdl/pom.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/jpdl/pom.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -50,38 +50,6 @@ <build> <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-jpdlxsd-doc</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> - <mkdir dir="${basedir}/target/doc/jpdlxsd" /> - <xsddoc file="${basedir}/src/main/resources/org/jbpm/jpdl/jpdl.xsd" out="${basedir}/target/doc/jpdlxsd" title="jPDL: jBPM's Process Definition Language" - verbose="false" /> - </tasks> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>xsddoc</groupId> - <artifactId>xsddoc</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> - </dependencies> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/xml/JpdlParser.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -29,7 +29,6 @@ import org.jbpm.activity.Activity; import org.jbpm.jpdl.JpdlProcessDefinition; import org.jbpm.log.Log; -import org.jbpm.model.Node; import org.jbpm.pvm.internal.model.NodeImpl; import org.jbpm.pvm.internal.model.ProcessDefinitionImpl; import org.jbpm.pvm.internal.model.TransitionImpl; @@ -54,7 +53,7 @@ public JpdlParser() { super(defaultBindings); ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); - this.addEntity("http://jbpm.org/jpdl4";, new UrlEntity("org/jbpm/jpdl/jpdl.xsd", classLoader)); + this.addEntity("http://jbpm.org/jpdl4";, new UrlEntity("jpdl.xsd", classLoader)); } Modified: jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/jpdl/src/test/resources/jbpm.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager> <language name="jpdl"> @@ -47,7 +47,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -58,4 +58,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml =================================================================== --- jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch02-ExecutionModes.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -102,9 +102,9 @@ like this: </para> <literal><emphasis role="bold">environment.cfg.xml</emphasis>:</literal> - <programlisting>&lt;contexts xmlns=&quot;http://jbpm.org/pvm/1.0/wire&quot;&gt; + <programlisting>&lt;jbpm-configuration xmlns=&quot;http://jbpm.org/xsd/cfg&quot;&gt; - &lt;environment-factory&gt; + &lt;process-engine&gt; &lt;deployer-manager&gt; &lt;language name=&quot;api&quot;&gt; @@ -137,7 +137,7 @@ &lt;variable-types resource=&quot;org/jbpm/pvm/pvm.types.xml&quot; /&gt; &lt;job-executor auto-start=&quot;false&quot; /&gt; - &lt;/environment-factory&gt; + &lt;/process-engine&gt; &lt;environment&gt; &lt;hibernate-session /&gt; @@ -147,7 +147,7 @@ &lt;message-session /&gt; &lt;/environment&gt; -&lt;/contexts&gt;</programlisting> +&lt;/jbpm-configuration&gt;</programlisting> <para>And next to it a hibernate.properties like this</para> <literal>hibernate.properties:</literal> <programlisting>hibernate.dialect org.hibernate.dialect.HSQLDialect Modified: jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch03-Architecture.xml =================================================================== --- jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch03-Architecture.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/manual/src/main/docbook/en/modules/ch03-Architecture.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -188,9 +188,9 @@ <para>From the default configuration which is included in full above, here is the section that configures the services </para> - <programlisting>&lt;contexts xmlns=&quot;http://jbpm.org/pvm/1.0/wire&quot;&gt; + <programlisting>&lt;jbpm-configuration xmlns=&quot;http://jbpm.org/xsd/cfg&quot;&gt; - &lt;environment-factory&gt; + &lt;process-engine&gt; &lt;process-service /&gt; &lt;execution-service /&gt; Modified: jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Environment.xml =================================================================== --- jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Environment.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Environment.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -14,7 +14,7 @@ in a standard Java environment as well as an enterprise Java environment. </para> <para>The environment is partitioned into a set of contexts. Each context - can have its own lifecycle. For instance, the environment-factory context will + can have its own lifecycle. For instance, the process-engine context will strech over the full lifetime of the application. The block context only for the duration of a try-finally block. Typically a block context represents a database transaction. Each context exposes a list of key-value @@ -27,7 +27,7 @@ <para>To start working with an environment, you need an EnvironmentFactory. One single environment factory object can be used throughout the complete lifetime of the application. So typically this is kept in a static - member field. The EnvironmentFactory itself is the environment-factory context. + member field. The EnvironmentFactory itself is the process-engine context. </para> <para>An <literal>EnvironmentFactory</literal> is typically obtained by parsing a configuration file like this: @@ -66,11 +66,11 @@ <literal>environment.get(String name)</literal> or <literal>&lt;T&gt; T environment.get(Class&lt;T&gt;)</literal>. </para> - <para>when an environment is created, it has a <literal>environment-factory</literal> context + <para>when an environment is created, it has a <literal>process-engine</literal> context and a <literal>block</literal> context. </para> - <para>In the default implementation, the <literal>environment-factory</literal> context and + <para>In the default implementation, the <literal>process-engine</literal> context and the <literal>block</literal> context are <literal>WireContext</literal>s. A <literal>WireContext</literal> contains a description of how its objects are created and wired together to form object graphs. @@ -87,11 +87,11 @@ }</programlisting> <para>Then let's create an environment factory that knows how to create book</para> <programlisting>static EnvironmentFactory environmentFactory = EnvironmentFactory.parseXmlString( - "&lt;contexts&gt;" + - " &lt;environment-factory&gt;" + + "&lt;jbpm-configuration&gt;" + + " &lt;process-engine&gt;" + " &lt;object name='book' class='org.jbpm.examples.ch09.Book' /&gt;" + - " &lt;/environment-factory&gt;" + - "&lt;/contexts&gt;" + " &lt;/process-engine&gt;" + + "&lt;/jbpm-configuration&gt;" ));</programlisting> <para>Now we'll create an environment block with this environment factory and we'll look up the book in the environment. First the lookup is done by @@ -130,7 +130,7 @@ <para>When doing a lookup on the environment, there is a default search order in which the contexts will be scanned for the requested object. The default order is the inverse of the sequence in which the contexts were added. E.g. - if an object is defined in both the environment-factory context and in the block context, + if an object is defined in both the process-engine context and in the block context, the block context is considered more applicable and that will be scanned first. Alternatively, an explicit search order can be passed in with the <literal>get</literal> lookups as an optional parameter. Modified: jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Persistence.xml =================================================================== --- jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Persistence.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/manual/src/main/docbook/en/modules/chxx-Persistence.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -6,9 +6,9 @@ <para>This section describes how the environment can be configured to use hibernate in a standard Java environment. </para> - <programlisting>01 | &lt;contexts&gt; + <programlisting>01 | &lt;jbpm-configuration&gt; 02 | -03 | &lt;environment-factory&gt; +03 | &lt;process-engine&gt; 04 |<emphasis role="bold"> &lt;hibernate-session-factory /&gt;</emphasis> 05 |<emphasis role="bold"> &lt;hibernate-configuration&gt;</emphasis> 06 |<emphasis role="bold"> &lt;properties resource="hibernate.properties" /&gt;</emphasis> @@ -17,7 +17,7 @@ 09 |<emphasis role="bold"> resource="org/jbpm/pvm/pvm.cache.xml" </emphasis> 10 |<emphasis role="bold"> usage="nonstrict-read-write" /&gt;</emphasis> 11 |<emphasis role="bold"> &lt;/hibernate-configuration&gt;</emphasis> -12 | &lt;/environment-factory&gt; +12 | &lt;/process-engine&gt; 13 | 14 | &lt;block&gt; 15 |<emphasis role="bold"> &lt;standard-transaction /&gt;</emphasis> @@ -25,9 +25,9 @@ 17 |<emphasis role="bold"> &lt;pvm-db-session /&gt;</emphasis> 18 | &lt;/block&gt; 19 | -20 | &lt;/contexts&gt;</programlisting> +20 | &lt;/jbpm-configuration&gt;</programlisting> <para><literal>line 04</literal> specifies a hibernate session factory in the - environment-factory context. This means that a hibernate session factory is lazy + process-engine context. This means that a hibernate session factory is lazy created when it is first needed and cached in the <literal>EnvironmentFactory</literal>. </para> Modified: jbpm4/trunk/modules/pvm/pom.xml =================================================================== --- jbpm4/trunk/modules/pvm/pom.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/pom.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -155,34 +155,7 @@ </tasks> </configuration> </execution> - <execution> - <id>generate-wirexsd-doc</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> - <mkdir dir="${basedir}/target/doc-wirexsd" /> - <xsddoc file="${basedir}/src/main/resources/org/jbpm/pvm/wire.xsd" out="${basedir}/target/doc-wirexsd" title="Process Virtual Machine: Wiring Schema" - verbose="false" /> - </tasks> - </configuration> - </execution> </executions> - <dependencies> - <dependency> - <groupId>xsddoc</groupId> - <artifactId>xsddoc</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> - </dependencies> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -49,27 +49,27 @@ import org.jbpm.pvm.internal.wire.WireDefinition; /** - * an environment factory that also is the environment-factory context. + * an environment factory that also is the process-engine context. * * <p> * This environment factory will produce environments with 2 contexts: the - * environment-factory context and the block context. + * process-engine context and the block context. * </p> * * <p> - * An environment-factory context is build from two wire definitions: the - * environment-factory wire definition and the environment wire definition. + * An process-engine context is build from two wire definitions: the + * process-engine wire definition and the environment wire definition. * </p> * * <p> - * The environment-factory context itself is build from the environment-factory + * The process-engine context itself is build from the process-engine * wire definition. So all objects that are created in this context remain - * cached for the lifetime of this environment-factory context object. + * cached for the lifetime of this process-engine context object. * </p> * * <p> - * This environment-factory context is also a environment factory. The produced - * environments contain 2 contexts: the environment-factory context itself and a + * This process-engine context is also a environment factory. The produced + * environments contain 2 contexts: the process-engine context itself and a * new environment context, build from the environment wire definition. For each * created environment, a new environment context will be created from the same * environment wire definition. Objects in the environment context will live for @@ -172,7 +172,7 @@ environment.setClassLoader(classLoader); } - // add the environment-factory context + // add the process-engine context environment.addContext(environmentFactoryCtxWireContext); // add the environment block context @@ -198,7 +198,7 @@ environmentFactoryCtxWireContext.fire(WireContext.EVENT_CLOSE, null); } - // environment-factory context delegation methods + // process-engine context delegation methods // /////////////////////////////////// public Object get(String key) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/env/PvmEnvironmentFactoryParser.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -34,8 +34,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; -/** main parser. It parses the <code>contexts</code>, which is assumed the document element - * and can contain the {@link EnvironmentFactoryXmlParser environment-factory} +/** main parser. It parses the <code>jbpm-configuration</code>, which is assumed the document element + * and can contain the {@link EnvironmentFactoryXmlParser process-engine} * context and the {@link EnvironmentXmlParser environment} context. * * See {@link Parser} for usage instructions. 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-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/ScriptManager.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -66,7 +66,7 @@ "<objects>" + " <script-manager default-expression-language='juel'" + " default-script-language='beanshell' " + - " read-contexts='execution, environment, environment-factory' " + + " read-contexts='execution, environment, process-engine' " + " write-context='execution'>" + " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" + " </script-manager>" + Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -66,7 +66,7 @@ * * <p>A WireContext is used often in combination with {@link Environment} to * decouple the processDefinition virtual machine from its environment. In the - * {@link JbpmConfiguration}, both the environment-factory context and + * {@link JbpmConfiguration}, both the process-engine context and * the environment contexts are WireContexts. The PVM will use the persistence service, * asynchronous message service, timer service and other services through specified * abstractions in the environment. Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/EnvironmentFactoryRefBinding.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -37,7 +37,7 @@ public class EnvironmentFactoryRefBinding extends WireDescriptorBinding { public EnvironmentFactoryRefBinding() { - super("environment-factory-ref"); + super("process-engine-ref"); } public Object parse(Element element, Parse parse, Parser parser) { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/BasicEnvironmentTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -35,14 +35,14 @@ public void testBasicEnvironmentOperation() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object name='b' class='"+Object.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Object firstA; @@ -65,7 +65,7 @@ environment = environmentFactory.openEnvironment(); try { - // the same a should have been stored in the environment-factory cache + // the same a should have been stored in the process-engine cache assertSame(firstA, environment.get("a")); // a new b should be created because we're in a new environment Object secondB = environment.get("b"); @@ -78,10 +78,10 @@ public void testCurrentEnvironment(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory/>" + + "<jbpm-configuration>" + + " <process-engine/>" + " <environment/>" + - "</contexts>" + "</jbpm-configuration>" ); assertNotNull(environmentFactory); @@ -108,14 +108,14 @@ public void testUnexistingElement() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object name='b' class='"+Object.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -129,9 +129,9 @@ public void testNoBlockEnvironment(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory/>" + - "</contexts>" + "<jbpm-configuration>" + + " <process-engine/>" + + "</jbpm-configuration>" ); assertNotNull(environmentFactory); @@ -150,9 +150,9 @@ public void testNoApplicationEnvironment(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + + "<jbpm-configuration>" + " <environment/>" + - "</contexts>" + "</jbpm-configuration>" ); assertNotNull(environmentFactory); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentSearchOrderTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -37,14 +37,14 @@ public void testEnvironmentDefaultSearchOrder() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + - " <string name='a' value='environment-factory-a' />" + - " </environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + + " <string name='a' value='process-engine-a' />" + + " </process-engine>" + " <environment>" + " <string name='a' value='environment-a' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -59,22 +59,22 @@ public void testEnvironmentGivenSearchOrder() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + - " <string name='a' value='environment-factory-a' />" + - " </environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + + " <string name='a' value='process-engine-a' />" + + " </process-engine>" + " <environment>" + " <string name='a' value='environment-a' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - // only search in context 'environment-factory' and then in 'environment' - String[] searchOrder = new String[]{"environment-factory", "environment"}; - assertEquals("environment-factory-a", environment.get("a", searchOrder)); + // only search in context 'process-engine' and then in 'environment' + String[] searchOrder = new String[]{"process-engine", "environment"}; + assertEquals("process-engine-a", environment.get("a", searchOrder)); } finally { environment.close(); @@ -83,22 +83,22 @@ public void testEnvironmentGivenSearchOrderUnexistingObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + - " <string name='a' value='environment-factory-a' />" + - " </environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + + " <string name='a' value='process-engine-a' />" + + " </process-engine>" + " <environment>" + " <string name='a' value='environment-a' />" + " <string name='b' value='environment-b' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); try { - // only search in context 'environment-factory' - String[] searchOrder = new String[]{"environment-factory"}; + // only search in context 'process-engine' + String[] searchOrder = new String[]{"process-engine"}; assertNull(environment.get("b", searchOrder)); } finally { @@ -109,14 +109,14 @@ public void testEnvironmentDefaultSearchOrderWithAddedContext() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + - " <string name='a' value='environment-factory-a' />" + - " </environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + + " <string name='a' value='process-engine-a' />" + + " </process-engine>" + " <environment>" + " <string name='a' value='environment-a' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -143,14 +143,14 @@ public void testEnvironmentGivenSearchOrderWithAddedContext() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + - " <string name='a' value='environment-factory-a' />" + - " </environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + + " <string name='a' value='process-engine-a' />" + + " </process-engine>" + " <environment>" + " <string name='a' value='environment-a' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -167,8 +167,8 @@ // add the new context to the enviromnent environment.addContext(addedContext); - // only search in context 'environment-factory' and 'environment' - String[] searchOrder = new String[]{"environment", "environment-factory"}; + // only search in context 'process-engine' and 'environment' + String[] searchOrder = new String[]{"environment", "process-engine"}; assertEquals("environment-a", environment.get("a", searchOrder)); } finally { Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/EnvironmentTypeLookupTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -36,14 +36,14 @@ public void testApplicationTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object class='"+A.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <string name='a' value='distraction' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -60,14 +60,14 @@ public void testBlockTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <string name='a' value='distraction' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object class='"+A.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -84,14 +84,14 @@ public void testNonExistingTypeLookup() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <string name='a' value='A' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <string name='b' value='B' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/env/NestedEnvironmentTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -34,14 +34,14 @@ public void testNestedEnvironments() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='a' class='"+Object.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object name='b' class='"+Object.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/GroovyExpressionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -42,16 +42,16 @@ public void dontTestGroovyExpression() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <script-manager default-expression-language='juel'" + " default-script-language='juel'" + - " read-contexts='execution, environment, environment-factory' " + + " read-contexts='execution, environment, process-engine' " + " write-context='execution'>" + " <script-language name='groovy' factory='com.sun.script.groovy.GroovyScriptEngineFactory' />" + " </script-manager>" + - " </environment-factory>" + - "</contexts>" + " </process-engine>" + + "</jbpm-configuration>" ); ScriptManager scriptManager = environmentFactory.get(ScriptManager.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -38,16 +38,16 @@ public void testJuelExpression() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <script-manager default-expression-language='juel'" + " default-script-language='juel'" + - " read-contexts='execution, environment, environment-factory' " + + " read-contexts='execution, environment, process-engine' " + " write-context='execution'>" + " <script-language name='juel' factory='com.sun.script.juel.JuelScriptEngineFactory' />" + " </script-manager>" + - " </environment-factory>" + - "</contexts>" + " </process-engine>" + + "</jbpm-configuration>" ); ScriptManager scriptManager = environmentFactory.get(ScriptManager.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/EnlistTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -34,15 +34,15 @@ public void testEnlist() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { @@ -64,15 +64,15 @@ public void testEnlistRollback() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { @@ -94,15 +94,15 @@ public void testEnlistInOtherContext() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { @@ -127,15 +127,15 @@ public void testEnlistInOtherContextWithRollback() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction name='tx' />" + " <object name='o' class='"+ MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { @@ -160,15 +160,15 @@ public void testEnlistNotAResource() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction name='transaction' />" + " <object name='o' class='java.lang.Object'>" + " <enlist transaction='transaction'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try{ @@ -184,15 +184,15 @@ public void testEnlistNotATransaction() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <object name='o' class='"+MyResource.class.getName()+"'>" + " <enlist transaction='tx'/>" + " </object>" + " <object name='tx' class='java.lang.Object'/>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try{ @@ -208,12 +208,12 @@ public void testMissingTransactionName() { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try{ Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionFailingCommitTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -50,8 +50,8 @@ try { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -64,7 +64,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); @@ -122,8 +122,8 @@ try { Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -136,7 +136,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesCommitTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -36,15 +36,15 @@ TestResource resourceOne = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); @@ -73,8 +73,8 @@ TestResource resourceThree = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -87,7 +87,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); @@ -131,8 +131,8 @@ TestResource resourceTwo = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -145,7 +145,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/tx/TransactionResourcesSetRollbackOnlyTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -37,15 +37,15 @@ TestResource resourceOne = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); @@ -76,8 +76,8 @@ TestResource resourceThree = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -90,7 +90,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); @@ -136,8 +136,8 @@ TestResource resourceTwo = null; Environment environment = openEnvironment( - "<contexts>" + - " <environment-factory/>"+ + "<jbpm-configuration>" + + " <process-engine/>"+ " <environment>" + " <transaction />" + " <object name='resourceOne' class='"+TestResource.class.getName()+"'>" + @@ -150,7 +150,7 @@ " <enlist />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); try { StandardTransaction standardTransaction = environment.get(StandardTransaction.class); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ContextBlockSubscriptionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -77,14 +77,14 @@ // In this test, there is no eager initialization EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -127,14 +127,14 @@ // In this test, there is eager initialisation EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -161,15 +161,15 @@ // In this test, there is eager initialisation EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe />" + " </object>" + " <object name='o' class='"+Object.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -202,14 +202,14 @@ // In this test, there is eager initialisation EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe event='interestingevent'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -238,14 +238,14 @@ // In this test, there is eager initialisation EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe events='constructing, open, constructed, interestingevent, close'/>" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -285,15 +285,15 @@ // In this test, there is eager initialisation EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe events='constructing, open, constructed, interestingevent, close'/>" + " </object>" + " <object name='o' class='"+Object.class.getName()+"' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -321,17 +321,17 @@ public void testOtherWireScope() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='factory' class='"+Object.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + - " <subscribe context='environment-factory'/>" + + " <subscribe context='process-engine'/>" + " </object>" + " <object name='product' factory='factory' method='getClass' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); int index=0; @@ -371,17 +371,17 @@ public void testOtherWireScopeWithEventFiltering() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='factory' class='"+Object.class.getName()+"' />" + - " </environment-factory>" + + " </process-engine>" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + - " <subscribe context='environment-factory' events='initializing' />" + + " <subscribe context='process-engine' events='initializing' />" + " </object>" + " <object name='product' factory='factory' method='getClass' />" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); int index=0; @@ -409,14 +409,14 @@ public void testUnexistingScope() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe context='unexistingcontext' />" + " </object>" + " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); assertNull(Environment.getCurrent()); @@ -438,8 +438,8 @@ // In this test, there is no eager initialization EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='a' class='"+A.class.getName()+"'>" + " <field name='o'>" + @@ -449,7 +449,7 @@ " </field>" + " </object>"+ " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); @@ -497,8 +497,8 @@ // In this test, there is no eager initialization EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory />" + + "<jbpm-configuration>" + + " <process-engine />" + " <environment>" + " <object name='a' class='"+A.class.getName()+"'>" + " <field name='o'>" + @@ -512,7 +512,7 @@ " </field>" + " </object>"+ " </environment>" + - "</contexts>" + "</jbpm-configuration>" ); Environment environment = environmentFactory.openEnvironment(); Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/EnvWireTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -14,7 +14,7 @@ public void testEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <environment-ref name='e' />" + " </environment>" + @@ -38,9 +38,9 @@ public void testEnvironmentFactoryWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + - " <environment-factory-ref name='f' />" + + " <process-engine-ref name='f' />" + " </environment>" + "</environment-scopes>" ); @@ -61,7 +61,7 @@ public void testContextRefEnvironmentWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <context-ref name='c' />" + " </environment>" + @@ -85,9 +85,9 @@ public void testContextRefEnvironmentFactoryWire(){ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory>" + + " <process-engine>" + " <context-ref name='c' />" + - " </environment-factory>" + + " </process-engine>" + " <environment/>" + "</environment-scopes>" ); @@ -99,7 +99,7 @@ assertNotNull(c); assertEquals(WireContext.class, c.getClass()); - assertEquals(environment.getContext("environment-factory"), c); + assertEquals(environment.getContext("process-engine"), c); } finally { environment.close(); } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/MethodSubscriptionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -46,7 +46,7 @@ public void testMethodWithNoArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' />" + @@ -88,7 +88,7 @@ public void testMethodWithBadName() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='i-am-not-a-method' />" + @@ -125,7 +125,7 @@ public void testMethodWithOneArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + @@ -172,7 +172,7 @@ public void testMethodWithTwoArgs() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' event='ping'>" + @@ -232,7 +232,7 @@ public void testMethodWithThreeArgs() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent'>" + @@ -284,7 +284,7 @@ public void testMethodWithArgsAndMultipleObjectsSubcription() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+NonListenerRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + @@ -375,7 +375,7 @@ public void testMethodAndOverLoading() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + @@ -430,7 +430,7 @@ public void testMethodAndBadArg() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='l' class='"+OverloadingRecorder.class.getName()+"' init='eager'>" + " <subscribe object='a' method='logEvent' >" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ObjectSubscriptionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -40,7 +40,7 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe object='o' />" + @@ -82,7 +82,7 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' />" + @@ -128,7 +128,7 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe objects='newsletter, blog, newspaper' />" + @@ -195,7 +195,7 @@ public void testUnexistingObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='unexistingobject' />" + @@ -218,7 +218,7 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' events='ping, pong' />" + @@ -268,7 +268,7 @@ public void testNotObservableObject() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + " <subscribe object='o' />" + @@ -290,7 +290,7 @@ public void testNotListener() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='java.lang.Object' init='eager'>" + " <subscribe object='o' />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireEventsSubscriptionTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -42,7 +42,7 @@ public void testRegisterToAllDescriptors() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + // If no object(s) are specified, the subscriber will be informed of @@ -84,7 +84,7 @@ public void testOneObjectDescriptor() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // only subscribe to wire-events of object o, which means that recorder will @@ -141,7 +141,7 @@ public void testMultipleObjectDescriptors() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record all wire events coming from the descriptors of objects o and p @@ -217,7 +217,7 @@ public void testOneObjectDescriptorWithEventFilter() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record only 'initializing' wire events produced by the descriptor of object o. @@ -258,7 +258,7 @@ public void testMultipleObjectDescriptorsWithEventFilter() { EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"' init='eager'>" + // record 'constructing' and 'constructed' events fired by descriptors for objects o and p Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/WireObservableTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -48,7 +48,7 @@ EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( "<environment-scopes>" + - " <environment-factory />" + + " <process-engine />" + " <environment>" + " <object name='recorder' class='"+Recorder.class.getName()+"'>" + " <subscribe />" + Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/samples/ex13/EnvironmentTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -33,11 +33,11 @@ public class EnvironmentTest extends TestCase { static EnvironmentFactory environmentFactory = JbpmConfiguration.parseXmlString( - "<contexts>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <object name='book' class='org.jbpm.pvm.samples.ex13.Book' />" + - " </environment-factory>" + - "</contexts>" + " </process-engine>" + + "</jbpm-configuration>" ); public void testEnvironment() { Modified: jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager> <language name="api"> @@ -46,7 +46,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -57,4 +57,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/continuation/ContinuationTest.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <object class="org.jbpm.pvm.internal.hibernate.PvmNamingStrategy" auto-wire="true" /> @@ -21,7 +21,7 @@ <transaction-interceptor /> </command-service> - </environment-factory> + </process-engine> <environment> @@ -34,4 +34,4 @@ </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/db/svc/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager resource="pvm.language.deployers.xml"> <language name="api"> @@ -29,7 +29,7 @@ </hibernate-configuration> <hibernate-session-factory /> <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> - </environment-factory> + </process-engine> <environment> <transaction /> @@ -37,4 +37,4 @@ <pvm-db-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/api/timer/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <job-test-helper /> @@ -42,7 +42,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <transaction /> @@ -52,4 +52,4 @@ <timer-session target="test" /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,10 +1,10 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> - </environment-factory> + </process-engine> <environment> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/langext/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager resource="pvm.language.deployers.xml"> <language name="api"> @@ -33,7 +33,7 @@ <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -42,4 +42,4 @@ <object class="org.jbpm.pvm.internal.db.langext.AddressSession" /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/model/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <hibernate-configuration> <properties resource="hibernate.properties" /> @@ -11,7 +11,7 @@ <hibernate-session-factory /> <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> - </environment-factory> + </process-engine> <environment> @@ -21,4 +21,4 @@ </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/db/type/environmentCustomTypes.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <hibernate-configuration> <properties resource="hibernate.properties" /> @@ -12,7 +12,7 @@ <variable-types> <type name="date" class="java.util.Date" variable-class="org.jbpm.pvm.internal.type.variable.DateVariable" /> </variable-types> - </environment-factory> + </process-engine> <environment> @@ -22,4 +22,4 @@ </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/jobexecutor/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <job-executor threads="1" auto-start="false" /> @@ -27,7 +27,7 @@ <!-- used in JobExecutorTimerSessionTest --> <map name="timerVariables" synchronized="true" /> - </environment-factory> + </process-engine> <environment> @@ -40,4 +40,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/type/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,10 +1,10 @@ -<contexts> +<jbpm-configuration> - <environment-factory> + <process-engine> <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> - </environment-factory> + </process-engine> <environment> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/schematest.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/schematest.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/pvm/internal/xml/schematest.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<object xmlns="http://jbpm.org/pvm/1.0/wire"> +<object xmlns="http://jbpm.org/xsd/cfg"> <constructor> <arg/> Modified: jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/schematest.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/schematest.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/pvm/src/test/resources/org/jbpm/xml/schematest.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<object xmlns="http://jbpm.org/pvm/1.0/wire"> +<object xmlns="http://jbpm.org/xsd/cfg"> <constructor> <arg/> Modified: jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager> <language name="api"> @@ -46,7 +46,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -57,4 +57,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager> <language name="api"> @@ -46,7 +46,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -57,4 +57,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -123,7 +123,7 @@ Session session = sessionFactory.openSession(); try { for (String query : cleanSql) { - log.trace(query); + // log.trace(query); session.createSQLQuery(query).executeUpdate(); } } finally { Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/basicfeatures/ConfigurationTest.java 2008-11-21 15:52:02 UTC (rev 3037) @@ -30,9 +30,22 @@ */ public class ConfigurationTest extends JbpmTestCase { + public void testDefaultConfiguration() { + ProcessEngine processEngine = new Configuration() + .buildProcessEngine(); + assertNotNull(processEngine); + } + + public void testResourceConfiguration() { + ProcessEngine processEngine = new Configuration() + .setResource("my-jbpm-configuration.cfg.xml") + .buildProcessEngine(); + assertNotNull(processEngine); + } + public void testMinimalConfiguration() { ProcessEngine processEngine = new Configuration() - .setXmlString("<configuration />") + .setXmlString("<jbpm-configuration />") .buildProcessEngine(); assertNotNull(processEngine); } @@ -40,13 +53,13 @@ public void testConfigurationServices() { ProcessEngine processEngine = new Configuration() .setXmlString( - "<configuration>" + - " <environment-factory>" + + "<jbpm-configuration>" + + " <process-engine>" + " <process-service />" + " <execution-service />" + " <management-service />" + - " </environment-factory>" + - "</configuration>" + " </process-engine>" + + "</jbpm-configuration>" ) .buildProcessEngine(); assertNotNull(processEngine); Modified: jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/modules/test-db/src/test/resources/jbpm.cfg.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> +<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg"> - <environment-factory> + <process-engine> <deployer-manager> <language name="jpdl"> @@ -53,7 +53,7 @@ <holiday period="01/07/2008 - 31/08/2008"/> </business-calendar> - </environment-factory> + </process-engine> <environment> <hibernate-session /> @@ -64,4 +64,4 @@ <timer-session /> </environment> -</contexts> +</jbpm-configuration> Property changes on: jbpm4/trunk/modules/userguide ___________________________________________________________________ Name: svn:ignore + target Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2008-11-21 15:47:43 UTC (rev 3036) +++ jbpm4/trunk/pom.xml 2008-11-21 15:52:02 UTC (rev 3037) @@ -34,15 +34,16 @@ <!-- Modules --> <modules> <module>modules/api</module> + <module>modules/devguide</module> <module>modules/jpdl</module> <module>modules/log</module> - <module>modules/manual</module> <module>modules/pvm</module> <module>modules/task</module> <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-load</module> <module>modules/test-pojo</module> + <module>modules/userguide</module> </modules> <!-- Properties -->