Author: veithen
Date: Thu Jun 10 19:06:58 2010
New Revision: 953422
URL: http://svn.apache.org/viewvc?rev=953422&view=rev
Log:
* WSCOMMONS-547: Build the binary distribution in a Maven module instead of the
root project, so that the apache-release profile works.
* Removed the assembly descriptor for the source distribution. A source
distribution (defined in org.apache:apache:7) is now build by default with the
apache-release profile.
Added:
webservices/commons/trunk/modules/axiom/distribution/
webservices/commons/trunk/modules/axiom/distribution/pom.xml (with props)
webservices/commons/trunk/modules/axiom/distribution/src/
webservices/commons/trunk/modules/axiom/distribution/src/main/
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/
- copied from r949515,
webservices/commons/trunk/modules/axiom/src/main/assembly/
Removed:
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/filter.properties
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/src.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/
Modified:
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/jar.xml
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/docbkx/devguide.xml
Added: webservices/commons/trunk/modules/axiom/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/distribution/pom.xml?rev=953422&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/distribution/pom.xml (added)
+++ webservices/commons/trunk/modules/axiom/distribution/pom.xml Thu Jun 10
19:06:58 2010
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>1.2.9-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>apache-axiom</artifactId>
+ <name>Axiom Binary Distribution</name>
+ <description>This module builds the Axiom binary distribution</description>
+ <packaging>pom</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-dom</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-c14n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>axiom-${project.version}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <executions>
+ <execution>
+ <id>all-in-one-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/jar.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <finalName>axiom</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ </execution>
+ <execution>
+ <id>distribution-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: webservices/commons/trunk/modules/axiom/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml?rev=953422&r1=949515&r2=953422&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml
(original)
+++
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/bin.xml
Thu Jun 10 19:06:58 2010
@@ -26,20 +26,21 @@
<includeSiteDirectory>false</includeSiteDirectory>
<fileSets>
<fileSet>
+ <directory>..</directory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
</includes>
</fileSet>
- <fileSet>
+ <!-- fileSet>
<directory>target/site</directory>
<outputDirectory>docs</outputDirectory>
<includes>
<include>**/*</include>
</includes>
- </fileSet>
+ </fileSet -->
<fileSet>
- <directory>legal</directory>
+ <directory>../legal</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>**/*</include>
@@ -48,60 +49,33 @@
</fileSets>
<files>
<file>
- <source>README.txt</source>
+ <source>../README.txt</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
</file>
<file>
- <source>RELEASE-NOTE.txt</source>
+ <source>../RELEASE-NOTE.txt</source>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
<fileMode>0644</fileMode>
</file>
<file>
-
<source>${project.build.directory}/axiom-${project.version}-jar.jar</source>
+ <source>${project.build.directory}/axiom.jar</source>
<outputDirectory>/</outputDirectory>
- <destName>axiom.jar</destName>
</file>
</files>
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.apache.ws.commons.axiom:axiom-dom</include>
- <include>org.apache.ws.commons.axiom:axiom-api</include>
- <include>org.apache.ws.commons.axiom:axiom-c14n</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <includeDependencies>false</includeDependencies>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <!--<include>org.apache.ws.commons.axiom:axiom-dom</include>-->
- <include>org.apache.ws.commons.axiom:axiom-impl</include>
- <!--<include>org.apache.ws.commons.axiom:axiom-api</include>-->
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.codehaus.woodstox:wstx-asl</include>
- <include>commons-logging:commons-logging</include>
- <include>jaxen:jaxen</include>
-
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
-
<include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <!-- TODO: historically, these files were not included in the
Axiom binary
+ distribution. Since we now require Java 1.5 anyway, maybe
we should
+ also exclude them as Maven dependencies? -->
+ <exclude>xerces:xercesImpl:jar</exclude>
+ <exclude>xml-apis:xml-apis:jar</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified:
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/jar.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/jar.xml?rev=953422&r1=949515&r2=953422&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/jar.xml
(original)
+++
webservices/commons/trunk/modules/axiom/distribution/src/main/assembly/jar.xml
Thu Jun 10 19:06:58 2010
@@ -22,18 +22,32 @@
<formats>
<format>jar</format>
</formats>
- <moduleSets>
- <moduleSet>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ <outputDirectory>META-INF</outputDirectory>
+ </fileSet>
+ </fileSets>
+ <dependencySets>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<includes>
<include>org.apache.ws.commons.axiom:axiom-api</include>
<include>org.apache.ws.commons.axiom:axiom-impl</include>
<include>org.apache.ws.commons.axiom:axiom-dom</include>
<include>org.apache.ws.commons.axiom:axiom-c14n</include>
</includes>
- <binaries>
- <includeDependencies>false</includeDependencies>
- <unpack>true</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <excludes>
+ <exclude>OSGI-INF/**</exclude>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=953422&r1=953421&r2=953422&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Thu Jun 10 19:06:58 2010
@@ -396,19 +396,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jar.xml</descriptor>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- <descriptor>src/main/assembly/src.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.4</version>
</plugin>
@@ -757,6 +744,7 @@
<module>modules/axiom-tests</module>
<module>modules/axiom-osgi</module>
<module>modules/axiom-parser-tests</module>
+ <module>distribution</module>
</modules>
<properties>
<axiom.version>${project.version}</axiom.version>
Modified: webservices/commons/trunk/modules/axiom/src/docbkx/devguide.xml
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/docbkx/devguide.xml?rev=953422&r1=953421&r2=953422&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/docbkx/devguide.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/docbkx/devguide.xml Thu Jun 10
19:06:58 2010
@@ -225,6 +225,13 @@ javax.xml.stream.XMLOutputFactory=com.be
Branding Guidelines</ulink>.
</para>
</listitem>
+ <listitem>
+ <para>
+ Check that the <literal>apache-release</literal>
profile can be executed properly.
+ To do this, issue the following command:
+ </para>
+ <screen>mvn clean install -Papache-release
-Dmaven.test.skip=true</screen>
+ </listitem>
</itemizedlist>
</section>
<section>
