hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r613385 - in /httpcomponents/httpcore/trunk: ./ module-main/src/site/ module-main/src/site/resources/css/ module-nio/src/site/ module-nio/src/site/resources/css/ src/main/assembly/ src/site/resources/css/
Date Sat, 19 Jan 2008 11:48:10 GMT
Author: olegk
Date: Sat Jan 19 03:48:09 2008
New Revision: 613385

URL: http://svn.apache.org/viewvc?rev=613385&view=rev
Log:
Updated BUILDING.txt; updated assembly descriptor to include all sources including web site;
added missing ASL headers

Modified:
    httpcomponents/httpcore/trunk/BUILDING.txt
    httpcomponents/httpcore/trunk/module-main/src/site/resources/css/site.css
    httpcomponents/httpcore/trunk/module-main/src/site/site.xml
    httpcomponents/httpcore/trunk/module-nio/src/site/resources/css/site.css
    httpcomponents/httpcore/trunk/module-nio/src/site/site.xml
    httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml
    httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml
    httpcomponents/httpcore/trunk/src/site/resources/css/site.css

Modified: httpcomponents/httpcore/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/BUILDING.txt?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/BUILDING.txt (original)
+++ httpcomponents/httpcore/trunk/BUILDING.txt Sat Jan 19 03:48:09 2008
@@ -5,9 +5,8 @@
 --------------
 HttpCore utilizes Maven 2 as a distribution management and packaging tool. Version 2.0.7
or above is
 recommended. Maven 2 requires JDK 1.4 or above in order to execute. However, JDK 1.5 or above
is
-required in order to compile some modules (such as NIOSSL) and we generally recommend a 1.5

-compatible JDK be used to build HttpComponents Core packages. Java 1.5 dependent modules
will be
-excluded when managing the distribution with an older JDK.
+required in order to compile some modules (such as NIO extensions) and we generally recommend
a 1.5 
+compatible JDK be used to build HttpComponents Core packages.
 
 Maven installation and configuration instructions can be found here:
 
@@ -29,7 +28,6 @@
 
 module-main/target/httpcore-<VERSION>.jar
 module-nio/target/httpcore-nio-<VERSION>.jar
-module-niossl/target/httpcore-niossl-<VERSION>.jar
 
 where <VERSION> is the release version
 

Modified: httpcomponents/httpcore/trunk/module-main/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-main/src/site/resources/css/site.css?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-main/src/site/resources/css/site.css (original)
+++ httpcomponents/httpcore/trunk/module-main/src/site/resources/css/site.css Sat Jan 19 03:48:09
2008
@@ -1 +1,31 @@
+/*
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   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 software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+*/
+
 @import url("http://hc.apache.org/css/hc-maven.css");

Modified: httpcomponents/httpcore/trunk/module-main/src/site/site.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-main/src/site/site.xml?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-main/src/site/site.xml (original)
+++ httpcomponents/httpcore/trunk/module-main/src/site/site.xml Sat Jan 19 03:48:09 2008
@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   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 software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+ -->
 <project name="HttpCore">
   <bannerLeft>
     <name>Apache</name>

Modified: httpcomponents/httpcore/trunk/module-nio/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/site/resources/css/site.css?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/site/resources/css/site.css (original)
+++ httpcomponents/httpcore/trunk/module-nio/src/site/resources/css/site.css Sat Jan 19 03:48:09
2008
@@ -1 +1,31 @@
+/*
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   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 software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+*/
+
 @import url("http://hc.apache.org/css/hc-maven.css");

Modified: httpcomponents/httpcore/trunk/module-nio/src/site/site.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/site/site.xml?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/site/site.xml (original)
+++ httpcomponents/httpcore/trunk/module-nio/src/site/site.xml Sat Jan 19 03:48:09 2008
@@ -1,4 +1,33 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   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 software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+ -->
 <project name="HttpCore">
   <bannerLeft>
     <name>Apache</name>

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=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/src-unix.xml Sat Jan 19 03:48:09 2008
@@ -51,14 +51,17 @@
           </includes>
           <lineEnding>lf</lineEnding>
         </fileSet>
+        <!-- Site and assembly descriptors -->
+        <fileSet>
+          <directory>src</directory>
+          <outputDirectory>src</outputDirectory>
+          <lineEnding>lf</lineEnding>
+        </fileSet>
         <!-- Base module source and text resources -->
         <fileSet>
           <directory>module-main/src</directory>
           <outputDirectory>module-main/src</outputDirectory>
           <lineEnding>lf</lineEnding>
-          <excludes>
-            <exclude>site/**</exclude>
-          </excludes>
         </fileSet>
         <!-- Base module build files -->
         <fileSet>
@@ -75,7 +78,6 @@
           <outputDirectory>module-nio/src</outputDirectory>
           <lineEnding>lf</lineEnding>
           <excludes>
-            <exclude>site/**</exclude>
             <exclude>test/resources/*.keystore</exclude>
           </excludes>
         </fileSet>

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=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml (original)
+++ httpcomponents/httpcore/trunk/src/main/assembly/src-win.xml Sat Jan 19 03:48:09 2008
@@ -51,14 +51,17 @@
           </includes>
           <lineEnding>crlf</lineEnding>
         </fileSet>
+        <!-- Site and assembly descriptors -->
+        <fileSet>
+          <directory>src</directory>
+          <outputDirectory>src</outputDirectory>
+          <lineEnding>crlf</lineEnding>
+        </fileSet>
         <!-- Base module source and text resources -->
         <fileSet>
           <directory>module-main/src</directory>
           <outputDirectory>module-main/src</outputDirectory>
           <lineEnding>crlf</lineEnding>
-          <excludes>
-            <exclude>site/**</exclude>
-          </excludes>
         </fileSet>
         <!-- Base module build files -->
         <fileSet>
@@ -75,7 +78,6 @@
           <outputDirectory>module-nio/src</outputDirectory>
           <lineEnding>crlf</lineEnding>
           <excludes>
-            <exclude>site/**</exclude>
             <exclude>test/resources/*.keystore</exclude>
           </excludes>
         </fileSet>

Modified: httpcomponents/httpcore/trunk/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/site/resources/css/site.css?rev=613385&r1=613384&r2=613385&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/site/resources/css/site.css (original)
+++ httpcomponents/httpcore/trunk/src/site/resources/css/site.css Sat Jan 19 03:48:09 2008
@@ -1 +1,31 @@
+/*
+   $HeadURL$
+   $Revision$
+   $Date$
+
+   ====================================================================
+   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 software consists of voluntary contributions made by many
+   individuals on behalf of the Apache Software Foundation.  For more
+   information on the Apache Software Foundation, please see
+   <http://www.apache.org/>.
+*/
+
 @import url("http://hc.apache.org/css/hc-maven.css");



Mime
View raw message