[jboss-svn-commits] JBoss Common SVN: r4469 - in shrinkwrap/trunk: extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jun 1 19:56:20 EDT 2010
Author: ALRubinger
Date: 2010-06-01 19:56:18 -0400 (Tue, 01 Jun 2010)
New Revision: 4469
Modified:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchiveFactory.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ShrinkWrap.java
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-vdf/src/test/java/org/jboss/shrinkwrap/vdf/ShrinkWrapDeployerTestCase.java
shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/DefaultPackageAddTestCase.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/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-185] Remove @Deprecated ShrinkWrap/ArchiveFactory.create(String,Class)
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchiveFactory.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchiveFactory.java 2010-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchiveFactory.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -81,26 +81,6 @@
* Creates a new archive of the specified type. The archive
* will be be backed by the {@link Configuration}
* specific to this {@link ArchiveFactory}.
- *
- * Deprecated as part of SHRINKWRAP-163
- * Use {@link ArchiveFactory#create(Class, String)} instead.
- *
- * @param archiveName The name of the archive
- * @param type The type of the archive e.g. {@link org.jboss.shrinkwrap.api.spec.WebArchive}
- * @return An {@link Assignable} archive base
- * @throws IllegalArgumentException If either argument is not specified
- */
- @Deprecated
- public <T extends Assignable> T create(final String archiveName, final Class<T> type)
- throws IllegalArgumentException
- {
- return create(type, archiveName);
- }
-
- /**
- * Creates a new archive of the specified type. The archive
- * will be be backed by the {@link Configuration}
- * specific to this {@link ArchiveFactory}.
* Generates a random name for the archive and adds proper extension based
* on the type mappings found in this {@link Domain}'s
* {@link Configuration#getExtensionMappings()}s.
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ShrinkWrap.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ShrinkWrap.java 2010-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ShrinkWrap.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -129,39 +129,6 @@
/**
* Creates a new archive of the specified type. The archive
* will be be backed by the default {@link Configuration}.
- * Invoking this method is functionally equivalent to calling
- * {@link ArchiveFactory#create(String, Class)} upon
- * {@link Domain#getArchiveFactory()} upon the domain returned
- * by {@link ShrinkWrap#getDefaultDomain()}.
- *
- * @param archiveName The name of the archive
- * @param type The type of the archive e.g. {@link WebArchive}
- * @return An {@link Assignable} archive base
- * @throws IllegalArgumentException If either argument is not specified
- * @deprecated As part of SHRINKWRAP-163
- * Use {@link ShrinkWrap#create(Class, String)} instead.
- */
- @Deprecated
- public static <T extends Assignable> T create(final String archiveName, final Class<T> type)
- throws IllegalArgumentException
- {
- // Precondition checks
- if (archiveName == null || archiveName.length() == 0)
- {
- throw new IllegalArgumentException("ArchiveName must be specified");
- }
- if (type == null)
- {
- throw new IllegalArgumentException("Type must be specified");
- }
-
- // Delegate to the default domain's archive factory for creation
- return ShrinkWrap.getDefaultDomain().getArchiveFactory().create(type, archiveName);
- }
-
- /**
- * Creates a new archive of the specified type. The archive
- * will be be backed by the default {@link Configuration}.
* specific to this {@link ArchiveFactory}.
* Generates a random name for the archive and adds proper extension based
* on the type mappings found in the default {@link Domain}'s
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/GlassFishDeploymentUnitTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -105,9 +105,9 @@
{
// Create the packaging
- javaArchive = ShrinkWrap.create(NAME_DEPLOYMENT_JAR, JavaArchive.class).addClasses(EchoLocalBusiness.class,
+ javaArchive = ShrinkWrap.create(JavaArchive.class, NAME_DEPLOYMENT_JAR).addClasses(EchoLocalBusiness.class,
EchoBean.class).as(ShrinkwrapReadableArchive.class);
- enterpriseArchive = ShrinkWrap.create(NAME_DEPLOYMENT_EAR, EnterpriseArchive.class).addModule(
+ enterpriseArchive = ShrinkWrap.create(EnterpriseArchive.class, NAME_DEPLOYMENT_EAR).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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-glassfish/src/test/java/org/jboss/shrinkwrap/glassfish/ShrinkwrapReadableArchiveUnitTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -34,7 +34,7 @@
@Test
public void shouldBeAbleToLoadExtension() throws Exception
{
- ShrinkwrapReadableArchive archive = ShrinkWrap.create("test", ShrinkwrapReadableArchive.class);
+ ShrinkwrapReadableArchive archive = ShrinkWrap.create(ShrinkwrapReadableArchive.class, "test");
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-jetty/src/test/java/org/jboss/shrinkwrap/jetty/test/JettyDeploymentIntegrationUnitTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -124,7 +124,7 @@
// Create the new server
server = new Server(HTTP_BIND_PORT);
- final WebArchive archive = ShrinkWrap.create(NAME_WAR, WebArchive.class);
+ final WebArchive archive = ShrinkWrap.create(WebArchive.class, NAME_WAR);
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-openejb/src/test/java/org/jboss/shrinkwrap/openejb/test/ShrinkWrapArchiveDeploymentTest.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -120,7 +120,7 @@
// Create archive to hold our test EJB
final String name = "echo.jar";
- final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class).addClasses(EchoBean.class,
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, name).addClasses(EchoBean.class,
EchoLocalBusiness.class);
log.info("Created archive: " + archive.toString(true));
Modified: shrinkwrap/trunk/extension-vdf/src/test/java/org/jboss/shrinkwrap/vdf/ShrinkWrapDeployerTestCase.java
===================================================================
--- shrinkwrap/trunk/extension-vdf/src/test/java/org/jboss/shrinkwrap/vdf/ShrinkWrapDeployerTestCase.java 2010-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-vdf/src/test/java/org/jboss/shrinkwrap/vdf/ShrinkWrapDeployerTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -214,7 +214,7 @@
+ LifecyclePojo.class.getName() + "\" /></deployment>").getBytes());
}
};
- final JavaArchive testJar = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addClass(LifecyclePojo.class).add(
+ final JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE).addClass(LifecyclePojo.class).add(
deploymentXmlAsset, ArchivePaths.create("pojo-jboss-beans.xml"));
// Deploy the test JAR
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/extension-vfs3/src/test/java/org/jboss/shrinkwrap/vfs3/ArchiveFileSystemUnitTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -116,7 +116,7 @@
public void testArchiveFileSystem() throws Exception
{
// Create and mount an archive
- final JavaArchive archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE);
final VirtualFile virtualFile = this.createAndMountArchive(archive);
// Add to the archive
@@ -143,7 +143,7 @@
public void nonExistentFilesAreNotDirectory() throws Exception
{
// Create and mount an archive
- final JavaArchive archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE);
final VirtualFile virtualFile = this.createAndMountArchive(archive);
// Control
Modified: shrinkwrap/trunk/impl-base/src/test/java/DefaultPackageAddTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/DefaultPackageAddTestCase.java 2010-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/DefaultPackageAddTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -59,7 +59,7 @@
public void canAddClassFromDefaultPackage() throws Exception
{
// Create an archive with Classes from the default package
- final JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class)
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClass(ClassInDefaultPackage.class);
log.info(archive.toString(true));
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ServiceExtensionLoaderTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -38,8 +38,8 @@
@Test
public void shouldBeAbleToLoadExtension() throws Exception {
- Extension extension = new ServiceExtensionLoader()
- .load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
+ Extension extension = new ServiceExtensionLoader().load(Extension.class, ShrinkWrap.create(JavaArchive.class,
+ "test.jar"));
Assert.assertNotNull(extension);
@@ -48,9 +48,8 @@
@Test
public void shouldBeAbleToOverrideExtension() throws Exception {
- Extension extension = new ServiceExtensionLoader()
- .addOverride(Extension.class, ExtensionImpl2.class)
- .load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
+ Extension extension = new ServiceExtensionLoader().addOverride(Extension.class, ExtensionImpl2.class).load(
+ Extension.class, ShrinkWrap.create(JavaArchive.class, "test.jar"));
Assert.assertNotNull(extension);
@@ -60,7 +59,7 @@
@Test
public void shouldBePlacedInCacheAfterLoad() throws Exception {
ServiceExtensionLoader loader = new ServiceExtensionLoader();
- loader.load(Extension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
+ loader.load(Extension.class, ShrinkWrap.create(JavaArchive.class, "test.jar"));
Assert.assertTrue(
"Should be placed in cache",
@@ -70,14 +69,12 @@
@Test(expected = RuntimeException.class)
public void shouldThrowExceptionOnMissingExtension() throws Exception {
- new ServiceExtensionLoader()
- .load(MissingExtension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
+ new ServiceExtensionLoader().load(MissingExtension.class, ShrinkWrap.create(JavaArchive.class, "test.jar"));
}
@Test(expected = RuntimeException.class)
public void shouldThrowExceptionOnWrongImplType() throws Exception {
- new ServiceExtensionLoader()
- .load(WrongImplExtension.class, ShrinkWrap.create("test.jar", JavaArchive.class));
+ new ServiceExtensionLoader().load(WrongImplExtension.class, ShrinkWrap.create(JavaArchive.class, "test.jar"));
}
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -141,7 +141,7 @@
{
log.info("testExportExplodedRequiresBaseDirectroy");
- ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(null);
+ ShrinkWrap.create(ExplodedExporter.class, "test.jar").exportExploded(null);
}
/**
@@ -155,7 +155,7 @@
log.info("testExportExplodedRequiresExisitingDirectroy");
final File directory = this.getNonexistantDirectory();
- ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(directory);
+ ShrinkWrap.create(ExplodedExporter.class, "test.jar").exportExploded(directory);
}
/**
@@ -166,7 +166,7 @@
{
log.info("testExportExplodedRequiresValidDirectory");
final File nonDirectory = new File(this.getTarget(), "tempFile.txt");
- ShrinkWrap.create("test.jar", ExplodedExporter.class).exportExploded(nonDirectory);
+ ShrinkWrap.create(ExplodedExporter.class, "test.jar").exportExploded(nonDirectory);
}
/**
@@ -179,7 +179,7 @@
final File directory = createTempDirectory("testExportExplodedOutpuDirCreationFails");
directory.deleteOnExit();
- ShrinkWrap.create("test/" + NAME_ARCHIVE, ExplodedExporter.class).exportExploded(directory);
+ ShrinkWrap.create(ExplodedExporter.class, "test/" + NAME_ARCHIVE).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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -159,7 +159,7 @@
protected Archive<?> createArchiveWithAssets()
{
// Create an archive
- Archive<?> archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class);
+ Archive<?> archive = ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE);
// Add some content
addContent(archive);
// Return archive
@@ -175,7 +175,7 @@
Archive<?> archive = createArchiveWithAssets();
// Create a nested archive
- Archive<?> nestedArchive = ShrinkWrap.create(NAME_NESTED_ARCHIVE, JavaArchive.class);
+ Archive<?> nestedArchive = ShrinkWrap.create(JavaArchive.class, NAME_NESTED_ARCHIVE);
// Add some content
addContent(nestedArchive);
@@ -184,7 +184,7 @@
archive.add(nestedArchive, new BasicPath());
// Add an archive nested in a directory
- Archive<?> nestedArchiveTwo = ShrinkWrap.create(NAME_NESTED_ARCHIVE_2, JavaArchive.class);
+ Archive<?> nestedArchiveTwo = ShrinkWrap.create(JavaArchive.class, NAME_NESTED_ARCHIVE_2);
// 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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterStressTest.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -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 = ShrinkWrap.create("hugeArchive.jar", JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "hugeArchive.jar");
// 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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -115,7 +115,7 @@
final Domain domain = ShrinkWrap.createDomain(new ConfigurationBuilder().executorService(service).build());
// Make an archive using the new configuration
- final Archive<?> archive = domain.getArchiveFactory().create("test.jar", JavaArchive.class).addClass(
+ final Archive<?> archive = domain.getArchiveFactory().create(JavaArchive.class, "test.jar").addClass(
ZipExporterTestCase.class);
// Fully export by reading all content (export is on-demand)
@@ -149,7 +149,7 @@
public void exportEmptyArchiveAsZip() throws Exception
{
// Attempt to export an empty archive, should fail
- ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).as(ZipExporter.class).exportZip();
+ ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE).as(ZipExporter.class).exportZip();
}
/**
@@ -162,7 +162,7 @@
public void testExportArchiveWithOnlyDirectories()
{
// Attempt to export an archive with some directories, should pass
- ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addDirectories("/test/game").as(ZipExporter.class).exportZip();
+ ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE).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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/formatter/FormatterTestBase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -70,7 +70,7 @@
@Before
public void createArchive()
{
- archive = ShrinkWrap.create(NAME_ARCHIVE, JavaArchive.class).addClasses(FormatterTestBase.class,
+ archive = ShrinkWrap.create(JavaArchive.class, NAME_ARCHIVE).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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -42,7 +42,7 @@
@Test
public void shouldBeAbleToImportADriectory() throws Exception {
- Archive<?> archive = ShrinkWrap.create("test.jar", ExplodedImporter.class)
+ Archive<?> archive = ShrinkWrap.create(ExplodedImporter.class, "test.jar")
.importDirectory(
SecurityActions.getThreadContextClassLoader()
.getResource(EXISTING_DIRECTORY_RESOURCE).toURI().getPath()
@@ -73,7 +73,7 @@
@Test(expected = IllegalArgumentException.class)
public void shouldThrowExceptionIfImportingAFile() throws Exception {
- ShrinkWrap.create("test.jar", ExplodedImporter.class)
+ ShrinkWrap.create(ExplodedImporter.class, "test.jar")
.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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/importer/ZipImporterImplTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -75,7 +75,7 @@
final File testFile = delegate.getExistingZipResource();
ZipFile testZip = new ZipFile(testFile);
- Archive<?> archive = ShrinkWrap.create("test.jar", ZipImporter.class).importZip(testZip).as(JavaArchive.class);
+ Archive<?> archive = ShrinkWrap.create(ZipImporter.class, "test.jar").importZip(testZip).as(JavaArchive.class);
Assert.assertNotNull("Should not return a null archive", archive);
@@ -91,7 +91,7 @@
final Archive<?> archive;
try
{
- archive = ShrinkWrap.create("test.jar", ZipImporter.class).importZip(stream).as(JavaArchive.class);
+ archive = ShrinkWrap.create(ZipImporter.class, "test.jar").importZip(stream).as(JavaArchive.class);
}
finally
{
@@ -119,7 +119,7 @@
final Archive<?> archive;
try
{
- archive = ShrinkWrap.create("test.jar", ZipImporter.class).importZip(stream).as(JavaArchive.class);
+ archive = ShrinkWrap.create(ZipImporter.class, "test.jar").importZip(stream).as(JavaArchive.class);
}
finally
{
@@ -149,7 +149,7 @@
});
try
{
- ShrinkWrap.create("test.jar", ZipImporter.class).importZip(stream).as(JavaArchive.class);
+ ShrinkWrap.create(ZipImporter.class, "test.jar").importZip(stream).as(JavaArchive.class);
}
finally
{
@@ -174,6 +174,6 @@
throw new IllegalStateException("mock exception");
}
};
- ShrinkWrap.create("test.jar", ZipImporter.class).importZip(testZip).as(JavaArchive.class);
+ ShrinkWrap.create(ZipImporter.class, "test.jar").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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -95,7 +95,7 @@
@Override
protected EnterpriseArchive createNewArchive()
{
- return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", EnterpriseArchive.class);
+ return ShrinkWrap.create(EnterpriseArchive.class, UUID.randomUUID().toString() + ".jar");
}
//-------------------------------------------------------------------------------------||
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -91,7 +91,7 @@
@Override
protected JavaArchive createNewArchive()
{
- return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", JavaArchive.class);
+ return ShrinkWrap.create(JavaArchive.class, UUID.randomUUID().toString() + ".jar");
}
//-------------------------------------------------------------------------------------||
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -96,7 +96,7 @@
@Override
protected ResourceAdapterArchive createNewArchive()
{
- return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", ResourceAdapterArchive.class);
+ return ShrinkWrap.create(ResourceAdapterArchive.class, UUID.randomUUID().toString() + ".jar");
}
//-------------------------------------------------------------------------------------||
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -97,7 +97,7 @@
@Override
protected WebArchive createNewArchive()
{
- return ShrinkWrap.create(UUID.randomUUID().toString() + ".jar", WebArchive.class);
+ return ShrinkWrap.create(WebArchive.class, UUID.randomUUID().toString() + ".jar");
}
//-------------------------------------------------------------------------------------||
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-06-01 22:26:48 UTC (rev 4468)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java 2010-06-01 23:56:18 UTC (rev 4469)
@@ -560,7 +560,7 @@
Archive<T> archive = getArchive();
try
{
- archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), (ArchivePath)null);
+ archive.add(ShrinkWrap.create(JavaArchive.class), (ArchivePath) null);
Assert.fail("Should have throw an IllegalArgumentException");
}
catch (IllegalArgumentException expectedException)
@@ -576,7 +576,7 @@
public void testAddArchiveToPathRequireStringPath() throws Exception
{
Archive<T> archive = getArchive();
- archive.add(ShrinkWrap.create("test.jar", JavaArchive.class), (String)null);
+ archive.add(ShrinkWrap.create(JavaArchive.class), (String) null);
}
/**
More information about the jboss-svn-commits
mailing list