summaryrefslogtreecommitdiff
path: root/javaunohelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-08-29 11:40:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-08-29 12:09:08 +0200
commit617c5e44e13eb12dd58559289bc83def9f2b77e9 (patch)
tree22cc8fb9bf2da1d60c66cc5add3bae001318e169 /javaunohelper
parent99138b6400a4fb1216fc331b65d17419d98a4805 (diff)
[API CHANGE] Remove obsolete com.sun.star.comp.helper.UnoInfo
It had originally been used in the SDK's "Simple Bootstrap" for Java, com.sun.star.lib.loader.Loader class, but only left in there for backwards compatibility with pre--three-layer OOo versions (i.e., < OOo 3) when that Loader was switched to use the unoinfo executable with the fix for #i88687# "C++/Java Simple Bootstrap broken" in e2b7ea631a5e7297346ec826527a019e2baca020 "INTEGRATION: CWS sb87 (1.5.10); FILE MERGED: 2008/05/07 11:34:25 sb 1.5.10.1: #i88687# let Loader call new unoinfo instead of old juh.jar UnoInfo.getJars." Recent work in AOO to undo three-layer caused AOO to now accidentally use the backwards-compatibility code, so AOO ran into a problem that they solved with a change to com.sun.star.comp.helper.UnoInfo that LO erroneously merged in as 95ada2d65f6d999920f2a04599ac132fa632d66d "Related: #i122483# set correct classpath, include unoil.jar." The better approach is to get rid of that backwards-compatibility code and remove the obsolete UnoInfo class. While this is nominally incompatible, in practice no other client code but the SDK's com.sun.star.lib.loader.Loader should ever have used it (it should have been designed as a private interface for just that one client from the start, anyway). Java applications using "Simple Bootstrap" and built against old versions of the SDK (post the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3) will continue to work against new LO versions (as the backwards-compatibility code that would call the removed UnoInfo class will not be triggered anyway; and even if it were, all resulting exceptions would be caught and the new code path using the unoinfo executable be chosen then). Likewise, Java applications using "Simple Bootstrap" and built against the new SDK will continue to work against old OOo/LO/AOO vesions as far back as the fix for #i88687# and its introduction of the unoinfo exectuable in OOo 3. Change-Id: I64824ed002c3ccdf6912eab67499beb0c423081e
Diffstat (limited to 'javaunohelper')
-rw-r--r--javaunohelper/Jar_juh.mk1
-rw-r--r--javaunohelper/com/sun/star/comp/helper/UnoInfo.java107
2 files changed, 0 insertions, 108 deletions
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index a4f1f4c9fbe7..32f7449049c0 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Jar_add_sourcefiles,juh,\
javaunohelper/com/sun/star/comp/helper/ComponentContext \
javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
- javaunohelper/com/sun/star/comp/helper/UnoInfo \
javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \
diff --git a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java b/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
deleted file mode 100644
index 67a359473c75..000000000000
--- a/javaunohelper/com/sun/star/comp/helper/UnoInfo.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * 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 com.sun.star.comp.helper;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-/**
- * UnoInfo offers functionality to obtain the UNO jar files.
- */
-public final class UnoInfo {
-
- /**
- * do not instantiate
- */
- private UnoInfo() {}
-
- /**
- * Gets the URL base.
- *
- * @return the URL base
- */
- private static String getBase() {
-
- final String JUHJAR = "/juh.jar";
-
- String base = null;
-
- URLClassLoader cl = (URLClassLoader) UnoInfo.class.getClassLoader();
- URL[] urls = cl.getURLs();
- for ( int i = 0; i < urls.length; i++ ) {
- String url = urls[i].toString();
- if ( url.endsWith( JUHJAR ) )
- {
- int index = url.lastIndexOf( JUHJAR );
- if ( index >= 0 ) {
- base = url.substring( 0, index + 1 );
- break;
- }
- }
- }
-
- return base;
- }
-
- /**
- * Gets a list of URLs for the given jar files.
- *
- * @return the list of URLs
- */
- private static URL[] getURLs( String[] jarFileNames ) {
-
- URL[] jars = new URL[jarFileNames.length];
- String base = getBase();
- for ( int i = 0; i < jarFileNames.length; i++ ) {
- try {
- jars[i] = new URL( base + jarFileNames[i] );
- } catch ( MalformedURLException e ) {
- return null;
- }
- }
-
- return jars;
- }
-
- /**
- * Gets the UNO jar files.
- *
- * @return the UNO jar files
- */
- public static URL[] getJars() {
-
- String[] jarFileNames = new String[] {
- "jurt.jar",
- "ridl.jar",
- "juh.jar",
- "unoil.jar" };
-
- return getURLs( jarFileNames );
- }
-
- /**
- * Gets the extra UNO types.
- *
- * @return the extra UNO types
- */
- public static URL[] getExtraTypes() {
- return new URL[0];
- }
-}