directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r986958 - in /directory/apacheds-manuals/trunk: pom.xml src/main/assembly/ src/main/assembly/advanced-user-guide.xml src/main/assembly/basic-user-guide.xml
Date Wed, 18 Aug 2010 21:42:30 GMT
Author: felixk
Date: Wed Aug 18 21:42:30 2010
New Revision: 986958

URL: http://svn.apache.org/viewvc?rev=986958&view=rev
Log:
- Fix destination path for copying advanced guide data
- Add assemblies to assembly zip files containing the guide as html

Added:
    directory/apacheds-manuals/trunk/src/main/assembly/
    directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml   (with props)
    directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml   (with props)
Modified:
    directory/apacheds-manuals/trunk/pom.xml

Modified: directory/apacheds-manuals/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/pom.xml?rev=986958&r1=986957&r2=986958&view=diff
==============================================================================
--- directory/apacheds-manuals/trunk/pom.xml (original)
+++ directory/apacheds-manuals/trunk/pom.xml Wed Aug 18 21:42:30 2010
@@ -52,6 +52,14 @@ under the License.
   </distributionManagement>
 
   <build>
+    <!-- ======================================= -->
+    <!-- ATTENTION                               -->
+    <!-- Order of the plugins matters!           -->
+    <!-- 1. maven-dependency-plugin              -->
+    <!-- 2. docbkx-maven-plugin                  -->
+    <!-- 3. maven-assembly-plugin                -->
+    <!-- 4. maven-site-plugin                    -->
+    <!-- ======================================= -->
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -106,10 +114,6 @@ under the License.
           <fop1Extensions>1</fop1Extensions>
           <htmlCustomization>${basedir}/src/docbkx-stylesheet/html/docbook.xsl</htmlCustomization>
           <foCustomization>${basedir}/src/docbkx-stylesheet/fo/docbook.xsl</foCustomization>
-          <!--
-             <customizationParameters>
-            <parameter> <name>key</name> <value>value</value>
</parameter> </customizationParameters>
-          -->
         </configuration>
         <executions>
           <execution>
@@ -163,14 +167,14 @@ under the License.
               <targetDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html</targetDirectory>
               <postProcess>
                 <!-- Copy the images -->
-                <copy todir="${project.build.directory}//manuals/advanced-user-guide-${pom.version}/html/images">
+                <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/images">
                   <fileset dir="${basedir}/src/advanced-user-guide/images" />
                 </copy>
-                <copy todir="${project.build.directory}//manuals/advanced-user-guide-${pom.version}/html/images">
+                <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/images">
                   <fileset dir="${project.build.directory}/docbook-xsl/docbook/images"
/>
                 </copy>
                 <!-- Copy the data -->
-                <copy todir="${project.build.directory}//manuals/advanced-user-guide-${pom.version}/html/data">
+                <copy todir="${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html/data">
                   <fileset dir="${basedir}/src/advanced-user-guide/data" />
                 </copy>
               </postProcess>
@@ -193,6 +197,39 @@ under the License.
         </executions>
       </plugin>
       <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>gen-basic-zip</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>assembly</goal>
+            </goals>
+            <configuration>
+              <finalName>basic-user-guide-${pom.version}</finalName>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/basic-user-guide.xml</descriptor>
+              </descriptors>
+              <outputDirectory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/zip</outputDirectory>
+            </configuration>
+          </execution>
+          <execution>
+            <id>gen-advanced-zip</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>assembly</goal>
+            </goals>
+            <configuration>
+              <finalName>advanced-user-guide-${pom.version}</finalName>
+              <descriptors>
+                <descriptor>${basedir}/src/main/assembly/advanced-user-guide.xml</descriptor>
+              </descriptors>
+              <outputDirectory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/zip</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <generateReports>false</generateReports>

Added: directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml?rev=986958&view=auto
==============================================================================
--- directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml (added)
+++ directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml Wed Aug 18
21:42:30 2010
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/docbook/manuals/advanced-user-guide-${pom.version}/html</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Propchange: directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds-manuals/trunk/src/main/assembly/advanced-user-guide.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml
URL: http://svn.apache.org/viewvc/directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml?rev=986958&view=auto
==============================================================================
--- directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml (added)
+++ directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml Wed Aug 18 21:42:30
2010
@@ -0,0 +1,34 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"

+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.directory}/docbook/manuals/basic-user-guide-${pom.version}/html</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Propchange: directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds-manuals/trunk/src/main/assembly/basic-user-guide.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision



Mime
View raw message