[jboss-svn-commits] JBoss Common SVN: r4311 - in shrinkwrap/trunk: extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Apr 21 17:34:09 EDT 2010
Author: ALRubinger
Date: 2010-04-21 17:34:07 -0400 (Wed, 21 Apr 2010)
New Revision: 4311
Removed:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java
Modified:
shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/GlassFishDeploymentUnitTestCase.java
shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/ShrinkwrapReadableArchiveUnitTestCase.java
shrinkwrap/trunk/extension-jetty/src/test/java/org/jboss/shrinkwrap/jetty/test/JettyDeploymentIntegrationUnitTestCase.java
shrinkwrap/trunk/extension-openejb/src/test/java/org/jboss/shrinkwrap/openejb/test/ShrinkWrapArchiveDeploymentTest.java
shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java
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/ShrinkWrapTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterStressTest.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/formatter/FormatterTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
Log:
[SHRINKWRAP-158] Remove "Archives" @Deprecated support
Deleted: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archives.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -1,73 +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;
-
-/**
- * Generic unified factory for archive creation.
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- * @deprecated Use {@link ShrinkWrap}
- * @see {@link ShrinkWrap}
- */
- at Deprecated
-public final class Archives
-{
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * Create a archive as a specific type.
- *
- * @param archiveName The name of the archive
- * @return A {@link Assignable} archive base
- * @deprecated
- * @see {@link ShrinkWrap#create(String, Class)}
- */
- public static <T extends Assignable> T create(String archiveName, Class<T> type)
- {
- // Delegate to ShrinkWrap
- return ShrinkWrap.create(archiveName, type);
- }
-
- /**
- * Override the loading of a specific Extension.
- *
- * @param <T>
- * @param extensionClass The Extension interface
- * @param extensionImplClass The Extension implementation class
- * @see {@link Configuration#getExtensionLoader()}
- */
- public static <T extends Assignable> void addExtensionOverride(Class<T> extensionClass,
- Class<? extends T> extensionImplClass)
- {
- final ExtensionLoader extensionLoader = ShrinkWrap.getDefaultDomain().getConfiguration().getExtensionLoader();
- extensionLoader.addOverride(extensionClass, extensionImplClass);
- }
-
- //-------------------------------------------------------------------------------------||
- // Constructor ------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * No instantiation
- */
- private Archives()
- {
- }
-}
Modified: shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/GlassFishDeploymentUnitTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/GlassFishDeploymentUnitTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/GlassFishDeploymentUnitTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -31,7 +31,7 @@
import org.glassfish.api.embedded.LifecycleException;
import org.glassfish.api.embedded.Server;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.glassfish.api.ShrinkwrapReadableArchive;
@@ -105,9 +105,9 @@
{
// Create the packaging
- javaArchive = Archives.create(NAME_DEPLOYMENT_JAR, JavaArchive.class).addClasses(EchoLocalBusiness.class,
+ javaArchive = ShrinkWrap.create(NAME_DEPLOYMENT_JAR, JavaArchive.class).addClasses(EchoLocalBusiness.class,
EchoBean.class).as(ShrinkwrapReadableArchive.class);
- enterpriseArchive = Archives.create(NAME_DEPLOYMENT_EAR, EnterpriseArchive.class).addModule(
+ enterpriseArchive = ShrinkWrap.create(NAME_DEPLOYMENT_EAR, EnterpriseArchive.class).addModule(
javaArchive.as(JavaArchive.class)).as(ShrinkwrapReadableArchive.class);
}
Modified: shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/ShrinkwrapReadableArchiveUnitTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/ShrinkwrapReadableArchiveUnitTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/ShrinkwrapReadableArchiveUnitTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -18,7 +18,7 @@
import junit.framework.Assert;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.glassfish.api.ShrinkwrapReadableArchive;
import org.junit.Test;
@@ -34,7 +34,7 @@
@Test
public void shouldBeAbleToLoadExtension() throws Exception
{
- ShrinkwrapReadableArchive archive = Archives.create("test", ShrinkwrapReadableArchive.class);
+ ShrinkwrapReadableArchive archive = ShrinkWrap.create("test", ShrinkwrapReadableArchive.class);
Assert.assertNotNull(archive);
}
}
Modified: shrinkwrap/trunk/extension-jetty/src/test/java/org/jboss/shrinkwrap/jetty/test/JettyDeploymentIntegrationUnitTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-jetty/src/test/java/org/jboss/shrinkwrap/jetty/test/JettyDeploymentIntegrationUnitTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/extension-jetty/src/test/java/org/jboss/shrinkwrap/jetty/test/JettyDeploymentIntegrationUnitTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -37,7 +37,7 @@
import org.apache.http.message.BasicNameValuePair;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.jetty.api.ShrinkWrapWebAppContext;
import org.jboss.shrinkwrap.jetty.servlet.JspForwardingServlet;
@@ -124,7 +124,7 @@
// Create the new server
server = new Server(HTTP_BIND_PORT);
- final WebArchive archive = Archives.create(NAME_WAR, WebArchive.class);
+ final WebArchive archive = ShrinkWrap.create(NAME_WAR, WebArchive.class);
final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
archive.addWebResource(PATH_ACTUAL_WEB_XML, targetPathWebXml).addResource(PATH_JSP).addClass(servletClass);
log.info(archive.toString(true));
Modified: shrinkwrap/trunk/extension-openejb/src/test/java/org/jboss/shrinkwrap/openejb/test/ShrinkWrapArchiveDeploymentTest.java
===================================================================
--- shrinkwrap/trunk/extension-openejb/src/test/java/org/jboss/shrinkwrap/openejb/test/ShrinkWrapArchiveDeploymentTest.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/extension-openejb/src/test/java/org/jboss/shrinkwrap/openejb/test/ShrinkWrapArchiveDeploymentTest.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -32,7 +32,7 @@
import org.apache.openejb.client.LocalInitialContextFactory;
import org.apache.openejb.config.ConfigurationFactory;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.openejb.config.ShrinkWrapConfigurationFactory;
import org.jboss.shrinkwrap.openejb.ejb.EchoBean;
@@ -120,7 +120,7 @@
// Create archive to hold our test EJB
final String name = "echo.jar";
- final JavaArchive archive = Archives.create(name, JavaArchive.class).addClasses(EchoBean.class,
+ final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class).addClasses(EchoBean.class,
EchoLocalBusiness.class);
log.info("Created archive: " + archive.toString(true));
Modified: shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -25,7 +25,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.vfs.TempDir;
import org.jboss.vfs.TempFileProvider;
@@ -115,7 +115,7 @@
@Test
public void testArchiveFileSystem() throws Exception
{
- final JavaArchive archive = Archives.create(NAME_ARCHIVE, JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class);
// Back VFS by a temp directory
final TempDir tempDir = tempFileProvider.createTempDir(archive.getName());
Deleted: 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 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -1,103 +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.impl.base;
-
-import junit.framework.Assert;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.formatter.Formatter;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.impl.base.container.ContainerBase;
-import org.junit.Test;
-
-
-/**
- * ArchivesTest
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- * @deprecated To be moved / replaced by the {@link ShrinkWrapTestCase}
- */
- at Deprecated
-public class ArchivesTestCase
-{
- @Test
- public void shouldBeAbleToCreateANewArchive() throws Exception {
- String archiveName = "test.war";
- JavaArchive archive = Archives.create(archiveName, JavaArchive.class);
-
- Assert.assertNotNull(
- "A archive should have been created", archive);
-
- Assert.assertEquals(
- "Should have the same name as given imput",
- archiveName,
- archive.getName());
- }
-
- @Test
- public void shouldBeAbleToAddOverride() throws Exception {
- Archives.addExtensionOverride(JavaArchive.class, MockJavaArchiveImpl.class);
- JavaArchive archive = Archives.create("test.jar", JavaArchive.class);
-
- Assert.assertEquals(
- "Should have overridden normal JavaArchive impl",
- MockJavaArchiveImpl.class, archive.getClass());
-
- }
-
- public static class MockJavaArchiveImpl extends ContainerBase<JavaArchive> implements JavaArchive {
-
- public MockJavaArchiveImpl(Archive<?> archive)
- {
- super(JavaArchive.class, archive);
- }
-
- @Override
- protected ArchivePath getClassesPath()
- {
- return ArchivePaths.root();
- }
-
- @Override
- protected ArchivePath getLibraryPath()
- {
- return ArchivePaths.root();
- }
-
- @Override
- protected ArchivePath getManinfestPath()
- {
- return ArchivePaths.root();
- }
-
- @Override
- protected ArchivePath getResourcePath()
- {
- return ArchivePaths.root();
- }
-
- @Override
- public String toString(final Formatter formatter) throws IllegalArgumentException
- {
- return formatter.format(this);
- }
- }
-}
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 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,8 +19,8 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Assignable;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.Test;
@@ -39,7 +39,7 @@
@Test
public void shouldBeAbleToLoadExtension() throws Exception {
Extension extension = new ServiceExtensionLoader()
- .load(Extension.class, Archives.create("test.jar", JavaArchive.class));
+ .load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
Assert.assertNotNull(extension);
@@ -50,7 +50,7 @@
public void shouldBeAbleToOverrideExtension() throws Exception {
Extension extension = new ServiceExtensionLoader()
.addOverride(Extension.class, ExtensionImpl2.class)
- .load(Extension.class, Archives.create("test.jar", JavaArchive.class));
+ .load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
Assert.assertNotNull(extension);
@@ -60,7 +60,7 @@
@Test
public void shouldBePlacedInCacheAfterLoad() throws Exception {
ServiceExtensionLoader loader = new ServiceExtensionLoader();
- loader.load(Extension.class, Archives.create("test.jar", JavaArchive.class));
+ loader.load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
Assert.assertTrue(
"Should be placed in cache",
@@ -71,13 +71,13 @@
@Test(expected = RuntimeException.class)
public void shouldThrowExceptionOnMissingExtension() throws Exception {
new ServiceExtensionLoader()
- .load(MissingExtension.class, Archives.create("test.jar", JavaArchive.class));
+ .load(MissingExtension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
}
@Test(expected = RuntimeException.class)
public void shouldThrowExceptionOnWrongImplType() throws Exception {
new ServiceExtensionLoader()
- .load(WrongImplExtension.class, Archives.create("test.jar", JavaArchive.class));
+ .load(WrongImplExtension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ShrinkWrapTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ShrinkWrapTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ShrinkWrapTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -23,13 +23,17 @@
import junit.framework.TestCase;
import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.api.Configuration;
import org.jboss.shrinkwrap.api.ConfigurationBuilder;
import org.jboss.shrinkwrap.api.Domain;
import org.jboss.shrinkwrap.api.ExtensionLoader;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.formatter.Formatter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.container.ContainerBase;
import org.junit.Test;
/**
@@ -169,6 +173,23 @@
}
+ /**
+ * Ensures that we may add extension overrides via the {@link ExtensionLoader}
+ * through some new {@link Domain}
+ * @throws Exception
+ */
+ @Test
+ public void shouldBeAbleToAddOverride() throws Exception
+ {
+ final Domain domain = ShrinkWrap.createDomain();
+ domain.getConfiguration().getExtensionLoader().addOverride(JavaArchive.class, MockJavaArchiveImpl.class);
+ final JavaArchive archive = domain.getArchiveFactory().create("test.jar", JavaArchive.class);
+
+ Assert.assertEquals("Should have overridden normal JavaArchive impl", MockJavaArchiveImpl.class, archive
+ .getClass());
+
+ }
+
//-------------------------------------------------------------------------------------||
// Internal Helper Members ------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
@@ -195,4 +216,49 @@
}
}
+ /**
+ * Mock Archive wrapper implementation
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+ public static class MockJavaArchiveImpl extends ContainerBase<JavaArchive> implements JavaArchive
+ {
+
+ public MockJavaArchiveImpl(Archive<?> archive)
+ {
+ super(JavaArchive.class, archive);
+ }
+
+ @Override
+ protected ArchivePath getClassesPath()
+ {
+ return ArchivePaths.root();
+ }
+
+ @Override
+ protected ArchivePath getLibraryPath()
+ {
+ return ArchivePaths.root();
+ }
+
+ @Override
+ protected ArchivePath getManinfestPath()
+ {
+ return ArchivePaths.root();
+ }
+
+ @Override
+ protected ArchivePath getResourcePath()
+ {
+ return ArchivePaths.root();
+ }
+
+ @Override
+ public String toString(final Formatter formatter) throws IllegalArgumentException
+ {
+ return formatter.format(this);
+ }
+ }
+
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -27,8 +27,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.exporter.ArchiveExportException;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
import org.jboss.shrinkwrap.impl.base.TestIOUtil;
@@ -141,7 +141,7 @@
{
log.info("testExportExplodedRequiresBaseDirectroy");
- Archives.create("test.jar", ExplodedExporter.class).exportExploded(null);
+ ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(null);
}
/**
@@ -155,7 +155,7 @@
log.info("testExportExplodedRequiresExisitingDirectroy");
final File directory = this.getNonexistantDirectory();
- Archives.create("test.jar", ExplodedExporter.class).exportExploded(directory);
+ ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(directory);
}
/**
@@ -166,7 +166,7 @@
{
log.info("testExportExplodedRequiresValidDirectory");
final File nonDirectory = new File(this.getTarget(), "tempFile.txt");
- Archives.create("test.jar", ExplodedExporter.class).exportExploded(nonDirectory);
+ ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(nonDirectory);
}
/**
@@ -179,7 +179,7 @@
final File directory = createTempDirectory("testExportExplodedOutpuDirCreationFails");
directory.deleteOnExit();
- Archives.create("test/" + NAME_ARCHIVE, ExplodedExporter.class).exportExploded(directory);
+ ShrinkWrap.create("test/" + NAME_ARCHIVE, ExplodedExporter.class).exportExploded(directory);
}
/**
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -24,8 +24,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.TestIOUtil;
import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
@@ -159,7 +159,7 @@
protected Archive<?> createArchiveWithAssets()
{
// Create an archive
- Archive<?> archive = Archives.create(NAME_ARCHIVE, JavaArchive.class);
+ Archive<?> archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class);
// Add some content
addContent(archive);
// Return archive
@@ -175,7 +175,7 @@
Archive<?> archive = createArchiveWithAssets();
// Create a nested archive
- Archive<?> nestedArchive = Archives.create(NAME_NESTED_ARCHIVE, JavaArchive.class);
+ Archive<?> nestedArchive = ShrinkWrap.create(NAME_NESTED_ARCHIVE, JavaArchive.class);
// Add some content
addContent(nestedArchive);
@@ -184,7 +184,7 @@
archive.add(nestedArchive, new BasicPath());
// Add an archive nested in a directory
- Archive<?> nestedArchiveTwo = Archives.create(NAME_NESTED_ARCHIVE_2, JavaArchive.class);
+ Archive<?> nestedArchiveTwo = ShrinkWrap.create(NAME_NESTED_ARCHIVE_2, JavaArchive.class);
// Add some content
addContent(nestedArchiveTwo);
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterStressTest.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterStressTest.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterStressTest.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -26,8 +26,8 @@
import junit.framework.TestCase;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
@@ -78,7 +78,7 @@
log.info("This test may take awhile as it's intended to fill memory");
// Get an archive instance
- final JavaArchive archive = Archives.create("hugeArchive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create("hugeArchive.jar", JavaArchive.class);
// Approximate the free memory to start
final Runtime runtime = Runtime.getRuntime();
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -38,7 +38,6 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ConfigurationBuilder;
import org.jboss.shrinkwrap.api.Domain;
@@ -150,7 +149,7 @@
public void exportEmptyArchiveAsZip() throws Exception
{
// Attempt to export an empty archive, should fail
- Archives.create(NAME_ARCHIVE, JavaArchive.class).as(ZipExporter.class).exportZip();
+ ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).as(ZipExporter.class).exportZip();
}
/**
@@ -163,7 +162,7 @@
public void testExportArchiveWithOnlyDirectories()
{
// Attempt to export an archive with some directories, should pass
- Archives.create(NAME_ARCHIVE, JavaArchive.class).addDirectories("/test/game").as(ZipExporter.class).exportZip();
+ ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addDirectories("/test/game").as(ZipExporter.class).exportZip();
}
/**
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/formatter/FormatterTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/formatter/FormatterTestBase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/formatter/FormatterTestBase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -21,7 +21,7 @@
import junit.framework.TestCase;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.formatter.Formatter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.test.ArchiveTestBase;
@@ -70,7 +70,7 @@
@Before
public void createArchive()
{
- archive = Archives.create(NAME_ARCHIVE, JavaArchive.class).addClasses(FormatterTestBase.class,
+ archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addClasses(FormatterTestBase.class,
ArchiveTestBase.class);
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -42,7 +42,7 @@
@Test
public void shouldBeAbleToImportADriectory() throws Exception {
- Archive<?> archive = Archives.create("test.jar", ExplodedImporter.class)
+ Archive<?> archive = ShrinkWrap.create("test.jar", ExplodedImporter.class)
.importDirectory(
SecurityActions.getThreadContextClassLoader()
.getResource(EXISTING_DIRECTORY_RESOURCE).toURI().getPath()
@@ -73,7 +73,7 @@
@Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfImportingAFile() throws Exception {
- Archives.create("test.jar", ExplodedImporter.class)
+ ShrinkWrap.create("test.jar", ExplodedImporter.class)
.importDirectory(
SecurityActions.getThreadContextClassLoader()
.getResource(EXISTING_FILE_RESOURCE).toURI().getPath()
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -33,7 +33,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
import org.jboss.shrinkwrap.api.importer.ArchiveImportException;
import org.jboss.shrinkwrap.api.importer.ZipImporter;
@@ -89,7 +89,7 @@
new File(
SecurityActions.getThreadContextClassLoader().getResource(EXISTING_ZIP_RESOURCE).toURI()));
- Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
+ Archive<?> archive = ShrinkWrap.create("test.jar", ZipImporter.class)
.importZip(testZip)
.as(JavaArchive.class);
@@ -107,7 +107,7 @@
ZipInputStream stream = new ZipInputStream(
SecurityActions.getThreadContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
- Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
+ Archive<?> archive = ShrinkWrap.create("test.jar", ZipImporter.class)
.importZip(stream)
.as(JavaArchive.class);
@@ -129,7 +129,7 @@
ZipInputStream stream = new ZipInputStream(
SecurityActions.getThreadContextClassLoader().getResourceAsStream(EXISTING_ZIP_RESOURCE));
- Archive<?> archive = Archives.create("test.jar", ZipImporter.class)
+ Archive<?> archive = ShrinkWrap.create("test.jar", ZipImporter.class)
.importZip(stream)
.as(JavaArchive.class);
@@ -156,7 +156,7 @@
throw new IOException("Mock exception");
}
});
- Archives.create("test.jar", ZipImporter.class).importZip(stream).as(JavaArchive.class);
+ ShrinkWrap.create("test.jar", ZipImporter.class).importZip(stream).as(JavaArchive.class);
}
/**
@@ -176,7 +176,7 @@
throw new IllegalStateException("mock exception");
}
};
- Archives.create("test.jar", ZipImporter.class).importZip(testZip).as(JavaArchive.class);
+ ShrinkWrap.create("test.jar", ZipImporter.class).importZip(testZip).as(JavaArchive.class);
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.EnterpriseContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -95,7 +95,7 @@
@Override
protected EnterpriseArchive createNewArchive()
{
- return Archives.create(UUID.randomUUID().toString() + ".jar", EnterpriseArchive.class);
+ return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", EnterpriseArchive.class);
}
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
import org.jboss.shrinkwrap.api.container.ManifestContainer;
@@ -91,7 +91,7 @@
@Override
protected JavaArchive createNewArchive()
{
- return Archives.create(UUID.randomUUID().toString() + ".jar", JavaArchive.class);
+ return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", JavaArchive.class);
}
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
import org.jboss.shrinkwrap.api.container.ManifestContainer;
@@ -96,7 +96,7 @@
@Override
protected ResourceAdapterArchive createNewArchive()
{
- return Archives.create(UUID.randomUUID().toString() + ".jar", ResourceAdapterArchive.class);
+ return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", ResourceAdapterArchive.class);
}
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
import org.jboss.shrinkwrap.api.container.ManifestContainer;
@@ -97,7 +97,7 @@
@Override
protected WebArchive createNewArchive()
{
- return Archives.create(UUID.randomUUID().toString() + ".jar", WebArchive.class);
+ return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", WebArchive.class);
}
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java 2010-04-21 20:36:13 UTC (rev 4310)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java 2010-04-21 21:34:07 UTC (rev 4311)
@@ -25,11 +25,11 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
import org.jboss.shrinkwrap.api.IllegalArchivePathException;
import org.jboss.shrinkwrap.api.Node;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
@@ -501,7 +501,7 @@
Archive<T> archive = getArchive();
try
{
- archive.add(Archives.create("test.jar", JavaArchive.class), null);
+ archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), null);
Assert.fail("Should have throw an IllegalArgumentException");
}
catch (IllegalArgumentException expectedException)
More information about the jboss-svn-commits
mailing list