Fix package tangle by moving AsciiBytes

This commit is contained in:
Phillip Webb 2014-02-03 17:26:10 -08:00
parent f7d4490b2d
commit 1552759584
15 changed files with 15 additions and 11 deletions

View File

@ -19,6 +19,7 @@ package org.springframework.boot.loader;
import java.util.List; import java.util.List;
import org.springframework.boot.loader.archive.Archive; import org.springframework.boot.loader.archive.Archive;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are * {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are

View File

@ -42,6 +42,7 @@ import org.springframework.boot.loader.archive.Archive.EntryFilter;
import org.springframework.boot.loader.archive.ExplodedArchive; import org.springframework.boot.loader.archive.ExplodedArchive;
import org.springframework.boot.loader.archive.FilteredArchive; import org.springframework.boot.loader.archive.FilteredArchive;
import org.springframework.boot.loader.archive.JarFileArchive; import org.springframework.boot.loader.archive.JarFileArchive;
import org.springframework.boot.loader.util.AsciiBytes;
import org.springframework.boot.loader.util.SystemPropertyUtils; import org.springframework.boot.loader.util.SystemPropertyUtils;
/** /**

View File

@ -20,6 +20,7 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import org.springframework.boot.loader.archive.Archive; import org.springframework.boot.loader.archive.Archive;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* {@link Launcher} for WAR based archives. This launcher for standard WAR archives. * {@link Launcher} for WAR based archives. This launcher for standard WAR archives.

View File

@ -23,8 +23,8 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.Launcher; import org.springframework.boot.loader.Launcher;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* An archive that can be launched by the {@link Launcher}. * An archive that can be launched by the {@link Launcher}.

View File

@ -35,7 +35,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* {@link Archive} implementation backed by an exploded archive directory. * {@link Archive} implementation backed by an exploded archive directory.

View File

@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* Decorator to apply an {@link Archive.EntryFilter} to an existing {@link Archive}. * Decorator to apply an {@link Archive.EntryFilter} to an existing {@link Archive}.

View File

@ -27,10 +27,10 @@ import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.jar.JarEntryData; import org.springframework.boot.loader.jar.JarEntryData;
import org.springframework.boot.loader.jar.JarEntryFilter; import org.springframework.boot.loader.jar.JarEntryFilter;
import org.springframework.boot.loader.jar.JarFile; import org.springframework.boot.loader.jar.JarFile;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* {@link Archive} implementation backed by a {@link JarFile}. * {@link Archive} implementation backed by a {@link JarFile}.

View File

@ -21,9 +21,9 @@ import java.io.InputStream;
import java.lang.ref.SoftReference; import java.lang.ref.SoftReference;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.data.RandomAccessData; import org.springframework.boot.loader.data.RandomAccessData;
import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess; import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* Holds the underlying data of a {@link JarEntry}, allowing creation to be deferred until * Holds the underlying data of a {@link JarEntry}, allowing creation to be deferred until

View File

@ -16,7 +16,7 @@
package org.springframework.boot.loader.jar; package org.springframework.boot.loader.jar;
import org.springframework.boot.loader.AsciiBytes; import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* Interface that can be used to filter and optionally rename jar entries. * Interface that can be used to filter and optionally rename jar entries.

View File

@ -34,10 +34,10 @@ import java.util.jar.JarInputStream;
import java.util.jar.Manifest; import java.util.jar.Manifest;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.data.RandomAccessData; import org.springframework.boot.loader.data.RandomAccessData;
import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess; import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess;
import org.springframework.boot.loader.data.RandomAccessDataFile; import org.springframework.boot.loader.data.RandomAccessDataFile;
import org.springframework.boot.loader.util.AsciiBytes;
/** /**
* Extended variant of {@link java.util.jar.JarFile} that behaves in the same way but * Extended variant of {@link java.util.jar.JarFile} that behaves in the same way but

View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.loader; package org.springframework.boot.loader.util;
import java.nio.charset.Charset; import java.nio.charset.Charset;

View File

@ -19,6 +19,7 @@ package org.springframework.boot.loader;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.springframework.boot.loader.util.AsciiBytes;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.not;

View File

@ -33,9 +33,9 @@ import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.TestJarCreator;
import org.springframework.boot.loader.archive.Archive.Entry; import org.springframework.boot.loader.archive.Archive.Entry;
import org.springframework.boot.loader.util.AsciiBytes;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue; import static org.hamcrest.Matchers.nullValue;

View File

@ -25,9 +25,9 @@ import org.junit.Before;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.TestJarCreator;
import org.springframework.boot.loader.archive.Archive.Entry; import org.springframework.boot.loader.archive.Archive.Entry;
import org.springframework.boot.loader.util.AsciiBytes;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat; import static org.junit.Assert.assertThat;

View File

@ -31,9 +31,9 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.springframework.boot.loader.AsciiBytes;
import org.springframework.boot.loader.TestJarCreator; import org.springframework.boot.loader.TestJarCreator;
import org.springframework.boot.loader.data.RandomAccessDataFile; import org.springframework.boot.loader.data.RandomAccessDataFile;
import org.springframework.boot.loader.util.AsciiBytes;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.greaterThan;