diff --git a/all-pom.xml b/all-pom.xml deleted file mode 100755 index 6dd7530e..00000000 --- a/all-pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - com.twelvemonkeys - twelvemonkeys - 2.0 - pom - Twelvemonkeys all (aggregator) - - - twelvemonkeys-core - twelvemonkeys-servlet - twelvemonkeys-swing - twelvemonkeys-imageio - twelvemonkeys-sandbox - - - \ No newline at end of file diff --git a/common/common-image/pom.xml b/common/common-image/pom.xml new file mode 100644 index 00000000..dc1a9fba --- /dev/null +++ b/common/common-image/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.twelvemonkeys.common + common + 3.0-SNAPSHOT + + common-image + jar + TwelveMonkeys :: Common :: Image + + The TwelveMonkeys Common Image support + + + + + + ${project.groupId} + common-lang + + + ${project.groupId} + common-io + + + jmagick + jmagick + 6.2.4 + true + + + diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java b/common/common-image/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/AbstractImageSource.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/AreaAverageOp.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/BrightnessContrastFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageFactory.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java b/common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/BufferedImageIcon.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/ConvolveWithEdgeOp.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/CopyDither.java b/common/common-image/src/main/java/com/twelvemonkeys/image/CopyDither.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/CopyDither.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/CopyDither.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/DiffusionDither.java b/common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/DiffusionDither.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/DiffusionDither.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/GraphicsUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GrayColorModel.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayColorModel.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/GrayColorModel.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/GrayFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/GrayFilter.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/GrayFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageConversionException.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageConversionException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageConversionException.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageConversionException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageFilterException.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageFilterException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageFilterException.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageFilterException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ImageUtil.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/ImageUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/IndexImage.java b/common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/IndexImage.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/IndexImage.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java b/common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMap.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/InverseColorMapIndexColorModel.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/Magick.java b/common/common-image/src/main/java/com/twelvemonkeys/image/Magick.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/Magick.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/Magick.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/MagickAccelerator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickUtil.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MagickUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MagickUtil.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/MagickUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java b/common/common-image/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/MonochromeColorModel.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/PixelizeOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/PixelizeOp.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/PixelizeOp.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/PixelizeOp.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ResampleOp.java b/common/common-image/src/main/java/com/twelvemonkeys/image/ResampleOp.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/ResampleOp.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/ResampleOp.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java b/common/common-image/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/SubsamplingFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/inv_cmap.c b/common/common-image/src/main/java/com/twelvemonkeys/image/inv_cmap.c similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/inv_cmap.c rename to common/common-image/src/main/java/com/twelvemonkeys/image/inv_cmap.c diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/package-info.java b/common/common-image/src/main/java/com/twelvemonkeys/image/package-info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/image/package-info.java rename to common/common-image/src/main/java/com/twelvemonkeys/image/package-info.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java b/common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java rename to common/common-image/src/test/java/com/twelvemonkeys/image/ImageUtilTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java b/common/common-image/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java rename to common/common-image/src/test/java/com/twelvemonkeys/image/ResampleOpTestCase.java diff --git a/twelvemonkeys-core/src/test/resources/sunflower.jpg b/common/common-image/src/test/resources/sunflower.jpg similarity index 100% rename from twelvemonkeys-core/src/test/resources/sunflower.jpg rename to common/common-image/src/test/resources/sunflower.jpg diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml new file mode 100644 index 00000000..1993037a --- /dev/null +++ b/common/common-io/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + com.twelvemonkeys.common + common + 3.0-SNAPSHOT + + common-io + jar + TwelveMonkeys :: Common :: IO + + The TwelveMonkeys IO support + + + + + ${project.groupId} + common-lang + + + ${project.groupId} + common-lang + tests + test + + + + diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/AbstractCachedSeekableStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/CompoundReader.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/CompoundReader.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/EmptyReader.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/EmptyReader.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/EmptyReader.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FastByteArrayOutputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileCacheSeekableStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileSeekableStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileSystem.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileSystem.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FileUtil.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FileUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FilenameMaskFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/FilenameSuffixFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataInputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianDataOutputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java b/common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/LittleEndianRandomAccessFile.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/MemoryCacheSeekableStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/NullInputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullInputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/NullInputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/NullOutputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/NullOutputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/NullOutputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/RandomAccessStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Seekable.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Seekable.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/Seekable.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/SeekableInputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/SeekableOutputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java b/common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/StringArrayReader.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/StringArrayReader.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/SubStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/SubStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/SubStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/UnixFileSystem.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32File.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32File.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32File.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32FileSystem.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java b/common/common-io/src/main/java/com/twelvemonkeys/io/Win32Lnk.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/Win32Lnk.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/Win32Lnk.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/WriterOutputStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/AbstractRLEDecoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Decoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Base64Encoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecodeException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Decoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Decoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/DecoderStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/Encoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/Encoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/Encoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/EncoderStream.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBits16Decoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsDecoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/PackBitsEncoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE4Decoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/RLE8Decoder.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/package-info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/enc/package-info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/enc/package-info.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/enc/package-info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CompoundDocument.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/CorruptDocumentException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/Entry.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/Entry.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/Entry.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/SIdChain.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/package-info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/ole2/package-info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/ole2/package-info.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/ole2/package-info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/io/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/io/package_info.java rename to common/common-io/src/main/java/com/twelvemonkeys/io/package_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java b/common/common-io/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/AuthenticatorFilter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java b/common/common-io/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/HttpURLConnection.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/net/MIMEUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/MIMEUtil.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/MIMEUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/NetUtil.java b/common/common-io/src/main/java/com/twelvemonkeys/net/NetUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/NetUtil.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/NetUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java b/common/common-io/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/PasswordAuthenticator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java b/common/common-io/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/SimpleAuthenticator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/net/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/net/package_info.java rename to common/common-io/src/main/java/com/twelvemonkeys/net/package_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BASE64.java b/common/common-io/src/main/java/com/twelvemonkeys/util/BASE64.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BASE64.java rename to common/common-io/src/main/java/com/twelvemonkeys/util/BASE64.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java rename to common/common-io/src/main/java/com/twelvemonkeys/xml/DOMSerializer.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java rename to common/common-io/src/main/java/com/twelvemonkeys/xml/XMLSerializer.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/package_info.java b/common/common-io/src/main/java/com/twelvemonkeys/xml/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/xml/package_info.java rename to common/common-io/src/main/java/com/twelvemonkeys/xml/package_info.java diff --git a/twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties b/common/common-io/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties similarity index 100% rename from twelvemonkeys-core/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties rename to common/common-io/src/main/resources/com/twelvemonkeys/net/MIMEUtil.properties diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/CompoundReaderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/FastByteArrayOutputStreamTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/FileCacheSeekableStreamTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/FileSeekableStreamTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/InputStreamAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/MemoryCacheSeekableStreamTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/OutputStreamAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/ReaderAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInputStreamAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java b/common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/SeekableInterfaceTest.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/StringArrayReaderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64DecoderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/Base64EncoderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/DecoderAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/EncoderAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsDecoderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/enc/PackBitsEncoderTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/io/ole2/CompoundDocumentTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java b/common/common-io/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java rename to common/common-io/src/test/java/com/twelvemonkeys/net/NetUtilTestCase.java diff --git a/twelvemonkeys-core/src/test/resources/Thumbs-camera.db b/common/common-io/src/test/resources/Thumbs-camera.db similarity index 100% rename from twelvemonkeys-core/src/test/resources/Thumbs-camera.db rename to common/common-io/src/test/resources/Thumbs-camera.db diff --git a/common/common-lang/pom.xml b/common/common-lang/pom.xml new file mode 100644 index 00000000..f143ecb9 --- /dev/null +++ b/common/common-lang/pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + com.twelvemonkeys.common + common + 3.0-SNAPSHOT + + common-lang + jar + TwelveMonkeys :: Common :: Language support + + The TwelveMonkeys Common Language support + + + diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/BeanUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/BeanUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/BeanUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/DateUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/DateUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/DateUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/ExceptionUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/MathUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/MathUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/MathUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/MathUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Platform.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/ReflectUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/StringUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/StringUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/StringUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/SystemUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/SystemUtil.java similarity index 96% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/SystemUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/SystemUtil.java index 65d8d8ea..8f3712e4 100644 --- a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/SystemUtil.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/lang/SystemUtil.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.lang; -import com.twelvemonkeys.util.XMLProperties; +//import com.twelvemonkeys.util.XMLProperties; import java.io.*; import java.lang.reflect.Array; @@ -414,13 +414,13 @@ public final class SystemUtil { throw new IllegalArgumentException("InputStream == null!"); } - Properties mapping; - if (pInput instanceof XMLPropertiesInputStream) { + Properties mapping = new Properties(); + /*if (pInput instanceof XMLPropertiesInputStream) { mapping = new XMLProperties(); } else { mapping = new Properties(); - } + }*/ // Load the properties mapping.load(pInput); diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Validate.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/Validate.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/Validate.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/Validate.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/lang/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/lang/package_info.java rename to common/common-lang/src/main/java/com/twelvemonkeys/lang/package_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractDecoratedMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractResource.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractResource.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractResource.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/AbstractTokenIterator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BeanMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/BeanMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BeanMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/BeanMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BooleanKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/BooleanKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/BooleanKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/CollectionUtil.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/CollectionUtil.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/CollectionUtil.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/CollectionUtil.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/DuplicateHandler.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ExpiringMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ExpiringMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ExpiringMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ExpiringMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FileResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FileResource.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FileResource.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FileResource.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FilterIterator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FilterIterator.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FilterIterator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FloatKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/FloatKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/FloatKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/IgnoreCaseMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IntegerKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/IntegerKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/IntegerKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUHashMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUHashMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LRUHashMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LRUMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LRUMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedSet.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedSet.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/LinkedSet.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/LinkedSet.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/NullMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/NullMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/NullMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/NullMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/PaintKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/PaintKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/PaintKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Rectangle2DKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Resource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Resource.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Resource.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Resource.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceChangeListener.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/ResourceMonitor.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringKey.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringKey.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/StringKey.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/StringTokenIterator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Time.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Time.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Time.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Time.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeFormat.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TimeFormat.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeFormat.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TimeFormat.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeoutMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TimeoutMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TimeoutMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TimeoutMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TokenIterator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TokenIterator.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TokenIterator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TypedMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/TypedMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/TypedMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/URLResource.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/URLResource.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/URLResource.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/URLResource.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Visitor.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/Visitor.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/Visitor.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/Visitor.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/WeakWeakMap.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConversionException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/Converter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/Converter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/Converter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/Converter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/ConverterImpl.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DateConverter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/DefaultConverter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/MissingTypeException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NoAvailableConverterException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/PropertyConverter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TimeConverter.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/TypeMismathException.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/convert/pacakge_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/package_info.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/package_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/RegExTokenIterator.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/WildcardStringParser.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/regex/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/regex/package_info.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/regex/package_info.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/RegisterableService.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceConfigurationError.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/ServiceRegistry.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/package_info.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/service/package_info.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/service/package_info.java rename to common/common-lang/src/main/java/com/twelvemonkeys/util/service/package_info.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/ObjectAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/lang/StringUtilTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/BeanMapTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/CollectionAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/LRUMapTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/LinkedMapTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/MapAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/NullMapTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/ObjectAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/SetAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/StringTokenIteratorTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/TimeoutMapTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/TokenIteratorAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/ConverterTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DateConverterTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/DefaultConverterTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/NumberConverterTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/PropertyConverterAbstractTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/convert/TimeConverterTestCase.java diff --git a/twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java similarity index 100% rename from twelvemonkeys-core/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java rename to common/common-lang/src/test/java/com/twelvemonkeys/util/regex/RegExTokenIteratorTestCase.java diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 00000000..f995ea5e --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,63 @@ + + + 4.0.0 + + com.twelvemonkeys + twelvemonkeys-parent + 3.0-SNAPSHOT + + com.twelvemonkeys.common + common + pom + TwelveMonkeys :: Common + + The TwelveMonkeys Common library. Contains common utility classes. + + + + common-io + common-lang + common-image + + + + + + + ${project.groupId} + common-lang + ${project.version} + + + ${project.groupId} + common-lang + ${project.version} + tests + test + + + ${project.groupId} + common-io + ${project.version} + + + + + + junit + junit + 4.7 + test + + + + jmock + jmock-cglib + 1.0.1 + test + + + + diff --git a/twelvemonkeys-imageio/batik/license.txt b/imageio/imageio-batik/license.txt similarity index 100% rename from twelvemonkeys-imageio/batik/license.txt rename to imageio/imageio-batik/license.txt diff --git a/twelvemonkeys-imageio/batik/pom.xml b/imageio/imageio-batik/pom.xml similarity index 80% rename from twelvemonkeys-imageio/batik/pom.xml rename to imageio/imageio-batik/pom.xml index 8af053d9..404d2122 100644 --- a/twelvemonkeys-imageio/batik/pom.xml +++ b/imageio/imageio-batik/pom.xml @@ -3,9 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-batik - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-batik + TwelveMonkeys ImageIO Batik Plugin - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests @@ -65,4 +62,4 @@ - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderSpi.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriterSpi.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMF.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java diff --git a/twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java b/imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java rename to imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi similarity index 100% rename from twelvemonkeys-imageio/batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi rename to imageio/imageio-batik/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi diff --git a/twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java b/imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java rename to imageio/imageio-batik/src/test/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/batik/src/test/resources/svg/batikLogo.svg b/imageio/imageio-batik/src/test/resources/svg/batikLogo.svg similarity index 100% rename from twelvemonkeys-imageio/batik/src/test/resources/svg/batikLogo.svg rename to imageio/imageio-batik/src/test/resources/svg/batikLogo.svg diff --git a/twelvemonkeys-imageio/batik/src/test/resources/wmf/test.wmf b/imageio/imageio-batik/src/test/resources/wmf/test.wmf similarity index 100% rename from twelvemonkeys-imageio/batik/src/test/resources/wmf/test.wmf rename to imageio/imageio-batik/src/test/resources/wmf/test.wmf diff --git a/twelvemonkeys-imageio/core/license.txt b/imageio/imageio-core/license.txt similarity index 100% rename from twelvemonkeys-imageio/core/license.txt rename to imageio/imageio-core/license.txt diff --git a/twelvemonkeys-imageio/core/pom.xml b/imageio/imageio-core/pom.xml similarity index 55% rename from twelvemonkeys-imageio/core/pom.xml rename to imageio/imageio-core/pom.xml index 98518220..86705354 100644 --- a/twelvemonkeys-imageio/core/pom.xml +++ b/imageio/imageio-core/pom.xml @@ -3,14 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-core TwelveMonkeys ImageIO Core - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageReaderBase.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/ImageWriterBase.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/ProviderInfo.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/package-info.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/package-info.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/spi/package-info.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/spi/package-info.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStream.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStream.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamSpi.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStream.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStream.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStream.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStream.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/URLImageInputStreamSpi.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/package-info.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/package-info.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/stream/package-info.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/package-info.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapter.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOOutputStreamAdapter.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IIOUtil.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifier.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ProgressListenerBase.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/ReaderFileSuffixFilter.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/WriterFileSuffixFilter.java diff --git a/twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/package-info.java b/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/package-info.java similarity index 100% rename from twelvemonkeys-imageio/core/src/main/java/com/twelvemonkeys/imageio/util/package-info.java rename to imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/util/package-info.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/spi/ProviderInfoTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/BufferedImageInputStreamTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/ByteArrayImageInputStreamTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IIOInputStreamAdapterTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageReaderAbstractTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/ImageWriterAbstractTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java similarity index 100% rename from twelvemonkeys-imageio/core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/util/IndexedImageTypeSpecifierTestCase.java diff --git a/twelvemonkeys-imageio/core/src/test/resources/Thumbs-camera.db b/imageio/imageio-core/src/test/resources/Thumbs-camera.db similarity index 100% rename from twelvemonkeys-imageio/core/src/test/resources/Thumbs-camera.db rename to imageio/imageio-core/src/test/resources/Thumbs-camera.db diff --git a/twelvemonkeys-imageio/core/todo.txt b/imageio/imageio-core/todo.txt similarity index 100% rename from twelvemonkeys-imageio/core/todo.txt rename to imageio/imageio-core/todo.txt diff --git a/twelvemonkeys-imageio/ico/license.txt b/imageio/imageio-ico/license.txt similarity index 100% rename from twelvemonkeys-imageio/ico/license.txt rename to imageio/imageio-ico/license.txt diff --git a/twelvemonkeys-imageio/ico/pom.xml b/imageio/imageio-ico/pom.xml similarity index 63% rename from twelvemonkeys-imageio/ico/pom.xml rename to imageio/imageio-ico/pom.xml index c12aca26..8c3ffa9b 100644 --- a/twelvemonkeys-imageio/ico/pom.xml +++ b/imageio/imageio-ico/pom.xml @@ -3,27 +3,24 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-ico - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-ico TwelveMonkeys ImageIO ICO plugin ImageIO plugin for Windows Icon (ICO) and Cursor (CUR) format. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapDescriptor.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapIndexed.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapMask.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapRGB.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/BitmapUnsupported.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReader.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderSpi.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIB.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DIBHeader.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/Directory.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/DirectoryEntry.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReader.java diff --git a/twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java b/imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java rename to imageio/imageio-ico/src/main/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderSpi.java diff --git a/twelvemonkeys-imageio/ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-ico/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java b/imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java rename to imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/CURImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java b/imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java rename to imageio/imageio-ico/src/test/java/com/twelvemonkeys/imageio/plugins/ico/ICOImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/ico/src/test/resources/cur/hand.cur b/imageio/imageio-ico/src/test/resources/cur/hand.cur similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/cur/hand.cur rename to imageio/imageio-ico/src/test/resources/cur/hand.cur diff --git a/twelvemonkeys-imageio/ico/src/test/resources/cur/zoom.cur b/imageio/imageio-ico/src/test/resources/cur/zoom.cur similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/cur/zoom.cur rename to imageio/imageio-ico/src/test/resources/cur/zoom.cur diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/JavaCup.ico b/imageio/imageio-ico/src/test/resources/ico/JavaCup.ico similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/ico/JavaCup.ico rename to imageio/imageio-ico/src/test/resources/ico/JavaCup.ico diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/colors.ico b/imageio/imageio-ico/src/test/resources/ico/colors.ico similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/ico/colors.ico rename to imageio/imageio-ico/src/test/resources/ico/colors.ico diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/down.ico b/imageio/imageio-ico/src/test/resources/ico/down.ico similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/ico/down.ico rename to imageio/imageio-ico/src/test/resources/ico/down.ico diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/favicon.ico b/imageio/imageio-ico/src/test/resources/ico/favicon.ico similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/ico/favicon.ico rename to imageio/imageio-ico/src/test/resources/ico/favicon.ico diff --git a/twelvemonkeys-imageio/ico/src/test/resources/ico/joypad.ico b/imageio/imageio-ico/src/test/resources/ico/joypad.ico similarity index 100% rename from twelvemonkeys-imageio/ico/src/test/resources/ico/joypad.ico rename to imageio/imageio-ico/src/test/resources/ico/joypad.ico diff --git a/twelvemonkeys-imageio/ico/todo.txt b/imageio/imageio-ico/todo.txt similarity index 100% rename from twelvemonkeys-imageio/ico/todo.txt rename to imageio/imageio-ico/todo.txt diff --git a/twelvemonkeys-imageio/iff/license.txt b/imageio/imageio-iff/license.txt similarity index 100% rename from twelvemonkeys-imageio/iff/license.txt rename to imageio/imageio-iff/license.txt diff --git a/twelvemonkeys-imageio/iff/pom.xml b/imageio/imageio-iff/pom.xml similarity index 69% rename from twelvemonkeys-imageio/iff/pom.xml rename to imageio/imageio-iff/pom.xml index 9e5da886..f2049765 100644 --- a/twelvemonkeys-imageio/iff/pom.xml +++ b/imageio/imageio-iff/pom.xml @@ -3,30 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + twelvemonkeys-imageio-iff - 2.3 TwelveMonkeys ImageIO IFF plugin ImageIO plugin for Amiga/Electronic Arts Interchange Filed Format (IFF) type ILBM and PBM format. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BMHDChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/BODYChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CAMGChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/CMAPChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GRABChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/GenericChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFF.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFChunk.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriter.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageWriterSpi.java diff --git a/twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java rename to imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFUtil.java diff --git a/twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi similarity index 100% rename from twelvemonkeys-imageio/iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi rename to imageio/imageio-iff/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi diff --git a/twelvemonkeys-imageio/iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java rename to imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM6.IFF b/imageio/imageio-iff/src/test/resources/iff/A4000T_HAM6.IFF similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM6.IFF rename to imageio/imageio-iff/src/test/resources/iff/A4000T_HAM6.IFF diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM8.IFF b/imageio/imageio-iff/src/test/resources/iff/A4000T_HAM8.IFF similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/A4000T_HAM8.IFF rename to imageio/imageio-iff/src/test/resources/iff/A4000T_HAM8.IFF diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/Abyss.iff b/imageio/imageio-iff/src/test/resources/iff/Abyss.iff similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/Abyss.iff rename to imageio/imageio-iff/src/test/resources/iff/Abyss.iff diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaAmiga.iff b/imageio/imageio-iff/src/test/resources/iff/AmigaAmiga.iff similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaAmiga.iff rename to imageio/imageio-iff/src/test/resources/iff/AmigaAmiga.iff diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaBig.iff b/imageio/imageio-iff/src/test/resources/iff/AmigaBig.iff similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/AmigaBig.iff rename to imageio/imageio-iff/src/test/resources/iff/AmigaBig.iff diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/survivor.iff b/imageio/imageio-iff/src/test/resources/iff/survivor.iff similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/survivor.iff rename to imageio/imageio-iff/src/test/resources/iff/survivor.iff diff --git a/twelvemonkeys-imageio/iff/src/test/resources/iff/test.iff b/imageio/imageio-iff/src/test/resources/iff/test.iff similarity index 100% rename from twelvemonkeys-imageio/iff/src/test/resources/iff/test.iff rename to imageio/imageio-iff/src/test/resources/iff/test.iff diff --git a/twelvemonkeys-imageio/iff/todo.txt b/imageio/imageio-iff/todo.txt similarity index 100% rename from twelvemonkeys-imageio/iff/todo.txt rename to imageio/imageio-iff/todo.txt diff --git a/twelvemonkeys-imageio/jmagick/license.txt b/imageio/imageio-jmagick/license.txt similarity index 100% rename from twelvemonkeys-imageio/jmagick/license.txt rename to imageio/imageio-jmagick/license.txt diff --git a/twelvemonkeys-imageio/jmagick/pom.xml b/imageio/imageio-jmagick/pom.xml similarity index 74% rename from twelvemonkeys-imageio/jmagick/pom.xml rename to imageio/imageio-jmagick/pom.xml index ac203146..e2c9affb 100644 --- a/twelvemonkeys-imageio/jmagick/pom.xml +++ b/imageio/imageio-jmagick/pom.xml @@ -3,9 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + twelvemonkeys-imageio-jmagick - 2.2 TwelveMonkeys ImageIO JMagick Plugin - - twelvemonkeys-imageio - com.twelvemonkeys - 2.2 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests @@ -38,4 +35,4 @@ - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/GIFImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/ICOImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagick.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderSpiSupport.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageWriterSpiSupport.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEG2KImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/JPEGImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCDImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PCXImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PDBImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNGImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PNMImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/PSDImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/SWFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TIFFImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/TargaImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WBMPImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/WMFImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XBMImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReader.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageReaderSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriter.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/XPMImageWriterSpi.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java b/imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java rename to imageio/imageio-jmagick/src/main/java/com/twelvemonkeys/imageio/plugins/jmagick/package_info.java diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi rename to imageio/imageio-jmagick/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi diff --git a/twelvemonkeys-imageio/jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties b/imageio/imageio-jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties rename to imageio/imageio-jmagick/src/main/resources/com/twelvemonkeys/imageio/plugins/jmagick/JMagickReader.properties diff --git a/twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java b/imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java rename to imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/BMPImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java b/imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java rename to imageio/imageio-jmagick/src/test/java/com/twelvemonkeys/imageio/plugins/jmagick/JMagickImageReaderAbstractTestCase.java diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/Blue Lace 16.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/Blue Lace 16.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/Blue Lace 16.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/Blue Lace 16.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask444.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask555.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_16_bitmask565.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_24.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_24.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_24.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_24.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_32_bitmask888_reversed.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4-IM.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.rle b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.rle similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_4.rle rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_4.rle diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8-IM.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.rle b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.rle similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_8.rle rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_8.rle diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_gray.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_gray.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_gray.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_gray.bmp diff --git a/twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_mono.bmp b/imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_mono.bmp similarity index 100% rename from twelvemonkeys-imageio/jmagick/src/test/resources/bmp/blauesglas_mono.bmp rename to imageio/imageio-jmagick/src/test/resources/bmp/blauesglas_mono.bmp diff --git a/twelvemonkeys-imageio/jmagick/todo.txt b/imageio/imageio-jmagick/todo.txt similarity index 100% rename from twelvemonkeys-imageio/jmagick/todo.txt rename to imageio/imageio-jmagick/todo.txt diff --git a/twelvemonkeys-imageio/metadata/pom.xml b/imageio/imageio-metadata/pom.xml similarity index 64% rename from twelvemonkeys-imageio/metadata/pom.xml rename to imageio/imageio-metadata/pom.xml index e631f762..17fe3865 100644 --- a/twelvemonkeys-imageio/metadata/pom.xml +++ b/imageio/imageio-metadata/pom.xml @@ -2,29 +2,26 @@ + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-metadata - 2.3 + imageio-metadata TwelveMonkeys ImageIO Metadata ImageIO metadata module. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractDirectory.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractDirectory.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractDirectory.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractDirectory.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractEntry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractEntry.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractEntry.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/AbstractEntry.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Directory.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Directory.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Directory.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Directory.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Entry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Entry.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Entry.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/Entry.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/MetadataReader.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/MetadataReader.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/MetadataReader.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/MetadataReader.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIF.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFDirectory.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFDirectory.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFDirectory.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFDirectory.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFEntry.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/EXIFReader.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/Rational.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/Rational.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/Rational.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/Rational.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/TIFF.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTC.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTC.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTC.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTC.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCDirectory.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCDirectory.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCDirectory.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCDirectory.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCEntry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCEntry.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCEntry.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCEntry.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCReader.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCReader.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCReader.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/iptc/IPTCReader.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMP.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMP.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMP.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMP.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPDirectory.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPDirectory.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPDirectory.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPDirectory.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPEntry.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPEntry.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPEntry.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPEntry.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPNamespaceMapping.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPNamespaceMapping.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPNamespaceMapping.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPNamespaceMapping.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPReader.java diff --git a/twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScanner.java b/imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScanner.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScanner.java rename to imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScanner.java diff --git a/twelvemonkeys-imageio/metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/RationalTestCase.java b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/RationalTestCase.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/RationalTestCase.java rename to imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/exif/RationalTestCase.java diff --git a/twelvemonkeys-imageio/metadata/src/test/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScannerTestCase.java b/imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScannerTestCase.java similarity index 100% rename from twelvemonkeys-imageio/metadata/src/test/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScannerTestCase.java rename to imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/xmp/XMPScannerTestCase.java diff --git a/twelvemonkeys-imageio/pdf/license.txt b/imageio/imageio-pdf/license.txt similarity index 100% rename from twelvemonkeys-imageio/pdf/license.txt rename to imageio/imageio-pdf/license.txt diff --git a/twelvemonkeys-imageio/pdf/pom.xml b/imageio/imageio-pdf/pom.xml similarity index 63% rename from twelvemonkeys-imageio/pdf/pom.xml rename to imageio/imageio-pdf/pom.xml index a5d73622..396be84c 100644 --- a/twelvemonkeys-imageio/pdf/pom.xml +++ b/imageio/imageio-pdf/pom.xml @@ -3,29 +3,27 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-pdf - 2.2 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-pdf TwelveMonkeys ImageIO PDF plugin ImageIO plugin for Adobe Portable Document Format (PDF). - - twelvemonkeys-imageio - com.twelvemonkeys - 2.2 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/pdf/todo.txt b/imageio/imageio-pdf/todo.txt similarity index 100% rename from twelvemonkeys-imageio/pdf/todo.txt rename to imageio/imageio-pdf/todo.txt diff --git a/twelvemonkeys-imageio/pict/license.txt b/imageio/imageio-pict/license.txt similarity index 100% rename from twelvemonkeys-imageio/pict/license.txt rename to imageio/imageio-pict/license.txt diff --git a/twelvemonkeys-imageio/pict/pom.xml b/imageio/imageio-pict/pom.xml similarity index 63% rename from twelvemonkeys-imageio/pict/pom.xml rename to imageio/imageio-pict/pom.xml index a87dad35..4f000aaf 100644 --- a/twelvemonkeys-imageio/pict/pom.xml +++ b/imageio/imageio-pict/pom.xml @@ -3,27 +3,25 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-pict - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-pict TwelveMonkeys ImageIO PICT plugin ImageIO plugin for Apple Mac Paint Picture (PICT) format. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - \ No newline at end of file + + diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/BitMapPattern.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICT.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderSpi.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriter.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageWriterSpi.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTUtil.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/Pattern.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PenState.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PixMapPattern.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QDTest.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTBMPDecompressor.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTDecompressor.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTGenericDecompressor.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QTRAWDecompressor.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDraw.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickDrawContext.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/QuickTime.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/RGBColor.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTClippingApp.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/TestPICTEagerDetect.java diff --git a/twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp rename to imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/plpictdec.cpp diff --git a/twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi b/imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi similarity index 100% rename from twelvemonkeys-imageio/pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi rename to imageio/imageio-pict/src/main/resources/META-INF/services/javax.imageio.spi.ImageWriterSpi diff --git a/twelvemonkeys-imageio/pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java rename to imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/pict/src/test/resources/jpeg/R-7439-1151526181.jpeg b/imageio/imageio-pict/src/test/resources/jpeg/R-7439-1151526181.jpeg similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/jpeg/R-7439-1151526181.jpeg rename to imageio/imageio-pict/src/test/resources/jpeg/R-7439-1151526181.jpeg diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/1.pict b/imageio/imageio-pict/src/test/resources/pict/1.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/1.pict rename to imageio/imageio-pict/src/test/resources/pict/1.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/16bit.pict b/imageio/imageio-pict/src/test/resources/pict/16bit.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/16bit.pict rename to imageio/imageio-pict/src/test/resources/pict/16bit.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/2.pict b/imageio/imageio-pict/src/test/resources/pict/2.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/2.pict rename to imageio/imageio-pict/src/test/resources/pict/2.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/32bit.pict b/imageio/imageio-pict/src/test/resources/pict/32bit.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/32bit.pict rename to imageio/imageio-pict/src/test/resources/pict/32bit.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/4.pict b/imageio/imageio-pict/src/test/resources/pict/4.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/4.pict rename to imageio/imageio-pict/src/test/resources/pict/4.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/5.pict b/imageio/imageio-pict/src/test/resources/pict/5.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/5.pict rename to imageio/imageio-pict/src/test/resources/pict/5.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/6.pict b/imageio/imageio-pict/src/test/resources/pict/6.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/6.pict rename to imageio/imageio-pict/src/test/resources/pict/6.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/7.pict b/imageio/imageio-pict/src/test/resources/pict/7.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/7.pict rename to imageio/imageio-pict/src/test/resources/pict/7.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/8.pict b/imageio/imageio-pict/src/test/resources/pict/8.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/8.pict rename to imageio/imageio-pict/src/test/resources/pict/8.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/9.pict b/imageio/imageio-pict/src/test/resources/pict/9.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/9.pict rename to imageio/imageio-pict/src/test/resources/pict/9.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/BLK.PCT b/imageio/imageio-pict/src/test/resources/pict/BLK.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/BLK.PCT rename to imageio/imageio-pict/src/test/resources/pict/BLK.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/BLU.PCT b/imageio/imageio-pict/src/test/resources/pict/BLU.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/BLU.PCT rename to imageio/imageio-pict/src/test/resources/pict/BLU.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/EDUC0052.pict b/imageio/imageio-pict/src/test/resources/pict/EDUC0052.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/EDUC0052.pict rename to imageio/imageio-pict/src/test/resources/pict/EDUC0052.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/FLAG_B24.PCT b/imageio/imageio-pict/src/test/resources/pict/FLAG_B24.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/FLAG_B24.PCT rename to imageio/imageio-pict/src/test/resources/pict/FLAG_B24.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/GRN.PCT b/imageio/imageio-pict/src/test/resources/pict/GRN.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/GRN.PCT rename to imageio/imageio-pict/src/test/resources/pict/GRN.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/MARBLES.PCT b/imageio/imageio-pict/src/test/resources/pict/MARBLES.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/MARBLES.PCT rename to imageio/imageio-pict/src/test/resources/pict/MARBLES.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/RED.PCT b/imageio/imageio-pict/src/test/resources/pict/RED.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/RED.PCT rename to imageio/imageio-pict/src/test/resources/pict/RED.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/TRU256.PCT b/imageio/imageio-pict/src/test/resources/pict/TRU256.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/TRU256.PCT rename to imageio/imageio-pict/src/test/resources/pict/TRU256.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/VENUS.PCT b/imageio/imageio-pict/src/test/resources/pict/VENUS.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/VENUS.PCT rename to imageio/imageio-pict/src/test/resources/pict/VENUS.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/WHT.PCT b/imageio/imageio-pict/src/test/resources/pict/WHT.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/WHT.PCT rename to imageio/imageio-pict/src/test/resources/pict/WHT.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/YEL.PCT b/imageio/imageio-pict/src/test/resources/pict/YEL.PCT similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/YEL.PCT rename to imageio/imageio-pict/src/test/resources/pict/YEL.PCT diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/carte.pict b/imageio/imageio-pict/src/test/resources/pict/carte.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/carte.pict rename to imageio/imageio-pict/src/test/resources/pict/carte.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/demo.pict b/imageio/imageio-pict/src/test/resources/pict/demo.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/demo.pict rename to imageio/imageio-pict/src/test/resources/pict/demo.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/foo.pict b/imageio/imageio-pict/src/test/resources/pict/foo.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/foo.pict rename to imageio/imageio-pict/src/test/resources/pict/foo.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/food.pct b/imageio/imageio-pict/src/test/resources/pict/food.pct similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/food.pct rename to imageio/imageio-pict/src/test/resources/pict/food.pct diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/mire16.pict b/imageio/imageio-pict/src/test/resources/pict/mire16.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/mire16.pict rename to imageio/imageio-pict/src/test/resources/pict/mire16.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/mire32.pict b/imageio/imageio-pict/src/test/resources/pict/mire32.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/mire32.pict rename to imageio/imageio-pict/src/test/resources/pict/mire32.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/oom.pict b/imageio/imageio-pict/src/test/resources/pict/oom.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/oom.pict rename to imageio/imageio-pict/src/test/resources/pict/oom.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_bmp.pict b/imageio/imageio-pict/src/test/resources/pict/qt_bmp.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_bmp.pict rename to imageio/imageio-pict/src/test/resources/pict/qt_bmp.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_jpeg.pict b/imageio/imageio-pict/src/test/resources/pict/qt_jpeg.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_jpeg.pict rename to imageio/imageio-pict/src/test/resources/pict/qt_jpeg.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_mire.pict b/imageio/imageio-pict/src/test/resources/pict/qt_mire.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_mire.pict rename to imageio/imageio-pict/src/test/resources/pict/qt_mire.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_png.pict b/imageio/imageio-pict/src/test/resources/pict/qt_png.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_png.pict rename to imageio/imageio-pict/src/test/resources/pict/qt_png.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/qt_tiff.pict b/imageio/imageio-pict/src/test/resources/pict/qt_tiff.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/qt_tiff.pict rename to imageio/imageio-pict/src/test/resources/pict/qt_tiff.pict diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/test.pct b/imageio/imageio-pict/src/test/resources/pict/test.pct similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/test.pct rename to imageio/imageio-pict/src/test/resources/pict/test.pct diff --git a/twelvemonkeys-imageio/pict/src/test/resources/pict/u2.pict b/imageio/imageio-pict/src/test/resources/pict/u2.pict similarity index 100% rename from twelvemonkeys-imageio/pict/src/test/resources/pict/u2.pict rename to imageio/imageio-pict/src/test/resources/pict/u2.pict diff --git a/twelvemonkeys-imageio/psd/license.txt b/imageio/imageio-psd/license.txt similarity index 100% rename from twelvemonkeys-imageio/psd/license.txt rename to imageio/imageio-psd/license.txt diff --git a/twelvemonkeys-imageio/psd/pom.xml b/imageio/imageio-psd/pom.xml similarity index 64% rename from twelvemonkeys-imageio/psd/pom.xml rename to imageio/imageio-psd/pom.xml index 89402e48..fa868416 100644 --- a/twelvemonkeys-imageio/psd/pom.xml +++ b/imageio/imageio-psd/pom.xml @@ -1,35 +1,32 @@ - - - 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-psd - 2.3 - TwelveMonkeys ImageIO PSD plugin - - ImageIO plugin for Adobe Photoshop Document (PSD). - - - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 + + + 4.0.0 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT - - - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-psd + TwelveMonkeys ImageIO PSD plugin + + ImageIO plugin for Adobe Photoshop Document (PSD). + + + + + com.twelvemonkeys.imageio + imageio-core + + + com.twelvemonkeys.imageio + imageio-core + tests com.twelvemonkeys.imageio - twelvemonkeys-imageio-core - tests - - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-metadata + imageio-metadata diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/AbstractMetadata.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/AbstractMetadata.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/AbstractMetadata.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/AbstractMetadata.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/CMYKColorSpace.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/ICCProfile.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSD.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDAlphaChannelInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDChannelSourceDestinationRange.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDColorData.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDDisplayInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDEXIF1Data.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGlobalLayerMask.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGridAndGuideInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGridAndGuideInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGridAndGuideInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDGridAndGuideInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDHeader.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDIPTCData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDIPTCData.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDIPTCData.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDIPTCData.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderSpi.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerBlendMode.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDLayerMaskData.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadataFormat.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPixelAspectRatio.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPixelAspectRatio.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPixelAspectRatio.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPixelAspectRatio.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintScale.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintScale.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintScale.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintScale.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDResolutionInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDThumbnail.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUnicodeAlphaNames.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUnicodeAlphaNames.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUnicodeAlphaNames.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUnicodeAlphaNames.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDUtil.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDVersionInfo.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDXMPData.java diff --git a/twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java b/imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java rename to imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/YCbCrColorSpace.java diff --git a/twelvemonkeys-imageio/psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-psd/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java b/imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java rename to imageio/imageio-psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/AlphaChannelSample_720x480.psd b/imageio/imageio-psd/src/test/resources/psd/AlphaChannelSample_720x480.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/AlphaChannelSample_720x480.psd rename to imageio/imageio-psd/src/test/resources/psd/AlphaChannelSample_720x480.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/MARBLES.PSD b/imageio/imageio-psd/src/test/resources/psd/MARBLES.PSD similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/MARBLES.PSD rename to imageio/imageio-psd/src/test/resources/psd/MARBLES.PSD diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/buttons.psd b/imageio/imageio-psd/src/test/resources/psd/buttons.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/buttons.psd rename to imageio/imageio-psd/src/test/resources/psd/buttons.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/circles.psd b/imageio/imageio-psd/src/test/resources/psd/circles.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/circles.psd rename to imageio/imageio-psd/src/test/resources/psd/circles.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_16bits.psd b/imageio/imageio-psd/src/test/resources/psd/cmyk_16bits.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_16bits.psd rename to imageio/imageio-psd/src/test/resources/psd/cmyk_16bits.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_8bits.psd b/imageio/imageio-psd/src/test/resources/psd/cmyk_8bits.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/cmyk_8bits.psd rename to imageio/imageio-psd/src/test/resources/psd/cmyk_8bits.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/coral_fish.psd b/imageio/imageio-psd/src/test/resources/psd/coral_fish.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/coral_fish.psd rename to imageio/imageio-psd/src/test/resources/psd/coral_fish.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/escenic-liquid-logo.psd b/imageio/imageio-psd/src/test/resources/psd/escenic-liquid-logo.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/escenic-liquid-logo.psd rename to imageio/imageio-psd/src/test/resources/psd/escenic-liquid-logo.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/jugware-icon.psd b/imageio/imageio-psd/src/test/resources/psd/jugware-icon.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/jugware-icon.psd rename to imageio/imageio-psd/src/test/resources/psd/jugware-icon.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/photoshopping.psd b/imageio/imageio-psd/src/test/resources/psd/photoshopping.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/photoshopping.psd rename to imageio/imageio-psd/src/test/resources/psd/photoshopping.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_bitmap.psd b/imageio/imageio-psd/src/test/resources/psd/test_bitmap.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_bitmap.psd rename to imageio/imageio-psd/src/test/resources/psd/test_bitmap.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray.psd b/imageio/imageio-psd/src/test/resources/psd/test_gray.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray.psd rename to imageio/imageio-psd/src/test/resources/psd/test_gray.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray16.psd b/imageio/imageio-psd/src/test/resources/psd/test_gray16.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_gray16.psd rename to imageio/imageio-psd/src/test/resources/psd/test_gray16.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_indexed.psd b/imageio/imageio-psd/src/test/resources/psd/test_indexed.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_indexed.psd rename to imageio/imageio-psd/src/test/resources/psd/test_indexed.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psb b/imageio/imageio-psd/src/test/resources/psd/test_original.psb similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psb rename to imageio/imageio-psd/src/test/resources/psd/test_original.psb diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psd b/imageio/imageio-psd/src/test/resources/psd/test_original.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/test_original.psd rename to imageio/imageio-psd/src/test/resources/psd/test_original.psd diff --git a/twelvemonkeys-imageio/psd/src/test/resources/psd/transp.psd b/imageio/imageio-psd/src/test/resources/psd/transp.psd similarity index 100% rename from twelvemonkeys-imageio/psd/src/test/resources/psd/transp.psd rename to imageio/imageio-psd/src/test/resources/psd/transp.psd diff --git a/twelvemonkeys-imageio/psd/todo.txt b/imageio/imageio-psd/todo.txt similarity index 100% rename from twelvemonkeys-imageio/psd/todo.txt rename to imageio/imageio-psd/todo.txt diff --git a/twelvemonkeys-imageio/reference/license.txt b/imageio/imageio-reference/license.txt similarity index 100% rename from twelvemonkeys-imageio/reference/license.txt rename to imageio/imageio-reference/license.txt diff --git a/twelvemonkeys-imageio/reference/pom.xml b/imageio/imageio-reference/pom.xml similarity index 63% rename from twelvemonkeys-imageio/reference/pom.xml rename to imageio/imageio-reference/pom.xml index 60d56d3e..bca41630 100644 --- a/twelvemonkeys-imageio/reference/pom.xml +++ b/imageio/imageio-reference/pom.xml @@ -3,29 +3,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-reference - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-reference TwelveMonkeys ImageIO reference test cases Test cases for the JDK provided ImageReader implementations for reference. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - + - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/JPEGImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java b/imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java rename to imageio/imageio-reference/src/test/java/com/twelvemonkeys/imageio/reference/PNGImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/reference/src/test/resources/jpeg/R-7439-1151526181.jpeg b/imageio/imageio-reference/src/test/resources/jpeg/R-7439-1151526181.jpeg similarity index 100% rename from twelvemonkeys-imageio/reference/src/test/resources/jpeg/R-7439-1151526181.jpeg rename to imageio/imageio-reference/src/test/resources/jpeg/R-7439-1151526181.jpeg diff --git a/twelvemonkeys-imageio/reference/src/test/resources/png/12monkeys-splash.png b/imageio/imageio-reference/src/test/resources/png/12monkeys-splash.png similarity index 100% rename from twelvemonkeys-imageio/reference/src/test/resources/png/12monkeys-splash.png rename to imageio/imageio-reference/src/test/resources/png/12monkeys-splash.png diff --git a/twelvemonkeys-imageio/thumbsdb/license.txt b/imageio/imageio-thumbsdb/license.txt similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/license.txt rename to imageio/imageio-thumbsdb/license.txt diff --git a/twelvemonkeys-imageio/thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml similarity index 63% rename from twelvemonkeys-imageio/thumbsdb/pom.xml rename to imageio/imageio-thumbsdb/pom.xml index b4d28f53..a7191c62 100644 --- a/twelvemonkeys-imageio/thumbsdb/pom.xml +++ b/imageio/imageio-thumbsdb/pom.xml @@ -3,29 +3,26 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.twelvemonkeys.imageio - twelvemonkeys-imageio-thumbsdb - 2.3 + + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + + imageio-thumbsdb TwelveMonkeys ImageIO Thumbs.db plugin ImageIO plugin for Windows Thumbs DB (Thumbs.db) format. - - twelvemonkeys-imageio - com.twelvemonkeys - 2.3 - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core com.twelvemonkeys.imageio - twelvemonkeys-imageio-core + imageio-core tests - \ No newline at end of file + diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/Catalog.java diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReader.java diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java b/imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java rename to imageio/imageio-thumbsdb/src/main/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderSpi.java diff --git a/twelvemonkeys-imageio/thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi b/imageio/imageio-thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi rename to imageio/imageio-thumbsdb/src/main/resources/META-INF/services/javax.imageio.spi.ImageReaderSpi diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java b/imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java rename to imageio/imageio-thumbsdb/src/test/java/com/twelvemonkeys/imageio/plugins/thumbsdb/ThumbsDBImageReaderTestCase.java diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db b/imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db rename to imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs-camera.db diff --git a/twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs.db b/imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs.db similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/src/test/resources/thumbsdb/Thumbs.db rename to imageio/imageio-thumbsdb/src/test/resources/thumbsdb/Thumbs.db diff --git a/twelvemonkeys-imageio/thumbsdb/todo.txt b/imageio/imageio-thumbsdb/todo.txt similarity index 100% rename from twelvemonkeys-imageio/thumbsdb/todo.txt rename to imageio/imageio-thumbsdb/todo.txt diff --git a/imageio/pom.xml b/imageio/pom.xml new file mode 100644 index 00000000..ed39ee7c --- /dev/null +++ b/imageio/pom.xml @@ -0,0 +1,118 @@ + + + + com.twelvemonkeys + twelvemonkeys-parent + 3.0-SNAPSHOT + + 4.0.0 + com.twelvemonkeys.imageio + imageio + 3.0-SNAPSHOT + pom + TwelveMonkeys ImageIO + + + + + Harald Kuhr + harald.kuhr@gmail.com + + owner + developer + + + + + + + imageio-core + imageio-metadata + + + imageio-ico + imageio-iff + imageio-pdf + imageio-pict + imageio-psd + imageio-thumbsdb + + + imageio-batik + imageio-jmagick + + imageio-reference + + + + 3.0-SNAPSHOT + 3.0-SNAPSHOT + + + + + com.twelvemonkeys.common + common-io + ${project.version} + + + com.twelvemonkeys.common + common-image + ${project.version} + + + com.twelvemonkeys.common + common-lang + ${project.version} + tests + test + + + com.twelvemonkeys.common + common-io + ${project.version} + tests + test + + + + + junit + junit + 4.7 + test + + + + jmock + jmock-cglib + 1.0.1 + test + + + + + + + ${project.groupId} + imageio-core + ${project.version} + + + ${project.groupId} + imageio-metadata + ${project.version} + + + + ${project.groupId} + imageio-core + ${project.version} + tests + test + + + + diff --git a/twelvemonkeys-imageio/todo.txt b/imageio/todo.txt similarity index 100% rename from twelvemonkeys-imageio/todo.txt rename to imageio/todo.txt diff --git a/parent-pom.xml b/pom.xml similarity index 78% rename from parent-pom.xml rename to pom.xml index 57581f55..53f43405 100755 --- a/parent-pom.xml +++ b/pom.xml @@ -5,10 +5,17 @@ 4.0.0 com.twelvemonkeys twelvemonkeys-parent - 2.0 + 3.0-SNAPSHOT pom Twelvemonkeys + + common + twelvemonkeys-servlet + imageio + + + harald.kuhr @@ -35,6 +42,27 @@ + + org.apache.maven.plugins + maven-jar-plugin + 2.2 + + + + ${project.name} + TwelveMonkeys + ${project.version} + http://github.com/haraldk/TwelveMonkeys + + + + + + maven-resources-plugin + + UTF-8 + + maven-jar-plugin true diff --git a/public-pom.xml b/public-pom.xml deleted file mode 100755 index 3e911e7d..00000000 --- a/public-pom.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - 4.0.0 - com.twelvemonkeys - twelvemonkeys - 2.0 - pom - Twelvemonkeys public (aggregator) - - - twelvemonkeys-core - twelvemonkeys-servlet - twelvemonkeys-imageio - - - diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ConvolveTester.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ConvolveTester.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ConvolveTester.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ConvolveTester.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/EasyImage.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/EasyImage.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/EasyImage.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/EasyImage.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ExtendedImageConsumer.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ExtendedImageConsumer.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/ExtendedImageConsumer.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/ExtendedImageConsumer.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/SubsampleTester.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/SubsampleTester.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/image/SubsampleTester.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/image/SubsampleTester.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/DeflateEncoder.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/DeflateEncoder.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/DeflateEncoder.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/InflateDecoder.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/InflateDecoder.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/InflateDecoder.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWDecoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWDecoder.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWDecoder.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWDecoder.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWEncoder.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWEncoder.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/io/enc/LZWEncoder.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/io/enc/LZWEncoder.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/MostUnfortunateException.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/MostUnfortunateException.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/MostUnfortunateException.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/MostUnfortunateException.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeLoader.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeLoader.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeLoader.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeLoader.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeResourceSPI.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeResourceSPI.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/lang/NativeResourceSPI.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/lang/NativeResourceSPI.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/DebugUtil.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/DebugUtil.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/DebugUtil.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/DebugUtil.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/regex/REWildcardStringParser.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/regex/REWildcardStringParser.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/util/regex/REWildcardStringParser.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/util/regex/REWildcardStringParser.java diff --git a/twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/xml/XMLReader.java b/sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/xml/XMLReader.java similarity index 100% rename from twelvemonkeys-sandbox/src/main/java/com/twelvemonkeys/xml/XMLReader.java rename to sandbox/common/src/main/java/com/twelvemonkeys/twelvemonkeys/xml/XMLReader.java diff --git a/twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/XMLProperties.java b/sandbox/common/src/main/java/com/twelvemonkeys/util/XMLProperties.java similarity index 100% rename from twelvemonkeys-core/src/main/java/com/twelvemonkeys/util/XMLProperties.java rename to sandbox/common/src/main/java/com/twelvemonkeys/util/XMLProperties.java diff --git a/twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java b/sandbox/common/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java similarity index 100% rename from twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java rename to sandbox/common/src/test/java/com/twelvemonkeys/io/enc/DeflateEncoderTestCase.java diff --git a/twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java b/sandbox/common/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java similarity index 100% rename from twelvemonkeys-sandbox/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java rename to sandbox/common/src/test/java/com/twelvemonkeys/io/enc/InflateDecoderTestCase.java diff --git a/twelvemonkeys-core/pom.xml b/twelvemonkeys-core/pom.xml deleted file mode 100644 index 726b57df..00000000 --- a/twelvemonkeys-core/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - twelvemonkeys-core - com.twelvemonkeys - 2.3 - TwelveMonkeys Core - - The TwelveMonkeys Core library. Contains common utility classes. - - - - com.twelvemonkeys - twelvemonkeys-parent - 2.0 - - - - - jmagick - jmagick - 6.2.4 - provided - true - - - - junit - junit - 4.3.1 - test - - - - jmock - jmock-cglib - 1.0.1 - test - - - - - - - maven-source-plugin - - - - maven-resources-plugin - - UTF-8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - ${project.name} - TwelveMonkeys - ${project.version} - http://github.com/haraldk/TwelveMonkeys - - - - - - - \ No newline at end of file diff --git a/twelvemonkeys-core/todo.txt b/twelvemonkeys-core/todo.txt deleted file mode 100644 index 42ea4984..00000000 --- a/twelvemonkeys-core/todo.txt +++ /dev/null @@ -1,21 +0,0 @@ -- Remove util.BASE64, make clients use io.Base64. - -- Rename core to common? -- Split up into three sub modules? - - common-core - - lang - - util - - common-io - - io - - io.enc - - io.ole2 (or move to separate module?) - - net (or move to separate module?) - - xml (or move to separate module?) - - common-image - - image - - common-sandbox - - all unreleased/experimental stuff - -- Test cases for the OLE2Compound stuff -- Test cases for encoder/decoders -- Test cases in general diff --git a/twelvemonkeys-imageio/pom.xml b/twelvemonkeys-imageio/pom.xml deleted file mode 100644 index ecce69b5..00000000 --- a/twelvemonkeys-imageio/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - 4.0.0 - com.twelvemonkeys - twelvemonkeys-imageio - 2.3 - pom - TwelveMonkeys ImageIO - - - com.twelvemonkeys - twelvemonkeys-parent - 2.0 - - - - - Harald Kuhr - harald.kuhr@gmail.com - - owner - developer - - - - - - - core - metadata - - - ico - iff - pdf - pict - psd - thumbsdb - - - batik - jmagick - - reference - - - - 2.3 - 2.3 - - - - - com.twelvemonkeys - twelvemonkeys-core - ${core.version} - compile - - - com.twelvemonkeys - twelvemonkeys-core - ${core.version} - tests - test - - - - junit - junit - 4.3.1 - test - - - - jmock - jmock-cglib - 1.0.1 - test - - - - - - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core - ${imageio.core.version} - compile - - - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-core - ${imageio.core.version} - tests - test - - - - com.twelvemonkeys.imageio - twelvemonkeys-imageio-metadata - ${imageio.core.version} - compile - - - - - - - - maven-source-plugin - - - - maven-resources-plugin - - UTF-8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - ${project.name} - TwelveMonkeys - ${project.version} - https://twelvemonkeys-imageio.dev.java.net/ - - - - - - - - diff --git a/twelvemonkeys-servlet/pom.xml b/twelvemonkeys-servlet/pom.xml index 529f7df7..88113a57 100644 --- a/twelvemonkeys-servlet/pom.xml +++ b/twelvemonkeys-servlet/pom.xml @@ -2,34 +2,46 @@ - 4.0.0 - com.twelvemonkeys - twelvemonkeys-servlet - 2.3 - TwelveMonkeys Servlet - com.twelvemonkeys twelvemonkeys-parent - 2.0 + 3.0-SNAPSHOT - - 2.3 - + 4.0.0 + com.twelvemonkeys + twelvemonkeys-servlet + 3.0-SNAPSHOT + TwelveMonkeys Servlet - com.twelvemonkeys - twelvemonkeys-core - ${core.version} - compile + com.twelvemonkeys.common + common-lang + ${project.version} + + + com.twelvemonkeys.common + common-io + ${project.version} + + + com.twelvemonkeys.common + common-image + ${project.version} - com.twelvemonkeys - twelvemonkeys-core - ${core.version} + com.twelvemonkeys.common + common-lang + ${project.version} + tests + test + + + com.twelvemonkeys.common + common-io + ${project.version} tests test