Browse files

updated maven files and licenses

git-svn-id: https://source.sakaiproject.org/svn/sakai/trunk@7549 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information...
1 parent 141010d commit 928e15ed9190e4f373d25e648422d9e7b22745f0 ggolden@umich.edu committed Apr 10, 2006
Showing with 77 additions and 90 deletions.
  1. +51 −0 ECLv1.txt
  2. +22 −22 maven.xml
  3. +4 −4 project.xml
  4. +0 −29 sakai_license_1_0.html
  5. +0 −35 sakai_license_1_0.txt
View
51 ECLv1.txt
@@ -0,0 +1,51 @@
+The Educational Community License
+
+This Educational Community License (the "License") applies to any
+original work of authorship (the "Original Work") whose owner (the
+"Licensor") has placed the following notice immediately following the
+copyright notice for the Original Work:
+
+Copyright (c) <year> <copyright holders>
+
+Licensed under the Educational Community License version 1.0
+
+This Original Work, including software, source code, documents, or
+other related items, is being provided by the copyright holder(s)
+subject to the terms of the Educational Community License. By
+obtaining, using and/or copying this Original Work, you agree that you
+have read, understand, and will comply with the following terms and
+conditions of the Educational Community License:
+
+Permission to use, copy, modify, merge, publish, distribute, and
+sublicense this Original Work and its documentation, with or without
+modification, for any purpose, and without fee or royalty to the
+copyright holder(s) is hereby granted, provided that you include the
+following on ALL copies of the Original Work or portions thereof,
+including modifications or derivatives, that you make:
+
+- The full text of the Educational Community License in a location
+viewable to users of the redistributed or derivative work.
+
+- Any pre-existing intellectual property disclaimers, notices, or terms
+and conditions.
+
+- Notice of any changes or modifications to the Original Work,
+including the date the changes were made.
+
+- Any modifications of the Original Work must be distributed in such a
+manner as to avoid any confusion with the Original Work of the
+copyright holders.
+
+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 name and trademarks of copyright holder(s) may NOT be used in
+advertising or publicity pertaining to the Original or Derivative Works
+without specific, written prior permission. Title to copyright in the
+Original Work and any associated documentation will at all times remain
+with the copyright holders.
View
44 maven.xml
@@ -16,48 +16,48 @@
<!-- clear the deploy area -->
<delete dir="${basedir}/target/demo/"/>
- <!-- expand the tomcat 5.5.9 zip from the repo into the target -->
- <ant:unzip src="${maven.repo.local}/tomcat/zips/jakarta-tomcat-5.5.9.zip"
+ <!-- expand the tomcat 5.5.16 zip from the repo into the target -->
+ <ant:unzip src="${maven.repo.local}/tomcat/zips/apache-tomcat-5.5.16.zip"
dest="${basedir}/target/demo/"
overwrite="true" />
- <!-- expand the tomcat 5.5.9 compat into the target -->
- <ant:unzip src="${maven.repo.local}/tomcat/zips/jakarta-tomcat-compat-5.5.9.zip"
+ <!-- expand the tomcat 5.5.16 compat into the target -->
+ <ant:unzip src="${maven.repo.local}/tomcat/zips/apache-tomcat-compat-5.5.16.zip"
dest="${basedir}/target/demo/"
overwrite="true" />
<!-- deploy sakai to this area -->
- <j:set var="maven.tomcat.home" value="${basedir}/target/demo/jakarta-tomcat-5.5.9/" />
+ <j:set var="maven.tomcat.home" value="${basedir}/target/demo/apache-tomcat-5.5.16/" />
<attainGoal name="sakai:deploy" />
<!-- add in demo stuff -->
- <copy file="${basedir}/demo/sakai.properties" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/sakai/sakai.properties" />
- <copy file="${basedir}/demo/toolOrder.xml" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/sakai/toolOrder.xml" />
- <copy file="${basedir}/demo/readme.txt" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/demo_readme.txt" />
- <copy file="${basedir}/docs/readme_2-1-0.txt" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/sakai_readme.txt" />
- <copy todir="${basedir}/target/demo/jakarta-tomcat-5.5.9/licenses/">
+ <copy file="${basedir}/demo/sakai.properties" tofile="${maven.tomcat.home}sakai/sakai.properties" />
+ <copy file="${basedir}/demo/toolOrder.xml" tofile="${maven.tomcat.home}sakai/toolOrder.xml" />
+ <copy file="${basedir}/demo/readme.txt" tofile="${maven.tomcat.home}demo_readme.txt" />
+ <copy file="${basedir}/docs/readme_2-1-0.txt" tofile="${maven.tomcat.home}sakai_readme.txt" />
+ <copy todir="${maven.tomcat.home}licenses/">
<fileset dir="${basedir}/licenses">
<exclude name="CVS/**"/>
</fileset>
</copy>
- <copy file="${basedir}/demo/bin/start-sakai.bat" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/start-sakai.bat" />
- <copy file="${basedir}/demo/bin/start-sakai.sh" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/start-sakai.sh" />
- <copy file="${basedir}/demo/bin/stop-sakai.bat" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/stop-sakai.bat" />
- <copy file="${basedir}/demo/bin/stop-sakai.sh" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/stop-sakai.sh" />
+ <copy file="${basedir}/demo/bin/start-sakai.bat" tofile="${maven.tomcat.home}start-sakai.bat" />
+ <copy file="${basedir}/demo/bin/start-sakai.sh" tofile="${maven.tomcat.home}start-sakai.sh" />
+ <copy file="${basedir}/demo/bin/stop-sakai.bat" tofile="${maven.tomcat.home}stop-sakai.bat" />
+ <copy file="${basedir}/demo/bin/stop-sakai.sh" tofile="${maven.tomcat.home}stop-sakai.sh" />
- <delete file="${basedir}/target/demo/jakarta-tomcat-5.5.9/licenses/.project" />
- <ant:copy file="${basedir}/sakai_license_1_0.txt" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/sakai_license_1_0.txt" overwrite="true" />
- <ant:copy file="${basedir}/sakai_license_1_0.html" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/sakai_license_1_0.html" overwrite="true" />
+ <delete file="${maven.tomcat.home}licenses/.project" />
+ <ant:copy file="${basedir}/sakai_license_1_0.txt" tofile="${maven.tomcat.home}sakai_license_1_0.txt" overwrite="true" />
+ <ant:copy file="${basedir}/sakai_license_1_0.html" tofile="${maven.tomcat.home}sakai_license_1_0.html" overwrite="true" />
<!-- custom Tomcat mods -->
- <copy file="${basedir}/demo/index.html" tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/webapps/ROOT/index.html" />
+ <copy file="${basedir}/demo/index.html" tofile="${maven.tomcat.home}webapps/ROOT/index.html" />
<copy overwrite="true"
- file="${basedir}/target/demo/jakarta-tomcat-5.5.9/conf/server.xml"
- tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/conf/server-orig.xml" />
+ file="${maven.tomcat.home}conf/server.xml"
+ tofile="${maven.tomcat.home}conf/server-orig.xml" />
<copy overwrite="true"
- file="${basedir}/target/demo/jakarta-tomcat-5.5.9/conf/server-orig.xml"
- tofile="${basedir}/target/demo/jakarta-tomcat-5.5.9/conf/server.xml" >
+ file="${maven.tomcat.home}conf/server-orig.xml"
+ tofile="${maven.tomcat.home}conf/server.xml" >
<filterset
begintoken="maxHttpHeaderSize"
endtoken="&quot;8192&quot;">
View
8 project.xml
@@ -18,14 +18,14 @@
<!-- these two used only for packaging the demo (pack-demo target) -->
<dependency>
<groupId>tomcat</groupId>
- <artifactId>jakarta-tomcat</artifactId>
- <version>5.5.9</version>
+ <artifactId>apache-tomcat</artifactId>
+ <version>5.5.16</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>tomcat</groupId>
- <artifactId>jakarta-tomcat-compat</artifactId>
- <version>5.5.9</version>
+ <artifactId>apache-tomcat-compat</artifactId>
+ <version>5.5.16</version>
<type>zip</type>
</dependency>
View
29 sakai_license_1_0.html
@@ -1,29 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta http-equiv="Content-Style-Type" content="text/css">
- <title>Educational Community License Version 1.0</title>
- <meta name="Generator" content="Cocoa HTML Writer">
- <meta name="CocoaVersion" content="824.1">
- <style type="text/css">
- p.p1 {margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Times}
- p.p2 {margin: 0.0px 0.0px 12.0px 0.0px; font: 12.0px Times}
- </style>
-</head>
-<body>
-<p class="p1">The Sakai Project Software is Licensed under the Educational Community License Version 1.0:</p>
-<p class="p2">This Educational Community License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following notice immediately following the copyright notice for the Original Work:</p>
-<p class="p1"><i>Copyright (c) 2003, 2004, 2005 The Regents of the University of Michigan, Trustees of Indiana University, Board of Trustees of the Leland Stanford, Jr., University, and The MIT Corporation</i></p>
-<p class="p2">This Original Work, including software, source code, documents, or other related items, is being provided by the copyright holder(s) subject to the terms of the Educational Community License. By obtaining, using and/or copying this Original Work, you agree that you have read, understand, and will comply with the following terms and conditions of the Educational Community License:</p>
-<p class="p2">Permission to use, copy, modify, merge, publish, distribute, and sublicense this Original Work and its documentation, with or without modification, for any purpose, and without fee or royalty to the copyright holder(s) is hereby granted, provided that you include the following on ALL copies of the Original Work or portions thereof, including modifications or derivatives, that you make:</p>
-<ul>
- <li style="margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Times">The full text of the Educational Community License in a location viewable to users of the redistributed or derivative work.</li>
- <li style="margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Times">Any pre-existing intellectual property disclaimers, notices, or terms and conditions.</li>
- <li style="margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Times">Notice of any changes or modifications to the Original Work, including the date the changes were made.</li>
- <li style="margin: 0.0px 0.0px 0.0px 0.0px; font: 12.0px Times">Any modifications of the Original Work must be distributed in such a manner as to avoid any confusion with the Original Work of the copyright holders.</li>
-</ul>
-<p class="p2">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.</p>
-<p class="p2">The name and trademarks of copyright holder(s) may NOT be used in advertising or publicity pertaining to the Original or Derivative Works without specific, written prior permission. Title to copyright in the Original Work and any associated documentation will at all times remain with the copyright holders.</p>
-</body>
-</html>
View
35 sakai_license_1_0.txt
@@ -1,35 +0,0 @@
-The Sakai Project Software is Licensed under the Educational Community License Version 1.0:
-
-This Educational Community License (the "License") applies to any original work of authorship
-(the "Original Work") whose owner (the "Licensor") has placed the following notice immediately
-following the copyright notice for the Original Work:
-
- Copyright (c) 2003, 2004, 2005 The Regents of the University of Michigan, Trustees of Indiana University,
- Board of Trustees of the Leland Stanford, Jr., University, and The MIT Corporation
-
-
-This Original Work, including software, source code, documents, or other related items, is being provided
-by the copyright holder(s) subject to the terms of the Educational Community License. By obtaining, using
-and/or copying this Original Work, you agree that you have read, understand, and will comply with the
-following terms and conditions of the Educational Community License:
-
-Permission to use, copy, modify, merge, publish, distribute, and sublicense this Original Work and its documentation,
-with or without modification, for any purpose, and without fee or royalty to the copyright holder(s) is hereby granted,
-provided that you include the following on ALL copies of the Original Work or portions thereof, including modifications
-or derivatives, that you make:
-
- o The full text of the Educational Community License in a location viewable to users of the
- redistributed or derivative work.
- o Any pre-existing intellectual property disclaimers, notices, or terms and conditions.
- o Notice of any changes or modifications to the Original Work, including the date the changes were made.
- o Any modifications of the Original Work must be distributed in such a manner as to avoid any confusion
- with the Original Work of the copyright holders.
-
-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 name and trademarks of copyright holder(s) may NOT be used in advertising or publicity pertaining to the Original
-or Derivative Works without specific, written prior permission. Title to copyright in the Original Work and any associated
-documentation will at all times remain with the copyright holders.

0 comments on commit 928e15e

Please sign in to comment.