You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by se...@apache.org on 2008/05/23 18:02:27 UTC

svn commit: r659578 - /turbine/core/branches/TURBINE_2_3_BRANCH/README.txt

Author: seade
Date: Fri May 23 09:02:26 2008
New Revision: 659578

URL: http://svn.apache.org/viewvc?rev=659578&view=rev
Log:
Update the license header and remove a bunch of information that is no longer applicable.

Modified:
    turbine/core/branches/TURBINE_2_3_BRANCH/README.txt

Modified: turbine/core/branches/TURBINE_2_3_BRANCH/README.txt
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/README.txt?rev=659578&r1=659577&r2=659578&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/README.txt (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/README.txt Fri May 23 09:02:26 2008
@@ -1,17 +1,20 @@
 --------------------------------------------------------------------------
-Copyright 2001-2004 The Apache Software Foundation
-
-Licensed 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.
+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.
 --------------------------------------------------------------------------
 
 --------------------------------------------------------------------------
@@ -24,51 +27,21 @@
 
 Turbine requires Apache Maven (http://maven.apache.org/) as build
 tool. Please download and install maven from its download page at
-http://maven.apache.org/start/download.html
-
-As of September 2005, the official released maven version is
-1.0.2. This is the version recommended to build Turbine. The current
-Maven 1.1-beta2 version does build the jar, but not the site
-(see http://jira.codehaus.org/browse/MAVEN-1690).
+http://maven.apache.org/maven-1.x/start/download.html
 
 As of Turbine 2.3, you must also have the Torque plugin for Maven
 installed to build Turbine. Install it using the following
 plugin:download instruction:
 
-maven -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.1.1 plugin:download
+maven -DartifactId=maven-torque-plugin -DgroupId=torque -Dversion=3.3 plugin:download
 
 The turbine jar is built by running the "maven jar:jar" command in the
 root directory of the Turbine source distribution.
 
-
-Using JDK 1.4 or newer
-----------------------
-
-The following jars cannot be downloaded from the central maven
-repository at www.ibiblio.org/maven/ due to license restrictions:
-
-- activation 1.0.2 from http://java.sun.com/products/javabeans/glasgow/jaf.html
-- javamail 1.3.3 from http://java.sun.com/products/javamail/
-
-Please download these jars and install them into your local repository at
-
-MAVEN_REPO_LOCAL/javax.activation/jars/activation-1.0.2.jar
-MAVEN_REPO_LOCAL/javax.mail/jars/mail-1.3.3.jar
-
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 IMPORTANT NOTICE FOR USERS OF JDK 1.3. IT IS NO LONGER SUPPORTED
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-Using a J2EE distribution
--------------------------
-
-All jars mentioned above are part of J2EE distributions. Turbine
-should build without any missing dependencies in a J2EE
-environment. However, you might have to copy the mail.jar,
-activation.jar, jndi.jar and jdbc.jar to the appropriate locations in
-your local maven repository as described above.
-
-
 Further documentation
 =====================
 
@@ -77,4 +50,3 @@
 most current documentation for this source tree by executing "maven
 site" in the root directory of the source distribution after building
 the jar.
-