diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-18 13:25:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-18 14:17:28 +0100 |
commit | 15a2cdb68eb1e6696cf5b33d2a05a325216e0b85 (patch) | |
tree | 7b1c480f20051066c7ad5bd954da2c9cda484b93 | |
parent | attempt to prevent illegal maTabData access(s) (diff) | |
download | core-15a2cdb68eb1e6696cf5b33d2a05a325216e0b85.tar.gz core-15a2cdb68eb1e6696cf5b33d2a05a325216e0b85.zip |
forgot to remove lucene post clucene replacement
Change-Id: Ib68cbc8cbbd2b2b0b6f6069a3c6834c33eff8756
-rw-r--r-- | lucene/README | 1 | ||||
-rw-r--r-- | lucene/long_path.patch | 37 | ||||
-rw-r--r-- | lucene/lucene.patch | 12 | ||||
-rw-r--r-- | lucene/makefile.mk | 74 | ||||
-rw-r--r-- | lucene/prj/build.lst | 3 | ||||
-rw-r--r-- | lucene/prj/d.lst | 3 | ||||
-rw-r--r-- | lucene/prj/dmake | 0 | ||||
-rw-r--r-- | lucene/version.mk | 27 |
8 files changed, 0 insertions, 157 deletions
diff --git a/lucene/README b/lucene/README deleted file mode 100644 index 3948ffcbb70f..000000000000 --- a/lucene/README +++ /dev/null @@ -1 +0,0 @@ -From [http://lucene.apache.org/]. (CH: What of it is used for what ???) diff --git a/lucene/long_path.patch b/lucene/long_path.patch deleted file mode 100644 index d3ab8e3ddb91..000000000000 --- a/lucene/long_path.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- misc/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2008-05-01 22:27:58.000000000 +0200 -+++ misc/build/lucene-2.3.2/src/java/org/apache/lucene/store/FSDirectory.java 2011-02-23 16:36:26.249515000 +0100 -@@ -165,7 +165,15 @@ - public static FSDirectory getDirectory(File file, LockFactory lockFactory) - throws IOException - { -- file = new File(file.getCanonicalPath()); -+ String path = file.getPath(); -+ //File.getCanonicalPath fails on Windows with long path names -+ //Tested with Java SE 6u23 -+ //Long path names created by osl_getSystemPathFromFileURL are already -+ //unique because its implementation replaces the occurrences of .. and . -+ //That is using the com.sun.star.help.HelpIndexer service from c++ is -+ //relatively safe. -+ if (!path.startsWith("\\\\?\\")) -+ file = new File(file.getCanonicalPath()); - - if (file.exists() && !file.isDirectory()) - throw new IOException(file + " not a directory"); -@@ -455,7 +463,16 @@ - public String getLockID() { - String dirName; // name to be hashed - try { -- dirName = directory.getCanonicalPath(); -+ //File.getCanonicalPath fails on Windows with long path names -+ //Tested with Java SE 6u23 -+ //Long path names created by osl_getSystemPathFromFileURL are already -+ //unique because its implementation replaces the occurrences of .. and . -+ //That is using the com.sun.star.help.HelpIndexer service from c++ is -+ //relatively safe. -+ if (!directory.getPath().startsWith("\\\\?\\")) -+ dirName = directory.getCanonicalPath(); -+ else -+ dirName = directory.getPath(); - } catch (IOException e) { - throw new RuntimeException(e.toString(), e); - } diff --git a/lucene/lucene.patch b/lucene/lucene.patch deleted file mode 100644 index 3acd21e63636..000000000000 --- a/lucene/lucene.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lucene-2.3.2/common-build.xml 2008-05-01 22:28:56.000000000 +0200 -+++ misc/build/lucene-2.3.2/common-build.xml 2008-06-16 16:01:28.812500000 +0200 -@@ -280 +280 @@ -- value="${version} ${svnversion} - ${user.name} - ${DSTAMP} ${TSTAMP}"/> -+ value="${version}"/> -@@ -297,6 +296,0 @@ -- <!-- If possible, include the svnversion --> -- <exec dir="." executable="svnversion" -- outputproperty="svnversion" failifexecutionfails="false"> -- <arg line="."/> -- </exec> -- diff --git a/lucene/makefile.mk b/lucene/makefile.mk deleted file mode 100644 index 98fab3f9a363..000000000000 --- a/lucene/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=. - -PRJNAME=so_lucene -TARGET=so_lucene - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : antsettings.mk -# --- Files -------------------------------------------------------- - -.IF "$(SOLAR_JAVA)" != "" - -LUCENE_MAJOR=2 -LUCENE_MINOR=3 -LUCENE_MICRO=2 - -LUCENE_NAME=lucene-$(LUCENE_MAJOR).$(LUCENE_MINOR).$(LUCENE_MICRO) -# NOTE that the jar names do not contain the micro version -LUCENE_CORE_JAR=lucene-core-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar -LUCENE_ANALYZERS_JAR=lucene-analyzers-$(LUCENE_MAJOR).$(LUCENE_MINOR).jar - -TARFILE_NAME=$(LUCENE_NAME) -TARFILE_MD5=48d8169acc35f97e05d8dcdfd45be7f2 -PATCH_FILES=lucene.patch - -.IF "$(OS)" == "WNT" -PATCH_FILES+= long_path.patch -.ENDIF - - -BUILD_DIR=. -BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml - -OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR) - -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk - -.IF "$(SOLAR_JAVA)" != "" -.INCLUDE : tg_ext.mk -.ENDIF diff --git a/lucene/prj/build.lst b/lucene/prj/build.lst deleted file mode 100644 index 9f51b60f03c5..000000000000 --- a/lucene/prj/build.lst +++ /dev/null @@ -1,3 +0,0 @@ -xh lucene : soltools EXPAT:expat NULL -xh lucene usr1 - all xh_mkout NULL -xh lucene nmake - all xh_lucene NULL diff --git a/lucene/prj/d.lst b/lucene/prj/d.lst deleted file mode 100644 index 97c896802d5e..000000000000 --- a/lucene/prj/d.lst +++ /dev/null @@ -1,3 +0,0 @@ -mkdir: %_DEST%\inc\external -mkdir: %_DEST%\inc\external\lucene -..\%__SRC%\bin\lucene-*.jar %_DEST%\bin\lucene-*.jar diff --git a/lucene/prj/dmake b/lucene/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/lucene/prj/dmake +++ /dev/null diff --git a/lucene/version.mk b/lucene/version.mk deleted file mode 100644 index fe9f60bcb669..000000000000 --- a/lucene/version.mk +++ /dev/null @@ -1,27 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - |