jurt.jar and unoil.jar are kept as effectively empty jars, each with a Class-Path: ridl.jar in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or without also loading ridl.jar) will still have access to their content. Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi) are not part of the URE, but are now made available by URE's ridl.jar. This should probably not cause problems in practice. At least for now, we seal exactly those packages in ridl.jar that were originally sealed in jurt.jar. Ideally, all of ridl.jar could be sealed now, but that would be mildly incompatible, as it would prevent 3rd-party code from introducing additional UNOIDL entities in the relevant namespaces (even if that is something we do not want 3rd-party code to do anyway). However, some JunitTest_jurt_* define classes in those sealed packages. In the past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt. Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the gb_JunitTest_use_jar,*,ridl. But the former only makes available the classes that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the UNOIDL entities specified via gb_Jar_add_packagedirs. But the tests need the udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests get them explicitly. (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets leave that for a follow-up clean up.) As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/. Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a Co-authored-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
197 lines
6.3 KiB
Java
197 lines
6.3 KiB
Java
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
package oooapplet;
|
|
|
|
import java.lang.reflect.Method;
|
|
import java.lang.reflect.Array;
|
|
import java.net.*;
|
|
import java.io.*;
|
|
import java.awt.*;
|
|
import java.applet.Applet;
|
|
import java.awt.Graphics;
|
|
import java.util.*;
|
|
|
|
public class OOoViewer extends Applet {
|
|
|
|
private static CustomURLClassLoader m_loader;
|
|
|
|
Object m_objBean;
|
|
|
|
@Override
|
|
public void init() {
|
|
try {
|
|
if (m_loader == null) {
|
|
String s = getParameter("office");
|
|
System.out.println("sun.awt.noxembed: " + System.getProperty("sun.awt.noxembed"));
|
|
System.setProperty("sun.awt.xembedserver", "true");
|
|
|
|
File f = new File(s);
|
|
URL url = f.toURI().toURL();
|
|
String officeURL = url.toString();
|
|
URL[] arURL = new URL[] {
|
|
new URL(officeURL + "/program/classes/officebean.jar"),
|
|
new URL(officeURL + "/program/classes/ridl.jar"),
|
|
new URL(officeURL + "/program/classes/java_uno.jar"),
|
|
new URL(officeURL + "/program/classes/juh.jar")
|
|
};
|
|
m_loader = new CustomURLClassLoader(arURL);
|
|
File fileProg = new File(s + "/program");
|
|
m_loader.addResourcePath(fileProg.toURI().toURL());
|
|
}
|
|
} catch (MalformedURLException e) {
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void start() {
|
|
try {
|
|
Class<?> beanClass = m_loader.loadClass("com.sun.star.comp.beans.OOoBean");
|
|
m_objBean = beanClass.newInstance();
|
|
setLayout(new BorderLayout());
|
|
add((java.awt.Container)m_objBean, BorderLayout.CENTER);
|
|
setVisible(true);
|
|
//this does not work here. Why?
|
|
// Class arPropValClass = m_loader.loadClass("[Lcom.sun.star.beans.PropertyValue;");
|
|
Object arProp = Array.newInstance(
|
|
m_loader.loadClass("com.sun.star.beans.PropertyValue"), 1);
|
|
|
|
Method methLoad = beanClass.getMethod(
|
|
"loadFromURL", new Class[] {
|
|
String.class, arProp.getClass() });
|
|
|
|
methLoad.invoke(m_objBean, new Object[] {"private:factory/swriter", null});
|
|
} catch (ClassNotFoundException e) {
|
|
e.printStackTrace();
|
|
} catch (InstantiationException e) {
|
|
e.printStackTrace();
|
|
} catch (IllegalAccessException e) {
|
|
e.printStackTrace();
|
|
} catch (ClassCastException e) {
|
|
e.printStackTrace();
|
|
} catch (java.lang.reflect.InvocationTargetException e) {
|
|
e.printStackTrace();
|
|
} catch (java.lang.NoSuchMethodException e) {
|
|
e.printStackTrace(); }
|
|
|
|
|
|
|
|
validate();
|
|
}
|
|
|
|
@Override
|
|
public void stop() {
|
|
try {
|
|
Method methStop = m_objBean.getClass().getMethod(
|
|
"stopOOoConnection", new Class[0]);
|
|
methStop.invoke(m_objBean, (Object[]) null);
|
|
} catch (java.lang.NoSuchMethodException e) {
|
|
e.printStackTrace();
|
|
} catch (java.lang.IllegalAccessException e) {
|
|
e.printStackTrace();
|
|
}
|
|
catch (java.lang.reflect.InvocationTargetException e) {
|
|
e.printStackTrace();
|
|
}
|
|
|
|
}
|
|
|
|
@Override
|
|
public void destroy() {
|
|
}
|
|
|
|
@Override
|
|
public void paint(Graphics g) {
|
|
}
|
|
}
|
|
|
|
|
|
final class CustomURLClassLoader extends URLClassLoader {
|
|
|
|
private ArrayList<URL> resourcePaths;
|
|
|
|
public CustomURLClassLoader( URL[] urls ) {
|
|
super( urls );
|
|
}
|
|
|
|
@Override
|
|
protected Class<?> findClass( String name ) throws ClassNotFoundException {
|
|
// This is only called via this.loadClass -> super.loadClass ->
|
|
// this.findClass, after this.loadClass has already called
|
|
// super.findClass, so no need to call super.findClass again:
|
|
throw new ClassNotFoundException( name );
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
protected synchronized Class<?> loadClass( String name, boolean resolve )
|
|
throws ClassNotFoundException
|
|
{
|
|
Class c = findLoadedClass( name );
|
|
if ( c == null ) {
|
|
try {
|
|
c = super.findClass( name );
|
|
} catch ( ClassNotFoundException e ) {
|
|
return super.loadClass( name, resolve );
|
|
} catch ( SecurityException e ) {
|
|
// A SecurityException "Prohibited package name: java.lang"
|
|
// may occur when the user added the JVM's rt.jar to the
|
|
// java.class.path:
|
|
return super.loadClass( name, resolve );
|
|
}
|
|
}
|
|
if ( resolve ) {
|
|
resolveClass( c );
|
|
}
|
|
return c;
|
|
}
|
|
|
|
public void addResourcePath(URL rurl) {
|
|
if (resourcePaths == null) resourcePaths = new ArrayList<URL>();
|
|
resourcePaths.add(rurl);
|
|
}
|
|
|
|
@Override
|
|
public URL getResource(String name) {
|
|
if (resourcePaths == null) return null;
|
|
|
|
URL result = super.getResource(name);
|
|
if (result != null) {
|
|
return result;
|
|
}
|
|
|
|
for (URL u : resourcePaths) {
|
|
if (u.getProtocol().startsWith("file")){
|
|
try {
|
|
File f1 = new File(u.getPath());
|
|
File f2 = new File(f1, name);
|
|
if (f2.exists()) {
|
|
return new URL(f2.toURI().toASCIIString());
|
|
}
|
|
} catch (MalformedURLException e1) {
|
|
System.err.println("malformed url: "+e1.getMessage());
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
}
|