[jboss-cvs] JBossAS SVN: r86369 - 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-25 12:39:14 -0400 (Wed, 25 Mar 2009)
New Revision: 86369

Modified:
   projects/jboss-osgi/trunk/build/distribution/pom.xml
   projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
   projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
   projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/build/docbook/pom.xml
Log:
Fix dependency on jdocbook output

Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-03-25 16:36:19 UTC (rev 86368)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml	2009-03-25 16:39:14 UTC (rev 86369)
@@ -104,24 +104,9 @@
     <dependency>
       <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-userguide</artifactId>
-      <classifier>html</classifier>
       <version>${version}</version>
-      <type>war</type>
+      <type>jdocbook</type>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-userguide</artifactId>
-      <classifier>html_single</classifier>
-      <version>${version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-userguide</artifactId>
-      <classifier>pdf</classifier>
-      <version>${version}</version>
-      <type>war</type>
-    </dependency>
 
     <!-- javadoc -->
     <dependency>

Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-25 16:36:19 UTC (rev 86368)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml	2009-03-25 16:39:14 UTC (rev 86369)
@@ -62,6 +62,13 @@
     <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" />
     <mkdir dir="${izpack.temp.dir}" />
 
+    <!-- Expand jdocbook -->
+    <unzip src="${deploy.artifacts.dir}/docs/jboss-osgi-userguide-${product.version}.jdocbook" dest="${deploy.artifacts.dir}/docs/userguide">
+      <patternset>
+        <exclude name="META-INF/**"/>
+      </patternset>
+    </unzip>
+    
     <!-- Run installer build -->
     <echo message="Running IzPack to build the installer..." />
     <izpack input="${resources.dir}/installer/install-definition.xml" output="${output.dir}/jboss-osgi-installer-${product.version}.jar"

Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml	2009-03-25 16:36:19 UTC (rev 86368)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml	2009-03-25 16:39:14 UTC (rev 86369)
@@ -15,7 +15,7 @@
       <outputDirectory>docs</outputDirectory>
       <useStrictFiltering>true</useStrictFiltering>
       <includes>
-        <include>*:jboss-osgi-runtime-spi:jar:javadoc</include>
+        <include>*:jboss-osgi-userguide:jdocbook</include>
       </includes>
     </dependencySet>
     

Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-25 16:36:19 UTC (rev 86368)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml	2009-03-25 16:39:14 UTC (rev 86369)
@@ -95,14 +95,8 @@
       </fileset>
       
       <!-- JBossOSGi Docs -->
-      <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs"
-        unpack="true" override="true" />
-      <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-html.war" targetdir="$INSTALL_PATH/docs/userguide/html"
-        unpack="true" override="true" />
-      <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-html_single.war" targetdir="$INSTALL_PATH/docs/userguide/html_single"
-        unpack="true" override="true" />
-      <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-userguide-pdf.war" targetdir="$INSTALL_PATH/docs/userguide/pdf"
-        unpack="true" override="true" />
+      <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" />
+      <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>
       
       <!-- JBossOSGi Lib -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">

Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/docbook/pom.xml	2009-03-25 16:36:19 UTC (rev 86368)
+++ projects/jboss-osgi/trunk/build/docbook/pom.xml	2009-03-25 16:39:14 UTC (rev 86369)
@@ -89,9 +89,6 @@
           <options>
             <xincludeSupported>true</xincludeSupported>
             <xmlTransformerType>saxon</xmlTransformerType>
-            <!-- needed for uri-resolvers; can be ommitted if using 'current' uri scheme -->
-            <!-- could also locate the docbook dependency and inspect its version... -->
-            <docbookVersion>1.72.0</docbookVersion>
           </options>
         </configuration>
       </plugin>