Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Restructured the project to make the root POM the parent POM (whereas…

… today we have a parent POM that is not the root POM). As a side effect, this gives us more control over the classes included in the Javadoc. Note that the new submodules (apidocs, devguide, userguide and distribution) have been carefully designed such that the generated site keeps its current structure.

git-svn-id: https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom@1425484 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
commit 0f2e2568687ab63e9f096fad1ef08aaad5e8597c 1 parent 2061d4b
@veithen veithen authored
Showing with 1,023 additions and 829 deletions.
  1. +152 −0 apidocs/pom.xml
  2. +13 −6 src/docbkx/xsl/common.xsl → apidocs/src/main/assembly/apidocs.xml
  3. +117 −0 devguide/pom.xml
  4. 0  { → devguide}/src/docbkx/devguide.xml
  5. 0  { → devguide}/src/docbkx/images/sonarj-939984.png
  6. 0  { → devguide}/src/docbkx/images/sonarj-944680.png
  7. +135 −0 distribution/pom.xml
  8. +42 −47 { → distribution}/src/main/assembly/bin.xml
  9. +9 −2 modules/axiom-all/pom.xml
  10. +9 −9 modules/axiom-api/pom.xml
  11. +9 −2 modules/axiom-buildutils/pom.xml
  12. +10 −3 modules/axiom-c14n/pom.xml
  13. +13 −2 modules/axiom-common-impl-testsuite/pom.xml
  14. +9 −2 modules/axiom-common-impl/pom.xml
  15. +13 −2 modules/axiom-compat/pom.xml
  16. +13 −2 modules/axiom-dom-testsuite/pom.xml
  17. +9 −2 modules/axiom-dom/pom.xml
  18. +9 −2 modules/axiom-impl/pom.xml
  19. +9 −2 modules/axiom-integration/pom.xml
  20. +9 −2 modules/axiom-jaxb/pom.xml
  21. +13 −2 modules/axiom-jaxen-testsuite/pom.xml
  22. +9 −2 modules/axiom-osgi-tests/pom.xml
  23. +0 −508 modules/axiom-parent/pom.xml
  24. +9 −2 modules/axiom-samples/pom.xml
  25. +9 −2 modules/axiom-tests/pom.xml
  26. +13 −2 modules/axiom-testsuite/pom.xml
  27. +9 −3 modules/axiom-testutils/pom.xml
  28. +264 −184 pom.xml
  29. +0 −6 src/docbkx/xsl/fo.xsl
  30. +0 −33 src/docbkx/xsl/html.xsl
  31. +117 −0 userguide/pom.xml
  32. 0  { → userguide}/src/docbkx/images/api.jpg
  33. 0  { → userguide}/src/docbkx/images/architecture.jpg
  34. 0  { → userguide}/src/docbkx/userguide.xml
View
152 apidocs/pom.xml
@@ -0,0 +1,152 @@
+<?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.15-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>apidocs</artifactId>
+ <name>Javadoc</name>
+ <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-jaxb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-dom-testsuite</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-testsuite</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-compat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-c14n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!-- These are artifacts that are optional/provided dependencies of the above artifacts.
+ We need them to process the sources. -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.9</version>
+ <executions>
+ <execution>
+ <!-- This prepares the Javadoc for inclusion into the binary distribution. We could
+ as well execute this in the distribution POM, but doing it here ensures that
+ we generate the Javadoc with the exact same configuration. -->
+ <id>distribution-javadoc</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>site-javadoc</id>
+ <phase>site</phase>
+ <goals>
+ <goal>javadoc</goal>
+ </goals>
+ <configuration>
+ <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+ <destDir>.</destDir>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+ </dependencySourceIncludes>
+ <!-- There are no other modules that generate Javadoc we can link to -->
+ <detectOfflineLinks>false</detectOfflineLinks>
+ <links>
+ <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://download.oracle.com/javaee/1.4/api/</link>
+ <link>http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.5/api/</link>
+ <link>http://jaxen.codehaus.org/apidocs/</link>
+ </links>
+ <breakiterator>true</breakiterator>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/apidocs.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
19 src/docbkx/xsl/common.xsl → apidocs/src/main/assembly/apidocs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -17,8 +17,15 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- version="1.0">
- <xsl:param name="admon.textlabel">0</xsl:param>
-</xsl:stylesheet>
+<assembly>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/apidocs</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
View
117 devguide/pom.xml
@@ -0,0 +1,117 @@
+<?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.15-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>devguide</artifactId>
+ <name>Developer Guide</name>
+ <packaging>pom</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <configuration>
+ <admonGraphics>1</admonGraphics>
+ <admonTextlabel>0</admonTextlabel>
+ <entities>
+ <entity>
+ <name>version</name>
+ <value>${project.version}</value>
+ </entity>
+ </entities>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-pdf</id>
+ <goals>
+ <goal>generate-pdf</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <foCustomization>${basedir}/../src/docbkx/xsl/fo.xsl</foCustomization>
+ <imgSrcPath>${basedir}/src/docbkx/images/</imgSrcPath>
+ <admonGraphicsPath>${basedir}/../src/docbkx/images/</admonGraphicsPath>
+ <admonGraphicsExtension>.svg</admonGraphicsExtension>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-html</id>
+ <goals>
+ <goal>generate-html</goal>
+ </goals>
+ <phase>site</phase>
+ <configuration>
+ <chunkedOutput>true</chunkedOutput>
+ <!-- Only split chapters, not sections -->
+ <chunkSectionDepth>0</chunkSectionDepth>
+ <imgSrcPath>images/</imgSrcPath>
+ <admonGraphicsPath>images/</admonGraphicsPath>
+ <admonGraphicsExtension>.png</admonGraphicsExtension>
+ <postProcess>
+ <copy todir="${project.reporting.outputDirectory}">
+ <fileset dir="${project.build.directory}/docbkx/html/devguide"/>
+ </copy>
+ <copy todir="${project.reporting.outputDirectory}/images">
+ <fileset dir="src/docbkx/images"/>
+ <fileset dir="../src/docbkx/images">
+ <include name="**/*.png" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-pdf</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/docbkx/pdf/devguide.pdf</file>
+ <type>pdf</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
0  src/docbkx/devguide.xml → devguide/src/docbkx/devguide.xml
File renamed without changes
View
0  src/docbkx/images/sonarj-939984.png → devguide/src/docbkx/images/sonarj-939984.png
File renamed without changes
View
0  src/docbkx/images/sonarj-944680.png → devguide/src/docbkx/images/sonarj-944680.png
File renamed without changes
View
135 distribution/pom.xml
@@ -0,0 +1,135 @@
+<?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.15-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>distribution</artifactId>
+ <name>Distribution</name>
+ <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-compat</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-jaxb</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-c14n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axiom-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>devguide</artifactId>
+ <version>${project.version}</version>
+ <type>pdf</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>userguide</artifactId>
+ <version>${project.version}</version>
+ <type>pdf</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apidocs</artifactId>
+ <version>${project.version}</version>
+ <type>zip</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-timestamp</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['build_date'] = MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bin</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>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
89 src/main/assembly/bin.xml → distribution/src/main/assembly/bin.xml
@@ -26,6 +26,7 @@
<includeSiteDirectory>false</includeSiteDirectory>
<fileSets>
<fileSet>
+ <directory>..</directory>
<includes>
<include>NOTICE</include>
</includes>
@@ -33,16 +34,8 @@
<fileSet>
<directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
<outputDirectory>/</outputDirectory>
- <excludes>
- <!-- The root project has no dependencies; no need to include an empty file -->
- <exclude>DEPENDENCIES</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/docbkx/pdf</directory>
- <outputDirectory>docs</outputDirectory>
<includes>
- <include>*.pdf</include>
+ <include>LICENSE</include>
</includes>
</fileSet>
<fileSet>
@@ -50,7 +43,7 @@
<outputDirectory>apidocs</outputDirectory>
</fileSet>
<fileSet>
- <directory>legal</directory>
+ <directory>../legal</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>**/*</include>
@@ -59,55 +52,57 @@
</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>
</files>
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>*:*:jar</include>
+ </includes>
+ <excludes>
+ <exclude>*:axiom-all</exclude>
+ <!-- This dependency should be considered as provided by the application code -->
+ <exclude>javax.xml.bind:jaxb-api</exclude>
+ <!-- This together with useTransitiveFiltering=true ensures that we don't include
+ the dependencies of the apidocs ZIP. -->
+ <exclude>*:*:zip</exclude>
+ </excludes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ </dependencySet>
+ <dependencySet>
<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-compat</include>
- <include>org.apache.ws.commons.axiom:axiom-jaxb</include>
- <include>org.apache.ws.commons.axiom:axiom-c14n</include>
+ <include>*:axiom-all</include>
</includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- <includeDependencies>true</includeDependencies>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <!-- This artifact is actually shaded into axiom-impl and axiom-dom -->
- <exclude>org.apache.ws.commons.axiom:axiom-common-impl</exclude>
- <!-- This dependency should be considered as provided by the application code -->
- <exclude>javax.xml.bind:jaxb-api</exclude>
- </excludes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>axiom.jar</outputFileNameMapping>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>apidocs</outputDirectory>
+ <includes>
+ <include>*:apidocs:zip</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ <unpack>true</unpack>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>docs</outputDirectory>
<includes>
- <include>org.apache.ws.commons.axiom:axiom-all</include>
+ <include>*:*:pdf</include>
</includes>
- <binaries>
- <outputDirectory>/</outputDirectory>
- <unpack>false</unpack>
- <includeDependencies>false</includeDependencies>
- <outputFileNameMapping>axiom.jar</outputFileNameMapping>
- </binaries>
- </moduleSet>
- </moduleSets>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ </dependencySet>
+ </dependencySets>
</assembly>
View
11 modules/axiom-all/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-all</artifactId>
<name>Axiom Uber-JAR</name>
@@ -109,6 +109,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
18 modules/axiom-api/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-api</artifactId>
<name>Axiom API</name>
@@ -102,14 +102,7 @@
<!-- We need this in the StAX dialect for Woodstox 4 -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
- <version>3.1.1</version>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<build>
@@ -233,6 +226,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
View
11 modules/axiom-buildutils/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-buildutils</artifactId>
<name>Axiom Build Utilities</name>
@@ -73,6 +73,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
13 modules/axiom-c14n/pom.xml
@@ -19,13 +19,13 @@
-->
<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-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>axiom-c14n</artifactId>
<name>Axiom C14N</name>
<packaging>bundle</packaging>
@@ -70,6 +70,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
15 modules/axiom-common-impl-testsuite/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-common-impl-testsuite</artifactId>
<name>Axiom Common Implementation Test Suite</name>
@@ -61,4 +61,15 @@
<artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
11 modules/axiom-common-impl/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-common-impl</artifactId>
<name>Axiom Common Implementation Classes</name>
@@ -67,6 +67,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
15 modules/axiom-compat/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-compat</artifactId>
<name>Axiom Compatibility Classes</name>
@@ -68,4 +68,15 @@
<scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
15 modules/axiom-dom-testsuite/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-dom-testsuite</artifactId>
<name>Axiom DOM Test Suite</name>
@@ -71,6 +71,17 @@
<artifactId>xmlunit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
View
11 modules/axiom-dom/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-dom</artifactId>
<name>Axiom DOM</name>
@@ -195,6 +195,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
11 modules/axiom-impl/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-impl</artifactId>
<name>Axiom Impl</name>
@@ -178,6 +178,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
11 modules/axiom-integration/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-integration</artifactId>
<name>Axiom Integration Test Suite</name>
@@ -131,6 +131,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
11 modules/axiom-jaxb/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-jaxb</artifactId>
<name>Axiom JAXB Integration</name>
@@ -110,6 +110,13 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
15 modules/axiom-jaxen-testsuite/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-jaxen-testsuite</artifactId>
<name>Axiom Jaxen Test Suite</name>
@@ -48,6 +48,17 @@
<artifactId>junit</artifactId>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
View
11 modules/axiom-osgi-tests/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-osgi-tests</artifactId>
<name>Axiom OSGi Tests</name>
@@ -194,6 +194,13 @@
</systemPropertyVariables>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
<repositories>
View
508 modules/axiom-parent/pom.xml
@@ -1,508 +0,0 @@
-<?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</groupId>
- <artifactId>apache</artifactId>
- <version>9</version>
- </parent>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
- <name>Axiom Parent POM</name>
- <version>1.2.15-SNAPSHOT</version>
- <packaging>pom</packaging>
- <description>Axiom Parent POM</description>
- <url>http://ws.apache.org/axiom/</url>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/AXIOM</url>
- </issueManagement>
- <mailingLists>
- <mailingList>
- <name>Users</name>
- <subscribe>users-subscribe@ws.apache.org</subscribe>
- <unsubscribe>users-unsubscribe@ws.apache.org</unsubscribe>
- <post>users@ws.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/ws-users/</archive>
- </mailingList>
- <mailingList>
- <name>Developers</name>
- <subscribe>dev-subscribe@ws.apache.org</subscribe>
- <unsubscribe>dev-unsubscribe@ws.apache.org</unsubscribe>
- <post>dev@ws.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/ws-dev/</archive>
- </mailingList>
- <mailingList>
- <name>Commits</name>
- <subscribe>commits-subscribe@ws.apache.org</subscribe>
- <unsubscribe>commits-unsubscribe@ws.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/ws-commits/</archive>
- </mailingList>
- <mailingList>
- <name>WS Commons Developers (old)</name>
- <archive>http://mail-archives.apache.org/mod_mbox/ws-commons-dev/</archive>
- </mailingList>
- </mailingLists>
- <inceptionYear>2004</inceptionYear>
- <developers>
- <developer>
- <name>Saminda Abeyruwan</name>
- <id>saminda</id>
- <email>saminda AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Afkham Azeez</name>
- <id>azeez</id>
- <email>azeez AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Eran Chinthaka</name>
- <id>chinthaka</id>
- <email>chinthaka AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~chinthaka</url>
- </developer>
- <developer>
- <name>Glen Daniels</name>
- <id>gdaniels</id>
- <email>gdaniels AT apache.org</email>
- <organization>Sonic Software</organization>
- </developer>
- <developer>
- <name>Jaliya Ekanayake</name>
- <id>jaliya</id>
- <email>jaliya AT opensource.lk</email>
- <organization>Virtusa / Lanka Software Foundation</organization>
- <url>http://www.apache.org/~jaliya</url>
- </developer>
- <developer>
- <name>Nandana Mihindukulasooriya</name>
- <id>nandana</id>
- <email>nandana AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Ruchith Fernando</name>
- <id>ruchith</id>
- <email>ruchith AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <id>thilina</id>
- <name>Thilina Gunarathne</name>
- <email>thilina AT wso2.com</email>
- <url>http://www.apache.org/~thilina</url>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Chathura Herath</name>
- <id>chathura</id>
- <email>chathura AT opensource.lk</email>
- <organization>LSF/MIT</organization>
- <url>http://www.apache.org/~chathura</url>
- </developer>
- <developer>
- <name>Deepal Jayasinghe</name>
- <id>deepal</id>
- <email>deepal AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~deepal</url>
- </developer>
- <developer>
- <name>Chatra Nakkawita</name>
- <id>chatra</id>
- <email>chatra AT WSO2.com</email>
- <organization>WSO2</organization>
- </developer>
- <developer>
- <name>Srinath Perera</name>
- <id>hemapani</id>
- <email>hemapani AT apache.org</email>
- <organization>Lanka Software Foundation</organization>
- <url>http://www.apache.org/~hemapani</url>
- </developer>
- <developer>
- <name>Ajith Ranabahu</name>
- <id>ajith</id>
- <email>ajith AT wso2.com</email>
- <organization>WSO2</organization>
- <url>http://www.apache.org/~ajith</url>
- </developer>
- <developer>
- <name>Venkat Reddy</name>
- <id>venkat</id>
- <email>vreddyp AT gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Rich Scheuerle</name>
- <id>scheu</id>
- <email>scheu AT us.ibm.com</email>
- <organization>IBM</organization>
- </developer>
- <developer>
- <name>Ashutosh Shahi</name>
- <id>ashu</id>
- <email>Ashutosh.Shahi AT ca.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Aleksander Slominski</name>
- <id>alek</id>
- <email>aslom AT cs.indiana.edu</email>
- <organization>Indiana University Extreme! Computing Lab</organization>
- </developer>
- <developer>
- <name>Davanum Srinivas</name>
- <id>dims</id>
- <email>davanum AT gmail.com</email>
- <organization>IBM</organization>
- </developer>
- <developer>
- <name>Jayachandra Sekhara Rao Sunkara</name>
- <id>jaya</id>
- <email>jayachandra AT gmail.com</email>
- <organization>Computer Associates</organization>
- </developer>
- <developer>
- <name>Andreas Veithen</name>
- <id>veithen</id>
- <email>veithen AT apache.org</email>
- <url>http://www.linkedin.com/in/aveithen</url>
- </developer>
- <developer>
- <name>Dasarath Weerathunga</name>
- <id>dasarath</id>
- <email>dasarath AT opensource.lk</email>
- <organization>Lanka Software Foundation</organization>
- </developer>
- <developer>
- <name>Sanjiva Weerawarana</name>
- <id>sanjiva</id>
- <email>sanjiva AT wso2.com</email>
- <organization>WSO2</organization>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Dharshana Dias</name>
- <email />
- <organization>Lanka Software Foundation / University of Moratuwa</organization>
- </contributor>
- <contributor>
- <name>Anushka Kumara</name>
- <email>anushkakumar AT gmail.com</email>
- <organization>Lanka Software Foundation / University of Moratuwa</organization>
- </contributor>
- <contributor>
- <name>Chinthaka Thilakarathne</name>
- <email />
- <organization>Lanka Software Foundation / University of Moratuwa</organization>
- </contributor>
- <contributor>
- <name>Jochen Wiedmann</name>
- <email>jochen.wiedmann AT gmail.com</email>
- </contributor>
- </contributors>
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-parent</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom/modules/axiom-parent</developerConnection>
- <url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-parent</url>
- </scm>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.10</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- <!-- Uncomment this to test with the StAX implementation in Java 7 -->
- <!-- property>
- <name>javax.xml.stream.XMLInputFactory</name>
- <value>com.sun.xml.internal.stream.XMLInputFactoryImpl</value>
- </property>
- <property>
- <name>javax.xml.stream.XMLOutputFactory</name>
- <value>com.sun.xml.internal.stream.XMLOutputFactoryImpl</value>
- </property -->
- <!-- Uncomment this to test with BEA's reference implementation -->
- <!-- property>
- <name>javax.xml.stream.XMLInputFactory</name>
- <value>com.bea.xml.stream.MXParserFactory</value>
- </property>
- <property>
- <name>javax.xml.stream.XMLOutputFactory</name>
- <value>com.bea.xml.stream.XMLOutputFactoryBase</value>
- </property -->
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-shade-plugin</artifactId>
- <version>${shade.plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <inherited>true</inherited>
- <configuration>
- <source>1.3</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <!-- Use the same ID as in org.apache:apache; otherwise, the goal
- will be executed twice when the apache-release profile is
- activated -->
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
- <!-- We don't need to generate the site in sub-modules -->
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>apache-release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.8</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <!-- We can't add license headers to test resources -->
- <exclude>src/test/resources/**</exclude>
- <!-- Temporary file created by maven-shade-plugin -->
- <exclude>dependency-reduced-pom.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <dependencyManagement>
- <dependencies>
- <!-- We use the 1.0 version of the StAX API as Maven dependency (because
- we need to ensure compatibility with that StAX version), but we need
- the 1.2 version because Geronimo's 1.0 bundles are not fully OSGi aware
- (they don't locate StAX implementations that are deployed as bundles). -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.2_spec</artifactId>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <version>1.7.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifact}</artifactId>
- <version>${stax.impl.version}</version>
- <exclusions>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
- <version>0.7.2</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.9</version>
- </dependency>
- <dependency>
- <groupId>xmlunit</groupId>
- <artifactId>xmlunit</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.10.0</version>
- </dependency>
- <dependency>
- <!-- Recent versions of Xerces require this (because they need org.w3c.dom.ElementTraversal) -->
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <distributionManagement>
- <site>
- <id>website</id>
- <url>scpexe://people.apache.org/www/ws.apache.org/commons/axiom</url>
- </site>
- </distributionManagement>
- <properties>
- <osgi.version>4.2.0</osgi.version>
- <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
- <stax.impl.artifact>woodstox-core-asl</stax.impl.artifact>
- <stax.impl.version>4.1.4</stax.impl.version>
- <failIfNoTests>false</failIfNoTests>
- <!--
- <stax.impl.groupid>com.sun.xml.stream</stax.impl.groupid>
- <stax.impl.artifact>sjsxp</stax.impl.artifact>
- <stax.impl.version>1.0.1</stax.impl.version>
- -->
- <!--
- <stax.impl.groupid>stax</stax.impl.groupid>
- <stax.impl.artifact>stax</stax.impl.artifact>
- <stax.impl.version>1.2.0</stax.impl.version>
- -->
- <shade.plugin.version>1.6</shade.plugin.version>
- </properties>
-</project>
View
11 modules/axiom-samples/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-samples</artifactId>
<name>Axiom Samples</name>
@@ -96,6 +96,13 @@
</includes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
11 modules/axiom-tests/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-tests</artifactId>
<name>Axiom Test Suite</name>
@@ -131,6 +131,13 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
View
15 modules/axiom-testsuite/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-testsuite</artifactId>
<name>Axiom Implementation Test Suite</name>
@@ -74,6 +74,17 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<profiles>
<profile>
<id>apache-release</id>
View
12 modules/axiom-testutils/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>1.2.15-SNAPSHOT</version>
- <relativePath>../axiom-parent/pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>axiom-testutils</artifactId>
<name>Axiom Test Utilities</name>
@@ -89,7 +89,6 @@
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -115,6 +114,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <skipDeploy>true</skipDeploy>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
View
448 pom.xml
@@ -237,10 +237,236 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/commons/trunk/modules/axiom</developerConnection>
<url>http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom</url>
</scm>
+ <dependencyManagement>
+ <dependencies>
+ <!-- We use the 1.0 version of the StAX API as Maven dependency (because
+ we need to ensure compatibility with that StAX version), but we need
+ the 1.2 version because Geronimo's 1.0 bundles are not fully OSGi aware
+ (they don't locate StAX implementations that are deployed as bundles). -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.2_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${stax.impl.groupid}</groupId>
+ <artifactId>${stax.impl.artifact}</artifactId>
+ <version>${stax.impl.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.10.0</version>
+ </dependency>
+ <dependency>
+ <!-- Recent versions of Xerces require this (because they need org.w3c.dom.ElementTraversal) -->
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <version>3.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <properties>
+ <osgi.version>4.2.0</osgi.version>
+ <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>
+ <stax.impl.artifact>woodstox-core-asl</stax.impl.artifact>
+ <stax.impl.version>4.1.4</stax.impl.version>
+ <failIfNoTests>false</failIfNoTests>
+ <!--
+ <stax.impl.groupid>com.sun.xml.stream</stax.impl.groupid>
+ <stax.impl.artifact>sjsxp</stax.impl.artifact>
+ <stax.impl.version>1.0.1</stax.impl.version>
+ -->
+ <!--
+ <stax.impl.groupid>stax</stax.impl.groupid>
+ <stax.impl.artifact>stax</stax.impl.artifact>
+ <stax.impl.version>1.2.0</stax.impl.version>
+ -->
+ <shade.plugin.version>1.6</shade.plugin.version>
+ </properties>
<build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh-external</artifactId>
+ <version>2.2</version>
+ </extension>
+ </extensions>
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ <!-- Uncomment this to test with the StAX implementation in Java 7 -->
+ <!-- property>
+ <name>javax.xml.stream.XMLInputFactory</name>
+ <value>com.sun.xml.internal.stream.XMLInputFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.stream.XMLOutputFactory</name>
+ <value>com.sun.xml.internal.stream.XMLOutputFactoryImpl</value>
+ </property -->
+ <!-- Uncomment this to test with BEA's reference implementation -->
+ <!-- property>
+ <name>javax.xml.stream.XMLInputFactory</name>
+ <value>com.bea.xml.stream.MXParserFactory</value>
+ </property>
+ <property>
+ <name>javax.xml.stream.XMLOutputFactory</name>
+ <value>com.bea.xml.stream.XMLOutputFactoryBase</value>
+ </property -->
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>${shade.plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <version>2.0.13</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
<artifactId>maven-release-plugin</artifactId>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/webservices/commons/tags/axiom</tagBase>
@@ -262,205 +488,47 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>generate-timestamp</id>
- <phase>initialize</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- import java.util.Date
- import java.text.MessageFormat
- project.properties['build_date'] = MessageFormat.format("{0,date,MMMMM dd, yyyy}", new Date())
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- <executions>
- <execution>
- <id>distribution-javadoc</id>
- <!-- Need to execute this before the package phase. Reason: If the
- apache-release profile is activated, then the assembly plugin is run
- before the javadoc plugin in the package phase. Note that the
- prepare-package phase is only available in Maven 2.1. -->
- <phase>compile</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <configuration>
- <reportOutputDirectory>${project.build.directory}/apidocs</reportOutputDirectory>
- </configuration>
- </execution>
- <execution>
- <id>site-javadoc</id>
- <phase>pre-site</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <inherited>true</inherited>
<configuration>
- <links>
- <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
- <link>http://download.oracle.com/javaee/1.4/api/</link>
- <link>http://download.oracle.com/docs/cd/E17802_01/webservices/webservices/docs/1.5/api/</link>
- <link>http://jaxen.codehaus.org/apidocs/</link>
- </links>
- <excludePackageNames>org.apache.axiom.test:org.apache.axiom.testutils:org.jaxen.test:org.apache.axiom.om.impl.common*:org.apache.axiom.soap.impl.common*:org.apache.axiom.om.impl.llom*:org.apache.axiom.soap.impl.llom*:org.apache.axiom.om.impl.dom*:org.apache.axiom.soap.impl.dom*</excludePackageNames>
- <breakiterator>true</breakiterator>
+ <source>1.3</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
- <groupId>com.agilejava.docbkx</groupId>
- <artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.13</version>
- <inherited>false</inherited>
+ <!-- This serves two purposes:
+ (1) we want to generate source JARs for all builds, not just release builds;
+ (2) we need (some of) the source JARs to generate the Javadoc in the apidocs module. -->
+ <artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
- <id>userguide-html</id>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <phase>pre-site</phase>
- <configuration>
- <includes>userguide.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <targetDirectory>${project.reporting.outputDirectory}</targetDirectory>
- <htmlCustomization>src/docbkx/xsl/html.xsl</htmlCustomization>
- <postProcess>
- <copy todir="${project.reporting.outputDirectory}/userguide/images">
- <fileset dir="src/docbkx/images">
- <include name="**/*.jpg" />
- <include name="**/*.png" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>devguide-html</id>
- <goals>
- <goal>generate-html</goal>
- </goals>
- <phase>pre-site</phase>
- <configuration>
- <includes>devguide.xml</includes>
- <chunkedOutput>true</chunkedOutput>
- <targetDirectory>${project.reporting.outputDirectory}</targetDirectory>
- <htmlCustomization>src/docbkx/xsl/html.xsl</htmlCustomization>
- <postProcess>
- <copy todir="${project.reporting.outputDirectory}/devguide/images">
- <fileset dir="src/docbkx/images">
- <include name="**/*.jpg" />
- <include name="**/*.png" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- <execution>
- <id>userguide-pdf</id>
+ <!-- Use the same ID as in org.apache:apache; otherwise, the goal
+ will be executed twice when the apache-release profile is
+ activated -->
+ <id>attach-sources</id>
<goals>
- <goal>generate-pdf</goal>
+ <goal>jar</goal>
</goals>
- <phase>compile</phase>
- <configuration>
- <includes>userguide.xml</includes>
- <foCustomization>${basedir}/src/docbkx/xsl/fo.xsl</foCustomization>
- </configuration>
- </execution>
- <execution>
- <id>devguide-pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <phase>compile</phase>
- <configuration>
- <includes>devguide.xml</includes>
- <foCustomization>${basedir}/src/docbkx/xsl/fo.xsl</foCustomization>
- </configuration>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
<configuration>
- <admonGraphics>true</admonGraphics>
- <entities>
- <entity>
- <name>version</name>
- <value>${project.version}</value>
- </entity>
- </entities>
+ <attach>true</attach>
</configuration>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>attach-pdfs</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/docbkx/pdf/userguide.pdf</file>
- <type>pdf</type>
- <classifier>userguide</classifier>
- </artifact>
- <artifact>
- <file>${project.build.directory}/docbkx/pdf/devguide.pdf</file>
- <type>pdf</type>
- <classifier>devguide</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <id>bin</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>
<profiles>
@@ -482,6 +550,8 @@
</executions>
<configuration>
<excludes>
+ <!-- Exclusions specific to the root project -->
+
<!-- RAT doesn't recognize this one as notes file -->
<exclude>RELEASE-NOTE.txt</exclude>
<!-- SVG files are not edited by hand, so license headers would be lost anyway -->
@@ -494,6 +564,13 @@
<exclude>*.sonarj</exclude>
<!-- File generated by maven-release-plugin -->
<exclude>release.properties</exclude>
+
+ <!-- Exclusions that apply to submodules -->
+
+ <!-- We can't add license headers to test resources -->
+ <exclude>src/test/resources/**</exclude>
+ <!-- Temporary file created by maven-shade-plugin -->
+ <exclude>dependency-reduced-pom.xml</exclude>
</excludes>
</configuration>
</plugin>
@@ -522,11 +599,10 @@
<distributionManagement>
<site>
<id>website</id>
- <url>scpexe://people.apache.org/www/ws.apache.org/commons/axiom</url>
+ <url>scpexe://people.apache.org/home/${user.name}/public_html/axiom</url>
</site>
</distributionManagement>
<modules>
- <module>modules/axiom-parent</module>
<module>modules/axiom-buildutils</module>
<module>modules/axiom-testutils</module>
<module>modules/axiom-jaxen-testsuite</module>
@@ -545,5 +621,9 @@
<module>modules/axiom-integration</module>
<module>modules/axiom-all</module>
<module>modules/axiom-samples</module>
+ <module>devguide</module>
+ <module>userguide</module>
+ <module>apidocs</module>
+ <module>distribution</module>
</modules>
</project>
View
6 src/docbkx/xsl/fo.xsl
@@ -21,12 +21,6 @@
xmlns:fo="http://www.w3.org/1999/XSL/Format"
version="1.0">
<xsl:import href="urn:docbkx:stylesheet"/>
- <xsl:include href="common.xsl"/>
-
- <xsl:param name="img.src.path">src/docbkx/images/</xsl:param>
-
- <xsl:param name="admon.graphics.extension">.svg</xsl:param>
- <xsl:param name="admon.graphics.path"><xsl:value-of select="$img.src.path"/></xsl:param>
<xsl:attribute-set name="monospace.verbatim.properties">
<xsl:attribute name="font-size">
View
33 src/docbkx/xsl/html.xsl
@@ -1,33 +0,0 @@
-<?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