Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@velocity.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1752986 - in /velocity/engine/trunk: NOTICE
 velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
 velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
Date: Sat, 16 Jul 2016 16:52:23 -0000
To: commits@velocity.apache.org
From: cbrisson@apache.org
Message-Id: <20160716165223.F34B63A02E6@svn01-us-west.apache.org>
archived-at: Sat, 16 Jul 2016 16:52:29 -0000

Author: cbrisson
Date: Sat Jul 16 16:52:23 2016
New Revision: 1752986

URL: http://svn.apache.org/viewvc?rev=1752986&view=rev
Log:
[jsr223] fix licencing

Modified:
    velocity/engine/trunk/NOTICE
    velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
    velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java

Modified: velocity/engine/trunk/NOTICE
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/NOTICE?rev=1752986&r1=1752985&r2=1752986&view=diff
==============================================================================
--- velocity/engine/trunk/NOTICE (original)
+++ velocity/engine/trunk/NOTICE Sat Jul 16 16:52:23 2016
@@ -5,3 +5,7 @@ Copyright (C) 2000-2007 The Apache Softw
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
+The files
+ - velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
+ - velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
+are Copyright 2006 Sun Microsystems, Inc., and licenced under a BSD-like licence.

Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1752986&r1=1752985&r2=1752986&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java (original)
+++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java Sat Jul 16 16:52:23 2016
@@ -1,26 +1,5 @@
 package org.apache.velocity.script;
 
-/* dual licencing... */
-
-/*
- * 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.
- */
-
 /*
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved. 
  * Use is subject to license terms.
@@ -61,8 +40,13 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.io.Writer;
 import java.util.Properties;
-import org.apache.velocity.*;
-import org.apache.velocity.app.*;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.resource.loader.ResourceLoader2;
+import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
 
 import javax.script.AbstractScriptEngine;
 import javax.script.Bindings;
@@ -187,9 +171,9 @@ public class VelocityScriptEngine extend
         }
     }
 
-    private static VelocityContext getVelocityContext(ScriptContext ctx)
+    protected static VelocityContext getVelocityContext(ScriptContext ctx)
     {
-        ctx.setAttribute("context", ctx, ScriptContext.ENGINE_SCOPE);
+        ctx.setAttribute("script_context", ctx, ScriptContext.ENGINE_SCOPE);
         Bindings globalScope = ctx.getBindings(ScriptContext.GLOBAL_SCOPE);        
         Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);
         if (globalScope != null)
@@ -202,19 +186,19 @@ public class VelocityScriptEngine extend
         }
     }
 
-    private static String getFilename(ScriptContext ctx)
+    protected static String getFilename(ScriptContext ctx)
     {
         Object fileName = ctx.getAttribute(ScriptEngine.FILENAME);
         return fileName != null? fileName.toString() : "<unknown>";
     }
 
-    private static boolean isStringOutputMode(ScriptContext ctx)
+    protected static boolean isStringOutputMode(ScriptContext ctx)
     {
         Object flag = ctx.getAttribute(STRING_OUTPUT_MODE_KEY);
         return Boolean.parseBoolean(String.valueOf(flag));
     }
 
-    private static Properties getVelocityProperties(ScriptContext ctx)
+    protected static Properties getVelocityProperties(ScriptContext ctx)
     {
         try
         {

Modified: velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java?rev=1752986&r1=1752985&r2=1752986&view=diff
==============================================================================
--- velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java (original)
+++ velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngineFactory.java Sat Jul 16 16:52:23 2016
@@ -1,26 +1,5 @@
 package org.apache.velocity.script;
 
-/* dual licencing... */
-
-/*
- * 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.
- */
-
 /*
  * Copyright 2006 Sun Microsystems, Inc. All rights reserved. 
  * Use is subject to license terms.