[jbpm-commits] JBoss JBPM SVN: r2138 - in jbpm4/pvm/trunk: modules and 10 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Sep 8 05:41:17 EDT 2008
Author: tom.baeyens at 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 at 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>
More information about the jbpm-commits
mailing list