[jboss-cvs] JBossAS SVN: r85922 - in projects/jboss-osgi/trunk: build/distribution/scripts and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-03-16 08:06:32 -0400 (Mon, 16 Mar 2009)
New Revision: 85922

Modified:
   projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
   projects/jboss-osgi/trunk/build/docbook/pom.xml
   projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
   projects/jboss-osgi/trunk/pom.xml
Log:
Externalize docbook support versions

Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-16 12:00:59 UTC (rev 85921)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-16 12:06:32 UTC (rev 85922)
@@ -47,7 +47,7 @@
         <filter token="jboss.integration" value="${jboss.integration}" />
         <filter token="product.version" value="${product.version}" />
         <filter token="target.container" value="${target.container}" />
-        <filter token="installpath" value="${output.dir}/auto-install-dest/jboss-osgi-${product.version}" />
+        <filter token="installpath" value="${output.dir}/auto-install-dest" />
       </filterset>
     </copy>
   	

Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/docbook/pom.xml	2009-03-16 12:00:59 UTC (rev 85921)
+++ projects/jboss-osgi/trunk/build/docbook/pom.xml	2009-03-16 12:06:32 UTC (rev 85922)
@@ -40,18 +40,18 @@
       <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jdocbook-plugin</artifactId>
-        <version>2.0.0</version>
+        <version>${version.jboss.jdocbook.plugin}</version>
         <extensions>true</extensions>
         <dependencies>
           <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jbossorg-docbook-xslt</artifactId>
-            <version>1.0.0</version>
+            <version>${version.jboss.jdocbook.style}</version>
           </dependency>
           <dependency>
             <groupId>org.jboss</groupId>
             <artifactId>jbossorg-jdocbook-style</artifactId>
-            <version>1.0.0</version>
+            <version>${version.jboss.jdocbook.style}</version>
             <type>jdocbook-style</type>
           </dependency>
         </dependencies>

Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-03-16 12:00:59 UTC (rev 85921)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh	2009-03-16 12:06:32 UTC (rev 85922)
@@ -31,7 +31,7 @@
     rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE  
   ;;
   'runtime')
-	JBOSS_HOME=$DISTRODIR/auto-install-dest/jboss-osgi-$VERSION/runtime
+	JBOSS_HOME=$DISTRODIR/auto-install-dest/runtime
   ;;
   *)
 	echo "Unsupported container: $CONTAINER"

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-03-16 12:00:59 UTC (rev 85921)
+++ projects/jboss-osgi/trunk/pom.xml	2009-03-16 12:06:32 UTC (rev 85922)
@@ -50,6 +50,8 @@
     <version.jboss.common.core>2.2.11.GA</version.jboss.common.core>
     <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
     <version.jboss.jacc>1.1.0.GA</version.jboss.jacc>
+    <version.jboss.jdocbook.plugin>2.0.0</version.jboss.jdocbook.plugin>
+    <version.jboss.jdocbook.style>1.0.0</version.jboss.jdocbook.style>
     <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
     <version.jboss.metadata>1.0.0.CR11</version.jboss.metadata>