Author: elecharny
Date: Tue Sep 14 22:30:30 2010
New Revision: 997123
URL: http://svn.apache.org/viewvc?rev=997123&view=rev
Log:
moved the assembly descriptor to the top level project
Added:
mina/trunk/bin.xml
mina/trunk/src.xml
Removed:
mina/trunk/distribution/bin.xml
mina/trunk/distribution/src.xml
Modified:
mina/trunk/pom.xml
Added: mina/trunk/bin.xml
URL: http://svn.apache.org/viewvc/mina/trunk/bin.xml?rev=997123&view=auto
==============================================================================
--- mina/trunk/bin.xml (added)
+++ mina/trunk/bin.xml Tue Sep 14 22:30:30 2010
@@ -0,0 +1,83 @@
+<?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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <!-- Copy licenses into '/' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy Javadoc into '/docs' -->
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>apidocs*/**</include>
+ <include>xref*/**</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+ <!-- Copy Mina modules into '/dist' -->
+ <dependencySet>
+ <outputDirectory>dist</outputDirectory>
+ <includes>
+ <!-- Including only Mina modules -->
+ <include>${project.groupId}:*</include>
+ </includes>
+ <excludes>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ <exclude>${project.groupId}:mina-transport-serial</exclude>
+ </excludes>
+ </dependencySet>
+
+ <!-- Copy Mina dependencies into '/lib' -->
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <excludes>
+ <!-- Excluding Mina modules -->
+ <exclude>${project.groupId}:*</exclude>
+ <exclude>${project.groupId}:mina-transport-serial</exclude>
+ <!-- Excluding sources jars -->
+ <exclude>*:sources</exclude>
+ <!-- Explicitely excluding RXTX jars -->
+ <exclude>org.rxtx:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
+</assembly>
Modified: mina/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/mina/trunk/pom.xml?rev=997123&r1=997122&r2=997123&view=diff
==============================================================================
--- mina/trunk/pom.xml (original)
+++ mina/trunk/pom.xml Tue Sep 14 22:30:30 2010
@@ -357,13 +357,6 @@
</profile>
<profile>
- <id>distribution</id>
- <modules>
- <module>mina-transport-serial</module>
- <module>distribution</module>
- </modules>
- </profile>
- <profile>
<id>mina-release</id>
<build>
<plugins>
@@ -382,6 +375,7 @@
</execution>
</executions>
</plugin>
+
<!-- We want to deploy the artifact to a staging location for
perusal -->
<plugin>
<inherited>true</inherited>
@@ -391,6 +385,7 @@
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -403,6 +398,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -418,6 +414,45 @@
</execution>
</executions>
</plugin>
+
+ <!-- Creates the packages -->
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ <executions>
+
+ <!-- Creates the sources package -->
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+
+ <!-- Creates the binaries package -->
+ <execution>
+ <id>bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
</profile>
@@ -473,7 +508,7 @@
</tagBase>
<preparationGoals>clean install</preparationGoals>
<goals>clean deploy</goals>
- <arguments>-Pmina-release -Pserial</arguments>
+ <arguments>-Pmina-release</arguments>
<mavenExecutorId>forked-path</mavenExecutorId>
</configuration>
</plugin>
Added: mina/trunk/src.xml
URL: http://svn.apache.org/viewvc/mina/trunk/src.xml?rev=997123&view=auto
==============================================================================
--- mina/trunk/src.xml (added)
+++ mina/trunk/src.xml Tue Sep 14 22:30:30 2010
@@ -0,0 +1,79 @@
+<?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.
+-->
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+ <!-- Copy licenses into '/' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory></outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>README*</include>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy Javadoc into '/docs' -->
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ <includes>
+ <include>apidocs*/**</include>
+ <include>xref*/**</include>
+ </includes>
+ </fileSet>
+
+ <!-- Copy sources into '/src' -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <filtered>false</filtered>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>KEYS</exclude>
+ <exclude>LICENSE*.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>**/target</exclude>
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/.settings</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/*.gen</exclude>
+ <exclude>**/.wtpmodules</exclude>
+ <exclude>**/surefire*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <exclude>**/velocity.log</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
