svn commit: r1293366 - in /incubator/jena/Jena2/Fuseki/trunk/dist: LICENSE-dist NOTICE-dist

[an...@apache.org]

Author: andy
Date: Fri Feb 24 18:05:14 2012
New Revision: 1293366

URL: http://svn.apache.org/viewvc?rev=1293366&view=rev
Log:
Remove FreeMarker licensing and notice (FreeMarker is not going to be used).

Modified:
    incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist
    incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist

Modified: incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist?rev=1293366&r1=1293365&r2=1293366&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist (original)
+++ incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist Fri Feb 24 18:05:14 2012
@@ -295,42 +295,3 @@ modified April 2001  by Iris Van den Bro
 Permission to use, copy, modify and distribute UnixCrypt
 for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
-
-- - - - - - - - - - - - - - - - - - - - - - - 
-
-Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1.  Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-
-2.  The end-user documentation included with the redistribution, if any, must
-    include the following acknowlegement:
-      "This product includes software developed by the 
-      Visigoth Software Society (http://www.visigoths.org/)."
-    Alternately, this acknowlegement may appear in the software itself, if and
-    wherever such third-party acknowlegements normally appear.
-
-3.  Neither the name "FreeMarker", "Visigoth", nor any of the names of the
-    project contributors may be used to endorse or promote products derived
-    from this software without prior written permission. For written
-    permission, please contact visigoths@visigoths.org.
-
-4.  Products derived from this software may not be called "FreeMarker" or
-    "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
-    without prior written permission of the Visigoth Software Society.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
-VISIGOTH SOFTWARE SOCIETY OR ITS 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.
-
-- - - - - - - - - - - - - - - - - - - - - - - 

Modified: incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist?rev=1293366&r1=1293365&r2=1293366&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist (original)
+++ incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist Fri Feb 24 18:05:14 2012
@@ -42,14 +42,3 @@ The Jetty Web Container includes:
 UnixCrypt.java
 Copyright 1996 Aki Yoshida,
 modified April 2001  by Iris Van den Broeke, Daniel Deville.
-
-- - - - - - - - - - - - - - - - - - - - - - -
-
-FreeMarker:(http://freemarker.org/).
-
-This product includes software developed by the 
-Visigoth Software Society (http://www.visigoths.org/).
-
-Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
-
-- - - - - - - - - - - - - - - - - - - - - - -