[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - 3 commits - scripting/examples scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk scripting/java
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Mar 27 02:19:02 PDT 2012
scripting/Jar_HelloWorld.mk | 2
scripting/Jar_Highlight.mk | 2
scripting/Jar_MemoryUsage.mk | 2
scripting/Jar_ScriptFramework.mk | 2
scripting/Jar_ScriptProviderForBeanShell.mk | 4
scripting/Jar_ScriptProviderForJava.mk | 5 +
scripting/Jar_ScriptProviderForJavaScript.mk | 2
scripting/examples/java/HelloWorld/HelloWorld.java | 2
scripting/examples/java/HelloWorld/parcel-descriptor.xml | 2
scripting/examples/java/Highlight/HighlightText.java | 2
scripting/examples/java/Highlight/parcel-descriptor.xml | 2
scripting/examples/java/MemoryUsage/MemoryUsage.java | 2
scripting/examples/java/MemoryUsage/parcel-descriptor.xml | 2
scripting/examples/java/Newsgroup/MimeConfiguration.java | 2
scripting/examples/java/Newsgroup/NewsGroup.java | 2
scripting/examples/java/Newsgroup/OfficeAttachment.java | 2
scripting/examples/java/Newsgroup/PostNewsgroup.java | 2
scripting/examples/java/Newsgroup/Sender.java | 2
scripting/examples/java/Newsgroup/StatusWindow.java | 2
scripting/examples/java/Newsgroup/SubscribedNewsgroups.java | 2
scripting/examples/java/debugger/DebugRunner.java | 2
scripting/examples/java/debugger/OOBeanShellDebugger.java | 2
scripting/examples/java/debugger/OORhinoDebugger.java | 2
scripting/examples/java/debugger/OOScriptDebugger.java | 2
scripting/examples/java/debugger/parcel-descriptor.xml | 2
scripting/examples/java/selector/ScriptSelector.java | 2
scripting/examples/java/selector/parcel-descriptor.xml | 2
scripting/java/Framework/MANIFEST.MF | 2
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 46 +++++++++-
scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java | 6 -
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java | 3
scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptProviderForBeanShell.java | 3
scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF | 2
scripting/java/com/sun/star/script/framework/provider/java/ScriptProviderForJava.java | 2
scripting/java/com/sun/star/script/framework/provider/javascript/ScriptProviderForJavaScript.java | 3
35 files changed, 109 insertions(+), 17 deletions(-)
New commits:
commit a574a38a73b252498ac061dcf08d96a84b48b6af
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 23 16:05:24 2012 +0100
fdo#46102: Load Java scripts with class loaders that actually find them
ScriptMetaData.createURL produces weird URLs (ending in "/ucb/", and potentially
still containing vnd.sun.star.expand: prefix) that are apparently good for
loading documents for editing via UCBStreamHandler, but cannot meaningfully be
passed to a URLClassLoader.
It is unclear to me how the Java script provider shall ever have found the
script jars in the past.
(cherry picked from commit dd6c4f4db1d62268d73e09ae52d23f760a967dcc)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
Signed-off-by: Petr Mladek <pmladek at suse.cz>
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 1cf99d7..178f480 100755
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -50,7 +50,14 @@ import com.sun.star.script.framework.io.UCBStreamHandler;
import com.sun.star.ucb.XSimpleFileAccess2;
+import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+
+import com.sun.star.uri.UriReferenceFactory;
+import com.sun.star.uri.XVndSunStarExpandUrl;
+
+import com.sun.star.util.XMacroExpander;
public class ScriptMetaData extends ScriptEntry implements Cloneable {
private boolean hasSource = false;
@@ -246,7 +253,8 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
return "\nParcelLocation = " + getParcelLocation() + "\nLocationPlaceHolder = " + locationPlaceHolder + super.toString();
}
- public URL[] getClassPath() throws java.net.MalformedURLException
+ public URL[] getClassPath(XComponentContext context)
+ throws java.net.MalformedURLException
{
try
{
@@ -274,7 +282,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
{
String relativeClasspath = (String)stk.nextElement();
String pathToProcess = PathUtils.make_url( parcelPath, relativeClasspath);
- URL url = createURL( pathToProcess );
+ URL url = expandURL( context, pathToProcess );
if ( url != null )
{
classPathVec.add ( url );
@@ -283,7 +291,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
}
if ( classPathVec.size() == 0)
{
- URL url = createURL( parcelPath );
+ URL url = expandURL( context, parcelPath );
if ( url != null )
{
classPathVec.add(url);
@@ -300,6 +308,38 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
}
}
+
+ private URL expandURL(XComponentContext context, String url)
+ throws java.net.MalformedURLException
+ {
+ XVndSunStarExpandUrl exp = UnoRuntime.queryInterface(
+ XVndSunStarExpandUrl.class,
+ UriReferenceFactory.create(context).parse(url));
+ String expurl;
+ if (exp == null) {
+ expurl = url;
+ } else {
+ XMacroExpander expander;
+ try {
+ expander = (XMacroExpander) AnyConverter.toObject(
+ XMacroExpander.class,
+ context.getValueByName(
+ "/singletons/com.sun.star.util.theMacroExpander"));
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ throw new RuntimeException(e);
+ }
+ try {
+ expurl = exp.expand(expander);
+ } catch (com.sun.star.lang.IllegalArgumentException e) {
+ java.net.MalformedURLException e2 =
+ new java.net.MalformedURLException(e.toString());
+ e2.initCause(e);
+ throw e2;
+ }
+ }
+ return new URL(expurl);
+ }
+
private URL createURL( String path ) throws java.net.MalformedURLException
{
URL url = null;
diff --git a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
index 641ca58..081204f 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ClassLoaderFactory.java
@@ -31,6 +31,7 @@ import java.net.*;
import com.sun.star.script.framework.log.LogUtils;
import com.sun.star.script.framework.container.ScriptMetaData;
+import com.sun.star.uno.XComponentContext;
/**
* Class Loader Factory
@@ -42,11 +43,12 @@ public class ClassLoaderFactory
{
private ClassLoaderFactory() {}
- public static ClassLoader getURLClassLoader( ScriptMetaData scriptData )
+ public static ClassLoader getURLClassLoader(
+ XComponentContext context, ScriptMetaData scriptData )
throws NoSuitableClassLoaderException, MalformedURLException
{
ClassLoader parent = scriptData.getClass().getClassLoader();
- URL[] classPath = scriptData.getClassPath();
+ URL[] classPath = scriptData.getClassPath(context);
LogUtils.DEBUG("Classpath has length " + classPath.length );
for ( int i=0; i < classPath.length; i++ )
{
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 cbbcfc3..9f6739d 100755
--- a/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
+++ b/scripting/java/com/sun/star/script/framework/provider/beanshell/ScriptEditorForBeanShell.java
@@ -202,7 +202,8 @@ public class ScriptEditorForBeanShell
try {
ClassLoader cl = null;
try {
- cl = ClassLoaderFactory.getURLClassLoader( entry );
+ cl = ClassLoaderFactory.getURLClassLoader(
+ context.getComponentContext(), entry );
}
catch (Exception ignore) // TODO re-examine error handling
{
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 95c7278..22a9ea8 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
@@ -196,7 +196,8 @@ class ScriptImpl implements XScript
ClassLoader cl = null;
URL sourceUrl = null;
try {
- cl = ClassLoaderFactory.getURLClassLoader( metaData );
+ cl = ClassLoaderFactory.getURLClassLoader(
+ m_xContext, metaData );
sourceUrl = metaData.getSourceURL();
}
catch ( java.net.MalformedURLException mfu )
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 707ea05..3f392f7 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
@@ -205,7 +205,7 @@ class ScriptImpl implements XScript
try {
LogUtils.DEBUG( "Classloader starting..." );
scriptLoader = ClassLoaderFactory.getURLClassLoader(
- metaData );
+ m_xContext, metaData );
LogUtils.DEBUG( "Classloader finished..." );
}
catch (MalformedURLException mfe )
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 9f04d91..39205d4 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
@@ -195,7 +195,8 @@ class ScriptImpl implements XScript
ClassLoader cl = null;
URL sourceUrl = null;
try {
- cl = ClassLoaderFactory.getURLClassLoader( metaData );
+ cl = ClassLoaderFactory.getURLClassLoader(
+ m_xContext, metaData );
sourceUrl = metaData.getSourceURL();
}
catch ( java.net.MalformedURLException mfu )
commit a9caee65b7c76e54b2362ded366075249d0f858d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 23 16:11:42 2012 +0100
fdo#46102: Fix Java script examples after gbuild'ification
...they contained no class files anymore, due to missing gb_Jar_set_packageroot
calls. However, those calls only work for subdirectories, i.e., the example
.java files need to be put into a package (I chose
org.libreoffice.example.java_scripts) for all of them). This in turn required
adaption of the parcel-descriptor.xml files; not sure what the logicalname
entries there are good for if anything -- the macro names at "Tools - Macros -
Run Macro..." now unfortunately(?) contain the fully qualified paths for the
HelloWorld, HighlightText, and MemoryUpdate examples. There are additional
examples at scripting/examples/java/ that apparently do not get packaged (but I
adapted them anyway).
(cherry picked from commit 0b9fda25f321ce2697179064e330843237177668)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
Signed-off-by: Petr Mladek <pmladek at suse.cz>
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index fa0ec4d..87902d3 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -39,4 +39,6 @@ $(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\
scripting/examples/java/HelloWorld/HelloWorld \
))
+$(eval $(call gb_Jar_set_packageroot,HelloWorld,org))
+
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index ea46602..0f9a81f 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -39,4 +39,6 @@ $(eval $(call gb_Jar_add_sourcefiles,Highlight,\
scripting/examples/java/Highlight/HighlightText \
))
+$(eval $(call gb_Jar_set_packageroot,Highlight,org))
+
# vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index bb9300b..952dec0 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -39,4 +39,6 @@ $(eval $(call gb_Jar_add_sourcefiles,MemoryUsage,\
scripting/examples/java/MemoryUsage/MemoryUsage \
))
+$(eval $(call gb_Jar_set_packageroot,MemoryUsage,org))
+
# vim: set noet sw=4 ts=4:
diff --git a/scripting/examples/java/HelloWorld/HelloWorld.java b/scripting/examples/java/HelloWorld/HelloWorld.java
index eaed56f..48f72e0 100755
--- a/scripting/examples/java/HelloWorld/HelloWorld.java
+++ b/scripting/examples/java/HelloWorld/HelloWorld.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import com.sun.star.script.provider.XScriptContext;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.text.XTextDocument;
diff --git a/scripting/examples/java/HelloWorld/parcel-descriptor.xml b/scripting/examples/java/HelloWorld/parcel-descriptor.xml
index 692933a..61375a4 100755
--- a/scripting/examples/java/HelloWorld/parcel-descriptor.xml
+++ b/scripting/examples/java/HelloWorld/parcel-descriptor.xml
@@ -7,7 +7,7 @@
Prints "Helo World".
</description>
</locale>
- <functionname value="HelloWorld.printHW"/>
+ <functionname value="org.libreoffice.example.java_scripts.HelloWorld.printHW"/>
<logicalname value="HelloWorld.printHW"/>
<languagedepprops>
<prop name="classpath" value="HelloWorld.jar"/>
diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java
index 14a02e3..1b45e22 100755
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import com.sun.star.uno.UnoRuntime;
import com.sun.star.script.provider.XScriptContext;
import com.sun.star.lang.XMultiComponentFactory;
diff --git a/scripting/examples/java/Highlight/parcel-descriptor.xml b/scripting/examples/java/Highlight/parcel-descriptor.xml
index 2612eae..54e2a88 100755
--- a/scripting/examples/java/Highlight/parcel-descriptor.xml
+++ b/scripting/examples/java/Highlight/parcel-descriptor.xml
@@ -8,7 +8,7 @@
Text highlighting
</description>
</locale>
- <functionname value="HighlightText.showForm"/>
+ <functionname value="org.libreoffice.example.java_scripts.HighlightText.showForm"/>
<logicalname value="HighlightText.showForm"/>
<languagedepprops>
<prop name="classpath" value="Highlight.jar"/>
diff --git a/scripting/examples/java/MemoryUsage/MemoryUsage.java b/scripting/examples/java/MemoryUsage/MemoryUsage.java
index 727f94a..6fc1ba7 100755
--- a/scripting/examples/java/MemoryUsage/MemoryUsage.java
+++ b/scripting/examples/java/MemoryUsage/MemoryUsage.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.util.Random;
import java.util.Date;
import com.sun.star.uno.UnoRuntime;
diff --git a/scripting/examples/java/MemoryUsage/parcel-descriptor.xml b/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
index e09bf4a..ec7daba 100755
--- a/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
+++ b/scripting/examples/java/MemoryUsage/parcel-descriptor.xml
@@ -7,7 +7,7 @@
Text highlighting
</description>
</locale>
- <functionname value="MemoryUsage.updateMemoryUsage"/>
+ <functionname value="org.libreoffice.example.java_scripts.MemoryUsage.updateMemoryUsage"/>
<logicalname value="MemoryUtils.MemUsage"/>
<languagedepprops>
<prop name="classpath" value="MemoryUsage.jar"/>
diff --git a/scripting/examples/java/Newsgroup/MimeConfiguration.java b/scripting/examples/java/Newsgroup/MimeConfiguration.java
index 8604c0a..f0a2bd1 100755
--- a/scripting/examples/java/Newsgroup/MimeConfiguration.java
+++ b/scripting/examples/java/Newsgroup/MimeConfiguration.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import com.sun.star.uno.UnoRuntime;
import com.sun.star.lang.XMultiComponentFactory;
import com.sun.star.uno.XComponentContext;
diff --git a/scripting/examples/java/Newsgroup/NewsGroup.java b/scripting/examples/java/Newsgroup/NewsGroup.java
index 714b81e..be1c404 100755
--- a/scripting/examples/java/Newsgroup/NewsGroup.java
+++ b/scripting/examples/java/Newsgroup/NewsGroup.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
public class NewsGroup
{
diff --git a/scripting/examples/java/Newsgroup/OfficeAttachment.java b/scripting/examples/java/Newsgroup/OfficeAttachment.java
index c2816e0..2455f6e 100755
--- a/scripting/examples/java/Newsgroup/OfficeAttachment.java
+++ b/scripting/examples/java/Newsgroup/OfficeAttachment.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
//import com.sun.star.frame.XComponentLoader;
import java.io.*;
import com.sun.star.lang.XComponent;
diff --git a/scripting/examples/java/Newsgroup/PostNewsgroup.java b/scripting/examples/java/Newsgroup/PostNewsgroup.java
index a88b1d3..b25049d 100755
--- a/scripting/examples/java/Newsgroup/PostNewsgroup.java
+++ b/scripting/examples/java/Newsgroup/PostNewsgroup.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
diff --git a/scripting/examples/java/Newsgroup/Sender.java b/scripting/examples/java/Newsgroup/Sender.java
index eb1da28..653e5e1 100755
--- a/scripting/examples/java/Newsgroup/Sender.java
+++ b/scripting/examples/java/Newsgroup/Sender.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import javax.mail.*;
import javax.mail.internet.*;
import com.msoft.mail.provider.nntp.NNTPTransport;
diff --git a/scripting/examples/java/Newsgroup/StatusWindow.java b/scripting/examples/java/Newsgroup/StatusWindow.java
index 2fcffae..389181f 100755
--- a/scripting/examples/java/Newsgroup/StatusWindow.java
+++ b/scripting/examples/java/Newsgroup/StatusWindow.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
diff --git a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
index b227791..c1d935f 100755
--- a/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
+++ b/scripting/examples/java/Newsgroup/SubscribedNewsgroups.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.io.*;
import java.util.Vector;
diff --git a/scripting/examples/java/debugger/DebugRunner.java b/scripting/examples/java/debugger/DebugRunner.java
index 4430b97..c1d5f46 100755
--- a/scripting/examples/java/debugger/DebugRunner.java
+++ b/scripting/examples/java/debugger/DebugRunner.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.io.File;
import java.io.InputStream;
import java.io.IOException;
diff --git a/scripting/examples/java/debugger/OOBeanShellDebugger.java b/scripting/examples/java/debugger/OOBeanShellDebugger.java
index be91aa4..eadb3a5 100755
--- a/scripting/examples/java/debugger/OOBeanShellDebugger.java
+++ b/scripting/examples/java/debugger/OOBeanShellDebugger.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import javax.swing.JFrame;
import javax.swing.JTextArea;
import javax.swing.JPanel;
diff --git a/scripting/examples/java/debugger/OORhinoDebugger.java b/scripting/examples/java/debugger/OORhinoDebugger.java
index 0aea985..209f4f7 100755
--- a/scripting/examples/java/debugger/OORhinoDebugger.java
+++ b/scripting/examples/java/debugger/OORhinoDebugger.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import javax.swing.SwingUtilities;
import java.io.InputStream;
diff --git a/scripting/examples/java/debugger/OOScriptDebugger.java b/scripting/examples/java/debugger/OOScriptDebugger.java
index 67532e1..c46bbc5 100755
--- a/scripting/examples/java/debugger/OOScriptDebugger.java
+++ b/scripting/examples/java/debugger/OOScriptDebugger.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import java.io.InputStream;
import drafts.com.sun.star.script.framework.runtime.XScriptContext;
diff --git a/scripting/examples/java/debugger/parcel-descriptor.xml b/scripting/examples/java/debugger/parcel-descriptor.xml
index 285db1b..f432bfe 100755
--- a/scripting/examples/java/debugger/parcel-descriptor.xml
+++ b/scripting/examples/java/debugger/parcel-descriptor.xml
@@ -8,7 +8,7 @@
<description>Script that starts debuggers for JavaScript and BeanShell
</description>
</locale>
- <logicalname value="_$DebugRunner.Debug" />
+ <logicalname value="org.libreoffice.example.java_scripts._$DebugRunner.Debug" />
<functionname value="DebugRunner.go" />
<languagedepprops>
<prop name="classpath" value="debugger.jar"/>
diff --git a/scripting/examples/java/selector/ScriptSelector.java b/scripting/examples/java/selector/ScriptSelector.java
index 698faa5..93475fe 100755
--- a/scripting/examples/java/selector/ScriptSelector.java
+++ b/scripting/examples/java/selector/ScriptSelector.java
@@ -1,3 +1,5 @@
+package org.libreoffice.example.java_scripts;
+
import javax.swing.*;
import javax.swing.tree.*;
import javax.swing.table.*;
diff --git a/scripting/examples/java/selector/parcel-descriptor.xml b/scripting/examples/java/selector/parcel-descriptor.xml
index 8e3e70e..951fdde 100755
--- a/scripting/examples/java/selector/parcel-descriptor.xml
+++ b/scripting/examples/java/selector/parcel-descriptor.xml
@@ -8,7 +8,7 @@
Prototype Script Selector GUI for StarOffice
</description>
</locale>
- <functionname value="ScriptSelector.showOrganizer"/>
+ <functionname value="org.libreoffice.example.java_scripts.ScriptSelector.showOrganizer"/>
<logicalname value="ScriptSelector.showOrganizer"/>
<languagedepprops>
<prop name="classpath" value="selector.jar"/>
commit addffddbc4acf9745e6bfeba322d6488b3c12605
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 22 23:27:32 2012 +0100
fdo#46102: Fix scripting jar manifests after gbuild'ification
(cherry picked from commit 91d60be7eeafa1f7872bda452bfb38936003f517)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index 05774b9..1e6a4be 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_Jar_add_jars,ScriptFramework,\
$(eval $(call gb_Jar_set_componentfile,ScriptFramework,scripting/java/ScriptFramework,OOO))
+$(eval $(call gb_Jar_set_manifest,ScriptFramework,$(SRCDIR)/scripting/java/Framework/MANIFEST.MF))
+
$(eval $(call gb_Jar_set_packageroot,ScriptFramework,com))
$(eval $(call gb_Jar_add_sourcefiles,ScriptFramework,\
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 753ea10..aee4ad5 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -45,10 +45,10 @@ $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting
#TODO: Ensure "file://$(BSH_JAR)" is a proper file URL:
ifeq ($(SYSTEM_BSH),YES)
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
- unoil.jar ScriptFramework.jar file://$(BSH_JAR)))
+ ScriptFramework.jar file://$(BSH_JAR)))
else
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
- unoil.jar ScriptFramework.jar bsh.jar))
+ ScriptFramework.jar bsh.jar))
endif
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForBeanShell,scripting/java/ScriptProviderForBeanShell,OOO))
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 39b747b..19e1995 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -38,6 +38,11 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJava,scripting/java/ScriptProviderForJava,OOO))
+$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJava, \
+ ScriptFramework.jar))
+
+$(eval $(call gb_Jar_set_manifest,ScriptProviderForJava,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF))
+
$(eval $(call gb_Jar_set_packageroot,ScriptProviderForJava,com))
$(eval $(call gb_Jar_add_sourcefiles,ScriptProviderForJava,\
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index 5f69085..bd405cc 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\
$(eval $(call gb_Jar_set_manifest,ScriptProviderForJavaScript,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/javascript/MANIFEST.MF))
$(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForJavaScript, \
- unoil.jar ScriptFramework.jar js.jar))
+ ScriptFramework.jar js.jar))
$(eval $(call gb_Jar_set_componentfile,ScriptProviderForJavaScript,scripting/java/ScriptProviderForJavaScript,OOO))
diff --git a/scripting/java/Framework/MANIFEST.MF b/scripting/java/Framework/MANIFEST.MF
new file mode 100644
index 0000000..4945b96
--- /dev/null
+++ b/scripting/java/Framework/MANIFEST.MF
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.script.framework.security.SecurityDialog
+UNO-Type-Path:
diff --git a/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF
new file mode 100644
index 0000000..f2056d0
--- /dev/null
+++ b/scripting/java/com/sun/star/script/framework/provider/java/MANIFEST.MF
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.script.framework.provider.java.ScriptProviderForJava
+UNO-Type-Path:
More information about the Libreoffice-commits
mailing list