[jboss-svn-commits] JBL Code SVN: r35403 - in labs/jbosstm/trunk: ArjunaCore and 6 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 4 09:19:09 EDT 2010
Author: jhalliday
Date: 2010-10-04 09:19:09 -0400 (Mon, 04 Oct 2010)
New Revision: 35403
Modified:
labs/jbosstm/trunk/ArjunaCore/build.xml
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Administration_Guide/en-US/Book_Info.xml
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/en-US/Book_Info.xml
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/publican.cfg
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Book_Info.xml
labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Preface.xml
labs/jbosstm/trunk/ArjunaJTA/INSTALL
labs/jbosstm/trunk/ArjunaJTS/INSTALL
labs/jbosstm/trunk/Build.txt
Log:
Doc updates for 4.13. JBTM-793
Modified: labs/jbosstm/trunk/ArjunaCore/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/build.xml 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/build.xml 2010-10-04 13:19:09 UTC (rev 35403)
@@ -50,24 +50,24 @@
<mkdir dir="${scripts.dest.dir}"/>
- <copy todir="${scripts.dest.dir}" filtering="true" overwrite="true" >
- <fileset dir="scripts">
- <include name="start-recovery-manager.bat"/>
- <include name="start-recovery-manager.sh"/>
- <include name="run-tools.bat"/>
- <include name="run-tools.sh"/>
+ <copy todir="${scripts.dest.dir}" filtering="true" overwrite="true" >
+ <fileset dir="scripts">
+ <include name="start-recovery-manager.bat"/>
+ <include name="start-recovery-manager.sh"/>
+ <include name="run-tools.bat"/>
+ <include name="run-tools.sh"/>
<include name="${extra_scripts}"/>
- </fileset>
+ </fileset>
<filterset>
<filter token="PRODUCT_NAME" value="${product_name}"/>
<filter token="HOME_DIRECTORY" value="${home_directory}"/>
</filterset>
- </copy>
+ </copy>
<copy todir="${scripts.dest.dir}" filtering="true" overwrite="true" >
<fileset dir="scripts">
- <include name="${orbprefix}orb-setup-env.*"/>
- </fileset>
+ <include name="${orbprefix}orb-setup-env.*"/>
+ </fileset>
<globmapper from="${orbprefix}orb-*" to="*"/>
@@ -87,21 +87,31 @@
<fileset dir="docs" includes="**/*.pdf"/>
</copy>
- <exec dir="docs/ArjunaCore_Administration_Guide" command="publican">
- <arg value="build"/>
- <arg value="--langs=en-US"/>
- <arg value="--formats=pdf,html"/>
- </exec>
- <exec dir="docs/ArjunaCore_Installation_Guide" command="publican">
- <arg value="build"/>
- <arg value="--langs=en-US"/>
- <arg value="--formats=pdf,html"/>
- </exec>
+ <if>
+ <istrue value="${publican}" />
+ <then>
+ <exec dir="docs/ArjunaCore_Administration_Guide" executable="publican">
+ <arg value="build"/>
+ <arg value="--langs=en-US"/>
+ <arg value="--formats=pdf,html"/>
+ </exec>
+ <exec dir="docs/ArjunaCore_Development_Guide" executable="publican">
+ <arg value="build"/>
+ <arg value="--langs=en-US"/>
+ <arg value="--formats=pdf,html"/>
+ </exec>
+ <exec dir="docs/ArjunaCore_Installation_Guide" executable="publican">
+ <arg value="build"/>
+ <arg value="--langs=en-US"/>
+ <arg value="--formats=pdf,html"/>
+ </exec>
+ </then>
+ </if>
<copy todir="${build.dir}/install/${dest.dir}" overwrite="true" flatten="true">
<fileset dir="${build.dir}" includes="*/en-US/pdf/*.pdf"/>
</copy>
-
+
</target>
<target name="install.services">
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Administration_Guide/en-US/Book_Info.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Administration_Guide/en-US/Book_Info.xml 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Administration_Guide/en-US/Book_Info.xml 2010-10-04 13:19:09 UTC (rev 35403)
@@ -7,7 +7,7 @@
<title>ArjunaCore Administration Guide</title>
<subtitle>Administration of the ArjunaCore Transaction Service</subtitle>
<productname>ArjunaCore</productname>
- <productnumber>4.12.0</productnumber>
+ <productnumber>4.13.0</productnumber>
<edition>1</edition>
<pubsnumber>1</pubsnumber>
<!--
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/en-US/Book_Info.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/en-US/Book_Info.xml 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/en-US/Book_Info.xml 2010-10-04 13:19:09 UTC (rev 35403)
@@ -7,7 +7,7 @@
<title>Development Guide</title>
<subtitle>Building Applications with JBoss Transactions</subtitle>
<productname>ArjunaCore</productname>
- <productnumber>4.12.0</productnumber>
+ <productnumber>4.13.0</productnumber>
<edition>0</edition>
<pubsnumber>0</pubsnumber>
<abstract>
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/publican.cfg
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/publican.cfg 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Development_Guide/publican.cfg 2010-10-04 13:19:09 UTC (rev 35403)
@@ -4,4 +4,5 @@
xml_lang: en-US
type: Book
brand: jboss-community
+tmp_dir: ../../build/ArjunaCore_Development_Guide
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Book_Info.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Book_Info.xml 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Book_Info.xml 2010-10-04 13:19:09 UTC (rev 35403)
@@ -7,12 +7,12 @@
<title>ArjunaCore Installation Guide</title>
<subtitle>Installation Instructions for UNIX and Microsoft Windows</subtitle>
<productname>ArjunaCore</productname>
- <productnumber>4.12</productnumber>
+ <productnumber>4.13.0</productnumber>
<edition>1</edition>
<pubsnumber>0</pubsnumber>
<abstract>
<para>
- The Installation Guide contains information on how to use ArjunaCore 4.12.0.
+ The Installation Guide contains information on how to use ArjunaCore 4.13.0.
</para>
</abstract>
<corpauthor>
Modified: labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Preface.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Preface.xml 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaCore/docs/ArjunaCore_Installation_Guide/en-US/Preface.xml 2010-10-04 13:19:09 UTC (rev 35403)
@@ -10,7 +10,7 @@
<title>Audience</title>
<para>
This guide is most relevant to engineers who are responsible for
- installing ArjunaCore 4.12.0 installations.
+ installing ArjunaCore installations.
</para>
</section>
Modified: labs/jbosstm/trunk/ArjunaJTA/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/INSTALL 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaJTA/INSTALL 2010-10-04 13:19:09 UTC (rev 35403)
@@ -1,12 +1,12 @@
-JBossTS 4.12 is designed for use standalone or with the JBossAS 6.0.M4 release
+JBossTS 4.13 is designed for use standalone or with the JBossAS 6.0.M5 release
It is not suitable for use with earlier versions of JBossAS.
The installation procedure has changed from earlier releases due to the move from
a JMX configuration style to the POJO microcontainer used by AS 6.x, packaging and config files changes.
Upgrading users should take care to read the steps below carefully.
-Installing JBossTS 4.12 JTA into JBossAS 6
+Installing JBossTS 4.13 JTA into JBossAS 6
------------------------------------------------------------
The application server ships with an earlier release of JBossTS JTS, configured to run in JTA local mode,
Modified: labs/jbosstm/trunk/ArjunaJTS/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/INSTALL 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/ArjunaJTS/INSTALL 2010-10-04 13:19:09 UTC (rev 35403)
@@ -1,5 +1,5 @@
-JBossTS 4.12 is designed for use standalone or with JBossAS 6.0.M4 release
+JBossTS 4.13 is designed for use standalone or with JBossAS 6.0.M5 release
It is not suitable for use with earlier versions of JBossAS.
The installation procedure has changed from earlier releases due to the move from
@@ -7,7 +7,7 @@
Upgrading users should take care to read the steps below carefully.
-Installing JBossTS 4.12 JTA into JBossAS 6
+Installing JBossTS 4.13 JTA into JBossAS 6
------------------------------------------------------------
The application server ships with an earlier release of JBossTS JTS, configured to run in JTA local mode,
@@ -23,7 +23,7 @@
- Replace JBossAS server/<name>/deploy/transaction-jboss-beans.xml with the newer JBossTS version.
-Installing JBossTS 4.12 JTS into JBossAS 6
+Installing JBossTS 4.13 JTS into JBossAS 6
------------------------------------------------------------
The JTS binaries are now bundled with JBossAS. To change the default JTA to JTS in JBossAS,
Modified: labs/jbosstm/trunk/Build.txt
===================================================================
--- labs/jbosstm/trunk/Build.txt 2010-10-04 12:19:57 UTC (rev 35402)
+++ labs/jbosstm/trunk/Build.txt 2010-10-04 13:19:09 UTC (rev 35403)
@@ -1,5 +1,9 @@
-ant jta
+ant
+will build JTS, AS integration, XTS and rhq-plugin modules.
+
+ant jta
+
will build the standalone JTA version
ant jts
@@ -51,7 +55,16 @@
pom.xml, even when building standalone releases. The version of JBossAS to use is determined by the pom-template.xml
You may need to set up maven to use the jboss.org repositories: http://community.jboss.org/wiki/MavenGettingStarted-Users
-The build currently requires Java 6, ant 1.7.1 and maven 2.0.9. Later version may work.
+The build currently requires Java 6, ant 1.7.1, maven 2.2.1 and publican 2.1 with the jboss-community brand.
+Later version for these tools may work. Download locations are:
+
+http://www.oracle.com/technetwork/java/javase/downloads/index.html
+http://ant.apache.org/
+http://maven.apache.org/
+https://fedorahosted.org/releases/p/u/publican/
+
+Note: publican is optional. If you can live without documentation then build with ant -Dpublican=false
+
Although it's no longer tried and tested, it may remain possible for a time to build on Java 5 by editing
ArjunaJTA/jdbc/build.xml and changing the excluded **/*JDBC3.java pattern
to **/*JDBC4.java instead. This is required as the JDBC3 and 4 APIs are not compatible.
More information about the jboss-svn-commits
mailing list