[jbpm-commits] JBoss JBPM SVN: r2042 - in jbpm3/trunk: modules/distribution and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 28 13:40:56 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-08-28 13:40:56 -0400 (Thu, 28 Aug 2008)
New Revision: 2042
Added:
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
jbpm3/trunk/modules/jpdl/identity/scripts/
jbpm3/trunk/modules/jpdl/identity/scripts/assembly-config.xml
Removed:
jbpm3/trunk/modules/distribution/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml
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/scripts/install-definition.xml
jbpm3/trunk/modules/jpdl/core/pom.xml
jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
jbpm3/trunk/modules/jpdl/identity/pom.xml
jbpm3/trunk/pom.xml
Log:
cleanup the distro
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -27,37 +27,30 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.jboss.bpm</groupId>
- <artifactId>jboss-bpm-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-core</artifactId>
- <classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-console</artifactId>
+ <artifactId>jbpm-jpdl-core</artifactId>
+ <classifier>config</classifier>
<version>${version}</version>
- <type>war</type>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-console</artifactId>
- <classifier>login</classifier>
+ <artifactId>jbpm-jpdl-identity</artifactId>
<version>${version}</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jpdl-identity</artifactId>
+ <classifier>config</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
- <classifier>config</classifier>
+ <artifactId>jbpm-jpdl-integration</artifactId>
<version>${version}</version>
</dependency>
<dependency>
@@ -93,79 +86,26 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>jbpm config</id>
+ <id>izpack</id>
<phase>package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
- <ant antfile="scripts/antrun-jbpm-config.xml" />
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>installer</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<property name="product.name" value="${project.name}" />
<property name="product.short.name" value="${artifactId}" />
<property name="product.version" value="${project.version}" />
- <property name="jboss421.home" value="${jboss421.home}" />
<property name="jboss422.home" value="${jboss422.home}" />
+ <property name="jboss423.home" value="${jboss423.home}" />
<property name="jboss500.home" value="${jboss500.home}" />
- <property name="jboss501.home" value="${jboss501.home}" />
<ant antfile="scripts/antrun-installer.xml" target="installer" />
</tasks>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-core</artifactId>
- <version>${version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-core</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-jpdl-identity</artifactId>
- <version>${version}</version>
- <classifier>config</classifier>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/resources/jbpm-jpdl-identity</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-console</artifactId>
- <version>${version}</version>
- <classifier>login</classifier>
- <type>jar</type>
- <outputDirectory>${project.build.directory}/resources/jbpm-login</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -30,22 +30,19 @@
<target name="init">
<echo />
- <echo message="jboss421.home=${jboss421.home}" />
<echo message="jboss422.home=${jboss422.home}" />
+ <echo message="jboss423.home=${jboss423.home}" />
<echo message="jboss500.home=${jboss500.home}" />
- <echo message="jboss501.home=${jboss501.home}" />
<property name="jboss.server.instance" value="default" />
- <property name="jboss421.available.file" value="${jboss421.home}/client/jboss-client.jar" />
<property name="jboss422.available.file" value="${jboss422.home}/client/jboss-client.jar" />
+ <property name="jboss423.available.file" value="${jboss423.home}/client/jboss-client.jar" />
<property name="jboss500.available.file" value="${jboss500.home}/client/jboss-client.jar" />
- <property name="jboss501.available.file" value="${jboss501.home}/client/jboss-client.jar" />
- <available property="jboss421.available" file="${jboss421.available.file}" />
<available property="jboss422.available" file="${jboss422.available.file}" />
+ <available property="jboss423.available" file="${jboss423.available.file}" />
<available property="jboss500.available" file="${jboss500.available.file}" />
- <available property="jboss501.available" file="${jboss501.available.file}" />
</target>
@@ -75,7 +72,7 @@
<!-- Run installer build -->
<echo message="Running IzPack to build the installer..." />
- <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-install.jar" installerType="standard"
+ <izpack input="${basedir}/scripts/install-definition.xml" output="${output.dir}/${product.short.name}-${product.version}-izpack.jar" installerType="standard"
inheritAll="true" basedir="${izpack.temp.dir}" />
<!-- Clean working directory -->
Deleted: jbpm3/trunk/modules/distribution/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-jbpm-config.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-jbpm-config.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -1,99 +0,0 @@
-<?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$ -->
-
-<project default="main">
-
- <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
- <property name="project.build.directory" value="${basedir}/target"/>
- <property name="project.build.resources.directory" value="${project.build.directory}/resources"/>
- <property name="project.build.classes.directory" value="${project.build.directory}/classes"/>
-
- <property name="thirdparty.dir" value="${project.build.directory}/thirdparty"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
- </target>
-
- <!-- Compile resource files -->
- <target name="main" depends="init">
-
- <!--
-
- jBPM Hibernate configuration. Will be concatenated from
- various module contributions:
-
- - hibernate.cfg.xml
-
- -->
-
- <echo>==================</echo>
- <echo message="Concat ${project.build.classes.directory}/hibernate.cfg.xml"/>
- <echo>==================</echo>
-
- <concat destfile="${project.build.classes.directory}/hibernate.cfg.xml">
- <header trimleading="yes"><?xml version='1.0' encoding='utf-8'?>
-
- <!DOCTYPE hibernate-configuration PUBLIC
- "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
-
- <hibernate-configuration>
- <session-factory>
- </header>
- <fileset file="${project.build.resources.directory}/jbpm-jpdl-core/hibernate.properties.xml"/>
- <fileset file="${project.build.resources.directory}/jbpm-jpdl-core/hibernate.mapping.xml"/>
- <fileset file="${project.build.resources.directory}/jbpm-jpdl-identity/hibernate.mapping.xml"/>
- <fileset file="${project.build.resources.directory}/jbpm-jpdl-core/hibernate.cache.xml"/>
- <footer trimleading="yes">
- </session-factory>
- </hibernate-configuration>
- </footer>
- </concat>
-
- <!--
- Remaining JBPM configuration:
-
- - jbpm.cfg.xml
- - jbpm.mail.templates.xml
- - log4j.xml
- -->
-
- <copy todir="${project.build.classes.directory}">
- <fileset dir="${project.build.resources.directory}/jbpm-jpdl-core">
- <include name="jbpm.cfg.xml"/>
- <include name="jbpm.mail.templates.xml"/>
- <include name="log4j.xml"/>
- </fileset>
- </copy>
-
- <!--
-
- Create a config jar directory, so that files stay editable:
-
- - jbpm-config.jar
-
- -->
-
- <mkdir dir="${project.build.directory}/deploy-artifacts/lib/jbpm-config.jar"/>
- <copy todir="${project.build.directory}/deploy-artifacts/lib/jbpm-config.jar">
- <fileset dir="${project.build.classes.directory}">
- <include name="*.xml"/>
- </fileset>
- </copy>
-
- </target>
-
-</project>
Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -14,29 +14,7 @@
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<unpack>false</unpack>
- <excludes>
- <exclude>*:war:*</exclude>
- <exclude>*:login</exclude>
- <exclude>*:config</exclude>
- </excludes>
</dependencySet>
- <dependencySet>
- <outputDirectory>lib/jbpm-console.war</outputDirectory>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>org.jboss.jbpm:jbpm-console:war</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>lib/jbpm-login.sar</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <unpack>true</unpack>
- <includes>
- <include>*:login</include>
- </includes>
- </dependencySet>
</dependencySets>
<fileSets>
Modified: jbpm3/trunk/modules/distribution/scripts/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/scripts/install-definition.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -52,29 +52,23 @@
<pack name="jBPM3" required="yes" installGroups="Main">
<description>The jBPM Main Components</description>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm" >
- <include name="jbpm-api.jar"/>
+ <include name="jboss-bpm-api.jar"/>
<include name="jbpm-jbpm4jsf.jar"/>
<include name="jbpm-jpdl-core.jar"/>
<include name="jbpm-jpdl-identity.jar"/>
+ <include name="jbpm-jpdl-integration.jar"/>
</fileset>
</pack>
<!-- jBPM Distro config -->
<pack name="jBPM3 Config" required="yes" installGroups="Main">
<description>The jBPM default configuration</description>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-config.jar"
+ <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-core-config.jar"
targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm">
<include>hibernate.cfg.xml</include>
</file>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-login.sar" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm" />
</pack>
- <!-- jBPM Console -->
- <pack name="jBPM3 Console" required="no" installGroups="Main">
- <description>The jBPM Console</description>
- <file src="@{deploy.artifacts.dir}/lib/jbpm-console.war" targetdir="$INSTALL_PATH/server/@{jboss.server.instance}/deploy/jbpm" />
- </pack>
-
<!-- jBPM Hypersonic Database -->
<pack name="jBPM3 Hypersonic Database Scripts" required="no" installGroups="Main">
<description>The Hypersonic Database Scripts</description>
Deleted: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -1,15 +0,0 @@
-<AutomatedInstallation langpack="eng">
- <com.izforge.izpack.panels.HelloPanel />
- <com.izforge.izpack.panels.TargetPanel>
- <installpath>@jboss421.home@</installpath>
- </com.izforge.izpack.panels.TargetPanel>
- <com.izforge.izpack.panels.TreePacksPanel>
- <pack name="jBPM3" index="0" selected="true" />
- <pack name="jBPM3 Config" index="1" selected="true" />
- <pack name="jBPM3 Console" index="2" selected="true" />
- <pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
- </com.izforge.izpack.panels.TreePacksPanel>
- <com.izforge.izpack.panels.SummaryPanel />
- <com.izforge.izpack.panels.InstallPanel />
- <com.izforge.izpack.panels.FinishPanel />
-</AutomatedInstallation>
\ No newline at end of file
Copied: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml (from rev 2041, jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss421.xml)
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss423.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -0,0 +1,15 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.TargetPanel>
+ <installpath>@jboss423.home@</installpath>
+ </com.izforge.izpack.panels.TargetPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3" index="0" selected="true" />
+ <pack name="jBPM3 Config" index="1" selected="true" />
+ <pack name="jBPM3 Console" index="2" selected="true" />
+ <pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
\ No newline at end of file
Added: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml (rev 0)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -0,0 +1,15 @@
+<AutomatedInstallation langpack="eng">
+ <com.izforge.izpack.panels.HelloPanel />
+ <com.izforge.izpack.panels.TargetPanel>
+ <installpath>@jboss500.home@</installpath>
+ </com.izforge.izpack.panels.TargetPanel>
+ <com.izforge.izpack.panels.TreePacksPanel>
+ <pack name="jBPM3" index="0" selected="true" />
+ <pack name="jBPM3 Config" index="1" selected="true" />
+ <pack name="jBPM3 Console" index="2" selected="true" />
+ <pack name="jBPM3 Hypersonic Database Scripts" index="3" selected="true" />
+ </com.izforge.izpack.panels.TreePacksPanel>
+ <com.izforge.izpack.panels.SummaryPanel />
+ <com.izforge.izpack.panels.InstallPanel />
+ <com.izforge.izpack.panels.FinishPanel />
+</AutomatedInstallation>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/distribution/src/main/resources/installer/auto-install-jboss500.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -128,9 +128,7 @@
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
- <exclude>hibernate.properties.xml</exclude>
- <exclude>hibernate.mapping.xml</exclude>
- <exclude>hibernate.cache.xml</exclude>
+ <exclude>hibernate.*</exclude>
<exclude>jbpm.cfg.xml</exclude>
<exclude>jbpm.mail.templates.xml</exclude>
</excludes>
Modified: jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/jpdl/core/scripts/assembly-config.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -14,6 +14,7 @@
<include>jbpm.cfg.xml</include>
<include>jbpm.mail.templates.xml</include>
</includes>
+ <!-- exclude the dummy extra mappings -->
<excludes>
<exclude>hibernate.extra.hbm.xml</exclude>
</excludes>
Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/modules/jpdl/identity/pom.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -64,6 +64,24 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-config.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showDeprecation>false</showDeprecation>
Added: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/scripts/assembly-config.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/identity/scripts/assembly-config.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -0,0 +1,17 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>hibernate.extra.hbm.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/jpdl/identity/scripts/assembly-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-08-28 14:29:09 UTC (rev 2041)
+++ jbpm3/trunk/pom.xml 2008-08-28 17:40:56 UTC (rev 2042)
@@ -28,7 +28,6 @@
<!-- Modules -->
<modules>
<module>modules/jpdl</module>
- <module>modules/console</module>
<module>modules/enterprise</module>
<module>modules/jbpm4jsf</module>
</modules>
More information about the jbpm-commits
mailing list