Rename ScriptRuntimeForRhino to ScriptRuntimeForJavaScript and replace

all references to language.

scripting/examples/java/debugger/DebugRunner.java

@@ -20,7 +20,7 @@ public class DebugRunner {
         OOScriptDebugger debugger;
         String path = "";
 
-        if (language.equals("Rhino")) {
+        if (language.equals("JavaScript")) {
             debugger = new OORhinoDebugger();
         }
         else if (language.equals("BeanShell")) {

scripting/examples/java/debugger/parcel-descriptor.xml

@@ -5,7 +5,7 @@
   <script language="Java">
     <locale lang="en">
       <displayname value="Scripting Framework Debugger" />
-      <description>Script that starts debuggers for Rhino and BeanShell
+      <description>Script that starts debuggers for JavaScript and BeanShell
       </description>
     </locale>
     <logicalname value="_$DebugRunner.Debug" />

scripting/java/build.xml

@@ -3,9 +3,9 @@
 #
 #   $RCSfile: build.xml,v $
 #
-#   $Revision: 1.19 $
+#   $Revision: 1.20 $
 #
-#   last change: $Author: toconnor $ $Date: 2003-05-16 13:50:00 $
+#   last change: $Author: toconnor $ $Date: 2003-06-03 09:32:48 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -169,10 +169,10 @@
          basedir="${scriptingclasses}">
         <exclude name="${netbeans.dir}/**/.*/*"/>
         <exclude name="**/beanshell/*"/>
-        <exclude name="**/rhino/*"/>
+        <exclude name="**/javascript/*"/>
         <exclude name="**/security/*"/>
         <exclude name="BeanShellRuntimeComponentRegistration.class"/>
-        <exclude name="RhinoRuntimeComponentRegistration.class"/>
+        <exclude name="JavaScriptRuntimeComponentRegistration.class"/>
         <manifest>
             <attribute name="Built-By" value="Sun Microsystems"/>
             <attribute name="RegistrationClassName" value="ScriptRuntimeComponentRegistration"/>
@@ -191,15 +191,15 @@
         <include name="**/ScriptContext.class"/>
     </jar>
 
-    <jar jarfile="${jardir}/ScriptRuntimeForRhino.jar"
+    <jar jarfile="${jardir}/ScriptRuntimeForJavaScript.jar"
          basedir="${scriptingclasses}">
         <manifest>
             <attribute name="Built-By" value="Sun Microsystems"/>
             <attribute name="RegistrationClassName"
-                       value="RhinoRuntimeComponentRegistration"/>
+                       value="JavaScriptRuntimeComponentRegistration"/>
         </manifest>
-        <include name="RhinoRuntimeComponentRegistration.class"/>
-        <include name="**/ScriptRuntimeForRhino**.class"/>
+        <include name="JavaScriptRuntimeComponentRegistration.class"/>
+        <include name="**/ScriptRuntimeForJavaScript**.class"/>
         <include name="**/ScriptContext.class"/>
     </jar>
 

scripting/workben/bindings/ScriptBinding.xba

@@ -234,7 +234,7 @@ end sub
 Sub ExecuteEditDebug()
         
 	locations = Array ( "User", "Share", "Document", "Filesystem" )
-	languages = Array ( "BeanShell", "Rhino" )
+	languages = Array ( "BeanShell", "JavaScript" )
 	dialogName = "EditDebug"
 	initialiseFileExtensions()  
 	bindingDialog = LoadDialog( "ScriptBindingLibrary", "EditDebug" )
@@ -281,15 +281,16 @@ Sub initialiseNavigationComboArrays()
     langCount = 1
     for index = 0 to ubound(svrArray)
         iPos = inStr(svrArray(index), "ScriptRuntimeFor")
-        iJava = inStr(svrArray(index), "ScriptRuntimeForJava")
 
-        if 	(iJava = 0) and  (iPos > 0) then
+        if (iPos > 0) then
             lang = Mid(svrArray(index), iPos + Len("ScriptRuntimeFor")
 
+            if not (lang = "Java") then
                 'Add to language vector
                 ReDim Preserve languages(langCount) as String
                 languages(langCount) = lang
-            langCount = langCount +1
+                langCount = langCount + 1
+            endif
         endif  
     next index
     initialiseFileExtensions()

scripting/workben/build.xml

@@ -3,9 +3,9 @@
 #
 #   $RCSfile: build.xml,v $
 #
-#   $Revision: 1.25 $
+#   $Revision: 1.26 $
 #
-#   last change: $Author: dfoster $ $Date: 2003-05-29 14:18:39 $
+#   last change: $Author: toconnor $ $Date: 2003-06-03 09:32:49 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -335,9 +335,9 @@
     <mkdir dir="${out}/class/jsruntime/skip_registration"/>
     <mkdir dir="${out}/class/jsruntimetmp"/>
 
-    <copy file="${out}/class/ScriptRuntimeForRhino.jar"
+    <copy file="${out}/class/ScriptRuntimeForJavaScript.jar"
         todir="${out}/class/jsruntime/"/>
-    <copy file="installer/Scripting.Rhino.xcu"
+    <copy file="installer/Scripting.JavaScript.xcu"
         tofile="${out}/class/jsruntime/Scripting.xcu"/>
 
     <unzip src="${install.dir}/js.jar"

scripting/workben/installer/Scripting.JavaScript.xcu

+<?xml version="1.0" encoding="UTF-8"?>
+<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Scripting" oor:package="org.openoffice.Office">
+    <node oor:name="ScriptRuntimes">
+        <node oor:name="JavaScript" oor:op="replace">
+            <prop oor:name="SupportedFileExtensions">
+                <value xml:lang="en-US">js</value>
+            </prop>
+        </node>
+    </node>
+</oor:node>