Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1031072 - in /commons/proper/vfs/trunk: dist/
 dist/pom.xml
 dist/src/ dist/src/assembly/ dist/src/assembly/bin.xml
 dist/src/assembly/src.xml pom.xml src/assembly/bin.xml src/assembly/src.xml
Date: Thu, 04 Nov 2010 16:46:56 -0000
To: commits@commons.apache.org
From: henning@apache.org
Message-Id: <20101104164656.81267238890D@eris.apache.org>

Author: henning
Date: Thu Nov  4 16:46:55 2010
New Revision: 1031072

URL: http://svn.apache.org/viewvc?rev=1031072&view=rev
Log:
To get the binary distribution to work, it is necessary to do some ugly workarounds to assemble after all the binaries are built. Shuffle the various pieces of the build
around to get it work.


Added:
    commons/proper/vfs/trunk/dist/
    commons/proper/vfs/trunk/dist/pom.xml   (with props)
    commons/proper/vfs/trunk/dist/src/
    commons/proper/vfs/trunk/dist/src/assembly/
      - copied from r1030835, commons/proper/vfs/trunk/src/assembly/
Removed:
    commons/proper/vfs/trunk/dist/src/assembly/src.xml
    commons/proper/vfs/trunk/src/assembly/src.xml
Modified:
    commons/proper/vfs/trunk/dist/src/assembly/bin.xml
    commons/proper/vfs/trunk/pom.xml
    commons/proper/vfs/trunk/src/assembly/bin.xml

Added: commons/proper/vfs/trunk/dist/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/dist/pom.xml?rev=1031072&view=auto
==============================================================================
--- commons/proper/vfs/trunk/dist/pom.xml (added)
+++ commons/proper/vfs/trunk/dist/pom.xml Thu Nov  4 16:46:55 2010
@@ -0,0 +1,149 @@
+<?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>
+
+    <name>Commons VFS Distribution</name>
+    <groupId>org.apache.commons</groupId>
+    <artifactId>commons-vfs-distribution</artifactId>
+    <version>2.0-SNAPSHOT</version>
+    <description>VFS is a Virtual File System library - Distribution archives.</description>
+
+    <parent>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-vfs-project</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-sources</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-examples</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-examples</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-examples</artifactId>
+            <version>${project.version}</version>
+            <classifier>javadoc</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-sandbox</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-sandbox</artifactId>
+            <version>${project.version}</version>
+            <classifier>sources</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-sandbox</artifactId>
+            <version>${project.version}</version>
+            <classifier>javadoc</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-sandbox</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-vfs-sandbox</artifactId>
+            <version>${project.version}</version>
+            <classifier>test-sources</classifier>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <commons.componentid>vfs-dist</commons.componentid>
+        <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>binary</id>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/assembly/bin.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                </configuration>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <phase>package</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

Propchange: commons/proper/vfs/trunk/dist/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/vfs/trunk/dist/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Revision

Modified: commons/proper/vfs/trunk/dist/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/dist/src/assembly/bin.xml?rev=1031072&r1=1030835&r2=1031072&view=diff
==============================================================================
--- commons/proper/vfs/trunk/dist/src/assembly/bin.xml (original)
+++ commons/proper/vfs/trunk/dist/src/assembly/bin.xml Thu Nov  4 16:46:55 2010
@@ -1,18 +1,18 @@
 <!--
- 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
+    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
+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.
+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>
@@ -21,24 +21,32 @@
         <format>zip</format>
     </formats>
     <includeSiteDirectory>false</includeSiteDirectory>
+    <moduleSets>
+        <moduleSet>
+            <useAllReactorProjects>true</useAllReactorProjects>
+        </moduleSet>
+    </moduleSets>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.apache.commons:commons-vfs*</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.commons:commons-vfs-distribution</exclude>
+            </excludes>
+            <outputDirectory></outputDirectory>
+            <unpack>false</unpack>
+        </dependencySet>
+    </dependencySets>
+
     <fileSets>
         <fileSet>
+            <directory>..</directory>
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
                 <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-        </fileSet>
     </fileSets>
 </assembly>

Modified: commons/proper/vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1031072&r1=1031071&r2=1031072&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Thu Nov  4 16:46:55 2010
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-parent</artifactId>
-    <version>17</version>
+    <version>18-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -155,17 +155,6 @@
             <commons.release.name>commons-${commons.componentid}-${commons.release.version}</commons.release.name>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <!-- version inherited from commons-parent -->
-        <configuration>
-          <descriptors>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
@@ -389,5 +378,13 @@
       <url>scp://people.apache.org/www/commons.apache.org/vfs/</url>
     </site>
   </distributionManagement>
-
+  
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+      <modules>
+        <module>dist</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

Modified: commons/proper/vfs/trunk/src/assembly/bin.xml
URL: http://svn.apache.org/viewvc/commons/proper/vfs/trunk/src/assembly/bin.xml?rev=1031072&r1=1031071&r2=1031072&view=diff
==============================================================================
--- commons/proper/vfs/trunk/src/assembly/bin.xml (original)
+++ commons/proper/vfs/trunk/src/assembly/bin.xml Thu Nov  4 16:46:55 2010
@@ -1,18 +1,18 @@
 <!--
- 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
+    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
+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.
+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>
@@ -21,24 +21,32 @@
         <format>zip</format>
     </formats>
     <includeSiteDirectory>false</includeSiteDirectory>
+    <moduleSets>
+        <moduleSet>
+            <useAllReactorProjects>true</useAllReactorProjects>
+        </moduleSet>
+    </moduleSets>
+    <dependencySets>
+        <dependencySet>
+            <includes>
+                <include>org.apache.commons:commons-vfs*</include>
+            </includes>
+            <excludes>
+                <exclude>org.apache.commons:commons-vfs-distribution</exclude>
+            </excludes>
+            <outputDirectory></outputDirectory>
+            <unpack>false</unpack>
+        </dependencySet>
+    </dependencySets>
+
     <fileSets>
         <fileSet>
+            <directory>..</directory>
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
                 <include>RELEASE-NOTES.txt</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>target</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/site/apidocs</directory>
-            <outputDirectory>apidocs</outputDirectory>
-        </fileSet>
     </fileSets>
 </assembly>