JBoss JBPM SVN: r2144 - in jbpm4/pvm/trunk: modules/manual and 4 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-09-08 12:05:24 -0400 (Mon, 08 Sep 2008)
New Revision: 2144
Added:
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/images/apis.png
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch03-Environments.xml
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch04-Services.xml
Removed:
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch10-Services.xml
Modified:
jbpm4/pvm/trunk/build.xml
jbpm4/pvm/trunk/modules/manual/pom.xml
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/master.xml
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch01-Introduction.xml
jbpm4/pvm/trunk/modules/manual/src/main/docbook/images.ppt
Log:
docs update
Modified: jbpm4/pvm/trunk/build.xml
===================================================================
--- jbpm4/pvm/trunk/build.xml 2008-09-08 15:17:21 UTC (rev 2143)
+++ jbpm4/pvm/trunk/build.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -61,12 +61,12 @@
</antcall>
</target>
- <target name="reference">
- <exec executable="cmd" dir="modules/core">
- <arg line="/C mvn docbkx:generate-html" />
+ <target name="manual">
+ <exec executable="cmd" dir="modules/manual">
+ <arg line="/C mvn jdocbook:resources jdocbook:generate" />
</exec>
<antcall target="show.html">
- <param name="page" value="modules/core/target/site/apidocs/index.html"/>
+ <param name="page" value="modules/manual/target/docbook/publish/en/html_single/index.html"/>
</antcall>
</target>
Modified: jbpm4/pvm/trunk/modules/manual/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/pom.xml 2008-09-08 15:17:21 UTC (rev 2143)
+++ jbpm4/pvm/trunk/modules/manual/pom.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -32,6 +32,7 @@
<build>
<plugins>
+<!--
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
@@ -56,7 +57,7 @@
</postProcess>
</configuration>
</execution>
- <!--
+
<execution>
<id>doc-reference chunk html</id>
<goals>
@@ -91,7 +92,7 @@
<imgSrcPath>${basedir}/src/docbook/doc-reference/en/</imgSrcPath>
</configuration>
</execution>
- -->
+
</executions>
<dependencies>
<dependency>
@@ -102,39 +103,45 @@
</dependency>
</dependencies>
</plugin>
+-->
-<!--
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <sourceDocumentName>en/master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>html_single</formatName>
- </format>
- </formats>
- </configuration>
- </execution>
- </executions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+
<configuration>
- <sourceDocumentName>en/master.xml</sourceDocumentName>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <masterTranslation>en</masterTranslation>
+ <imageResource>
+ <directory>src/main/docbook/en</directory>
+ <includes>
+ <include>images/*.png</include>
+ </includes>
+ </imageResource>
<formats>
<format>
<formatName>html_single</formatName>
+ <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
</format>
</formats>
</configuration>
</plugin>
--->
</plugins>
</build>
Added: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/images/apis.png
===================================================================
(Binary files differ)
Property changes on: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/images/apis.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/master.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/master.xml 2008-09-08 15:17:21 UTC (rev 2143)
+++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/master.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -3,15 +3,16 @@
<!DOCTYPE book [
<!ENTITY ch01-Introduction SYSTEM "modules/ch01-Introduction.xml">
<!ENTITY ch02-SoftwareLogging SYSTEM "modules/ch02-SoftwareLogging.xml">
- <!ENTITY ch03-BasicGraphExecution SYSTEM "modules/ch03-BasicGraphExecution.xml">
+ <!ENTITY ch03-Environments SYSTEM "modules/ch03-Environments.xml">
+ <!ENTITY ch04-Services SYSTEM "modules/ch04-Services.xml">
+ <!ENTITY ch03-BasicGraphExecution SYSTEM "modules/ch03-BasicGraphExecution.xml">
<!ENTITY ch04-AdvancedGraphExecution SYSTEM "modules/ch04-AdvancedGraphExecution.xml">
<!ENTITY ch05-DelegationClasses SYSTEM "modules/ch05-DelegationClasses.xml">
<!ENTITY ch06-Variables SYSTEM "modules/ch06-Variables.xml">
<!ENTITY ch07-History SYSTEM "modules/ch07-History.xml">
<!ENTITY ch08-Environment SYSTEM "modules/ch08-Environment.xml">
<!ENTITY ch09-Persistence SYSTEM "modules/ch09-Persistence.xml">
- <!ENTITY ch10-Services SYSTEM "modules/ch10-Services.xml">
<!ENTITY ch11-AsynchronousContinuations SYSTEM "modules/ch11-AsynchronousContinuations.xml">
<!ENTITY ch12-Timers SYSTEM "modules/ch12-Timers.xml">
<!ENTITY ch13-ProcessLanguages SYSTEM "modules/ch13-ProcessLanguages.xml">
@@ -30,17 +31,7 @@
&ch01-Introduction;
&ch02-SoftwareLogging;
- &ch03-BasicGraphExecution;
+ &ch03-Environments;
+ &ch04-Services;
- &ch04-AdvancedGraphExecution;
- &ch05-DelegationClasses;
- &ch06-Variables;
- &ch07-History;
- &ch08-Environment;
- &ch09-Persistence;
- &ch10-Services;
- &ch11-AsynchronousContinuations;
- &ch12-Timers;
- &ch13-ProcessLanguages;
-
</book>
\ No newline at end of file
Modified: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch01-Introduction.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch01-Introduction.xml 2008-09-08 15:17:21 UTC (rev 2143)
+++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch01-Introduction.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -2,13 +2,6 @@
<title>Introduction</title>
<section>
- <title>Scope and target audience</title>
- <para>This is the reference manual that explains all the concepts of the Process Virtual Machine.
- If you're looking for an introduction, check out the tutorial first.
- </para>
- </section>
-
- <section>
<title>JVM version</title>
<para>jbpm-pvm.jar requires a JVM version 5 or higher.
</para>
@@ -25,17 +18,25 @@
<section>
<title>What is it</title>
- <para>In essence, the process virtual machine is a framework specifying executable
+ <para>In essence, the Process Virtual Machine is a framework specifying executable
graphs. A process definition represents an execution flow and has a structure that
- be represented graphically as a diagram
- . Many executions can be
- started for one process definition. Typically, process definitions are static. A
- process definition is composed of nodes and transitions. The runtime behaviour
- of a node is encapsulated in a so called Activity and it's decoupled from the process
- graph structure.
+ be represented graphically as a diagram. Many executions can be
+ started for one process definition.
+ </para>
+ <figure id="example.process.graph">
+ <title>Example process definition</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/first.graph.process.png"/></imageobject></mediaobject>
+ </figure>
+ <para>Typically, process definitions are static. A process definition is composed of
+ nodes and transitions. The runtime behaviour of a node is encapsulated in a so called
+ Activity and it's decoupled from the process graph structure. The Process Virtual
+ Machine doesn't contain any such activity implementations. It only provides the
+ execution environment and a set of basic operations such as taking a transition.
+ It also gives the user a simple way of implementing the process
+ constructs as concrete <literal>Activity</literal> implementations.
</para>
<figure id="class.diagram.process.definition">
- <title>Process definition structure in UML class diagram</title>
+ <title>Process structure class diagram</title>
<mediaobject><imageobject><imagedata align="center" fileref="images/class.diagram.process.definition.png"/></imageobject></mediaobject>
</figure>
<para>Activities can also be wait states. This means that the node control flow goes
@@ -43,7 +44,7 @@
</para>
<para>An execution is a pointer that keeps track of the current node. To represent
concurrent paths of execution, there is a hierarchical parent-child relation between
- so that one process instance can correspond with a tree of executions.
+ so that one process instance can cope with concurrent paths of execution.
</para>
<figure id="class.diagram.process.execution">
<title>Process structure class diagram</title>
@@ -83,4 +84,30 @@
</para>
</section>
+ <section>
+ <title>APIs</title>
+ <para>The Process Virtual Machine has 4 integrated API's that together offer a complete coverage
+ of working with processes.
+ </para>
+ <figure id="apis">
+ <title>The 4 API's of the Process Virtual Machine</title>
+ <mediaobject><imageobject><imagedata align="center" fileref="images/apis.png"/></imageobject></mediaobject>
+ </figure>
+ <para>The services interfaces should be used from application code that wants to interact
+ with the Process Virtual Machine which runs in transactional persistent mode, backed by a
+ database. This is the most typical way how users interact with the PVM as a workflow engine.
+ </para>
+ <para>To execute processes without persistence, the client API can be used to work with process
+ and execution objects directly. The client API expose the methods of the core model objects.
+ </para>
+ <para>The activity API is used to implement the runtime behaviour of activities. So a activity
+ type is in fact a component with at the core an implementation of the <literal>Activity</literal>
+ interface. Activity implementations can control the flow of execution.
+ </para>
+ <para>The event listener API serves to write pieces of Java code that should be executed upon
+ process events. It's very similar to the activity API with that exception that event listeners
+ are not able to control the flow of execution.
+ </para>
+ </section>
+
</chapter>
Added: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch03-Environments.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch03-Environments.xml (rev 0)
+++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch03-Environments.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -0,0 +1,7 @@
+<chapter id="environments">
+ <title>Environments</title>
+
+ <para>
+ </para>
+
+</chapter>
\ No newline at end of file
Copied: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch04-Services.xml (from rev 2138, jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch10-Services.xml)
===================================================================
--- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch04-Services.xml (rev 0)
+++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch04-Services.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -0,0 +1,82 @@
+<chapter id="services">
+ <title>Services</title>
+
+ <para>Services can be fetched from the EnvironmentFactory, which in it's turn
+ can be created from a configuration file.
+ </para>
+
+ <programlisting>EnvironmentFactory environmentFactory = new PvmEnvironmentFactory("pvm.cfg.xml");
+ProcessService processService = environmentFactory.get(ProcessService.class);</programlisting>
+
+ <para>Services are thread safe so only 1 single service object should be maintained
+ by the application and it can serve all requests for the application.
+ </para>
+
+
+
+ <section id="architecture">
+ <title>Architecture</title>
+ <para>Service methods are implemented through command classes.
+ Each method creates a command object and the command is executed with
+ the <literal>execute</literal> method of the <literal>CommandService</literal>.
+ The <literal>CommandService</literal> is responsible for setting up the
+ environment.
+ </para>
+ <para>There are four command services:
+ </para>
+ <itemizedlist>
+ <listitem><literal>command-service</literal> will just
+ execute the command and pass in the current environment.</listitem>
+ <listitem>(UNTESTED) <literal>async-command-service</literal> will send an
+ asynchronous message. So right after that in a separate transaction,
+ the message is consumed and the command is executed.</listitem>
+ <listitem>(TODO) <literal>cmt-command-service</literal> will delegate
+ execution of the command to a local SLSB that has transaction attribute
+ <literal>required</literal>.</listitem>
+ <listitem>(TODO) <literal>remote-command-service</literal> will delegate
+ execution of the command to a remote SLSB.</listitem>
+ </itemizedlist>
+ <para>Each of the command services can be configured with a list of
+ interceptors that span around the command execution. Following
+ interceptors are available:</para>
+ <itemizedlist>
+ <listitem><literal>environment-interceptor</literal>: Will execute the
+ command within an <link linkend="environmentblock">environment block</link>.
+ </listitem>
+ <listitem>(UNTESTED) <literal>authorization-interceptor</literal>: Will perform
+ an authrorization check before the command is executed. The
+ authorization interceptor will look up the AuthorizationSession
+ from the environment to delegate the actual authorization check to.
+ </listitem>
+ <listitem><literal>retry-interceptor</literal>: Will catch hibernate's
+ optmistic locking exceptions (StaleStateException) and retries
+ to execute the command for a configurable number of times
+ </listitem>
+ <listitem><literal>transaction-interceptor</literal>: Will get
+ the transaction from the current context and invoke
+ setRollbackOnly() on it in case an exception comes out of
+ the command execution.
+ </listitem>
+ </itemizedlist>
+ <para>Following configuration can be used in default standard persistence
+ situations:
+ </para>
+ <programlisting><contexts>
+ <environment-factory>
+
+ <pvm-service />
+
+ <command-service>
+ <retry-interceptor />
+ <environment-interceptor />
+ <transaction-interceptor />
+ </command-service>
+
+ ...
+ </environment-factory>
+ ...
+
+</contexts></programlisting>
+ </section>
+
+</chapter>
\ No newline at end of file
Property changes on: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch04-Services.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Deleted: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch10-Services.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch10-Services.xml 2008-09-08 15:17:21 UTC (rev 2143)
+++ jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/modules/ch10-Services.xml 2008-09-08 16:05:24 UTC (rev 2144)
@@ -1,86 +0,0 @@
-<chapter id="services">
- <title>Services</title>
-
- <section>
- <title>Introduction</title>
- <para>All session facades are called services in the PVM and it's related projects.
- A service is the front door of the API. It has a number of methods that
- expose the functionality of the component. The service takes care of getting
- or setting up an <link linkend="environmentblock">environment</link> for each operation
- that is invoked.
- </para>
- </section>
-
- <section id="pvmservice">
- <title>PvmService</title>
- <para>The class org.jbpm.PvmService is the main way to access functionality from the
- PVM.
- </para>
- </section>
-
- <section id="architecture">
- <title>Architecture</title>
- <para>Service methods are implemented through command classes.
- Each method creates a command object and the command is executed with
- the <literal>execute</literal> method of the <literal>CommandService</literal>.
- The <literal>CommandService</literal> is responsible for setting up the
- environment.
- </para>
- <para>There are four command services:
- </para>
- <itemizedlist>
- <listitem><literal>command-service</literal> will just
- execute the command and pass in the current environment.</listitem>
- <listitem>(UNTESTED) <literal>async-command-service</literal> will send an
- asynchronous message. So right after that in a separate transaction,
- the message is consumed and the command is executed.</listitem>
- <listitem>(TODO) <literal>cmt-command-service</literal> will delegate
- execution of the command to a local SLSB that has transaction attribute
- <literal>required</literal>.</listitem>
- <listitem>(TODO) <literal>remote-command-service</literal> will delegate
- execution of the command to a remote SLSB.</listitem>
- </itemizedlist>
- <para>Each of the command services can be configured with a list of
- interceptors that span around the command execution. Following
- interceptors are available:</para>
- <itemizedlist>
- <listitem><literal>environment-interceptor</literal>: Will execute the
- command within an <link linkend="environmentblock">environment block</link>.
- </listitem>
- <listitem>(UNTESTED) <literal>authorization-interceptor</literal>: Will perform
- an authrorization check before the command is executed. The
- authorization interceptor will look up the AuthorizationSession
- from the environment to delegate the actual authorization check to.
- </listitem>
- <listitem><literal>retry-interceptor</literal>: Will catch hibernate's
- optmistic locking exceptions (StaleStateException) and retries
- to execute the command for a configurable number of times
- </listitem>
- <listitem><literal>transaction-interceptor</literal>: Will get
- the transaction from the current context and invoke
- setRollbackOnly() on it in case an exception comes out of
- the command execution.
- </listitem>
- </itemizedlist>
- <para>Following configuration can be used in default standard persistence
- situations:
- </para>
- <programlisting><contexts>
- <environment-factory>
-
- <pvm-service />
-
- <command-service>
- <retry-interceptor />
- <environment-interceptor />
- <transaction-interceptor />
- </command-service>
-
- ...
- </environment-factory>
- ...
-
-</contexts></programlisting>
- </section>
-
-</chapter>
\ No newline at end of file
Modified: jbpm4/pvm/trunk/modules/manual/src/main/docbook/images.ppt
===================================================================
(Binary files differ)
17 years, 7 months
JBoss JBPM SVN: r2143 - in jbpm3/trunk: modules/core and 1 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 11:17:21 -0400 (Mon, 08 Sep 2008)
New Revision: 2143
Modified:
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml
jbpm3/trunk/pom.xml
Log:
Fix sybase connection
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-09-08 14:01:30 UTC (rev 2142)
+++ jbpm3/trunk/modules/core/pom.xml 2008-09-08 15:17:21 UTC (rev 2143)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<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>
@@ -18,21 +18,21 @@
<artifactId>jbpm-core</artifactId>
<packaging>jar</packaging>
- <!-- Parent -->
+ <!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
- <!-- Dependencies -->
+ <!-- Dependencies -->
<dependencies>
- <!-- jBPM Dependencies -->
+ <!-- jBPM Dependencies -->
<!--
dependency> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-api</artifactId> <version>${version}</version> </dependency
-->
- <!-- Compile Dependencies -->
+ <!-- Compile Dependencies -->
<dependency>
<groupId>bsh</groupId>
<artifactId>bsh</artifactId>
@@ -73,6 +73,8 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate</artifactId>
</dependency>
+
+ <!-- Test Dependencies -->
<dependency>
<groupId>dumbster</groupId>
<artifactId>dumbster</artifactId>
@@ -83,13 +85,17 @@
<artifactId>jaxen</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Remove this static dependency -->
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
- <!-- Test Dependencies -->
</dependencies>
<!-- Plugins -->
@@ -148,10 +154,10 @@
</plugin>
</plugins>
</build>
-
+
<!-- Profiles -->
<profiles>
-
+
<!--
Name: no-database
Descr: Setup the default database
@@ -170,8 +176,7 @@
<configuration>
<excludes>
<!--
- Cleanup stale tests from the testsuite
- http://jira.jboss.org/jira/browse/JBPM-1205
+ Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-->
<exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
<exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
@@ -208,7 +213,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: hsqldb
Descr: Hypersonic Database Setup
@@ -228,8 +233,7 @@
<configuration>
<excludes>
<!--
- Cleanup stale tests from the testsuite
- http://jira.jboss.org/jira/browse/JBPM-1205
+ Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-->
<exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
<exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
@@ -266,7 +270,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: mysql
Descr: MySQL Database Setup
@@ -286,8 +290,7 @@
<configuration>
<excludes>
<!--
- Cleanup stale tests from the testsuite
- http://jira.jboss.org/jira/browse/JBPM-1205
+ Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-->
<exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
<exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
@@ -330,7 +333,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: postgresql
Descr: MySQL Database Setup
@@ -350,8 +353,7 @@
<configuration>
<excludes>
<!--
- Cleanup stale tests from the testsuite
- http://jira.jboss.org/jira/browse/JBPM-1205
+ Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-->
<exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
<exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
@@ -388,7 +390,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: sybase
Descr: Sybase Database Setup
@@ -408,8 +410,7 @@
<configuration>
<excludes>
<!--
- Cleanup stale tests from the testsuite
- http://jira.jboss.org/jira/browse/JBPM-1205
+ Cleanup stale tests from the testsuite http://jira.jboss.org/jira/browse/JBPM-1205
-->
<exclude>org/jbpm/context/exe/VariableQueryDbTest.java</exclude>
<exclude>org/jbpm/db/ContextSessionDbTest.java</exclude>
Modified: jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-08 14:01:30 UTC (rev 2142)
+++ jbpm3/trunk/modules/core/src/main/resources/hibernate.properties.sybase.xml 2008-09-08 15:17:21 UTC (rev 2143)
@@ -6,6 +6,6 @@
<property name="hibernate.connection.driver_class">com.sybase.jdbc3.jdbc.SybDriver</property>
<property name="hibernate.connection.url">jdbc:sybase:Tds:dev01.qa.atl.jboss.com:4100/jbpmteam</property>
<property name="hibernate.connection.username">jbpmteam</property>
- <property name="hibernate.connection.password"></property>
+ <property name="hibernate.connection.password">jbpmteam</property>
<!-- JDBC connection properties (end) -->
\ No newline at end of file
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-08 14:01:30 UTC (rev 2142)
+++ jbpm3/trunk/pom.xml 2008-09-08 15:17:21 UTC (rev 2143)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
-<!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
+ <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler(a)jboss.com $ -->
<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>
@@ -76,7 +76,7 @@
<richfaces.ui.version>3.2.1.GA</richfaces.ui.version>
<slf4j.version>1.5.2</slf4j.version>
<sun.facelets.version>1.1.14</sun.facelets.version>
-
+
<!-- Database Driver Versions -->
<hsqldb.version>1.8.0.7</hsqldb.version>
<mysql.connector.version>5.1.6</mysql.connector.version>
@@ -359,7 +359,7 @@
<artifactId>poi-scratchpad</artifactId>
<version>${poi.version}</version>
</dependency>
-
+
<!-- Database Driver Versions -->
<dependency>
<groupId>hsqldb</groupId>
@@ -393,7 +393,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<!-- Plugins -->
<build>
<plugins>
@@ -408,7 +408,7 @@
</plugin>
</plugins>
</build>
-
+
<!-- DistributionManagement -->
<distributionManagement>
<site>
@@ -454,7 +454,7 @@
</plugins>
</build>
</profile>
-
+
<!--
Name: skiptests
Desc: Skips the tests
@@ -494,9 +494,9 @@
</plugins>
</build>
</profile>
-
+
<!-- DATABASE PROFILES ***************************************************************************** -->
-
+
<!--
Name: no-database
Descr: Setup the default database
@@ -561,7 +561,7 @@
</dependency>
</dependencies>
</profile>
-
+
<!--
Name: postgresql
Descr: MySQL Database Setup
@@ -583,7 +583,7 @@
</dependency>
</dependencies>
</profile>
-
+
<!--
Name: sybase
Descr: Sybase Database Setup
@@ -598,13 +598,17 @@
</activation>
<dependencies>
<dependency>
- <groupId>jconnect</groupId>
+ <groupId>com.sybase</groupId>
<artifactId>jconnect</artifactId>
- <version>6.0</version>
- <systemPath>/local/opt/jdbc-drivers/jConnect-6_0/classes/jconn3.jar</systemPath>
- <scope>system</scope>
+ <version>6.0.5</version>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <id>qa.jboss.com</id>
+ <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url>
+ </repository>
+ </repositories>
</profile>
</profiles>
</project>
17 years, 7 months
JBoss JBPM SVN: r2142 - in jbpm3/trunk/modules/distribution: scripts and 1 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 10:01:30 -0400 (Mon, 08 Sep 2008)
New Revision: 2142
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
Add docs, config to installer
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 14:01:30 UTC (rev 2142)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<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>
@@ -18,14 +18,14 @@
<artifactId>jbpm-distribution</artifactId>
<packaging>pom</packaging>
- <!-- Parent -->
+ <!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
- <!-- Dependencies -->
+ <!-- Dependencies -->
<dependencies>
<dependency>
<groupId>org.jboss.jbpm</groupId>
@@ -35,23 +35,29 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-enterprise</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-enterprise</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-core</artifactId>
+ <classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-core</artifactId>
+ <artifactId>jbpm-enterprise</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-enterprise</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
@@ -69,6 +75,12 @@
<dependency>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-identity</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-identity</artifactId>
<classifier>service</classifier>
<version>${version}</version>
<type>zip</type>
@@ -84,17 +96,21 @@
<version>${version}</version>
<type>jdocbook</type>
</dependency>
-
+
<!-- Thirdparty Dependencies -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
<groupId>izpack</groupId>
<artifactId>standalone-compiler</artifactId>
</dependency>
-
+
<!-- Database Drivers -->
<dependency>
<groupId>mysql</groupId>
@@ -144,6 +160,9 @@
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<property name="database" value="${database}" />
<property name="jboss.home" value="${jboss.home}" />
+ <property name="jboss422.home" value="${jboss422.home}" />
+ <property name="jboss423.home" value="${jboss423.home}" />
+ <property name="jboss500.home" value="${jboss500.home}" />
<property name="jboss.id" value="${jboss.id}" />
<property name="product.name" value="${project.name}" />
<property name="product.short.name" value="${artifactId}" />
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-08 14:01:30 UTC (rev 2142)
@@ -121,6 +121,7 @@
<mkdir dir="${izpack.temp.dir}" />
<!-- http://jira.codehaus.org/browse/IZPACK-151 -->
+ <copy file="${deploy.artifacts.lib}/jbpm-core-config.jar" tofile="${deploy.artifacts.lib}/jbpm-core-config.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-console.war" tofile="${deploy.artifacts.lib}/jbpm-console.zip" />
<copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook" tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" />
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-08 14:01:30 UTC (rev 2142)
@@ -31,6 +31,16 @@
</includes>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>src</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jbpm-core:jar:sources</include>
+ <include>*:jbpm-identity:jar:sources</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
</dependencySets>
<fileSets>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-08 14:01:30 UTC (rev 2142)
@@ -85,17 +85,40 @@
<!-- Packs -->
<packs>
<!-- jBPM3 Standalone -->
- <pack name="jBPM3 Standalone" required="yes" preselected="no">
+ <pack name="jBPM3 Standalone" required="yes" preselected="yes">
<description>The jBPM3 Standalone Components</description>
+
+ <!-- jbpm3/config -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-core-config.zip" targetdir="$INSTALL_PATH/jbpm3/config"
+ unpack="true" override="true" />
+
+ <!-- jbpm3/docs -->
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
+ unpack="true" override="true" />
+
+ <!-- jbpm3/lib -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/jbpm3/lib" override="true">
- <include name="jboss-bpm-api.jar" />
<include name="jbpm-enterprise.jar" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
- <include name="jbpm-integration.jar" />
+
+ <include name="activation.jar" />
+ <include name="antlr.jar" />
+ <include name="asm.jar" />
+ <include name="bsh.jar" />
+ <include name="cglib.jar" />
+ <include name="commons-collections.jar" />
+ <include name="commons-logging.jar" />
+ <include name="dom4j.jar" />
+ <include name="hibernate.jar" />
+ <include name="hsqldb.jar" />
</fileset>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
- unpack="true" override="true" />
+
+ <!-- jbpm3/src -->
+ <fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/jbpm3/src" override="true">
+ <include name="jbpm-core-sources.jar" />
+ <include name="jbpm-identity-sources.jar" />
+ </fileset>
</pack>
<!-- Optional Downloads -->
@@ -120,23 +143,30 @@
<!-- jBPM3 Server Components -->
<pack name="jBPM3 Server Components" required="yes" preselected="yes">
<description>The jBPM3 Server Components</description>
+
+ <!-- jbpm -->
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
+ <include name="jbpm-enterprise.jar" />
+ </fileset>
+
+ <!-- jbpm/jbpm-service.sar -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
- <include name="jboss-bpm-api.jar" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
- <include name="jbpm-integration.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
- <include name="jbpm-enterprise.jar" />
- </fileset>
+ <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+ unpack="true" override="true" />
+
+ <!-- jbpm/jbpm-console.war -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
unpack="true" override="true" />
+
+ <!-- jbpm/jbpm-userguide.war -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- unpack="true" override="true" />
- <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
+
</pack>
<!-- jBPM Databases -->
17 years, 7 months
JBoss JBPM SVN: r2141 - maven/parent/trunk.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 06:17:34 -0400 (Mon, 08 Sep 2008)
New Revision: 2141
Modified:
maven/parent/trunk/pom.xml
Log:
remove codehouse docbook plugin
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2008-09-08 09:54:11 UTC (rev 2140)
+++ maven/parent/trunk/pom.xml 2008-09-08 10:17:34 UTC (rev 2141)
@@ -133,11 +133,6 @@
<version>1.0-beta-1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>docbook-maven-plugin</artifactId>
- <version>1.0.0-alpha-1</version>
- </plugin>
- <plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
<version>2.3</version>
17 years, 7 months
JBoss JBPM SVN: r2140 - in jbpm3/trunk: modules/distribution and 2 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 05:54:11 -0400 (Mon, 08 Sep 2008)
New Revision: 2140
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/pom.xml
Log:
Include userguide in distro
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 09:42:08 UTC (rev 2139)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 09:54:11 UTC (rev 2140)
@@ -78,6 +78,12 @@
<artifactId>jbpm-integration</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-userguide</artifactId>
+ <version>${version}</version>
+ <type>jdocbook</type>
+ </dependency>
<!-- Thirdparty Dependencies -->
<dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-08 09:42:08 UTC (rev 2139)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-08 09:54:11 UTC (rev 2140)
@@ -122,6 +122,7 @@
<!-- http://jira.codehaus.org/browse/IZPACK-151 -->
<copy file="${deploy.artifacts.lib}/jbpm-console.war" tofile="${deploy.artifacts.lib}/jbpm-console.zip" />
+ <copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook" tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" />
<!-- Run installer build -->
<echo message="Running IzPack to build the installer..." />
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-08 09:42:08 UTC (rev 2139)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-08 09:54:11 UTC (rev 2140)
@@ -90,10 +90,12 @@
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/jbpm3/lib" override="true">
<include name="jboss-bpm-api.jar" />
<include name="jbpm-enterprise.jar" />
- <include name="jbpm-jpdl-core.jar" />
- <include name="jbpm-jpdl-identity.jar" />
- <include name="jbpm-jpdl-integration.jar" />
+ <include name="jbpm-core.jar" />
+ <include name="jbpm-identity.jar" />
+ <include name="jbpm-integration.jar" />
</fileset>
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
+ unpack="true" override="true" />
</pack>
<!-- Optional Downloads -->
@@ -121,17 +123,19 @@
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
<include name="jboss-bpm-api.jar" />
- <include name="jbpm-jpdl-core.jar" />
- <include name="jbpm-jpdl-identity.jar" />
- <include name="jbpm-jpdl-integration.jar" />
+ <include name="jbpm-core.jar" />
+ <include name="jbpm-identity.jar" />
+ <include name="jbpm-integration.jar" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
<include name="jbpm-enterprise.jar" />
</fileset>
<file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
unpack="true" override="true" />
- <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+ unpack="true" override="true" />
<file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
</pack>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-08 09:42:08 UTC (rev 2139)
+++ jbpm3/trunk/pom.xml 2008-09-08 09:54:11 UTC (rev 2140)
@@ -481,6 +481,7 @@
<id>release</id>
<modules>
<module>modules/distribution</module>
+ <module>modules/userguide</module>
</modules>
<build>
<plugins>
17 years, 7 months
JBoss JBPM SVN: r2139 - jbpm4/pvm/trunk/modules/core.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-09-08 05:42:08 -0400 (Mon, 08 Sep 2008)
New Revision: 2139
Modified:
jbpm4/pvm/trunk/modules/core/pom.xml
Log:
moved manual to separate module
Modified: jbpm4/pvm/trunk/modules/core/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-08 09:41:17 UTC (rev 2138)
+++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-08 09:42:08 UTC (rev 2139)
@@ -224,80 +224,6 @@
</dependencies>
</plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <sourceDocumentName>en/master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>html</formatName>
- </format>
- </formats>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!--
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <sourceDirectory>src/docbook/doc-reference/en</sourceDirectory>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <targetDirectory>target/reference</targetDirectory>
- <imageCopyingRequired>true</imageCopyingRequired>
- <formats>
- <format>
- <formatName>html_single</formatName>
- <finalName>index.html</finalName>
- </format>
- </formats>
- </configuration>
- </plugin>
-
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- <format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
- <finalName>hibernate_reference.pdf</finalName>
- <profilingTypeName>two_pass</profilingTypeName>
- </format>
- -->
-
- <!--
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <sourceDirectory>src/docbook/doc-reference/en</sourceDirectory>
- <sourceDocumentName>master.xml</sourceDocumentName>
- <imagesDirectory>src/docbook/doc-reference/images</imagesDirectory>
- <targetDirectory>target/reference</targetDirectory>
- <formats>
- <format>
- <formatName>html_single</formatName>
- </format>
- </formats>
- </configuration>
- </plugin>
- -->
</plugins>
</build>
17 years, 7 months
JBoss JBPM SVN: r2138 - in jbpm4/pvm/trunk: modules and 10 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-09-08 05:41:17 -0400 (Mon, 08 Sep 2008)
New Revision: 2138
Added:
jbpm4/pvm/trunk/modules/manual/
jbpm4/pvm/trunk/modules/manual/pom.xml
jbpm4/pvm/trunk/modules/manual/src/
jbpm4/pvm/trunk/modules/manual/src/docbook/
jbpm4/pvm/trunk/modules/manual/src/main/
jbpm4/pvm/trunk/modules/manual/src/main/docbook/
jbpm4/pvm/trunk/modules/manual/src/main/docbook/en/
jbpm4/pvm/trunk/modules/manual/src/main/docbook/images.ppt
jbpm4/pvm/trunk/modules/manual/src/main/tutorial/
Removed:
jbpm4/pvm/trunk/modules/core/src/docbook/
jbpm4/pvm/trunk/modules/manual/src/docbook/doc-reference/en/
jbpm4/pvm/trunk/modules/manual/src/docbook/doc-reference/images.ppt
jbpm4/pvm/trunk/modules/manual/src/docbook/doc-tutorial/
Modified:
jbpm4/pvm/trunk/assembly.xml
jbpm4/pvm/trunk/build.xml
jbpm4/pvm/trunk/modules/core/pom.xml
jbpm4/pvm/trunk/pom.xml
Log:
moved manual to separate module
Modified: jbpm4/pvm/trunk/assembly.xml
===================================================================
--- jbpm4/pvm/trunk/assembly.xml 2008-09-08 09:40:23 UTC (rev 2137)
+++ jbpm4/pvm/trunk/assembly.xml 2008-09-08 09:41:17 UTC (rev 2138)
@@ -27,7 +27,7 @@
<fileSets>
<fileSet>
<directory>modules/core/target/apidocs</directory>
- <outputDirectory>doc/api</outputDirectory>
+ <outputDirectory>doc/api-javadocs</outputDirectory>
</fileSet>
<fileSet>
<directory>modules/core/src/main/java</directory>
@@ -38,14 +38,14 @@
<outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>modules/core/target/manual</directory>
+ <directory>modules/core/target/doc-reference</directory>
<outputDirectory>doc/reference</outputDirectory>
<excludes>
<exclude>**/*.fo</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>modules/core/target/doc/wirexsd</directory>
+ <directory>modules/core/target/doc-wirexsd</directory>
<outputDirectory>doc/wirexsd</outputDirectory>
<excludes>
<exclude>**/*.fo</exclude>
Modified: jbpm4/pvm/trunk/build.xml
===================================================================
--- jbpm4/pvm/trunk/build.xml 2008-09-08 09:40:23 UTC (rev 2137)
+++ jbpm4/pvm/trunk/build.xml 2008-09-08 09:41:17 UTC (rev 2138)
@@ -1,18 +1,32 @@
<project name="pvm" default="install" basedir=".">
+ <!-- This ant build only serves as IDE integration to run maven jobs.
+ Now in eclipse it's possible to open the ant view and double click
+ the targets in this ant build that will just delegate to the maven
+ build. Also, if there are html results being produced by a target,
+ they are opened in a browser.
+ -->
+
<!-- BROWSER PROPERTIES -->
- <property name="windows.browser" value="C:/Program Files/Internet Explorer/IEXPLORE.EXE" />
+ <!-- <property name="windows.browser" value="C:/Program Files/Internet Explorer/IEXPLORE.EXE" /> -->
+ <property name="windows.browser" value="C:/Program Files/Mozilla Firefox/firefox.exe" />
<property name="macos.browser" value="/usr/bin/open" />
<property name="linux.browser" value="mozilla" />
+ <target name="clean">
+ <exec executable="cmd">
+ <arg line="/C mvn clean" />
+ </exec>
+ </target>
+
<target name="install">
- <exec executable="cmd">
- <arg line="/C mvn install" />
+ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="/C mvn -DskipTests install" />
</exec>
</target>
<target name="javadoc">
- <exec executable="cmd">
+ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
<arg line="/C mvn javadoc:javadoc" />
</exec>
<antcall target="show.html">
@@ -20,6 +34,24 @@
</antcall>
</target>
+ <target name="test">
+ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="/C mvn surefire-report:report" />
+ </exec>
+ <antcall target="show.html">
+ <param name="page" value="modules/core/target/site/surefire-report.html"/>
+ </antcall>
+ </target>
+
+ <target name="distro.package">
+ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg line="/C mvn -DskipTests package assembly:assembly" />
+ </exec>
+ <antcall target="show.html">
+ <param name="page" value="target/"/>
+ </antcall>
+ </target>
+
<target name="wirexsddoc">
<exec executable="cmd">
<arg line="/C mvn ?" />
@@ -30,8 +62,8 @@
</target>
<target name="reference">
- <exec executable="cmd">
- <arg line="/C mvn ?" />
+ <exec executable="cmd" dir="modules/core">
+ <arg line="/C mvn docbkx:generate-html" />
</exec>
<antcall target="show.html">
<param name="page" value="modules/core/target/site/apidocs/index.html"/>
@@ -42,8 +74,8 @@
<!-- HTML -->
<target name="show.html">
<fail message="property page has to be specified to use this target" unless="page" />
- <exec executable="${windows.browser}" os="Windows XP,Windows 2000,Windows 98">
- <arg value="file://${basedir}/${page}" />
+ <exec executable="cmd" os="Windows Vista, Windows XP,Windows 2000,Windows 98">
+ <arg value="/C start "${windows.browser}" "file://${basedir}/${page}"" />
</exec>
<exec executable="${macos.browser}" os="Mac OS X">
<arg value="file://${basedir}/${page}" />
Modified: jbpm4/pvm/trunk/modules/core/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-08 09:40:23 UTC (rev 2137)
+++ jbpm4/pvm/trunk/modules/core/pom.xml 2008-09-08 09:41:17 UTC (rev 2138)
@@ -203,7 +203,7 @@
<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"
+ out="${basedir}/target/doc-wirexsd"
title="Process Virtual Machine: Wiring Schema"
verbose="false" />
</tasks>
@@ -223,76 +223,81 @@
</dependency>
</dependencies>
</plugin>
+
<plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
<executions>
<execution>
- <id>doc-reference html</id>
- <goals>
- <goal>generate-html</goal>
- </goals>
<phase>package</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/docbook/doc-reference/en</sourceDirectory>
- <targetDirectory>${basedir}/target/manual/html_single/reference</targetDirectory>
- <postProcess>
- <copy
- todir="${basedir}/target/manual/html_single/reference/images">
- <fileset
- dir="${basedir}/src/docbook/doc-reference/en/images">
- <include name="**/*.png" />
- <include name="**/*.gif" />
- <include name="**/*.jpg" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>doc-reference chunk html</id>
<goals>
- <goal>generate-html</goal>
+ <goal>generate</goal>
+ <goal>bundle</goal>
</goals>
- <phase>package</phase>
<configuration>
- <sourceDirectory>${basedir}/src/docbook/doc-reference/en</sourceDirectory>
- <targetDirectory>${basedir}/target/manual/html/reference</targetDirectory>
- <chunkedOutput>true</chunkedOutput>
- <postProcess>
- <copy todir="${basedir}/target/manual/html/reference/images">
- <fileset
- dir="${basedir}/src/docbook/doc-reference/en/images">
- <include name="**/*.png" />
- <include name="**/*.gif" />
- <include name="**/*.jpg" />
- </fileset>
- </copy>
- </postProcess>
+ <sourceDocumentName>en/master.xml</sourceDocumentName>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ </format>
+ </formats>
</configuration>
</execution>
- <execution>
- <id>doc-reference pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <sourceDirectory>${basedir}/src/docbook/doc-reference/en</sourceDirectory>
- <targetDirectory>${basedir}/target/manual/pdf/reference</targetDirectory>
- <imgSrcPath>${basedir}/src/docbook/doc-reference/en/</imgSrcPath>
- </configuration>
- </execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
</plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceDirectory>src/docbook/doc-reference/en</sourceDirectory>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <targetDirectory>target/reference</targetDirectory>
+ <imageCopyingRequired>true</imageCopyingRequired>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/html/main-chunk.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath:/xslt/hibernate/pdf/main-pdf.xsl</stylesheetResource>
+ <finalName>hibernate_reference.pdf</finalName>
+ <profilingTypeName>two_pass</profilingTypeName>
+ </format>
+ -->
+
+ <!--
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <sourceDirectory>src/docbook/doc-reference/en</sourceDirectory>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <imagesDirectory>src/docbook/doc-reference/images</imagesDirectory>
+ <targetDirectory>target/reference</targetDirectory>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+ -->
</plugins>
</build>
Property changes on: jbpm4/pvm/trunk/modules/manual
___________________________________________________________________
Name: svn:ignore
+ target
Added: jbpm4/pvm/trunk/modules/manual/pom.xml
===================================================================
--- jbpm4/pvm/trunk/modules/manual/pom.xml (rev 0)
+++ jbpm4/pvm/trunk/modules/manual/pom.xml 2008-09-08 09:41:17 UTC (rev 2138)
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: pom.xml 1846 2008-08-07 11:19:13Z tom.baeyens(a)jboss.com $ -->
+
+<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 jBPM 4 - PVM Manual</name>
+ <groupId>org.jbpm</groupId>
+ <artifactId>pvm-manual</artifactId>
+ <packaging>pom</packaging>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jbpm</groupId>
+ <artifactId>pvm-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>manual</id>
+ <goals>
+ <goal>generate-html</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/docbook/en</sourceDirectory>
+ <targetDirectory>${basedir}/target/manual/html_single</targetDirectory>
+ <postProcess>
+ <copy todir="${basedir}/target/manual/html_single/images">
+ <fileset dir="${basedir}/src/main/docbook/en/images">
+ <include name="**/*.png" />
+ <include name="**/*.gif" />
+ <include name="**/*.jpg" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ <!--
+ <execution>
+ <id>doc-reference chunk html</id>
+ <goals>
+ <goal>generate-html</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/docbook/doc-reference/en</sourceDirectory>
+ <targetDirectory>${basedir}/target/manual/html/reference</targetDirectory>
+ <chunkedOutput>true</chunkedOutput>
+ <postProcess>
+ <copy todir="${basedir}/target/manual/html/reference/images">
+ <fileset
+ dir="${basedir}/src/docbook/doc-reference/en/images">
+ <include name="**/*.png" />
+ <include name="**/*.gif" />
+ <include name="**/*.jpg" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ <execution>
+ <id>doc-reference pdf</id>
+ <goals>
+ <goal>generate-pdf</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <sourceDirectory>${basedir}/src/docbook/doc-reference/en</sourceDirectory>
+ <targetDirectory>${basedir}/target/manual/pdf/reference</targetDirectory>
+ <imgSrcPath>${basedir}/src/docbook/doc-reference/en/</imgSrcPath>
+ </configuration>
+ </execution>
+ -->
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+<!--
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>generate</goal>
+ <goal>bundle</goal>
+ </goals>
+ <configuration>
+ <sourceDocumentName>en/master.xml</sourceDocumentName>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ </format>
+ </formats>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDocumentName>en/master.xml</sourceDocumentName>
+ <formats>
+ <format>
+ <formatName>html_single</formatName>
+ </format>
+ </formats>
+ </configuration>
+ </plugin>
+-->
+
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Copied: jbpm4/pvm/trunk/modules/manual/src/docbook (from rev 2103, jbpm4/pvm/trunk/modules/core/src/docbook)
Property changes on: jbpm4/pvm/trunk/modules/manual/src/docbook
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: jbpm4/pvm/trunk/modules/manual/src/docbook/doc-reference/images.ppt
===================================================================
(Binary files differ)
Copied: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en (from rev 2103, jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/en)
Property changes on: jbpm4/pvm/trunk/modules/manual/src/main/docbook/en
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: jbpm4/pvm/trunk/modules/manual/src/main/docbook/images.ppt (from rev 2103, jbpm4/pvm/trunk/modules/core/src/docbook/doc-reference/images.ppt)
===================================================================
(Binary files differ)
Property changes on: jbpm4/pvm/trunk/modules/manual/src/main/docbook/images.ppt
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Name: svn:mergeinfo
+
Copied: jbpm4/pvm/trunk/modules/manual/src/main/tutorial (from rev 2103, jbpm4/pvm/trunk/modules/core/src/docbook/doc-tutorial)
Property changes on: jbpm4/pvm/trunk/modules/manual/src/main/tutorial
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: jbpm4/pvm/trunk/pom.xml
===================================================================
--- jbpm4/pvm/trunk/pom.xml 2008-09-08 09:40:23 UTC (rev 2137)
+++ jbpm4/pvm/trunk/pom.xml 2008-09-08 09:41:17 UTC (rev 2138)
@@ -32,6 +32,7 @@
<!-- ### MODULES ######################################################## -->
<modules>
<module>modules/core</module>
+ <module>modules/manual</module>
<module>modules/minimal</module>
</modules>
17 years, 7 months
JBoss JBPM SVN: r2137 - jbpm4/pvm/trunk/modules/core/src/test/resources.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-09-08 05:40:23 -0400 (Mon, 08 Sep 2008)
New Revision: 2137
Modified:
jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties
Log:
fixed default logging
Modified: jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties
===================================================================
--- jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties 2008-09-08 09:35:22 UTC (rev 2136)
+++ jbpm4/pvm/trunk/modules/core/src/test/resources/logging.properties 2008-09-08 09:40:23 UTC (rev 2137)
@@ -22,7 +22,7 @@
org.hibernate.cfg.HbmBinder.level=SEVERE
org.hibernate.cfg.SettingsFactory.level=SEVERE
# org.hibernate.level=FINE
-org.hibernate.SQL.level=FINEST
+# org.hibernate.SQL.level=FINEST
# org.hibernate.type.level=FINEST
# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST
# org.hibernate.transaction.level=FINEST
17 years, 7 months
JBoss JBPM SVN: r2136 - in jbpm3/trunk: modules and 11 other directories.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 05:35:22 -0400 (Mon, 08 Sep 2008)
New Revision: 2136
Added:
jbpm3/trunk/modules/core/
jbpm3/trunk/modules/db/
jbpm3/trunk/modules/identity/
jbpm3/trunk/modules/integration/
jbpm3/trunk/modules/simulation/
jbpm3/trunk/modules/userguide/
Removed:
jbpm3/trunk/modules/jpdl/
Modified:
jbpm3/trunk/modules/console/pom.xml
jbpm3/trunk/modules/core/.project
jbpm3/trunk/modules/core/pom.xml
jbpm3/trunk/modules/db/.project
jbpm3/trunk/modules/db/pom.xml
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/identity/.project
jbpm3/trunk/modules/identity/pom.xml
jbpm3/trunk/modules/integration/.project
jbpm3/trunk/modules/integration/pom.xml
jbpm3/trunk/modules/jbpm4jsf/pom.xml
jbpm3/trunk/modules/simulation/.project
jbpm3/trunk/modules/simulation/pom.xml
jbpm3/trunk/modules/userguide/.project
jbpm3/trunk/modules/userguide/pom.xml
jbpm3/trunk/pom.xml
Log:
Remove module jpdl
Modified: jbpm3/trunk/modules/console/pom.xml
===================================================================
--- jbpm3/trunk/modules/console/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/console/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -30,13 +30,13 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
Copied: jbpm3/trunk/modules/core (from rev 2135, jbpm3/trunk/modules/jpdl/core)
Modified: jbpm3/trunk/modules/core/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/core/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/core/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-core</name>
+ <name>jbpm-core</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/core/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -13,15 +13,15 @@
<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 jBPM - jPDL Core</name>
+ <name>JBoss jBPM - Core</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
Copied: jbpm3/trunk/modules/db (from rev 2135, jbpm3/trunk/modules/jpdl/db)
Modified: jbpm3/trunk/modules/db/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/db/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/db/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-db</name>
+ <name>jbpm-db</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/db/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/db/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/db/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -15,15 +15,15 @@
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 jBPM - jPDL Database</name>
+ <name>JBoss jBPM - Database</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-db</artifactId>
+ <artifactId>jbpm-db</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
@@ -32,14 +32,14 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>config</classifier>
<version>${version}</version>
<scope>test</scope>
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -46,36 +46,36 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<classifier>service</classifier>
<version>${version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-integration</artifactId>
+ <artifactId>jbpm-integration</artifactId>
<version>${version}</version>
</dependency>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -19,7 +19,7 @@
<outputDirectory>resources/jbpm-core-config</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jbpm-jpdl-core:jar:config</include>
+ <include>*:jbpm-core:jar:config</include>
</includes>
<unpack>true</unpack>
</dependencySet>
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -30,7 +30,7 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
Copied: jbpm3/trunk/modules/identity (from rev 2135, jbpm3/trunk/modules/jpdl/identity)
Modified: jbpm3/trunk/modules/identity/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/identity/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-identity</name>
+ <name>jbpm-identity</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/identity/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/identity/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -13,15 +13,15 @@
<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 jBPM - jPDL Identity</name>
+ <name>JBoss jBPM - Identity</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
@@ -30,7 +30,7 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
@@ -44,7 +44,7 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>config</classifier>
<version>${version}</version>
<scope>test</scope>
Copied: jbpm3/trunk/modules/integration (from rev 2135, jbpm3/trunk/modules/jpdl/integration)
Modified: jbpm3/trunk/modules/integration/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/integration/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-integration</name>
+ <name>jbpm-integration</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/integration/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/integration/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -12,15 +12,15 @@
<!-- $Id$ -->
<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 jBPM - jPDL CTS Integration</name>
+ <name>JBoss jBPM - Integration</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-integration</artifactId>
+ <artifactId>jbpm-integration</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
@@ -33,7 +33,7 @@
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
@@ -48,7 +48,7 @@
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>config</classifier>
<version>${version}</version>
<scope>test</scope>
Modified: jbpm3/trunk/modules/jbpm4jsf/pom.xml
===================================================================
--- jbpm3/trunk/modules/jbpm4jsf/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/jbpm4jsf/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -32,7 +32,7 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<version>${version}</version>
</dependency>
Copied: jbpm3/trunk/modules/simulation (from rev 2135, jbpm3/trunk/modules/jpdl/simulation)
Modified: jbpm3/trunk/modules/simulation/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/simulation/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-simulation</name>
+ <name>jbpm-simulation</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/simulation/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/simulation/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -12,15 +12,15 @@
<!-- $Id$ -->
<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 jBPM - jPDL Simulation</name>
+ <name>JBoss jBPM - Simulation</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-simulation</artifactId>
+ <artifactId>jbpm-simulation</artifactId>
<packaging>jar</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
@@ -29,7 +29,7 @@
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
+ <artifactId>jbpm-core</artifactId>
<version>${version}</version>
</dependency>
Copied: jbpm3/trunk/modules/userguide (from rev 2135, jbpm3/trunk/modules/jpdl/userguide)
Modified: jbpm3/trunk/modules/userguide/.project
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/.project 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/userguide/.project 2008-09-08 09:35:22 UTC (rev 2136)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-jpdl-userguide</name>
+ <name>jbpm-userguide</name>
<comment></comment>
<projects>
</projects>
Modified: jbpm3/trunk/modules/userguide/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/modules/userguide/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -15,15 +15,15 @@
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 jBPM - jPDL Userguide</name>
+ <name>JBoss jBPM - Userguide</name>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-userguide</artifactId>
+ <artifactId>jbpm-userguide</artifactId>
<packaging>jdocbook</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
+ <artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
+++ jbpm3/trunk/pom.xml 2008-09-08 09:35:22 UTC (rev 2136)
@@ -28,7 +28,10 @@
<!-- Modules -->
<modules>
- <module>modules/jpdl</module>
+ <module>modules/core</module>
+ <module>modules/identity</module>
+ <module>modules/integration</module>
+ <module>modules/simulation</module>
<module>modules/console</module>
<module>modules/enterprise</module>
<module>modules/jbpm4jsf</module>
17 years, 7 months
JBoss JBPM SVN: r2135 - in jbpm3/trunk: modules/jpdl/userguide and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-08 05:07:46 -0400 (Mon, 08 Sep 2008)
New Revision: 2135
Modified:
jbpm3/trunk/modules/jpdl/userguide/pom.xml
jbpm3/trunk/pom.xml
Log:
docbook WIP
Modified: jbpm3/trunk/modules/jpdl/userguide/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/userguide/pom.xml 2008-09-06 00:28:41 UTC (rev 2134)
+++ jbpm3/trunk/modules/jpdl/userguide/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
@@ -18,7 +18,7 @@
<name>JBoss jBPM - jPDL Userguide</name>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-userguide</artifactId>
- <packaging>pom</packaging>
+ <packaging>jdocbook</packaging>
<!-- Parent -->
<parent>
@@ -31,33 +31,29 @@
<build>
<plugins>
<!--
- <plugin> Maven JDocbook Plugin http://www.jboss.org/maven-jdocbook-plugin <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId> <extensions>true</extensions> <configuration>
- <sourceDocumentName>en/master.xml</sourceDocumentName> <formats> <format> <formatName>html</formatName> </format> <!- - Include the
- userguide in the deploy artefacts https://jira.jboss.org/jira/browse/JBPM-1299 <format> <formatName>pdf</formatName> </format> - ->
- </formats> </configuration> </plugin>
+ Maven JDocbook Plugin
+ http://www.jboss.org/maven-jdocbook-plugin
-->
<plugin>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<extensions>true</extensions>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>generate</goal>
- <goal>bundle</goal>
- </goals>
- <configuration>
- <sourceDocumentName>en/master.xml</sourceDocumentName>
- <formats>
- <format>
- <formatName>html</formatName>
- </format>
- </formats>
- </configuration>
- </execution>
- </executions>
+ <configuration>
+ <sourceDocumentName>en/master.xml</sourceDocumentName>
+ <imageResource>
+ <directory>${basedir}/src/main/docbook/en</directory>
+ <includes>
+ <include>**/*.gif</include>
+ <include>**/*.jpg</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>html</formatName>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-09-06 00:28:41 UTC (rev 2134)
+++ jbpm3/trunk/pom.xml 2008-09-08 09:07:46 UTC (rev 2135)
@@ -432,8 +432,8 @@
<profiles>
<!--
- Name: skiptests
- Desc: Skips the tests
+ Name: distro
+ Desc: Build the distribution
-->
<profile>
<id>distro</id>
@@ -470,6 +470,29 @@
</build>
</profile>
+ <!--
+ Name: release
+ Desc: Build the release
+ -->
+ <profile>
+ <id>release</id>
+ <modules>
+ <module>modules/distribution</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!-- DATABASE PROFILES ***************************************************************************** -->
+
<!--
Name: no-database
Descr: Setup the default database
17 years, 7 months