Revision: 19909
http://sourceforge.net/p/gate/code/19909
Author: markagreenwood
Date: 2017-01-03 13:45:54 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
removed another unsued file as part of the great clean up
Modified Paths:
--------------
gate/branches/sawdust2/gate-core/src/test/java/gate/util/TestFiles.java
Removed Paths:
-------------
gate/branches/sawdust2/gate-core/src/main/java/gate/util/JarFiles.java
Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/util/JarFiles.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/util/JarFiles.java
2017-01-03 13:40:55 UTC (rev 19908)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/JarFiles.java
2017-01-03 13:45:54 UTC (rev 19909)
@@ -1,210 +0,0 @@
-/*
- * JarFileMerger.java
- *
- * Copyright (c) 1995-2012, The University of Sheffield. See the file
- * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt
- *
- * This file is part of GATE (see http://gate.ac.uk/), and is free
- * software, licenced under the GNU Library General Public License,
- * Version 2, June 1991 (in the distribution as file licence.html,
- * and also available at http://gate.ac.uk/gate/licence.html).
- *
- * Oana Hamza, 09/06/00
- *
- * $Id$
- */
-
-package gate.util;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-
-/** This class is used to merge a set of Jar/Zip Files in a Jar File
- * It is ignored the manifest.
- */
-public class JarFiles {
-
- private StringBuffer dbgString = new StringBuffer();
- private boolean warning = false;
- String buggyJar = null;
-
- private final static int BUFF_SIZE = 65000;
-
- private Set<String> directorySet = null;
-
- private byte buffer[] = null;
-
- public JarFiles(){
- directorySet = new HashSet<String>();
- buffer = new byte[BUFF_SIZE];
- }
-
- /** This method takes the content of all jar/zip files from the set
- * jarFileNames and put them in a file with the name outputFileName.
- * If the jar entry is manifest then this information isn't added.
- * @param jarFileNames is a set of names of files (jar/zip)
- * @param destinationJarName is the name of the file which contains all the
- * classes of jarFilesNames
- */
- public void merge(Set<String> jarFileNames, String destinationJarName)
- throws GateException {
- String sourceJarName = null;
- JarOutputStream jarFileDestination = null;
- JarFile jarFileSource = null;
-
- try {
- // create the output jar file
- jarFileDestination =
- new JarOutputStream(new FileOutputStream(destinationJarName));
-
- dbgString.append("Creating " + destinationJarName + " from these
JARs:\n");
- // iterate through the Jar files set
- Iterator<String> jarFileNamesIterator = jarFileNames.iterator();
-
- while (jarFileNamesIterator.hasNext()) {
- sourceJarName = jarFileNamesIterator.next();
-
- // create the new input jar files based on the file name
- jarFileSource = new JarFile(sourceJarName);
-
- // Out.println("Adding " + sourceJarName + " to "
- // + destinationJarName);
- addJar(jarFileDestination, jarFileSource);
- if (jarFileSource.getName().equals(buggyJar))
- dbgString.append(sourceJarName + "...problems occured ! \n");
- else
- dbgString.append(sourceJarName + "...added OK ! \n");
- jarFileSource.close();
- }//End while
-
- jarFileDestination.close();
-
- } catch(IOException ioe) {
- ioe.printStackTrace(Err.getPrintWriter());
- //System.exit(1);
- }
- if (warning == true)
- Out.prln(dbgString);
- }// merge
-
-
- /**
- * This method adds all entries from sourceJar to destinationJar
- * NOTE: that manifest information is not added, method will throw
- * a gate Exception if a duplicate entry file is found.
- * @param destinationJar the jar that will collect all the entries
- * from source jar
- * @param sourceJar doesn't need any explanation ... DOES it?
- */
- private void addJar(JarOutputStream destinationJar, JarFile sourceJar)
- throws GateException {
- try {
-
- // get an enumeration of all entries from the sourceJar
- Enumeration<JarEntry> jarFileEntriesEnum = sourceJar.entries();
-
- JarEntry currentJarEntry = null;
- while (jarFileEntriesEnum.hasMoreElements()) {
-
- // get a JarEntry
- currentJarEntry = jarFileEntriesEnum.nextElement();
-
- // if current entry is manifest then it is skipped
- if(currentJarEntry.getName().equalsIgnoreCase("META-INF/") ||
- currentJarEntry.getName().equalsIgnoreCase("META-INF/MANIFEST.MF"))
- continue;
-
- // if current entry is a directory that was previously added to the
- // destination JAR then it is skipped
- if( currentJarEntry.isDirectory() &&
- directorySet.contains(currentJarEntry.getName())
- ) continue;
-
- // otherwise the current entry is added to the final jar file
- try {
- // if the entry is directory then is added to the directorySet
- // NOTE: files entries are not added to this set
- if (currentJarEntry.isDirectory())
- directorySet.add(currentJarEntry.getName());
-
- // put the entry into the destination JAR
- destinationJar.putNextEntry(new JarEntry(currentJarEntry.getName()));
-
- // add the binary data from the entry
- // NOTE: if the entry is a directory there will be no binary data
- // get an input stream from the entry
- InputStream currentEntryStream =
- sourceJar.getInputStream(currentJarEntry);
-
- // write data to destinationJar
- int bytesRead = 0;
- while((bytesRead = currentEntryStream.read(buffer,0,BUFF_SIZE)) !=
-1)
- destinationJar.write(buffer,0,bytesRead);
-
- // close the input stream
- currentEntryStream.close();
-
- // flush the destinationJar in order to be sure that
- // everything is there
- destinationJar.flush();
-
- // close the new added entry and prepare to read and write
- // another one
- // NOTE: destinationJar.putNextEntry automaticaly closes any previous
- // opened entry
- destinationJar.closeEntry();
-
- } catch (java.util.zip.ZipException ze) {
- if(!currentJarEntry.isDirectory()){
- warning = true;
- buggyJar = sourceJar.getName();
- Out.prln("WARNING: Duplicate file entry " +
- currentJarEntry.getName() + " (this file will be discarded)..." +
- "It happened while adding " +
- sourceJar.getName() + " !\n");
- dbgString.append(currentJarEntry.getName() +" file from " +
- sourceJar.getName() + " was discarded :( !\n");
- }// End if
- }
- }// while(jarFileEntriesEnum.hasMoreElements())
- } catch (java.io.IOException e) {
- e.printStackTrace(Err.getPrintWriter());
- // System.exit(1);
- }
- }// addJar
-
- /** args[0] is the final jar file and the other are the set of
- * jar file names
- * e.g. java gate.util.JarFiles libs.jar ../lib/*.jar ../lib/*.zip
- * will create a file calls libs.jar which will contain all
- * jar files and zip files
- */
-
- public static void main(String[] args) {
- if(args.length < 2) {
- Err.println("USAGE : JarFiles arg0 arg1 ... argN" +
- "(must be at least 2 args)");
- //System.exit(1);
- } else {
- JarFiles jarFiles = new JarFiles();
- Set<String> filesToMerge = new HashSet<String>();
- for (int i=1; i<args.length; i++) {
- filesToMerge.add(args[i]);
- }
- try {
- jarFiles.merge(filesToMerge, args[0]);
- } catch (GateException ge) {
- ge.printStackTrace(Err.getPrintWriter());
- }
- }// if
- }// main
-
-}// class JarFiles
Modified:
gate/branches/sawdust2/gate-core/src/test/java/gate/util/TestFiles.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/test/java/gate/util/TestFiles.java
2017-01-03 13:40:55 UTC (rev 19908)
+++ gate/branches/sawdust2/gate-core/src/test/java/gate/util/TestFiles.java
2017-01-03 13:45:54 UTC (rev 19909)
@@ -88,56 +88,6 @@
}
} // testWriteTempFile()
- /** Test JarFiles methods */
- public void testJarFiles() throws Exception {
-
- JarFiles jarFiles = new JarFiles();
- Set<String> filesToMerge = new HashSet<String>();
- String jarFilePathFirst = "jartest/ajartest.jar";
- String jarFilePathSecond ="jartest/bjartest.jar";
- String jarPathFirst = null;;
- String jarPathSecond = null;
- String jarPathFinal = null;
- File resourceFile = null;
- File f1 = null;
- File f2 = null;
- FileInputStream fileStreamFirst = null;
- FileInputStream fileStreamSecond = null;
-
- //open first jar file in a temporal file
- // Out.println(Files.getResourceAsStream(jarFilePathFirst));
- f1 = Files.writeTempFile(Files.getGateResourceAsStream(jarFilePathFirst));
-
- //open second jar file in a temporal file
- f2 =Files.writeTempFile(Files.getGateResourceAsStream(jarFilePathSecond));
-
-
- //create a temporal file in order to put the classes of jar files
- resourceFile = File.createTempFile("jarfinal", ".tmp");
- resourceFile.deleteOnExit();
-
- //determin the paths of the temporal files
- jarPathFirst = f1.getAbsolutePath();
- jarPathSecond = f2.getAbsolutePath();
- f1.deleteOnExit();
- f2.deleteOnExit();
- jarPathFinal = resourceFile.getAbsolutePath();
- filesToMerge.add(jarPathFirst);
- filesToMerge.add(jarPathSecond);
-
- //close the temporal files
- fileStreamFirst = new FileInputStream(f1);
-
- fileStreamSecond = new FileInputStream(f2);
-
- fileStreamFirst.close();
-
- fileStreamSecond.close();
-
- jarFiles.merge(filesToMerge,jarPathFinal);
-
- } // testJarFiles
-
/** Test the find method. */
public void testFind(){
String regex = "z:/gate2/doc/.*.html";
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
