1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
|
Description: the current way to set the classpath doesn't work with recent java versions
Author: Julien Puydt
Forwarded: http://bugzilla.scilab.org/show_bug.cgi?id=15687
--- a/scilab/bin/scilab
+++ b/scilab/bin/scilab
@@ -659,6 +659,49 @@
detect_java_vm
fi
+# Try to set the classpath as the classpath loader doesn't work anymore
+# bad way to detect if we're during the compilation
+SYSJARS=/usr/share/java/flexdock.jar
+SYSJARS=$SYSJARS:/usr/share/java/skinlf.jar
+SYSJARS=$SYSJARS:/usr/share/java/looks.jar
+SYSJARS=$SYSJARS:/usr/share/java/commons-logging.jar
+SYSJARS=$SYSJARS:/usr/share/java/jhall.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/apache/lucene/lucene-core/8.x/lucene-core-8.x.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/apache/lucene/lucene-analyzers-common/8.x/lucene-analyzers-common-8.x.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/apache/lucene/lucene-queryparser/8.x/lucene-queryparser-8.x.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/freehep/freehep-util/debian/freehep-util-debian.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/freehep/freehep-io/debian/freehep-io-debian.jar
+SYSJARS=$SYSJARS:/usr/share/maven-repo/org/freehep/freehep-graphicsio/debian/freehep-graphicsio-debian.jar
+SYSJARS=$SYSJARS:/usr/share/java/freehep-graphicsio-emf.jar
+SYSJARS=$SYSJARS:/usr/share/java/freehep-graphics2d.jar
+SYSJARS=$SYSJARS:/usr/share/java/jrosetta-API.jar
+SYSJARS=$SYSJARS:/usr/share/java/jrosetta-engine.jar
+SYSJARS=$SYSJARS:/usr/share/java/jgraphx.jar
+SYSJARS=$SYSJARS:/usr/share/java/jogl2.jar
+SYSJARS=$SYSJARS:/usr/share/java/gluegen2-rt.jar
+SYSJARS=$SYSJARS:/usr/share/java/jeuclid-core.jar
+SYSJARS=$SYSJARS:/usr/share/java/jlatexmath-fop.jar
+SYSJARS=$SYSJARS:/usr/share/java/fop.jar
+SYSJARS=$SYSJARS:/usr/share/java/saxon.jar
+SYSJARS=$SYSJARS:/usr/share/java/batik.jar
+SYSJARS=$SYSJARS:/usr/share/java/xml-apis-ext.jar
+SYSJARS=$SYSJARS:/usr/share/java/commons-io.jar
+SYSJARS=$SYSJARS:/usr/share/java/xmlgraphics-commons.jar
+SYSJARS=$SYSJARS:/usr/share/java/avalon-framework.jar
+SYSJARS=$SYSJARS:/usr/share/java/jlatexmath.jar
+SYSJARS=$SYSJARS:/usr/share/java/ecj.jar
+SYSJARS=$SYSJARS:/usr/share/java/javax.activation.jar
+SYSJARS=$SYSJARS:/usr/share/java/jaxb-runtime.jar
+SYSJARS=$SYSJARS:/usr/share/java/jakarta-activation.jar
+if test -r "./etc/classpath.xml"; then
+ SCIJARS=`find modules -name "*.jar" -type f | tr "\n" ":"`
+else
+ SCIJARS=`find /usr/share/scilab/modules -name "*.jar" -type f | tr "\n" ":"`
+fi
+_JAVA_OPTIONS=-Djava.class.path=$SYSJARS:$SCIJARS${_JAVA_OPTIONS+ $_JAVA_OPTIONS}
+
+export _JAVA_OPTIONS
+
if test $IS_SCILAB_BINARY -eq 1; then
if test ! -d "$SCIBINARYBASE/thirdparty/tcl8.5"; then
--- a/scilab/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
+++ b/scilab/modules/jvm/src/java/org/scilab/modules/jvm/ClassPath.java
@@ -59,14 +59,14 @@
* @param i the type of load: i=0 startup / i=1 background / i=2 onUse
*/
public static void addURL(final URL u, int i) {
- switch (i) {
- case 0: /* Load now */
+ /*switch (i) {
+ case 0: /* Load now
((ScilabClassLoader) ClassLoader.getSystemClassLoader()).addURL(u);
break;
- case 1: /* Load later (background) */
+ case 1: /* Load later (background)
queued.add(u);
break;
- }
+ }*/
}
/*-----------------------------------------------------------------------*/
/**
@@ -74,14 +74,14 @@
* @return classpath The list of the classpath
*/
public static String[] getClassPath() {
-
- URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
+ return new String[0];
+ /*URLClassLoader sysloader = (URLClassLoader) ClassLoader.getSystemClassLoader();
URL[] path = sysloader.getURLs();
String[] paths = new String[path.length];
for (int i = 0; i < path.length; i++) {
paths[i] = path[i].getFile();
}
- return paths;
+ return paths;*/
}
|