You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by di...@apache.org on 2008/04/07 18:50:55 UTC
svn commit: r645609 - in /webservices/commons/trunk/modules/axiom: ./
modules/axiom-api/ modules/axiom-dom/ modules/axiom-impl/ src/main/assembly/
Author: dims
Date: Mon Apr 7 09:50:53 2008
New Revision: 645609
URL: http://svn.apache.org/viewvc?rev=645609&view=rev
Log:
Working on Axiom distribution
Added:
webservices/commons/trunk/modules/axiom/src/main/assembly/doc.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/filter.properties
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
webservices/commons/trunk/modules/axiom/pom.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
webservices/commons/trunk/modules/axiom/src/main/assembly/src.xml
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/pom.xml Mon Apr 7 09:50:53 2008
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>SNAPSHOT</version>
<!-- Should better be ${axiom.version} -->
</parent>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-dom/pom.xml Mon Apr 7 09:50:53 2008
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>SNAPSHOT</version>
<!-- Should better be ${axiom.version} -->
</parent>
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-impl/pom.xml Mon Apr 7 09:50:53 2008
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<version>SNAPSHOT</version>
<!-- Should better be ${axiom.version} -->
</parent>
Modified: webservices/commons/trunk/modules/axiom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/pom.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/pom.xml (original)
+++ webservices/commons/trunk/modules/axiom/pom.xml Mon Apr 7 09:50:53 2008
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-parent</artifactId>
+ <artifactId>axiom</artifactId>
<name>Axiom</name>
<version>SNAPSHOT</version>
<!-- Should better be ${axiom.version} -->
@@ -310,6 +310,7 @@
<descriptors>
<descriptor>src/main/assembly/bin.xml</descriptor>
<descriptor>src/main/assembly/src.xml</descriptor>
+ <descriptor>src/main/assembly/doc.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -433,35 +434,23 @@
</dependencyManagement>
<reporting>
<plugins>
- <!--<plugin>-->
- <!--<inherited>false</inherited>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<aggregate>true</aggregate>-->
- <!--</configuration>-->
- <!--</plugin>-->
- <!--<plugin>-->
- <!--<artifactId>maven-changes-plugin</artifactId>-->
- <!--<reportSets>-->
- <!--<reportSet>-->
- <!--<reports>-->
- <!--<report>changes-report</report>-->
- <!--</reports>-->
- <!--</reportSet>-->
- <!--</reportSets>-->
- <!--</plugin>-->
- <plugin>
+ <plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.codehaus.mojo</groupId>-->
- <!--<artifactId>jxr-maven-plugin</artifactId>-->
- <!--<version>2.0-beta-2-SNAPSHOT</version>-->
- <!--</plugin>-->
<plugin>
<artifactId>maven-site-plugin</artifactId>
<inherited>false</inherited>
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/bin.xml Mon Apr 7 09:50:53 2008
@@ -19,9 +19,9 @@
<assembly>
<id>bin</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
- <includeSiteDirectory>true</includeSiteDirectory>
+ <includeSiteDirectory>false</includeSiteDirectory>
<fileSets>
<fileSet>
<includes>
@@ -32,24 +32,51 @@
</fileSet>
<fileSet>
<directory>modules/axiom-api/target</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>modules/axiom-impl/target</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
+ <!-- Note that we exclude these txt files and later copy them with
+ filteres -->
+ <excludes>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTE.txt</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>modules/axiom-dom/target</directory>
- <outputDirectory>/lib</outputDirectory>
+ <outputDirectory></outputDirectory>
<includes>
<include>*.jar</include>
</includes>
+ <!-- exclude sources -->
+ <excludes>
+ <exclude>*-sources.jar</exclude>
+ </excludes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>README.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>RELEASE-NOTE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
</assembly>
Added: webservices/commons/trunk/modules/axiom/src/main/assembly/doc.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/doc.xml?rev=645609&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/doc.xml (added)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/doc.xml Mon Apr 7 09:50:53 2008
@@ -0,0 +1,54 @@
+<!--
+ ~ 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>
+ <id>docs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/axiom-dom/target/apidocs</directory>
+ <outputDirectory>axiom-dom/apidocs</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/axiom-api/target/apidocs</directory>
+ <outputDirectory>axiom-api/apidocs</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>modules/axiom-impl/target/apidocs</directory>
+ <outputDirectory>axiom-impl/apidocs</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: webservices/commons/trunk/modules/axiom/src/main/assembly/filter.properties
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/filter.properties?rev=645609&view=auto
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/filter.properties (added)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/filter.properties Mon Apr 7 09:50:53 2008
@@ -0,0 +1,25 @@
+#
+# ~ 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.
+#
+# This entry here is for the assembly plugin- For some reason
+# the assembly plugin cannot override the filter properties (as explained
+# in the docs) and also does not inherit the maven standard properties. This
+# is the one that points to a separate filter props file
+#
+
+version = 1.2.6
\ No newline at end of file
Modified: webservices/commons/trunk/modules/axiom/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/src/main/assembly/src.xml?rev=645609&r1=645608&r2=645609&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/src/main/assembly/src.xml (original)
+++ webservices/commons/trunk/modules/axiom/src/main/assembly/src.xml Mon Apr 7 09:50:53 2008
@@ -19,28 +19,17 @@
<assembly>
<id>src</id>
<formats>
- <format>tar.gz</format>
+ <format>zip</format>
</formats>
<fileSets>
<fileSet>
<includes>
<include>*.txt</include>
- <include>pom.xml</include>
- <include>maven.xml</include>
- <include>project.properties</include>
- <include>project.xml</include>
- <include>.project</include>
- <include>.classpath</include>
+ <include>*.xml</include>
+ <include>*.properties</include>
</includes>
- </fileSet>
- <fileSet>
- <directory>.settings</directory>
- </fileSet>
- <fileSet>
- <directory>legal</directory>
- </fileSet>
- <fileSet>
- <directory>modules</directory>
+ <!-- Note that we exclude these txt files and later copy them with
+ filteres -->
<excludes>
<exclude>axiom-api/target</exclude>
<exclude>axiom-api/target/**/*</exclude>
@@ -56,4 +45,16 @@
<directory>src</directory>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>README.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>RELEASE-NOTE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ <filtered>true</filtered>
+ </file>
+ </files>
</assembly>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org