[jboss-svn-commits] JBoss Common SVN: r3719 - in shrinkwrap/trunk: api/src/main/java/org/jboss/shrinkwrap/api/exporter and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Nov 15 14:42:36 EST 2009
Author: ALRubinger
Date: 2009-11-15 14:42:35 -0500 (Sun, 15 Nov 2009)
New Revision: 3719
Added:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Assignable.java
Removed:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Specializer.java
Modified:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ExtensionLoader.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ExplodedExporter.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ZipExporter.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ExplodedImporter.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ZipImporter.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoader.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/SpecializedBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java
Log:
[SHRINKWRAP-50] Rename "Specializer" to "Assignable"
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
* @version $Revision: $
*/
-public interface Archive<T extends Archive<T>> extends Specializer
+public interface Archive<T extends Archive<T>> extends Assignable
{
//-------------------------------------------------------------------------------------||
// Contracts --------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -38,9 +38,9 @@
* Create a archive as a specific type.
*
* @param archiveName The name of the archive
- * @return A {@link Specializer} archive base
+ * @return A {@link Assignable} archive base
*/
- public static <T extends Specializer> T create(String archiveName, Class<T> type)
+ public static <T extends Assignable> T create(String archiveName, Class<T> type)
{
if(archiveName == null)
{
@@ -68,7 +68,7 @@
* @param extensionClass The Extension interface
* @param extensionImplClass The Extension implementation class
*/
- public static <T extends Specializer> void addExtensionOverride(
+ public static <T extends Assignable> void addExtensionOverride(
Class<T> extensionClass,
Class<? extends T> extensionImplClass)
{
Copied: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Assignable.java (from rev 3714, shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Specializer.java)
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Assignable.java (rev 0)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Assignable.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.shrinkwrap.api;
+
+/**
+ * General interface for representing entities such
+ * as {@link Archive}s and descriptors as different extension types.
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public interface Assignable
+{
+ /**
+ * Wraps a Archive in a different 'view'.
+ *
+ * @param <TYPE>
+ * @param clazz Extension interface to load
+ * @return The Archive wrapped as TYPE
+ */
+ <TYPE extends Assignable> TYPE as(Class<TYPE> clazz);
+}
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ExtensionLoader.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ExtensionLoader.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ExtensionLoader.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -35,7 +35,7 @@
* @param baseArchive The base archive to use
* @return a
*/
- public <T extends Specializer> T load(Class<T> extensionClass, Archive<?> baseArchive);
+ public <T extends Assignable> T load(Class<T> extensionClass, Archive<?> baseArchive);
/**
* Add a Override to the normal Extension loading.
@@ -48,7 +48,7 @@
* @param extensionImplClass The Extension implementation class
* @return this ExtensionLoader
*/
- public <T extends Specializer> ExtensionLoader addOverride(
+ public <T extends Assignable> ExtensionLoader addOverride(
Class<T> extensionClass,
Class<? extends T> extensionImplClass);
}
Deleted: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Specializer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Specializer.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Specializer.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.shrinkwrap.api;
-
-/**
- * General interface for wrapping archive as different extension types.
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public interface Specializer
-{
- /**
- * Wraps a Archive in a different 'view'.
- *
- * @param <TYPE>
- * @param clazz Extension interface to load
- * @return The Archive wrapped as TYPE
- */
- <TYPE extends Specializer> TYPE as(Class<TYPE> clazz);
-}
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ExplodedExporter.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ExplodedExporter.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ExplodedExporter.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -18,7 +18,7 @@
import java.io.File;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
/**
* ExplodedExporter
@@ -29,7 +29,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public interface ExplodedExporter extends Specializer
+public interface ExplodedExporter extends Assignable
{
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ZipExporter.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ZipExporter.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/exporter/ZipExporter.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -18,7 +18,7 @@
import java.io.InputStream;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
/**
* ZipExporter
@@ -29,7 +29,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public interface ZipExporter extends Specializer
+public interface ZipExporter extends Assignable
{
//-------------------------------------------------------------------------------------||
// Contracts --------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ExplodedImporter.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ExplodedImporter.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ExplodedImporter.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -19,7 +19,7 @@
import java.io.File;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
/**
* ExplodedImporter
@@ -29,7 +29,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public interface ExplodedImporter extends Specializer
+public interface ExplodedImporter extends Assignable
{
//-------------------------------------------------------------------------------------||
// Contracts --------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ZipImporter.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ZipImporter.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/importer/ZipImporter.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -20,7 +20,7 @@
import java.util.zip.ZipInputStream;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
/**
* ZipImporter
@@ -28,7 +28,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public interface ZipImporter extends Specializer
+public interface ZipImporter extends Assignable
{
//-------------------------------------------------------------------------------------||
// Contracts --------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -25,7 +25,7 @@
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ExtensionLoader;
import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -224,7 +224,7 @@
* @see org.jboss.shrinkwrap.api.Specializer#as(java.lang.Class)
*/
@Override
- public <TYPE extends Specializer> TYPE as(Class<TYPE> clazz)
+ public <TYPE extends Assignable> TYPE as(Class<TYPE> clazz)
{
Validate.notNull(clazz, "Class must be specified");
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoader.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoader.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoader.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -28,7 +28,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ExtensionLoader;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.impl.base.io.IOUtil;
/**
@@ -63,7 +63,7 @@
* @see org.jboss.shrinkwrap.api.ExtensionLoader#load(java.lang.Class, org.jboss.shrinkwrap.api.Archive)
*/
@Override
- public <T extends Specializer> T load(Class<T> extensionClass, Archive<?> baseArchive)
+ public <T extends Assignable> T load(Class<T> extensionClass, Archive<?> baseArchive)
{
if(isCached(extensionClass))
{
@@ -85,7 +85,7 @@
return cache.containsKey(extensionClass);
}
- private <T extends Specializer> T createFromCache(Class<T> extensionClass, Archive<?> archive)
+ private <T extends Assignable> T createFromCache(Class<T> extensionClass, Archive<?> archive)
{
Class<T> extensionImplClass = getFromCache(extensionClass);
return createExtension(extensionImplClass, archive);
@@ -97,7 +97,7 @@
}
@SuppressWarnings("unchecked")
- <T extends Specializer> Class<T> getFromCache(Class<T> extensionClass)
+ <T extends Assignable> Class<T> getFromCache(Class<T> extensionClass)
{
return (Class<T>)cache.get(extensionClass);
}
@@ -109,7 +109,7 @@
/* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.ExtensionLoader#addOverride(java.lang.Class, java.lang.Class)
*/
- public <T extends Specializer> ServiceExtensionLoader addOverride(Class<T> extensionClass, Class<? extends T> extensionImplClass)
+ public <T extends Assignable> ServiceExtensionLoader addOverride(Class<T> extensionClass, Class<? extends T> extensionImplClass)
{
addToCache(extensionClass, extensionImplClass);
return this;
@@ -131,7 +131,7 @@
// Internal Helper Methods - Loading --------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private <T extends Specializer> T createFromLoadExtension(Class<T> extensionClass, Archive<?> archive)
+ private <T extends Assignable> T createFromLoadExtension(Class<T> extensionClass, Archive<?> archive)
{
Class<T> extensionImplClass = loadExtension(extensionClass);
if(!extensionClass.isAssignableFrom(extensionImplClass))
@@ -143,14 +143,14 @@
return createExtension(extensionImplClass, archive);
}
- private <T extends Specializer> Class<T> loadExtension(Class<T> extensionClass)
+ private <T extends Assignable> Class<T> loadExtension(Class<T> extensionClass)
{
URL extensionImplUrl = findExtensionImpl(extensionClass);
String extensionImplClassName = loadExtensionName(extensionImplUrl);
return loadExtensionClass(extensionImplClassName);
}
- private <T extends Specializer> URL findExtensionImpl(Class<T> extensionClass)
+ private <T extends Assignable> URL findExtensionImpl(Class<T> extensionClass)
{
try
{
@@ -194,7 +194,7 @@
}
@SuppressWarnings("unchecked")
- private <T extends Specializer> Class<T> loadExtensionClass(String extensionClassName)
+ private <T extends Assignable> Class<T> loadExtensionClass(String extensionClassName)
{
try
{
@@ -205,7 +205,7 @@
}
}
- private <T extends Specializer> T createExtension(Class<T> extensionImplClass, Archive<?> archive)
+ private <T extends Assignable> T createExtension(Class<T> extensionImplClass, Archive<?> archive)
{
try
{
@@ -230,7 +230,7 @@
}
@SuppressWarnings("unchecked")
- private <T extends Specializer> Constructor<T> findConstructor(Class<T> extensionImplClass)
+ private <T extends Assignable> Constructor<T> findConstructor(Class<T> extensionImplClass)
{
Constructor<?>[] constructors = SecurityActions.getConstructors(extensionImplClass);
for(Constructor<?> constructor : constructors)
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/SpecializedBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/SpecializedBase.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/SpecializedBase.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -17,20 +17,20 @@
package org.jboss.shrinkwrap.impl.base;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
/**
- * A generic implementation of {@link Specializer} that delegates down to the Archive
+ * A generic implementation of {@link Assignable} that delegates down to the Archive
* extensions inner archive. Used by Archive extensions to simplify handling the generic extension
* mechanism.
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public abstract class SpecializedBase implements Specializer
+public abstract class SpecializedBase implements Assignable
{
/**
- * Used by the Generic {@link Specializer} implementation to
+ * Used by the Generic {@link Assignable} implementation to
* get the extension wrapped inner {@link Archive}.
*
* @return The wrapped {@link Archive}
@@ -41,7 +41,7 @@
* @see org.jboss.shrinkwrap.api.Specializer#as(java.lang.Class)
*/
@Override
- public <TYPE extends Specializer> TYPE as(Class<TYPE> clazz)
+ public <TYPE extends Assignable> TYPE as(Class<TYPE> clazz)
{
return getArchive().as(clazz);
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -27,7 +27,7 @@
import org.jboss.shrinkwrap.api.ExtensionLoader;
import org.jboss.shrinkwrap.api.Path;
import org.jboss.shrinkwrap.api.Paths;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.container.ContainerBase;
import org.jboss.shrinkwrap.impl.base.spec.JavaArchiveImpl;
@@ -78,7 +78,7 @@
Archives.setExtensionLoader(new ExtensionLoader()
{
@Override
- public <T extends Specializer> T load(Class<T> extensionClass,
+ public <T extends Assignable> T load(Class<T> extensionClass,
Archive<?> baseArchive)
{
extensionLoaderCalled = true;
@@ -86,7 +86,7 @@
}
@Override
- public <T extends Specializer> ExtensionLoader addOverride(
+ public <T extends Assignable> ExtensionLoader addOverride(
Class<T> extensionClass, Class<? extends T> extensionImplClass)
{
return null;
@@ -112,14 +112,14 @@
Archives.setExtensionLoader(new ExtensionLoader()
{
@Override
- public <T extends Specializer> T load(Class<T> extensionClass,
+ public <T extends Assignable> T load(Class<T> extensionClass,
Archive<?> baseArchive)
{
return null;
}
@Override
- public <T extends Specializer> ExtensionLoader addOverride(
+ public <T extends Assignable> ExtensionLoader addOverride(
Class<T> extensionClass, Class<? extends T> extensionImplClass)
{
return null;
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java 2009-11-15 19:26:55 UTC (rev 3718)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java 2009-11-15 19:42:35 UTC (rev 3719)
@@ -20,7 +20,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Specializer;
+import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
@@ -81,11 +81,11 @@
}
- public static interface WrongImplExtension extends Specializer {
+ public static interface WrongImplExtension extends Assignable {
}
- public static interface Extension extends Specializer {
+ public static interface Extension extends Assignable {
}
@@ -119,7 +119,7 @@
}
}
- public static interface MissingExtension extends Specializer {
+ public static interface MissingExtension extends Assignable {
}
}
More information about the jboss-svn-commits
mailing list