[Git][java-team/livetribe-jsr223][upstream] New upstream version 2.0.7
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Feb 11 18:07:20 GMT 2025
Andreas Tille pushed to branch upstream at Debian Java Maintainers / livetribe-jsr223
Commits:
06970e5f by Andreas Tille at 2025-02-11T18:30:58+01:00
New upstream version 2.0.7
- - - - -
16 changed files:
- + .gitignore
- pom.xml
- src/main/java/javax/script/AbstractScriptEngine.java
- src/main/java/javax/script/Bindings.java
- src/main/java/javax/script/Compilable.java
- src/main/java/javax/script/CompiledScript.java
- src/main/java/javax/script/Invocable.java
- src/main/java/javax/script/ScriptContext.java
- src/main/java/javax/script/ScriptEngine.java
- src/main/java/javax/script/ScriptEngineFactory.java
- src/main/java/javax/script/ScriptEngineInfo.java
- src/main/java/javax/script/ScriptEngineManager.java
- src/main/java/javax/script/ScriptException.java
- src/main/java/javax/script/SimpleBindings.java
- src/main/java/javax/script/SimpleScriptContext.java
- src/test/java/javax/script/ScriptExceptionTest.java
Changes:
=====================================
.gitignore
=====================================
@@ -0,0 +1,8 @@
+# intellij project files
+*.ipr
+*.iml
+*.iws
+.idea
+# all target dirs
+target/
+output/
=====================================
pom.xml
=====================================
@@ -4,15 +4,15 @@
<parent>
<groupId>org.livetribe</groupId>
<artifactId>livetribe</artifactId>
- <version>1.2</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.livetribe</groupId>
<artifactId>livetribe-jsr223</artifactId>
- <version>2.0.6</version>
+ <version>2.0.7</version>
<name>LiveTribe :: JSR 223</name>
- <packaging>jar</packaging>
+ <packaging>bundle</packaging>
<build>
<defaultGoal>install</defaultGoal>
@@ -20,11 +20,39 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.3</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.artifactId}</Bundle-Name>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}_1.0_spec</Bundle-SymbolicName>
+ <Bundle-Description>LiveTribe :: JSR 223</Bundle-Description>
+ <Export-Package>!META-INF*,javax.script.*;version=1.0</Export-Package>
+ <Import-Package></Import-Package>
+ <Private-Package></Private-Package>
+ <Implementation-Title>LiveTribe :: JSR 223</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
=====================================
src/main/java/javax/script/AbstractScriptEngine.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public abstract class AbstractScriptEngine implements ScriptEngine
{
=====================================
src/main/java/javax/script/Bindings.java
=====================================
@@ -20,7 +20,7 @@ import java.util.Map;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Bindings extends Map<String, Object>
{
=====================================
src/main/java/javax/script/Compilable.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Compilable
{
=====================================
src/main/java/javax/script/CompiledScript.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public abstract class CompiledScript
{
=====================================
src/main/java/javax/script/Invocable.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface Invocable
{
=====================================
src/main/java/javax/script/ScriptContext.java
=====================================
@@ -22,7 +22,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptContext
{
=====================================
src/main/java/javax/script/ScriptEngine.java
=====================================
@@ -20,7 +20,7 @@ import java.io.Reader;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngine
{
=====================================
src/main/java/javax/script/ScriptEngineFactory.java
=====================================
@@ -21,7 +21,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngineFactory
{
=====================================
src/main/java/javax/script/ScriptEngineInfo.java
=====================================
@@ -20,7 +20,7 @@ import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public interface ScriptEngineInfo
{
=====================================
src/main/java/javax/script/ScriptEngineManager.java
=====================================
@@ -32,7 +32,7 @@ import java.util.Stack;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class ScriptEngineManager
{
@@ -190,22 +190,35 @@ public class ScriptEngineManager
{
Stack<String> stack = new Stack<String>();
+ BufferedReader r = null;
try
{
- BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream()));
+ r = new BufferedReader(new InputStreamReader(url.openStream()));
String line;
while ((line = r.readLine()) != null)
{
int comment = line.indexOf('#');
if (comment != -1) line = line.substring(0, comment);
-
- stack.push(line.trim());
+ line = line.trim();
+ if (line.length() > 0)
+ stack.push(line);
}
}
catch (IOException doNothing)
{
}
+ finally
+ {
+ try
+ {
+ if (r != null)
+ r.close();
+ }
+ catch (IOException doNothing)
+ {
+ }
+ }
return stack;
}
=====================================
src/main/java/javax/script/ScriptException.java
=====================================
@@ -17,7 +17,7 @@
package javax.script;
/**
- * @version $Revision: 557 $ $Date: 2009-08-28 19:39:19 +0200 (Fr, 28. Aug 2009) $
+ * @version $Revision$ $Date$
*/
public class ScriptException extends Exception
{
=====================================
src/main/java/javax/script/SimpleBindings.java
=====================================
@@ -23,7 +23,7 @@ import java.util.Set;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class SimpleBindings implements Bindings
{
=====================================
src/main/java/javax/script/SimpleScriptContext.java
=====================================
@@ -21,15 +21,16 @@ import java.io.Reader;
import java.io.Writer;
import java.io.PrintWriter;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
- * @version $Revision: 553 $ $Date: 2009-03-27 06:04:43 +0100 (Fr, 27. Mär 2009) $
+ * @version $Revision$ $Date$
*/
public class SimpleScriptContext implements ScriptContext
{
- private static final Integer[] SCOPES = {ENGINE_SCOPE, GLOBAL_SCOPE};
+ private static final List<Integer> SCOPES = Collections.unmodifiableList(Arrays.asList(ENGINE_SCOPE, GLOBAL_SCOPE));
protected Bindings globalScope;
protected Bindings engineScope;
@@ -58,7 +59,7 @@ public class SimpleScriptContext implements ScriptContext
globalScope = bindings;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
}
@@ -71,7 +72,7 @@ public class SimpleScriptContext implements ScriptContext
case GLOBAL_SCOPE:
return globalScope;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
}
@@ -89,7 +90,7 @@ public class SimpleScriptContext implements ScriptContext
bindings = globalScope;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
if (bindings != null) {
bindings.put(name, value);
@@ -110,7 +111,7 @@ public class SimpleScriptContext implements ScriptContext
bindings = globalScope;
break;
default:
- throw new IllegalArgumentException("Invaild scope");
+ throw new IllegalArgumentException("Invalid scope");
}
return (bindings != null) ? bindings.get(name) : null;
@@ -162,7 +163,7 @@ public class SimpleScriptContext implements ScriptContext
public List<Integer> getScopes()
{
- return Arrays.asList(SCOPES);
+ return SCOPES;
}
public Writer getWriter()
=====================================
src/test/java/javax/script/ScriptExceptionTest.java
=====================================
@@ -20,7 +20,7 @@ import org.junit.Test;
/**
- * @version $Revision: 557 $ $Date: 2009-08-28 19:39:19 +0200 (Fr, 28. Aug 2009) $
+ * @version $Revision$ $Date: $
*/
public class ScriptExceptionTest
{
View it on GitLab: https://salsa.debian.org/java-team/livetribe-jsr223/-/commit/06970e5f353b46312f80c9ffad61613cd9f83d39
--
View it on GitLab: https://salsa.debian.org/java-team/livetribe-jsr223/-/commit/06970e5f353b46312f80c9ffad61613cd9f83d39
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20250211/426e5e1a/attachment.htm>
More information about the pkg-java-commits
mailing list