You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2011/05/18 13:06:43 UTC
svn commit: r1124187 - in /incubator/hama/trunk: CHANGES.txt LICENSE.txt
NOTICE.txt build.xml lib/ pom.xml
src/test/org/apache/hama/bsp/TestBSPPeer.java
Author: edwardyoon
Date: Wed May 18 11:06:43 2011
New Revision: 1124187
URL: http://svn.apache.org/viewvc?rev=1124187&view=rev
Log:
Add a profile 'forrest' to generate the website
Removed:
incubator/hama/trunk/build.xml
incubator/hama/trunk/lib/
incubator/hama/trunk/src/test/org/apache/hama/bsp/TestBSPPeer.java
Modified:
incubator/hama/trunk/CHANGES.txt
incubator/hama/trunk/LICENSE.txt
incubator/hama/trunk/NOTICE.txt
incubator/hama/trunk/pom.xml
Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=1124187&r1=1124186&r2=1124187&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Wed May 18 11:06:43 2011
@@ -13,6 +13,7 @@ Release 0.3 - Unreleased
IMPROVEMENTS
+ HAMA-388: Add a profile 'forrest' to generate the website (edwardyoon)
HAMA-392: Make zk session-timeout configurable (edwardyoon)
HAMA-389: Make the thread pool size user configurable (Thomas Jungblut via edwardyoon)
HAMA-386: Removing 'System.arraycopy(...)' call from ByteMessage (edwardyoon)
Modified: incubator/hama/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/LICENSE.txt?rev=1124187&r1=1124186&r2=1124187&view=diff
==============================================================================
--- incubator/hama/trunk/LICENSE.txt (original)
+++ incubator/hama/trunk/LICENSE.txt Wed May 18 11:06:43 2011
@@ -201,60 +201,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-===================================================
-The following license applies to the UmlGraph package
-===================================================
-Copyright (c) 2002-2007, Diomidis Spinellis
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of Diomidis Spinellis nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-==========================================================
-The following license applies to the GroboUtils package
-==========================================================
-The MIT License - (http://groboutils.sourceforge.net/license.html)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
==========================================================
The following license applies to the JUnit package
==========================================================
Modified: incubator/hama/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/NOTICE.txt?rev=1124187&r1=1124186&r2=1124187&view=diff
==============================================================================
--- incubator/hama/trunk/NOTICE.txt (original)
+++ incubator/hama/trunk/NOTICE.txt Wed May 18 11:06:43 2011
@@ -4,11 +4,5 @@ Copyright 2008-2011 The Apache Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes UmlGraph http://www.umlgraph.org/
-Copyright (c) 2002-2007, Diomidis Spinellis
-
-This product includes GroboTestingJUnit http://groboutils.sourceforge.net/
-Copyright (c) 2002-2003, Matt Albrecht
-
This product includes JUnit under the Common Public License Version 1.0
See http://www.junit.org/
\ No newline at end of file
Modified: incubator/hama/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/pom.xml?rev=1124187&r1=1124186&r2=1124187&view=diff
==============================================================================
--- incubator/hama/trunk/pom.xml (original)
+++ incubator/hama/trunk/pom.xml Wed May 18 11:06:43 2011
@@ -107,13 +107,6 @@
<version>1.0.4</version>
</dependency>
<dependency>
- <groupId>grobo-testing-junit</groupId>
- <artifactId>grobo-testing-junit-core</artifactId>
- <version>1.2.1</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/lib/GroboTestingJUnit-1.2.1-core.jar</systemPath>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
<version>0.20.2</version>
@@ -159,11 +152,6 @@
<version>2.5</version>
</dependency>
<dependency>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
<version>3.3.1</version>
@@ -259,6 +247,34 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>forrest</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <exec dir="${basedir}/src/docs" executable="${forrest.home}/bin/forrest" failonerror="true">
+ </exec>
+ <copy todir="${project.build.directory}/site">
+ <fileset dir="${basedir}/src/docs/build/site/" />
+ </copy>
+ <delete dir="${basedir}/src/docs/build/" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>