You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2008/01/16 22:46:08 UTC
svn commit: r612575 - in /httpcomponents/httpcore/trunk/src/main/assembly:
bin-unix.xml bin-win.xml src-unix.xml src-win.xml
Author: olegk
Date: Wed Jan 16 13:46:02 2008
New Revision: 612575
URL: http://svn.apache.org/viewvc?rev=612575&view=rev
Log:
Fixed assembly descriptors
Modified:
httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml
httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml
httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml
httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml
Modified: httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml?rev=612575&r1=612574&r2=612575&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/bin-unix.xml Wed Jan 16 13:46:02 2008
@@ -76,18 +76,5 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <!-- NIOSSL extensions module -->
- <fileSet>
- <directory>module-niossl/target/site/apidocs</directory>
- <outputDirectory>javadoc/httpcore-niossl</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>module-niossl/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <lineEnding>lf</lineEnding>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
Modified: httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml?rev=612575&r1=612574&r2=612575&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/bin-win.xml Wed Jan 16 13:46:02 2008
@@ -76,18 +76,5 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <!-- NIOSSL extensions module -->
- <fileSet>
- <directory>module-niossl/target/site/apidocs</directory>
- <outputDirectory>javadoc/httpcore-niossl</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>module-niossl/src/examples/</directory>
- <outputDirectory>examples</outputDirectory>
- <lineEnding>crlf</lineEnding>
- <includes>
- <include>**/*.java</include>
- </includes>
- </fileSet>
</fileSets>
</assembly>
Modified: httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml?rev=612575&r1=612574&r2=612575&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml Wed Jan 16 13:46:02 2008
@@ -76,39 +76,20 @@
<lineEnding>lf</lineEnding>
<excludes>
<exclude>site/**</exclude>
- </excludes>
- </fileSet>
- <!-- NIO module build files -->
- <fileSet>
- <directory>module-nio</directory>
- <outputDirectory>module-nio</outputDirectory>
- <lineEnding>lf</lineEnding>
- <includes>
- <include>*.xml</include>
- </includes>
- </fileSet>
- <!-- NIO SSL module source and text resources -->
- <fileSet>
- <directory>module-niossl/src</directory>
- <outputDirectory>module-niossl/src</outputDirectory>
- <lineEnding>lf</lineEnding>
- <excludes>
- <exclude>site/**</exclude>
<exclude>test/resources/*.keystore</exclude>
</excludes>
</fileSet>
- <!-- NIO SSL module binary resources -->
<fileSet>
- <directory>module-niossl/src</directory>
- <outputDirectory>module-niossl/src</outputDirectory>
+ <directory>module-nio/src</directory>
+ <outputDirectory>module-nio/src</outputDirectory>
<includes>
<include>test/resources/*.keystore</include>
</includes>
</fileSet>
- <!-- NIO SSL module build files -->
+ <!-- NIO module build files -->
<fileSet>
- <directory>module-niossl</directory>
- <outputDirectory>module-niossl</outputDirectory>
+ <directory>module-nio</directory>
+ <outputDirectory>module-nio</outputDirectory>
<lineEnding>lf</lineEnding>
<includes>
<include>*.xml</include>
Modified: httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml?rev=612575&r1=612574&r2=612575&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml Wed Jan 16 13:46:02 2008
@@ -76,39 +76,20 @@
<lineEnding>crlf</lineEnding>
<excludes>
<exclude>site/**</exclude>
- </excludes>
- </fileSet>
- <!-- NIO module build files -->
- <fileSet>
- <directory>module-nio</directory>
- <outputDirectory>module-nio</outputDirectory>
- <lineEnding>crlf</lineEnding>
- <includes>
- <include>*.xml</include>
- </includes>
- </fileSet>
- <!-- NIO SSL module source and text resources -->
- <fileSet>
- <directory>module-niossl/src</directory>
- <outputDirectory>module-niossl/src</outputDirectory>
- <lineEnding>crlf</lineEnding>
- <excludes>
- <exclude>site/**</exclude>
<exclude>test/resources/*.keystore</exclude>
</excludes>
</fileSet>
- <!-- NIO SSL module binary resources -->
<fileSet>
- <directory>module-niossl/src</directory>
- <outputDirectory>module-niossl/src</outputDirectory>
+ <directory>module-nio/src</directory>
+ <outputDirectory>module-nio/src</outputDirectory>
<includes>
<include>test/resources/*.keystore</include>
</includes>
</fileSet>
- <!-- NIO SSL module build files -->
+ <!-- NIO module build files -->
<fileSet>
- <directory>module-niossl</directory>
- <outputDirectory>module-niossl</outputDirectory>
+ <directory>module-nio</directory>
+ <outputDirectory>module-nio</outputDirectory>
<lineEnding>crlf</lineEnding>
<includes>
<include>*.xml</include>