Merge from trunk:

Retrofit with Maven artifact building.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_93@535148 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 30f9b7a52f27c7837af6438857a9cfe2ccb39287..4beba54ff1dece3ae5b1436de9103acf1f3a3758 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -552,7 +552,7 @@ list of possible build targets.
     <patternset id="java-only">
       <include name="**/*.java"/>
     </patternset>
-    <jar jarfile="${build.dir}/fop-sources.jar">
+    <jar jarfile="${build.dir}/${name}-${version}-sources.jar">
       <fileset dir="${build.gensrc.dir}">
         <patternset refid="java-only"/>
       </fileset>
@@ -1044,6 +1044,16 @@ NOTE:
     </javadoc>
   </target>
 
+  <target name="jar-javadocs" depends="javadocs" description="Generates a jar file containing the Javadocs">
+    <jar jarfile="${build.dir}/${name}-${version}-javadoc.jar">
+      <manifest>
+        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+      </manifest>
+      <fileset dir="${build.javadocs.dir}"/>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+    </jar>
+  </target>
+  
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
@@ -1240,6 +1250,27 @@ NOTE:
     <delete file="${name}-${version}-src.tar"/>
   </target>
 
+  <!-- =================================================================== -->
+  <!-- Maven artifacts                                                     -->
+  <!-- =================================================================== -->
+  <target name="maven-artifacts" depends="jar-main, jar-sources, jar-javadocs" description="Builds a Maven artifact that can be uploaded to a Maven repository">
+    <filter  token="version" value="${version}"/>
+    <mkdir dir="${build.dir}/maven"/>
+    <copy file="${basedir}/xmlgraphics-fop-pom-template.pom" tofile="${build.dir}/maven/pom.xml" filtering="true"/>
+    <copy file="${build.dir}/${name}.jar" tofile="${build.dir}/maven/${name}-${version}.jar"/>
+    <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
+      <manifest>
+        <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
+      </manifest>
+      <fileset dir="${build.dir}">
+        <include name="${name}-${version}-sources.jar"/>
+        <include name="${name}-${version}-javadoc.jar"/>
+      </fileset>
+      <fileset dir="${build.dir}/maven"/>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+    </jar>
+  </target>
+  
   <!-- =================================================================== -->
   <!-- Generate example PDFs                                               -->
   <!-- =================================================================== -->

diff --git a/xmlgraphics-fop-pom-template.pom b/xmlgraphics-fop-pom-template.pom
new file mode 100644 (file)
index 0000000..1bfbc49
--- /dev/null
+++ b/xmlgraphics-fop-pom-template.pom
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+  Licensed to the Apache Software Foundation (ASF) under one or more\r
+  contributor license agreements.  See the NOTICE file distributed with\r
+  this work for additional information regarding copyright ownership.\r
+  The ASF licenses this file to You under the Apache License, Version 2.0\r
+  (the "License"); you may not use this file except in compliance with\r
+  the License.  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+-->\r
+<!-- $Id$ -->\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0\r
+http://maven.apache.org/maven-v4_0_0.xsd">\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.apache.xmlgraphics</groupId>\r
+  <artifactId>xmlgraphics-fop</artifactId>\r
+  <packaging>jar</packaging>\r
+  <name>Apache FOP</name>\r
+  <version>@version@</version>\r
+  <url>http://xmlgraphics.apache.org/fop/</url>\r
+  <description>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting objects (XSL-FO) and the world's first output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. Output formats currently supported include PDF, PCL, PS, AFP, TIFF, PNG, SVG, XML (area tree representation), Print, AWT and TXT. The primary output target is PDF.</description>\r
+  <inceptionYear>1999</inceptionYear>\r
+  <mailingLists>\r
+    <mailingList>\r
+      <name>FOP Users List</name>\r
+      <subscribe>fop-users-subscribe@xmlgraphics.apache.org</subscribe>\r
+      <unsubscribe>fop-users-unsubscribe@xmlgraphics.apache.org</unsubscribe>\r
+      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/</archive>\r
+    </mailingList>\r
+    <mailingList>\r
+      <name>FOP Developer List</name>\r
+      <subscribe>fop-dev-subscribe@xmlgraphics.apache.org</subscribe>\r
+      <unsubscribe>fop-dev-unsubscribe@xmlgraphics.apache.org</unsubscribe>\r
+      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/</archive>\r
+    </mailingList>\r
+    <mailingList>\r
+      <name>FOP Commit List</name>\r
+      <subscribe>fop-commits-subscribe@xmlgraphics.apache.org</subscribe>\r
+      <unsubscribe>fop-commits-unsubscribe@xmlgraphics.apache.org</unsubscribe>\r
+      <archive>http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</archive>\r
+    </mailingList>\r
+  </mailingLists>\r
+  <licenses>\r
+    <license>\r
+      <name>The Apache Software License, Version 2.0</name>\r
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>\r
+      <distribution>repo</distribution>\r
+    </license>\r
+  </licenses>\r
+  <scm>\r
+    <connection>scm:svn:http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</connection>\r
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk</developerConnection>\r
+    <url>http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/?root=Apache-SVN</url>\r
+  </scm>\r
+  <organization>\r
+    <name>Apache Software Foundation</name>\r
+    <url>http://www.apache.org/</url>\r
+  </organization>\r
+  <dependencies>\r
+    <!-- XML Graphics -->\r
+    <dependency>\r
+      <groupId>org.apache.xmlgraphics</groupId>\r
+      <artifactId>xmlgraphics-commons</artifactId>\r
+      <version>1.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-svg-dom</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-bridge</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-awt-util</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-gvt</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-transcoder</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-extension</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>batik</groupId>\r
+      <artifactId>batik-ext</artifactId>\r
+      <version>1.6-1</version>\r
+    </dependency>\r
+    <!-- other dependencies -->\r
+    <dependency>\r
+      <groupId>commons-logging</groupId>\r
+      <artifactId>commons-logging</artifactId>\r
+      <version>1.0.4</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>commons-io</groupId>\r
+      <artifactId>commons-io</artifactId>\r
+      <version>1.1</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.avalon.framework</groupId>\r
+      <artifactId>avalon-framework-api</artifactId>\r
+      <version>4.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.apache.avalon.framework</groupId>\r
+      <artifactId>avalon-framework-impl</artifactId>\r
+      <version>4.3</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>javax.servlet</groupId>\r
+      <artifactId>servlet-api</artifactId>\r
+      <version>2.3</version>\r
+      <scope>provided</scope>\r
+    </dependency>\r
+  </dependencies>\r
+</project>\r