#i21858# - removal of framework namespace from namespace of

UNO interfaces and services

34 files changed, 198 insertions, 200 deletions

diff --git a/scripting/examples/beanshell/Capitalise/capitalise.bsh b/scripting/examples/beanshell/Capitalise/capitalise.bsh
index 7808db8c1294..1b9e5df4bbc6 100644
--- a/scripting/examples/beanshell/Capitalise/capitalise.bsh
+++ b/scripting/examples/beanshell/Capitalise/capitalise.bsh
@@ -5,7 +5,7 @@ import com.sun.star.container.XIndexAccess;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextRange;
 import com.sun.star.text.XWordCursor;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 String getNewString( theString ) {
     String newString;
diff --git a/scripting/examples/beanshell/Highlight/highlighter.bsh b/scripting/examples/beanshell/Highlight/highlighter.bsh
index 2441db13b516..a3989b994c7a 100644
--- a/scripting/examples/beanshell/Highlight/highlighter.bsh
+++ b/scripting/examples/beanshell/Highlight/highlighter.bsh
@@ -4,7 +4,7 @@ import com.sun.star.util.XReplaceDescriptor;
 import com.sun.star.util.XPropertyReplace;
 import com.sun.star.beans.PropertyValue;
 import com.sun.star.text.XTextDocument;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 int replaceText(searchKey, color, bold) {
 
diff --git a/scripting/examples/beanshell/Highlight/parcel-descriptor.xml b/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
index a8ddb9ddea5f..a7bf9d25b00f 100755
--- a/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
+++ b/scripting/examples/beanshell/Highlight/parcel-descriptor.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-

-<parcel language="BeanShell" xmlns:parcel="scripting.dtd">

-

-    <script language="BeanShell">

-        <locale lang="en">

-            <displayname value="Highlighter"/>

-            <description>

-                Text highlighting

-            </description>

-        </locale>

-        <functionname value="highlighter.bsh"/>

-        <logicalname value="Highlighter.BeanShell"/>

-    </script>

-

-</parcel>

+<?xml version="1.0" encoding="UTF-8"?>
+
+<parcel language="BeanShell" xmlns:parcel="scripting.dtd">
+
+    <script language="BeanShell">
+        <locale lang="en">
+            <displayname value="Highlighter"/>
+            <description>
+                Text highlighting
+            </description>
+        </locale>
+        <functionname value="highlighter.bsh"/>
+        <logicalname value="Highlighter.BeanShell"/>
+    </script>
+
+</parcel>
diff --git a/scripting/examples/beanshell/MemoryUsage/memusage.bsh b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
index 9427e194a1b4..809cb5c33e60 100644
--- a/scripting/examples/beanshell/MemoryUsage/memusage.bsh
+++ b/scripting/examples/beanshell/MemoryUsage/memusage.bsh
@@ -5,7 +5,7 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.sheet.XSpreadsheetDocument;
 import com.sun.star.sheet.XSpreadsheet;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 addEntry(date, total, free) {
 
diff --git a/scripting/examples/beanshell/WordCount/wordcount.bsh b/scripting/examples/beanshell/WordCount/wordcount.bsh
index 8006f4fed5af..35332799f6ba 100644
--- a/scripting/examples/beanshell/WordCount/wordcount.bsh
+++ b/scripting/examples/beanshell/WordCount/wordcount.bsh
@@ -4,7 +4,7 @@ import com.sun.star.view.XSelectionSupplier;
 import com.sun.star.container.XIndexAccess;
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextRange;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 void doDisplay(numWords) {
     wordsLabel = new JLabel("Word count = " + numWords);
diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java
index ad6c42897ef4..cee28d1c9e43 100644
--- a/scripting/examples/java/selector/ScriptSelector.java
+++ b/scripting/examples/java/selector/ScriptSelector.java
@@ -28,11 +28,11 @@ import com.sun.star.script.XInvocation;
 
 import com.sun.star.lib.uno.helper.PropertySet;
 
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
-import drafts.com.sun.star.script.framework.provider.XScript;
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.provider.XScriptContext;
+import drafts.com.sun.star.script.provider.XScript;
+import drafts.com.sun.star.script.provider.XScriptProvider;
 
 public class ScriptSelector {
 
@@ -329,7 +329,7 @@ public class ScriptSelector {
 
         try {
             String serviceName = "drafts.com.sun.star.script." +
-                "framework.provider.MasterScriptProvider";
+                "provider.MasterScriptProvider";
 
             XComponentContext xcc = ctxt.getComponentContext();
             XMultiComponentFactory xmcf = xcc.getServiceManager();
diff --git a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
index daf48ccea02c..b718385327b8 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ParcelBrowseNode.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ParcelBrowseNode.java,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-10-15 17:18:29 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,8 +61,8 @@
 
 package com.sun.star.script.framework.browse;
 
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
 import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.lib.uno.helper.PropertySet;
 import com.sun.star.uno.Type;
@@ -79,7 +79,7 @@ public class ParcelBrowseNode extends PropertySet implements XBrowseNode  {
     private String location;
     private Collection browsenodes;
     private XComponentContext m_XCtx;
-    public boolean deletable = false;
+    public boolean deletable = true;
     public boolean editable = false;
 
     public ParcelBrowseNode(String name) {
diff --git a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
index 63646d55bb94..5439b208e710 100644
--- a/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
+++ b/scripting/java/com/sun/star/script/framework/browse/ScriptBrowseNode.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScriptBrowseNode.java,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-10-15 17:18:29 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,9 +61,9 @@
 
 package com.sun.star.script.framework.browse;
 
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 import com.sun.star.beans.PropertyAttribute;
 import com.sun.star.lib.uno.helper.PropertySet;
diff --git a/scripting/java/com/sun/star/script/framework/log/LogUtils.java b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
index d773a9566632..ef4b1f9a56ec 100644
--- a/scripting/java/com/sun/star/script/framework/log/LogUtils.java
+++ b/scripting/java/com/sun/star/script/framework/log/LogUtils.java
@@ -42,7 +42,7 @@ public class LogUtils {
         String result = "";
         try
         {
-            baos = new ByteArrayOutputStream( 128 );
+            baos = new ByteArrayOutputStream( );
             ps = new PrintStream( baos );
             e.printStackTrace( ps );
         }
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
index 79da6dac5391..00d9658ac263 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptContext.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: ScriptContext.java,v $
 *
-*  $Revision: 1.1 $
+*  $Revision: 1.2 $
 *
-*  last change: $Author: toconnor $ $Date: 2003-09-10 10:44:28 $
+*  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:13 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -76,7 +76,7 @@ import com.sun.star.uno.AnyConverter;
 
 import java.util.HashMap;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 import com.sun.star.script.framework.log.LogUtils;
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 61812b56ca71..ef7c87f8e14b 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: ScriptProvider.java,v $
 *
-*  $Revision: 1.2 $
+*  $Revision: 1.3 $
 *
-*  last change: $Author: dfoster $ $Date: 2003-10-09 14:37:47 $
+*  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:14 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -80,12 +80,12 @@ import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.reflection.InvocationTargetException;
 import com.sun.star.script.CannotConvertException;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 import drafts.com.sun.star.script.framework.storage.XScriptInfo;
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
-import drafts.com.sun.star.script.framework.provider.XScript;
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.provider.XScriptProvider;
+import drafts.com.sun.star.script.provider.XScript;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
 
 import com.sun.star.script.framework.log.LogUtils;
 import com.sun.star.script.framework.browse.DirBrowseNode;
@@ -97,8 +97,8 @@ public abstract class ScriptProvider
                XInitialization, XTypeProvider, XServiceInfo
 {
     private final String[] __serviceNames = {
-        "drafts.com.sun.star.script.framework.provider.ScriptProviderFor",
-        "drafts.com.sun.star.script.framework.provider.LanguageScriptProvider"
+        "drafts.com.sun.star.script.provider.ScriptProviderFor",
+        "drafts.com.sun.star.script.provider.LanguageScriptProvider"
     };
 
     public final static String CLASSPATH = "classpath";
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
index d5fcdd72c28c..d35a2a2e75f3 100644
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -29,7 +29,7 @@ import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 import bsh.Interpreter;
 
 public class ScriptEditorForBeanShell
diff --git a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
index 9a365a5cef9e..4e8a54d7d9dc 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: ScriptProviderForBeanShell.java,v $
 *
-*  $Revision: 1.1 $
+*  $Revision: 1.2 $
 *
-*  last change: $Author: toconnor $ $Date: 2003-09-10 10:44:30 $
+*  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:15 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -93,10 +93,10 @@ import java.net.URLDecoder;
 import bsh.BshClassManager;
 import bsh.Interpreter;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 import drafts.com.sun.star.script.framework.storage.XScriptInfo;
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
-import drafts.com.sun.star.script.framework.provider.XScript;
+import drafts.com.sun.star.script.provider.XScriptProvider;
+import drafts.com.sun.star.script.provider.XScript;
 
 import com.sun.star.script.framework.provider.*;
 
@@ -281,7 +281,7 @@ public class ScriptProviderForBeanShell
         {
             xSingleServiceFactory = FactoryHelper.getServiceFactory(
                 ScriptProviderForBeanShell._ScriptProviderForBeanShell.class,
-                "drafts.com.sun.star.script.framework.ScriptProviderForBeanShell",
+                "drafts.com.sun.star.script.ScriptProviderForBeanShell",
                 multiFactory,
                 regKey );
         }
@@ -304,7 +304,7 @@ public class ScriptProviderForBeanShell
         String impl = "com.sun.star.scripting.runtime.beanshell." +
             "ScriptProviderForBeanShell$_ScriptProviderForBeanShell";
 
-        String service = "drafts.com.sun.star.script.framework.provider." +
+        String service = "drafts.com.sun.star.script.provider." +
             "ScriptProviderForBeanShell";
 
         if (FactoryHelper.writeRegistryServiceInfo(impl, service, regKey)) {
@@ -313,7 +313,7 @@ public class ScriptProviderForBeanShell
                 // as part of the install, this will have to be done
                 // programatically during the install as registration of java components
                 // is not fully supported in setup. It should work somewhat like c++ somewhat like c++ registration in install
-/*                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.framework.provider.theScriptProviderForBeanShell");
+/*                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.provider.theScriptProviderForBeanShell");
                 newKey.setStringValue(service); */
                 return true;
             }
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
index 944befeab781..801a79944406 100755
--- a/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
+++ b/scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: ScriptProviderForJava.java,v $
 *
-*  $Revision: 1.1 $
+*  $Revision: 1.2 $
 *
-*  last change: $Author: toconnor $ $Date: 2003-09-10 10:44:31 $
+*  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:17 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -92,12 +92,12 @@ import java.util.Properties;
 import java.util.ArrayList;
 import java.net.MalformedURLException;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 import drafts.com.sun.star.script.framework.storage.XScriptInfo;
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
-import drafts.com.sun.star.script.framework.provider.XScript;
-import drafts.com.sun.star.script.framework.browse.XBrowseNode;
-import drafts.com.sun.star.script.framework.browse.BrowseNodeTypes;
+import drafts.com.sun.star.script.provider.XScriptProvider;
+import drafts.com.sun.star.script.provider.XScript;
+import drafts.com.sun.star.script.browse.XBrowseNode;
+import drafts.com.sun.star.script.browse.BrowseNodeTypes;
 
 import com.sun.star.script.framework.provider.*;
 import com.sun.star.script.framework.log.LogUtils;
@@ -345,7 +345,7 @@ public class ScriptProviderForJava
         {
               xSingleServiceFactory = FactoryHelper.getServiceFactory(
                 ScriptProviderForJava._ScriptProviderForJava.class,
-                "drafts.com.sun.star.script.framework.provider.ScriptProviderForJava",
+                "drafts.com.sun.star.script.provider.ScriptProviderForJava",
                 multiFactory,
                 regKey );
         }
@@ -368,7 +368,7 @@ public class ScriptProviderForJava
         String impl = "com.sun.star.scripting.runtime.java." +
             "ScriptProviderForJava$_ScriptProviderForJava";
 
-        String service = "drafts.com.sun.star.script.framework.provider." +
+        String service = "drafts.com.sun.star.script.provider." +
             "ScriptProviderForJava";
 
         if (FactoryHelper.writeRegistryServiceInfo(impl, service, regKey)) {
@@ -378,7 +378,7 @@ public class ScriptProviderForJava
 // programatically during the install as registration of java components
 // is not fully supported in setup. It should work somewhat like c++ somewhat like c++ registration in install
 /*            try {
-                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.framework.provider.theScriptProviderForJava");
+                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.provider.theScriptProviderForJava");
                 newKey.setStringValue(service);
                 return true;
             }
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
index fb7c591bd543..7105ea86f3ee 100644
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptEditorForJavaScript.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ScriptEditorForJavaScript.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: toconnor $ $Date: 2003-10-15 17:18:31 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,7 +70,7 @@ import org.mozilla.javascript.ImporterTopLevel;
 import org.mozilla.javascript.tools.debugger.Main;
 import org.mozilla.javascript.tools.debugger.ScopeProvider;
 
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptContext;
 
 public class ScriptEditorForJavaScript {
 
diff --git a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
index 7528b58549c0..63a996a65f6f 100755
--- a/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
+++ b/scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: ScriptProviderForJavaScript.java,v $
 *
-*  $Revision: 1.1 $
+*  $Revision: 1.2 $
 *
-*  last change: $Author: toconnor $ $Date: 2003-09-10 10:44:35 $
+*  last change: $Author: toconnor $ $Date: 2003-10-29 15:01:18 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -84,9 +84,9 @@ import java.io.*;
 import java.util.Vector;
 import java.net.MalformedURLException;
 
-import drafts.com.sun.star.script.framework.provider.XScriptProvider;
-import drafts.com.sun.star.script.framework.provider.XScript;
-import drafts.com.sun.star.script.framework.runtime.XScriptContext;
+import drafts.com.sun.star.script.provider.XScriptProvider;
+import drafts.com.sun.star.script.provider.XScript;
+import drafts.com.sun.star.script.provider.XScriptContext;
 import drafts.com.sun.star.script.framework.storage.XScriptInfo;
 
 import com.sun.star.script.framework.log.LogUtils;
@@ -293,7 +293,7 @@ public class ScriptProviderForJavaScript
         {
             xSingleServiceFactory = FactoryHelper.getServiceFactory(
                 ScriptProviderForJavaScript._ScriptProviderForJavaScript.class,
-                "drafts.com.sun.star.script.framework.provider.ScriptProviderForJavaScript",
+                "drafts.com.sun.star.script.provider.ScriptProviderForJavaScript",
                 multiFactory,
                 regKey );
         }
@@ -316,7 +316,7 @@ public class ScriptProviderForJavaScript
         String impl = "com.sun.star.scripting.runtime.javascript." +
             "ScriptProviderForJavaScript$_ScriptProviderForJavaScript";
 
-        String service = "drafts.com.sun.star.script.framework.provider." +
+        String service = "drafts.com.sun.star.script.provider." +
             "ScriptProviderForJavaScript";
 
         if (FactoryHelper.writeRegistryServiceInfo(impl, service, regKey)) {
@@ -325,7 +325,7 @@ public class ScriptProviderForJavaScript
                 // as part of the install, this will have to be done
                 // programatically during the install as registration of java components
                 // is not fully supported in setup. It should work somewhat like c++ somewhat like c++ registration in install
-/*                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.framework.provider.theScriptProviderForJavaScript");
+/*                XRegistryKey newKey = regKey.createKey(impl + "/UNO/SINGLETONS/drafts.com.sun.star.script.provider.theScriptProviderForJavaScript");
                 newKey.setStringValue(service); */
                 return true;
             }
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index 83e029ad6a4d..a9594f159d0f 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baslibnode.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:30 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #include "basmodnode.hxx"
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_BROWSENODETYPES_HPP_
-#include <drafts/com/sun/star/script/framework/browse/BrowseNodeTypes.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_
+#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #endif
 
 #ifndef _BASMGR_HXX
@@ -82,7 +82,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 
 //.........................................................................
diff --git a/scripting/source/basprov/baslibnode.hxx b/scripting/source/basprov/baslibnode.hxx
index 15c35ff4bf53..edee5006998a 100644
--- a/scripting/source/basprov/baslibnode.hxx
+++ b/scripting/source/basprov/baslibnode.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baslibnode.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:30 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_XBROWSENODE_HPP_
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_XBROWSENODE_HPP_
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 #endif
 
 #ifndef _CPPUHELPER_IMPLBASE1_HXX_
@@ -86,7 +86,7 @@ namespace basprov
     //  ----------------------------------------------------
 
     typedef ::cppu::WeakImplHelper1<
-        ::drafts::com::sun::star::script::framework::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
+        ::drafts::com::sun::star::script::browse::XBrowseNode > BasicLibraryNodeImpl_BASE;
 
 
     class BasicLibraryNodeImpl : public BasicLibraryNodeImpl_BASE
@@ -106,7 +106,7 @@ namespace basprov
         // XBrowseNode
         virtual ::rtl::OUString SAL_CALL getName(  )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::framework::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL hasChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 573ad7b1a5ef..b5fc65ee2b09 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmethnode.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: dfoster $ $Date: 2003-10-17 11:22:24 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,8 +63,8 @@
 #include "basmethnode.hxx"
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_BROWSENODETYPES_HPP_
-#include <drafts/com/sun/star/script/framework/browse/BrowseNodeTypes.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_
+#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #endif
 
 #ifndef _SB_SBSTAR_HXX
@@ -80,7 +80,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 
 //.........................................................................
diff --git a/scripting/source/basprov/basmethnode.hxx b/scripting/source/basprov/basmethnode.hxx
index 6519ace99c59..b4b327dc6ce7 100644
--- a/scripting/source/basprov/basmethnode.hxx
+++ b/scripting/source/basprov/basmethnode.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmethnode.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:31 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef SCRIPTING_BASMETHNODE_HXX
 #define SCRIPTING_BASMETHNODE_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_XBROWSENODE_HPP_
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_XBROWSENODE_HPP_
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 #endif
 
 #ifndef _CPPUHELPER_IMPLBASE1_HXX_
@@ -87,7 +87,7 @@ namespace basprov
     //  ----------------------------------------------------
 
     typedef ::cppu::WeakImplHelper2<
-        ::drafts::com::sun::star::script::framework::browse::XBrowseNode,
+        ::drafts::com::sun::star::script::browse::XBrowseNode,
         com::sun::star::beans::XPropertySet > BasicMethodNodeImpl_BASE;
 
     typedef ::std::hash_map < ::rtl::OUString, com::sun::star::uno::Any, ::rtl::OUStringHash,
@@ -106,7 +106,7 @@ namespace basprov
         // XBrowseNode
         virtual ::rtl::OUString SAL_CALL getName(  )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::framework::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL hasChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index e439b41526cf..71fb301eaa20 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmodnode.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:31 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,8 +67,8 @@
 #include "basmethnode.hxx"
 #endif
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_BROWSENODETYPES_HPP_
-#include <drafts/com/sun/star/script/framework/browse/BrowseNodeTypes.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_
+#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #endif
 
 #ifndef _SBXCLASS_HXX
@@ -88,7 +88,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 
 //.........................................................................
diff --git a/scripting/source/basprov/basmodnode.hxx b/scripting/source/basprov/basmodnode.hxx
index 5184b93c1f71..1a2b878dc948 100644
--- a/scripting/source/basprov/basmodnode.hxx
+++ b/scripting/source/basprov/basmodnode.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basmodnode.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:32 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef SCRIPTING_BASMODNODE_HXX
 #define SCRIPTING_BASMODNODE_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_XBROWSENODE_HPP_
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_XBROWSENODE_HPP_
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 #endif
 
 #ifndef _CPPUHELPER_IMPLBASE1_HXX_
@@ -83,7 +83,7 @@ namespace basprov
     //  ----------------------------------------------------
 
     typedef ::cppu::WeakImplHelper1<
-        ::drafts::com::sun::star::script::framework::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
+        ::drafts::com::sun::star::script::browse::XBrowseNode > BasicModuleNodeImpl_BASE;
 
 
     class BasicModuleNodeImpl : public BasicModuleNodeImpl_BASE
@@ -98,7 +98,7 @@ namespace basprov
         // XBrowseNode
         virtual ::rtl::OUString SAL_CALL getName(  )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::framework::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL hasChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 811cae963637..4c890832ae4c 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basprov.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 15:03:41 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,8 +73,8 @@
 #ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_
 #include <com/sun/star/frame/XModel.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_BROWSENODETYPES_HPP_
-#include <drafts/com/sun/star/script/framework/browse/BrowseNodeTypes.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_BROWSENODETYPES_HPP_
+#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
 #endif
 #ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
 #include <cppuhelper/implementationentry.hxx>
@@ -108,7 +108,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 
 //.........................................................................
@@ -146,9 +146,9 @@ namespace basprov
             if ( !pNames )
             {
                 static Sequence< ::rtl::OUString > aNames(3);
-                aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.framework.provider.ScriptProviderForBasic" ) );
-                aNames.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.framework.provider.LanguageScriptProvider" ) );
-                aNames.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.framework.provider.ScriptProvider" ) );
+                aNames.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.ScriptProviderForBasic" ) );
+                aNames.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.LanguageScriptProvider" ) );
+                aNames.getArray()[2] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "drafts.com.sun.star.script.provider.ScriptProvider" ) );
                 pNames = &aNames;
             }
         }
diff --git a/scripting/source/basprov/basprov.hxx b/scripting/source/basprov/basprov.hxx
index 5b1610b7a4c6..d1deb12ef6b5 100644
--- a/scripting/source/basprov/basprov.hxx
+++ b/scripting/source/basprov/basprov.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basprov.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:35:32 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,11 +74,11 @@
 #ifndef _COM_SUN_STAR_SCRIPT_XLIBRARYCONTAINER_HPP_
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_BROWSE_XBROWSENODE_HPP_
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_BROWSE_XBROWSENODE_HPP_
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 #endif
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_PROVIDER_XSCRIPTPROVIDER_HPP_
-#include <drafts/com/sun/star/script/framework/provider/XScriptProvider.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_PROVIDER_XSCRIPTPROVIDER_HPP_
+#include <drafts/com/sun/star/script/provider/XScriptProvider.hpp>
 #endif
 #ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -103,8 +103,8 @@ namespace basprov
     typedef ::cppu::WeakImplHelper4<
         ::com::sun::star::lang::XServiceInfo,
         ::com::sun::star::lang::XInitialization,
-        ::drafts::com::sun::star::script::framework::provider::XScriptProvider,
-        ::drafts::com::sun::star::script::framework::browse::XBrowseNode > BasicProviderImpl_BASE;
+        ::drafts::com::sun::star::script::provider::XScriptProvider,
+        ::drafts::com::sun::star::script::browse::XBrowseNode > BasicProviderImpl_BASE;
 
 
     class BasicProviderImpl : public BasicProviderImpl_BASE
@@ -140,14 +140,14 @@ namespace basprov
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
         // XScriptProvider
-        virtual ::com::sun::star::uno::Reference < ::drafts::com::sun::star::script::framework::provider::XScript > SAL_CALL getScript(
+        virtual ::com::sun::star::uno::Reference < ::drafts::com::sun::star::script::provider::XScript > SAL_CALL getScript(
             const ::rtl::OUString& scriptURI )
             throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
         // XBrowseNode
         virtual ::rtl::OUString SAL_CALL getName(  )
             throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::framework::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::drafts::com::sun::star::script::browse::XBrowseNode > > SAL_CALL getChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL hasChildNodes(  )
             throw (::com::sun::star::uno::RuntimeException);
diff --git a/scripting/source/basprov/basprov.xml b/scripting/source/basprov/basprov.xml
index a1bc57c879e3..189d306a61a5 100644
--- a/scripting/source/basprov/basprov.xml
+++ b/scripting/source/basprov/basprov.xml
@@ -11,7 +11,7 @@
         <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
         <language>c++</language>
         <status value="drafts"/>
-        <supported-service>drafts.com.sun.star.script.framework.provider.ScriptProviderForBasic</supported-service>
+        <supported-service>drafts.com.sun.star.script.provider.ScriptProviderForBasic</supported-service>
         <type>com.sun.star.beans.XPropertySet</type>
         <type>com.sun.star.frame.XModel</type>
         <type>com.sun.star.lang.IllegalArgumentException</type>
@@ -22,10 +22,10 @@
         <type>com.sun.star.uno.Exception</type>
         <type>com.sun.star.uno.RuntimeException</type>
         <type>com.sun.star.uno.XComponentContext</type>
-        <type>drafts.com.sun.star.script.framework.browse.BrowseNodeTypes</type>
-        <type>drafts.com.sun.star.script.framework.browse.XBrowseNode</type>
-        <type>drafts.com.sun.star.script.framework.provider.XScript</type>
-        <type>drafts.com.sun.star.script.framework.provider.XScriptProvider</type>
+        <type>drafts.com.sun.star.script.browse.BrowseNodeTypes</type>
+        <type>drafts.com.sun.star.script.browse.XBrowseNode</type>
+        <type>drafts.com.sun.star.script.provider.XScript</type>
+        <type>drafts.com.sun.star.script.provider.XScriptProvider</type>
     </component-description>
 
     <project-build-dependency>sfx2</project-build-dependency>
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 3d1dd5470a85..731bd1e87983 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basscript.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: tbe $ $Date: 2003-10-28 13:47:30 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,7 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 
 extern ::com::sun::star::uno::Any sbxToUnoValue( SbxVariable* pVar );
diff --git a/scripting/source/basprov/basscript.hxx b/scripting/source/basprov/basscript.hxx
index c8ed1a4168f0..2f3dd085f243 100644
--- a/scripting/source/basprov/basscript.hxx
+++ b/scripting/source/basprov/basscript.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basscript.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: tbe $ $Date: 2003-09-16 15:22:58 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,8 @@
 #ifndef SCRIPTING_BASSCRIPT_HXX
 #define SCRIPTING_BASSCRIPT_HXX
 
-#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_FRAMEWORK_PROVIDER_XSCRIPT_HPP_
-#include <drafts/com/sun/star/script/framework/provider/XScript.hpp>
+#ifndef _DRAFTS_COM_SUN_STAR_SCRIPT_PROVIDER_XSCRIPT_HPP_
+#include <drafts/com/sun/star/script/provider/XScript.hpp>
 #endif
 
 #ifndef _CPPUHELPER_IMPLBASE1_HXX_
@@ -82,7 +82,7 @@ namespace basprov
     //  ----------------------------------------------------
 
     typedef ::cppu::WeakImplHelper1<
-        ::drafts::com::sun::star::script::framework::provider::XScript > BasicScriptImpl_BASE;
+        ::drafts::com::sun::star::script::provider::XScript > BasicScriptImpl_BASE;
 
 
     class BasicScriptImpl : public BasicScriptImpl_BASE
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index b7e4ae536b7a..cb8a005cd40e 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ActiveMSPList.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-09-10 08:08:13 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,14 +68,14 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
 
-#include <drafts/com/sun/star/script/framework/browse/BrowseNodeTypes.hpp>
+#include <drafts/com/sun/star/script/browse/BrowseNodeTypes.hpp>
 
 #include "MasterScriptProvider.hxx"
 #include "ActiveMSPList.hxx"
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
-using namespace drafts::com::sun::star::script::framework;
+using namespace drafts::com::sun::star::script;
 
 namespace func_provider
 {
@@ -260,7 +260,7 @@ ActiveMSPList::~ActiveMSPList()
 
 void
 ActiveMSPList::addActiveMSP( const Reference< frame::XModel >& xModel,
-               const Reference< dcsssf::provider::XScriptProvider >& msp )
+               const Reference< provider::XScriptProvider >& msp )
 {
 
     ::osl::MutexGuard guard( m_mutex );
@@ -376,7 +376,7 @@ ActiveMSPList::createNonDocMSPs()
             return;
         }
         // do creation of user and share MSPs here
-        ::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.framework.provider.MasterScriptProvider");
+        ::rtl::OUString serviceName = ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.provider.MasterScriptProvider");
         Sequence< Any > args(1);
 
         args[ 0 ] <<= userDirString;
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 354e857023b4..78a2000df65a 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ActiveMSPList.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-09-10 08:08:14 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,15 +74,15 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
-#include <drafts/com/sun/star/script/framework/provider/XScriptProvider.hpp>
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#include <drafts/com/sun/star/script/provider/XScriptProvider.hpp>
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 
 
 namespace func_provider
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
+#define dcsss ::drafts::com::sun::star::script
 
 //Typedefs
 //=============================================================================
@@ -90,8 +90,8 @@ namespace func_provider
 
 struct MspInst
 {
-    css::uno::Reference< dcsssf::provider::XScriptProvider > provider;
-    css::uno::Reference< dcsssf::browse::XBrowseNode > node;
+    css::uno::Reference< dcsss::provider::XScriptProvider > provider;
+    css::uno::Reference< dcsss::browse::XBrowseNode > node;
 };
 
 typedef ::std::map < css::uno::Reference< css::frame::XModel >,
@@ -102,7 +102,7 @@ typedef ::std::hash_map< ::rtl::OUString,
     ::rtl::OUStringHash,
             ::std::equal_to< ::rtl::OUString > > Msp_hash;
 
-class ActiveMSPList : public ::cppu::WeakImplHelper2< css::lang::XEventListener , dcsssf::browse::XBrowseNode >
+class ActiveMSPList : public ::cppu::WeakImplHelper2< css::lang::XEventListener , dcsss::browse::XBrowseNode >
 {
 
 public:
@@ -110,7 +110,7 @@ public:
         css::uno::XComponentContext >& xContext );
     ~ActiveMSPList();
     void addActiveMSP( const css::uno::Reference< css::frame::XModel >& xModel,
-                       const css::uno::Reference< dcsssf::provider::XScriptProvider >& msp );
+                       const css::uno::Reference< dcsss::provider::XScriptProvider >& msp );
 
     //XEventListener
     //======================================================================
@@ -123,7 +123,7 @@ public:
 
     virtual ::rtl::OUString SAL_CALL getName()
         throw ( css::uno::RuntimeException );
-    virtual css::uno::Sequence< css::uno::Reference< dcsssf::browse::XBrowseNode > > SAL_CALL getChildNodes()
+    virtual css::uno::Sequence< css::uno::Reference< dcsss::browse::XBrowseNode > > SAL_CALL getChildNodes()
         throw ( css::uno::RuntimeException );
     virtual sal_Bool SAL_CALL hasChildNodes()
         throw ( css::uno::RuntimeException );
diff --git a/scripting/source/provider/MasterScriptProvider.cxx b/scripting/source/provider/MasterScriptProvider.cxx
index d2c28c3c682f..28a9f3b8bf1f 100755
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MasterScriptProvider.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: npower $ $Date: 2003-10-15 08:36:44 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,18 +74,18 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::drafts::com::sun::star::script::framework;
+using namespace ::drafts::com::sun::star::script;
 
 namespace func_provider
 {
 
 ::rtl::OUString s_implName = ::rtl::OUString::createFromAscii(
-    "drafts.com.sun.star.script.framework.provider.MasterScriptProvider" );
+    "drafts.com.sun.star.script.provider.MasterScriptProvider" );
 const ::rtl::OUString s_serviceNameList[] = {
     ::rtl::OUString::createFromAscii(
-        "drafts.com.sun.star.script.framework.provider.MasterScriptProvider" ),
+        "drafts.com.sun.star.script.provider.MasterScriptProvider" ),
     ::rtl::OUString::createFromAscii(
-        "drafts.com.sun.star.script.framework.provider.ScriptProvider" ) };
+        "drafts.com.sun.star.script.provider.ScriptProvider" ) };
 
 Sequence< ::rtl::OUString > s_serviceNames = Sequence <
         ::rtl::OUString > ( s_serviceNameList, 2 );
@@ -125,7 +125,7 @@ MasterScriptProvider::MasterScriptProvider( const Reference< XComponentContext >
         }
         validateXRef( xInterface,
                           "MasterScriptProvider::initialise: cannot get StorageManager" );
-        m_xScriptStorageMgr = Reference< storage::XScriptStorageManager > ( xInterface, UNO_QUERY_THROW );
+        m_xScriptStorageMgr = Reference< framework::storage::XScriptStorageManager > ( xInterface, UNO_QUERY_THROW );
 
         // Set up contextless cache
         // if initialise method is called a new ProviderCache will be
@@ -407,7 +407,7 @@ throw ( lang::IllegalArgumentException, RuntimeException )
     try
     {
         ::rtl::OUStringBuffer buf( 80 );
-        buf.appendAscii( "drafts.com.sun.star.script.framework.provider.ScriptProviderFor");
+        buf.appendAscii( "drafts.com.sun.star.script.provider.ScriptProviderFor");
         buf.append( language );
         ::rtl::OUString serviceName = buf.makeStringAndClear();
         xScriptProvider = m_pPCache->getProvider( serviceName );
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index d3aaf3223d66..eba1e69eff9a 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MasterScriptProvider.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: npower $ $Date: 2003-09-10 08:08:14 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,10 +68,9 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include <drafts/com/sun/star/script/framework/provider/XScriptProvider.hpp>
-#include <drafts/com/sun/star/script/framework/runtime/XScriptInvocation.hpp>
+#include <drafts/com/sun/star/script/provider/XScriptProvider.hpp>
 #include <drafts/com/sun/star/script/framework/storage/XScriptStorageManager.hpp>
-#include <drafts/com/sun/star/script/framework/browse/XBrowseNode.hpp>
+#include <drafts/com/sun/star/script/browse/XBrowseNode.hpp>
 
 #include "ScriptingContext.hxx"
 #include "ProviderCache.hxx"
@@ -79,11 +78,11 @@ namespace func_provider
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
+#define dcsss ::drafts::com::sun::star::script
 
 class MasterScriptProvider :
-            public ::cppu::WeakImplHelper4 < dcsssf::provider::XScriptProvider,
-                dcsssf::browse::XBrowseNode, css::lang::XServiceInfo,
+            public ::cppu::WeakImplHelper4 < dcsss::provider::XScriptProvider,
+                dcsss::browse::XBrowseNode, css::lang::XServiceInfo,
                 css::lang::XInitialization >
 {
 public:
@@ -99,7 +98,7 @@ public:
     // XBrowseNode implementation
     virtual ::rtl::OUString SAL_CALL getName()
         throw ( css::uno::RuntimeException );
-    virtual css::uno::Sequence< css::uno::Reference< dcsssf::browse::XBrowseNode > > SAL_CALL getChildNodes()
+    virtual css::uno::Sequence< css::uno::Reference< dcsss::browse::XBrowseNode > > SAL_CALL getChildNodes()
         throw ( css::uno::RuntimeException );
     virtual sal_Bool SAL_CALL hasChildNodes()
         throw ( css::uno::RuntimeException );
@@ -112,8 +111,8 @@ public:
     virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( )
         throw( css::uno::RuntimeException );
 
-    // XScriptInvocation implementation
-    virtual css::uno::Reference < dcsssf::provider::XScript > SAL_CALL
+    // XScriptProvider implementation
+    virtual css::uno::Reference < dcsss::provider::XScript > SAL_CALL
         getScript( const ::rtl::OUString& scriptURI )
         throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
@@ -128,7 +127,7 @@ public:
 
     // Public method to return all Language Providers in this MasterScriptProviders
     // context.
-    css::uno::Sequence< css::uno::Reference< dcsssf::provider::XScriptProvider > > SAL_CALL
+    css::uno::Sequence< css::uno::Reference< dcsss::provider::XScriptProvider > > SAL_CALL
         getAllProviders() throw ( css::uno::RuntimeException );
 private:
     void addStorageAsListener() throw( css::uno::RuntimeException );
@@ -140,7 +139,7 @@ private:
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
     css::uno::Reference< css::lang::XMultiComponentFactory > m_xMgr;
     css::uno::Reference< css::frame::XModel > m_xModel;
-    css::uno::Reference < dcsssf::storage::XScriptStorageManager > m_xScriptStorageMgr;
+    css::uno::Reference < ::drafts::com::sun::star::script::framework::storage::XScriptStorageManager > m_xScriptStorageMgr;
 
     // This component supports XInitialization, it can be created
     // using createInstanceXXX() or createInstanceWithArgumentsXXX using
diff --git a/scripting/source/provider/ProviderCache.cxx b/scripting/source/provider/ProviderCache.cxx
index d6013c296ac9..47bd8dc8a164 100644
--- a/scripting/source/provider/ProviderCache.cxx
+++ b/scripting/source/provider/ProviderCache.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ProviderCache.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-09-15 14:32:37 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,14 +69,14 @@
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
-using namespace drafts::com::sun::star::script::framework;
+using namespace drafts::com::sun::star::script;
 
 namespace func_provider
 {
     ::rtl::OUString languageProviderName =
-        ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.framework.provider.LanguageScriptProvider" );
+        ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.provider.LanguageScriptProvider" );
     ::rtl::OUString providerKey =
-        ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.framework.provider.ScriptProviderFor" );
+        ::rtl::OUString::createFromAscii("drafts.com.sun.star.script.provider.ScriptProviderFor" );
 
 ProviderCache::ProviderCache( const Reference< XComponentContext >& xContext, const Sequence< Any >& scriptContext )
     throw ( RuntimeException ) : m_Sctx( scriptContext ), m_xContext( xContext )
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index 40e85558cebc..da99fce86717 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ProviderCache.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: npower $ $Date: 2003-09-15 14:32:37 $
+ *  last change: $Author: toconnor $ $Date: 2003-10-29 15:00:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,7 +74,7 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
 #include <com/sun/star/frame/XModel.hpp>
-#include <drafts/com/sun/star/script/framework/provider/XScriptProvider.hpp>
+#include <drafts/com/sun/star/script/provider/XScriptProvider.hpp>
 
 #include "ScriptingContext.hxx"
 
@@ -82,7 +82,7 @@ namespace func_provider
 {
 // for simplification
 #define css ::com::sun::star
-#define dcsssf ::drafts::com::sun::star::script::framework
+#define dcsss ::drafts::com::sun::star::script
 
 //Typedefs
 //=============================================================================
@@ -91,7 +91,7 @@ struct ProviderDetails
 {
     //css::uno::Reference< css::lang::XSingleServiceFactory > factory;
     css::uno::Reference< css::lang::XSingleComponentFactory > factory;
-    css::uno::Reference< dcsssf::provider::XScriptProvider > provider;
+    css::uno::Reference< dcsss::provider::XScriptProvider > provider;
 };
 typedef ::std::hash_map < ::rtl::OUString, ProviderDetails , ::rtl::OUStringHash,
             ::std::equal_to< ::rtl::OUString > > ProviderDetails_hash;
@@ -104,15 +104,15 @@ public:
      ProviderCache( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Sequence< css::uno::Any >& scriptContext )
         throw ( css::uno::RuntimeException );
     ~ProviderCache();
-     css::uno::Reference< dcsssf::provider::XScriptProvider >
+     css::uno::Reference< dcsss::provider::XScriptProvider >
          getProvider( const ::rtl::OUString& providerName );
-     css::uno::Sequence < css::uno::Reference< dcsssf::provider::XScriptProvider > >
+     css::uno::Sequence < css::uno::Reference< dcsss::provider::XScriptProvider > >
          getAllProviders() throw ( css::uno::RuntimeException );
 private:
     void populateCache()
         throw ( css::uno::RuntimeException );
 
-   css::uno::Reference< dcsssf::provider::XScriptProvider >
+   css::uno::Reference< dcsss::provider::XScriptProvider >
         createProvider( ProviderDetails& details ) throw ( css::uno::RuntimeException );
     ProviderDetails_hash  m_hProviderDetailsCache;
     osl::Mutex m_mutex;
diff --git a/scripting/source/provider/provider.xml b/scripting/source/provider/provider.xml
index c7b4e363ff03..9989a480d496 100755
--- a/scripting/source/provider/provider.xml
+++ b/scripting/source/provider/provider.xml
@@ -4,23 +4,22 @@
     <module-name>   ScriptProvider  </module-name>
     <component-description>
         <author> Noel Power</author>
-        <name>  drafts.com.sun.star.script.framework.provider.ScriptProvider    </name>
+        <name>  drafts.com.sun.star.script.provider.ScriptProvider  </name>
         <description>
     This component is part of the Scripting Framework
 </description>
         <loader-name>   com.sun.star.loader.SharedLibrary   </loader-name>
         <language>  c++ </language>
         <status value="drafts"/>
-        <supported-service> drafts.com.sun.star.script.framework.provider.ScriptProvider    </supported-service>
+        <supported-service> drafts.com.sun.star.script.provider.ScriptProvider  </supported-service>
         <type>  com.sun.star.beans.XPropertySet                 </type>
         <type>  com.sun.star.uno.Exception                  </type>
         <type>  com.sun.star.io.IOException                 </type>
         <type>  com.sun.star.io.XStream                 </type>
-        <type>  drafts.com.sun.star.script.framework.provider.XScript </type>
-        <type>  drafts.com.sun.star.script.framework.provider.XScriptProvider </type>
-        <type>  drafts.com.sun.star.script.framework.runtime.XScriptInvocation </type>
-        <type>  drafts.com.sun.star.script.framework.browse.XBrowseNode </type>
-        <type>  drafts.com.sun.star.script.framework.browse.BrowseNodeTypes </type>
+        <type>  drafts.com.sun.star.script.provider.XScript </type>
+        <type>  drafts.com.sun.star.script.provider.XScriptProvider </type>
+        <type>  drafts.com.sun.star.script.browse.XBrowseNode </type>
+        <type>  drafts.com.sun.star.script.browse.BrowseNodeTypes </type>
 
     </component-description>
     <project-build-dependency>  cppuhelper  </project-build-dependency>