diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 0af92464ed..954207ceec --- a/.gitignore +++ b/.gitignore @@ -1,91 +1,91 @@ -/dist/ -/build/ -/*/build/ -*/nbproject/private/* -/nbproject/private/* - -/Core/release/ -/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties -/Core/src/org/sleuthkit/autopsy/casemodule/docs/QuickStart.html -/Core/src/org/sleuthkit/autopsy/casemodule/docs/screenshot.png -/Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv -/Core/build/ -/Core/dist/ -/Core/nbproject/* -/Core/test/qa-functional/data/* -!/Core/nbproject/project.xml -!/Core/nbproject/project.properties - -/CoreLibs/release/ -/CoreLibs/build/ -/CoreLibs/dist/ -/CoreLibs/nbproject/* -!/CoreLibs/nbproject/project.xml -!/CoreLibs/nbproject/project.properties - -/Core/test/qa-functional/data/ - -/KeywordSearch/release/ -/KeywordSearch/build/ -/KeywordSearch/dist/ -/KeywordSearch/nbproject/* -!/KeywordSearch/nbproject/project.xml -!/KeywordSearch/nbproject/project.properties - -*/genfiles.properties -genfiles.properties - -/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties -/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties -/branding/build/ -/branding/dist/ -/branding/nbproject/* -!/branding/nbproject/project.xml -!/branding/nbproject/project.properties - -/test/input/* -!/test/input/notablehashes.txt-md5.idx -!/test/input/notablekeywords.xml -!/test/input/NSRL.txt-md5.idx -/test/output/* -!/test/output/gold -/test/script/output_dir_link.txt -/test/output/gold/tmp -/test/script/ScriptLog.txt -/test/script/__pycache__/ -/test/script/*.pyc -/test/script/DBDump-Diff.txt -/test/script/DBDump.txt -/test/script/SortedData-Diff.txt -/test/script/SortedData.txt -/test/script/myconfig.xml -/test/script/*/*.xml -/test/build/ -/test/dist/ -/test/nbproject/* - -!/Testing/nbproject/project.xml -!/Testing/nbproject/project.properties -*~ -/netbeans-plat -/docs/doxygen-user/user-docs -/jdiff-javadocs/* -/jdiff-logs/* -/gen_version.txt -hs_err_pid*.log - -.DS_Store -.*.swp -/Experimental/release/ -/ImageGallery/release/ -/thunderbirdparser/release/ -/RecentActivity/release/ -/CentralRepository/release/ -/Tika/release - -.idea/ -*.iml - -*.img -*.vhd -*.E01 +/dist/ +/build/ +/*/build/ +*/nbproject/private/* +/nbproject/private/* + +/Core/release/ +/Core/src/org/sleuthkit/autopsy/coreutils/Version.properties +/Core/src/org/sleuthkit/autopsy/casemodule/docs/QuickStart.html +/Core/src/org/sleuthkit/autopsy/casemodule/docs/screenshot.png +/Core/src/org/sleuthkit/autopsy/datamodel/ranges.csv +/Core/build/ +/Core/dist/ +/Core/nbproject/* +/Core/test/qa-functional/data/* +!/Core/nbproject/project.xml +!/Core/nbproject/project.properties + +/CoreLibs/release/ +/CoreLibs/build/ +/CoreLibs/dist/ +/CoreLibs/nbproject/* +!/CoreLibs/nbproject/project.xml +!/CoreLibs/nbproject/project.properties + +/Core/test/qa-functional/data/ + +/KeywordSearch/release/ +/KeywordSearch/build/ +/KeywordSearch/dist/ +/KeywordSearch/nbproject/* +!/KeywordSearch/nbproject/project.xml +!/KeywordSearch/nbproject/project.properties + +*/genfiles.properties +genfiles.properties + +/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties +/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties +/branding/build/ +/branding/dist/ +/branding/nbproject/* +!/branding/nbproject/project.xml +!/branding/nbproject/project.properties + +/test/input/* +!/test/input/notablehashes.txt-md5.idx +!/test/input/notablekeywords.xml +!/test/input/NSRL.txt-md5.idx +/test/output/* +!/test/output/gold +/test/script/output_dir_link.txt +/test/output/gold/tmp +/test/script/ScriptLog.txt +/test/script/__pycache__/ +/test/script/*.pyc +/test/script/DBDump-Diff.txt +/test/script/DBDump.txt +/test/script/SortedData-Diff.txt +/test/script/SortedData.txt +/test/script/myconfig.xml +/test/script/*/*.xml +/test/build/ +/test/dist/ +/test/nbproject/* + +!/Testing/nbproject/project.xml +!/Testing/nbproject/project.properties +*~ +/netbeans-plat +/docs/doxygen-user/user-docs +/jdiff-javadocs/* +/jdiff-logs/* +/gen_version.txt +hs_err_pid*.log + +.DS_Store +.*.swp +/Experimental/release/ +/ImageGallery/release/ +/thunderbirdparser/release/ +/RecentActivity/release/ +/CentralRepository/release/ +/Tika/release + +.idea/ +*.iml + +*.img +*.vhd +*.E01 diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java index 966eb919e7..4323753515 100644 --- a/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java +++ b/Core/src/org/sleuthkit/autopsy/coreutils/XMLUtil.java @@ -1,7 +1,7 @@ /* * Autopsy Forensic Browser * - * Copyright 2012-2014 Basis Technology Corp. + * Copyright 2012-2020 Basis Technology Corp. * Contact: carrier sleuthkit org * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -54,6 +54,40 @@ import org.xml.sax.SAXException; * -Loading documents from disk */ public class XMLUtil { + + private static DocumentBuilder getDocumentBuilder() throws ParserConfigurationException { + // See JIRA-6958 for details about class loading and jaxb. + ClassLoader original = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(XMLUtil.class.getClassLoader()); + DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); + return builderFactory.newDocumentBuilder(); + } finally { + Thread.currentThread().setContextClassLoader(original); + } + } + + private static SchemaFactory getSchemaFactory(String schemaLanguage) { + // See JIRA-6958 for details about class loading and jaxb. + ClassLoader original = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(XMLUtil.class.getClassLoader()); + return SchemaFactory.newInstance(schemaLanguage); + } finally { + Thread.currentThread().setContextClassLoader(original); + } + } + + private static TransformerFactory getTransformerFactory() { + // See JIRA-6958 for details about class loading and jaxb. + ClassLoader original = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(XMLUtil.class.getClassLoader()); + return TransformerFactory.newInstance(); + } finally { + Thread.currentThread().setContextClassLoader(original); + } + } /** * Creates a W3C DOM. @@ -63,9 +97,7 @@ public class XMLUtil { * @throws ParserConfigurationException */ public static Document createDocument() throws ParserConfigurationException { - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = builderFactory.newDocumentBuilder(); - return builder.newDocument(); + return getDocumentBuilder().newDocument(); } /** @@ -100,8 +132,7 @@ public class XMLUtil { * @throws IOException */ public static Document loadDocument(String docPath) throws ParserConfigurationException, SAXException, IOException { - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = builderFactory.newDocumentBuilder(); + DocumentBuilder builder = getDocumentBuilder(); Document doc = builder.parse(new FileInputStream(docPath)); return doc; } @@ -119,7 +150,7 @@ public class XMLUtil { public static void validateDocument(final Document doc, Class clazz, String schemaResourceName) throws SAXException, IOException { PlatformUtil.extractResourceToUserConfigDir(clazz, schemaResourceName, false); File schemaFile = new File(Paths.get(PlatformUtil.getUserConfigDirectory(), schemaResourceName).toAbsolutePath().toString()); - SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + SchemaFactory schemaFactory = getSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI); Schema schema = schemaFactory.newSchema(schemaFile); Validator validator = schema.newValidator(); validator.validate(new DOMSource(doc), new DOMResult()); @@ -140,7 +171,7 @@ public class XMLUtil { * @throws IOException */ public static void saveDocument(final Document doc, String encoding, String docPath) throws TransformerConfigurationException, FileNotFoundException, UnsupportedEncodingException, TransformerException, IOException { - TransformerFactory xf = TransformerFactory.newInstance(); + TransformerFactory xf = getTransformerFactory(); xf.setAttribute("indent-number", 1); //NON-NLS Transformer xformer = xf.newTransformer(); xformer.setOutputProperty(OutputKeys.METHOD, "xml"); //NON-NLS @@ -178,7 +209,7 @@ public class XMLUtil { try { PlatformUtil.extractResourceToUserConfigDir(clazz, schemaFile, false); File schemaLoc = new File(PlatformUtil.getUserConfigDirectory() + File.separator + schemaFile); - SchemaFactory schm = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); + SchemaFactory schm = getSchemaFactory(XMLConstants.W3C_XML_SCHEMA_NS_URI); try { Schema schema = schm.newSchema(schemaLoc); Validator validator = schema.newValidator(); @@ -226,10 +257,9 @@ public class XMLUtil { */ // TODO: Deprecate. public static Document loadDoc(Class clazz, String xmlPath) { - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); Document ret = null; try { - DocumentBuilder builder = builderFactory.newDocumentBuilder(); + DocumentBuilder builder = getDocumentBuilder(); ret = builder.parse(new FileInputStream(xmlPath)); } catch (ParserConfigurationException e) { Logger.getLogger(clazz.getName()).log(Level.SEVERE, "Error loading XML file " + xmlPath + " : can't initialize parser.", e); //NON-NLS @@ -268,7 +298,7 @@ public class XMLUtil { */ // TODO: Deprecate. public static boolean saveDoc(Class clazz, String xmlPath, String encoding, final Document doc) { - TransformerFactory xf = TransformerFactory.newInstance(); + TransformerFactory xf = getTransformerFactory(); xf.setAttribute("indent-number", 1); //NON-NLS boolean success = false; try { diff --git a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/EmbeddedFileExtractorIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/EmbeddedFileExtractorIngestModule.java index dc9e7c6d1d..b1481ddc01 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/EmbeddedFileExtractorIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/embeddedfileextractor/EmbeddedFileExtractorIngestModule.java @@ -117,6 +117,12 @@ public final class EmbeddedFileExtractorIngestModule extends FileIngestModuleAda * while processing archive files. */ mapOfDepthTrees.put(jobId, new ConcurrentHashMap<>()); + /** + * Initialize Java's Image I/O API so that image reading and writing + * (needed for image extraction) happens consistently through the + * same providers. See JIRA-6951 for more details. + */ + initializeImageIO(); } /* * Construct an embedded content extractor for processing Microsoft @@ -127,14 +133,6 @@ public final class EmbeddedFileExtractorIngestModule extends FileIngestModuleAda } catch (NoCurrentCaseException ex) { throw new IngestModuleException(Bundle.EmbeddedFileExtractorIngestModule_UnableToGetMSOfficeExtractor_errMsg(), ex); } - - /** - * Initialize Java's Image I/O API so that image reading and writing - * (needed for image extraction) happens consistently through the - * same providers. See JIRA-6951 for more details. - */ - initializeImageIO(); - } /** diff --git a/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java index e300171cf1..5935dbf89e 100644 --- a/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java +++ b/Core/src/org/sleuthkit/autopsy/report/modules/stix/STIXReportModule.java @@ -228,12 +228,19 @@ public class STIXReportModule implements GeneralReportModule { */ private STIXPackage loadSTIXFile(String stixFileName) throws JAXBException { // Create STIXPackage object from xml. - File file = new File(stixFileName); - JAXBContext jaxbContext = JAXBContext.newInstance("org.mitre.stix.stix_1:org.mitre.stix.common_1:org.mitre.stix.indicator_2:" //NON-NLS - + "org.mitre.cybox.objects:org.mitre.cybox.cybox_2:org.mitre.cybox.common_2"); //NON-NLS - Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); - STIXPackage stix = (STIXPackage) jaxbUnmarshaller.unmarshal(file); - return stix; + // See JIRA-6958 for details about class loading and jaxb. + ClassLoader original = Thread.currentThread().getContextClassLoader(); + try { + Thread.currentThread().setContextClassLoader(STIXReportModule.class.getClassLoader()); + File file = new File(stixFileName); + JAXBContext jaxbContext = JAXBContext.newInstance("org.mitre.stix.stix_1:org.mitre.stix.common_1:org.mitre.stix.indicator_2:" //NON-NLS + + "org.mitre.cybox.objects:org.mitre.cybox.cybox_2:org.mitre.cybox.common_2"); //NON-NLS + Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller(); + STIXPackage stix = (STIXPackage) jaxbUnmarshaller.unmarshal(file); + return stix; + } finally { + Thread.currentThread().setContextClassLoader(original); + } } /** diff --git a/ManifestTool/ManifestGenerationAlgorithms.au3 b/Tools/ManifestTool/ManifestGenerationAlgorithms.au3 similarity index 100% rename from ManifestTool/ManifestGenerationAlgorithms.au3 rename to Tools/ManifestTool/ManifestGenerationAlgorithms.au3 diff --git a/ManifestTool/ManifestTool.au3 b/Tools/ManifestTool/ManifestTool.au3 similarity index 100% rename from ManifestTool/ManifestTool.au3 rename to Tools/ManifestTool/ManifestTool.au3 diff --git a/ManifestTool/ManifestTool.exe b/Tools/ManifestTool/ManifestTool.exe similarity index 100% rename from ManifestTool/ManifestTool.exe rename to Tools/ManifestTool/ManifestTool.exe diff --git a/ZookeeperNodeMigration/.gitignore b/Tools/ZookeeperNodeMigration/.gitignore similarity index 62% rename from ZookeeperNodeMigration/.gitignore rename to Tools/ZookeeperNodeMigration/.gitignore index 0e56a449c7..46cba4a7dd 100755 --- a/ZookeeperNodeMigration/.gitignore +++ b/Tools/ZookeeperNodeMigration/.gitignore @@ -1,3 +1,2 @@ /nbproject/private/ -/build/ - +/build/ \ No newline at end of file diff --git a/ZookeeperNodeMigration/build.xml b/Tools/ZookeeperNodeMigration/build.xml similarity index 100% rename from ZookeeperNodeMigration/build.xml rename to Tools/ZookeeperNodeMigration/build.xml diff --git a/ZookeeperNodeMigration/dist/README.TXT b/Tools/ZookeeperNodeMigration/dist/README.TXT similarity index 100% rename from ZookeeperNodeMigration/dist/README.TXT rename to Tools/ZookeeperNodeMigration/dist/README.TXT diff --git a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar b/Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar similarity index 95% rename from ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar rename to Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar index 92b11bc86a..b2bb4f8e60 100755 Binary files a/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar and b/Tools/ZookeeperNodeMigration/dist/ZookeeperNodeMigration.jar differ diff --git a/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar rename to Tools/ZookeeperNodeMigration/dist/lib/curator-client-2.8.0.jar diff --git a/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar rename to Tools/ZookeeperNodeMigration/dist/lib/curator-framework-2.8.0.jar diff --git a/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar rename to Tools/ZookeeperNodeMigration/dist/lib/curator-recipes-2.8.0.jar diff --git a/ZookeeperNodeMigration/dist/lib/guava-17.0.jar b/Tools/ZookeeperNodeMigration/dist/lib/guava-17.0.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/guava-17.0.jar rename to Tools/ZookeeperNodeMigration/dist/lib/guava-17.0.jar diff --git a/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar b/Tools/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar rename to Tools/ZookeeperNodeMigration/dist/lib/log4j-1.2.17.jar diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar b/Tools/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar rename to Tools/ZookeeperNodeMigration/dist/lib/slf4j-api-1.7.24.jar diff --git a/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar b/Tools/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar rename to Tools/ZookeeperNodeMigration/dist/lib/slf4j-log4j12-1.7.6.jar diff --git a/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar b/Tools/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar similarity index 100% rename from ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar rename to Tools/ZookeeperNodeMigration/dist/lib/zookeeper-3.4.6.jar diff --git a/ZookeeperNodeMigration/docs/README.TXT b/Tools/ZookeeperNodeMigration/docs/README.TXT similarity index 100% rename from ZookeeperNodeMigration/docs/README.TXT rename to Tools/ZookeeperNodeMigration/docs/README.TXT diff --git a/ZookeeperNodeMigration/manifest.mf b/Tools/ZookeeperNodeMigration/manifest.mf similarity index 100% rename from ZookeeperNodeMigration/manifest.mf rename to Tools/ZookeeperNodeMigration/manifest.mf diff --git a/ZookeeperNodeMigration/nbproject/build-impl.xml b/Tools/ZookeeperNodeMigration/nbproject/build-impl.xml similarity index 100% rename from ZookeeperNodeMigration/nbproject/build-impl.xml rename to Tools/ZookeeperNodeMigration/nbproject/build-impl.xml diff --git a/ZookeeperNodeMigration/nbproject/project.properties b/Tools/ZookeeperNodeMigration/nbproject/project.properties similarity index 100% rename from ZookeeperNodeMigration/nbproject/project.properties rename to Tools/ZookeeperNodeMigration/nbproject/project.properties diff --git a/ZookeeperNodeMigration/nbproject/project.xml b/Tools/ZookeeperNodeMigration/nbproject/project.xml similarity index 100% rename from ZookeeperNodeMigration/nbproject/project.xml rename to Tools/ZookeeperNodeMigration/nbproject/project.xml diff --git a/ZookeeperNodeMigration/release/curator-client-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/release/curator-client-2.8.0.jar rename to Tools/ZookeeperNodeMigration/release/curator-client-2.8.0.jar diff --git a/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/release/curator-framework-2.8.0.jar rename to Tools/ZookeeperNodeMigration/release/curator-framework-2.8.0.jar diff --git a/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar b/Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar similarity index 100% rename from ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar rename to Tools/ZookeeperNodeMigration/release/curator-recipes-2.8.0.jar diff --git a/ZookeeperNodeMigration/release/guava-17.0.jar b/Tools/ZookeeperNodeMigration/release/guava-17.0.jar similarity index 100% rename from ZookeeperNodeMigration/release/guava-17.0.jar rename to Tools/ZookeeperNodeMigration/release/guava-17.0.jar diff --git a/ZookeeperNodeMigration/release/log4j-1.2.17.jar b/Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar similarity index 100% rename from ZookeeperNodeMigration/release/log4j-1.2.17.jar rename to Tools/ZookeeperNodeMigration/release/log4j-1.2.17.jar diff --git a/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar b/Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar similarity index 100% rename from ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar rename to Tools/ZookeeperNodeMigration/release/slf4j-api-1.7.24.jar diff --git a/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar b/Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar similarity index 100% rename from ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar rename to Tools/ZookeeperNodeMigration/release/slf4j-log4j12-1.7.6.jar diff --git a/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar b/Tools/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar similarity index 100% rename from ZookeeperNodeMigration/release/zookeeper-3.4.6.jar rename to Tools/ZookeeperNodeMigration/release/zookeeper-3.4.6.jar diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java similarity index 100% rename from ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/AutoIngestJobNodeData.java diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java similarity index 100% rename from ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/TimeStampUtils.java diff --git a/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java b/Tools/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java similarity index 100% rename from ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java rename to Tools/ZookeeperNodeMigration/src/zookeepernodemigration/ZookeeperNodeMigration.java diff --git a/build.xml b/build.xml index 7377d59c04..1cab40b475 100644 --- a/build.xml +++ b/build.xml @@ -106,7 +106,7 @@ - + @@ -117,10 +117,10 @@ - + - +