From 6bd624d515bfa9377a862751ee43bdc17d05ae11 Mon Sep 17 00:00:00 2001
From: Andrew Lee Rubinger <alr@alrubinger.com>
Date: Sun, 21 Aug 2011 15:22:52 -0400
Subject: [PATCH] [SHRINKDESC-15] Refactoring of Manifest Descriptors to fit
 into 1.2.0-X branch

---
 .../descriptor/api/spec/se/manifest/ManifestAppletDef.java     | 0
 .../descriptor/api/spec/se/manifest/ManifestCommonDef.java     | 0
 .../descriptor/api/spec/se/manifest/ManifestDescriptor.java    | 0
 .../descriptor/api/spec/se/manifest/ManifestEntryDef.java      | 0
 ...rinkwrap.descriptor.api.spec.ee.manifest.ManifestDescriptor | 2 --
 .../impl/base}/spec/se/manifest/ManifestAppletDefImpl.java     | 2 +-
 .../impl/base}/spec/se/manifest/ManifestCommonDefImpl.java     | 2 +-
 .../impl/base}/spec/se/manifest/ManifestDescriptorImpl.java    | 2 +-
 .../base}/spec/se/manifest/ManifestDescriptorImporter.java     | 2 +-
 .../impl/base}/spec/se/manifest/ManifestEntryDefImpl.java      | 2 +-
 .../descriptor/impl/base}/spec/se/manifest/ManifestModel.java  | 2 +-
 ...rinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor | 3 +++
 .../shrinkwrap/descriptor/api}/ManifestDescriptorTestCase.java | 2 +-
 ...rinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor | 3 ---
 14 files changed, 10 insertions(+), 12 deletions(-)
 rename {impl => api-base}/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestAppletDef.java (100%)
 rename {impl => api-base}/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestCommonDef.java (100%)
 rename {impl => api-base}/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestDescriptor.java (100%)
 rename {impl => api-base}/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestEntryDef.java (100%)
 delete mode 100644 api/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.ee.manifest.ManifestDescriptor
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestAppletDefImpl.java (97%)
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestCommonDefImpl.java (98%)
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestDescriptorImpl.java (97%)
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestDescriptorImporter.java (98%)
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestEntryDefImpl.java (98%)
 rename {impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl => impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base}/spec/se/manifest/ManifestModel.java (95%)
 create mode 100644 impl-base/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor
 rename {impl/src/test/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest => impl-base/src/test/java/org/jboss/shrinkwrap/descriptor/api}/ManifestDescriptorTestCase.java (99%)
 delete mode 100644 impl/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor

diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestAppletDef.java b/api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestAppletDef.java
similarity index 100%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestAppletDef.java
rename to api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestAppletDef.java
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestCommonDef.java b/api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestCommonDef.java
similarity index 100%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestCommonDef.java
rename to api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestCommonDef.java
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestDescriptor.java b/api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestDescriptor.java
similarity index 100%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestDescriptor.java
rename to api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestDescriptor.java
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestEntryDef.java b/api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestEntryDef.java
similarity index 100%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestEntryDef.java
rename to api-base/src/main/java/org/jboss/shrinkwrap/descriptor/api/spec/se/manifest/ManifestEntryDef.java
diff --git a/api/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.ee.manifest.ManifestDescriptor b/api/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.ee.manifest.ManifestDescriptor
deleted file mode 100644
index 3f727763..00000000
--- a/api/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.ee.manifest.ManifestDescriptor
+++ /dev/null
@@ -1,2 +0,0 @@
-implClass=org.jboss.shrinkwrap.descriptor.impl.spec.ee.manifest.ManifestDescriptorImpl
-modelClass=org.jboss.shrinkwrap.descriptor.impl.spec.ee.manifest.ManifestModel
\ No newline at end of file
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestAppletDefImpl.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestAppletDefImpl.java
similarity index 97%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestAppletDefImpl.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestAppletDefImpl.java
index ae0545c1..33deac70 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestAppletDefImpl.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestAppletDefImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.util.jar.Attributes;
 import java.util.jar.Attributes.Name;
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestCommonDefImpl.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestCommonDefImpl.java
similarity index 98%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestCommonDefImpl.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestCommonDefImpl.java
index 172a60d2..cca0f059 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestCommonDefImpl.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestCommonDefImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImpl.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImpl.java
similarity index 97%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImpl.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImpl.java
index b4c4144b..8e251357 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImpl.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.util.jar.Attributes.Name;
 
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImporter.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImporter.java
similarity index 98%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImporter.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImporter.java
index 98806af3..027c2287 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorImporter.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestDescriptorImporter.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestEntryDefImpl.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestEntryDefImpl.java
similarity index 98%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestEntryDefImpl.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestEntryDefImpl.java
index e5ba21f9..24f188f1 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestEntryDefImpl.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestEntryDefImpl.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.util.Map;
 import java.util.jar.Attributes;
diff --git a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestModel.java b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestModel.java
similarity index 95%
rename from impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestModel.java
rename to impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestModel.java
index aac0eeb6..349d3afc 100644
--- a/impl/src/main/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestModel.java
+++ b/impl-base/src/main/java/org/jboss/shrinkwrap/descriptor/impl/base/spec/se/manifest/ManifestModel.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/impl-base/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor b/impl-base/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor
new file mode 100644
index 00000000..6e2a1b1f
--- /dev/null
+++ b/impl-base/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor
@@ -0,0 +1,3 @@
+implClass=org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest.ManifestDescriptorImpl
+importerClass=org.jboss.shrinkwrap.descriptor.impl.base.spec.se.manifest.ManifestDescriptorImporter
+defaultName=MANIFEST.MF
\ No newline at end of file
diff --git a/impl/src/test/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorTestCase.java b/impl-base/src/test/java/org/jboss/shrinkwrap/descriptor/api/ManifestDescriptorTestCase.java
similarity index 99%
rename from impl/src/test/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorTestCase.java
rename to impl-base/src/test/java/org/jboss/shrinkwrap/descriptor/api/ManifestDescriptorTestCase.java
index 5a1f1386..a8876c50 100644
--- a/impl/src/test/java/org/jboss/shrinkwrap/descriptor/impl/spec/se/manifest/ManifestDescriptorTestCase.java
+++ b/impl-base/src/test/java/org/jboss/shrinkwrap/descriptor/api/ManifestDescriptorTestCase.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest;
+package org.jboss.shrinkwrap.descriptor.api;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
diff --git a/impl/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor b/impl/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor
deleted file mode 100644
index ced2676d..00000000
--- a/impl/src/main/resources/META-INF/services/org.jboss.shrinkwrap.descriptor.api.spec.se.manifest.ManifestDescriptor
+++ /dev/null
@@ -1,3 +0,0 @@
-implClass=org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest.ManifestDescriptorImpl
-importerClass=org.jboss.shrinkwrap.descriptor.impl.spec.se.manifest.ManifestDescriptorImporter
-defaultName=MANIFEST.MF
\ No newline at end of file