[jboss-svn-commits] JBoss Common SVN: r3595 - in shrinkwrap/trunk: impl-base/src/main/java/org/jboss/shrinkwrap/impl/base and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 14 09:50:58 EDT 2009
Author: ALRubinger
Date: 2009-10-14 09:50:57 -0400 (Wed, 14 Oct 2009)
New Revision: 3595
Modified:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/EnterpriseContainer.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ManifestContainer.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ResourceContainer.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/WebContainer.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/EnterpriseContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/WebContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtil.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ContainerTestBase.java
Log:
[SHRINKWRAP-51] Remove support to add* operations with a URL and no target Path; Path must now be specified
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/EnterpriseContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/EnterpriseContainer.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/EnterpriseContainer.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -103,15 +103,7 @@
*/
T addApplicationResource(File resource) throws IllegalArgumentException;
- /**
- *
- * @param resource {@link URL} resource to add
- * @return This virtual archive
- * @throws IllegalArgumentException if resource is null
- */
- T addApplicationResource(URL resource) throws IllegalArgumentException;
-
/**
*
* @param target The target relative to application path within the archive into which we'll place the resource
@@ -229,14 +221,6 @@
* @throws IllegalArgumentException if resource is null
*/
T addModule(File resource) throws IllegalArgumentException;
-
- /**
- *
- * @param resource {@link URL} resource to add
- * @return This virtual archive
- * @throws IllegalArgumentException if resource is null
- */
- T addModule(URL resource) throws IllegalArgumentException;
/**
* Adds a resource to this {@link Archive}s module context.
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -59,7 +59,6 @@
T addLibrary(String resourceName) throws IllegalArgumentException;
T addLibrary(File resource) throws IllegalArgumentException;
- T addLibrary(URL resource) throws IllegalArgumentException;
T addLibrary(String target, String resourceName) throws IllegalArgumentException;
T addLibrary(String target, File resource) throws IllegalArgumentException;
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ManifestContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ManifestContainer.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ManifestContainer.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -78,7 +78,6 @@
T addManifestResource(String resourceName) throws IllegalArgumentException;
T addManifestResource(File resource) throws IllegalArgumentException;
- T addManifestResource(URL resource) throws IllegalArgumentException;
T addManifestResource(String target, String resourceName) throws IllegalArgumentException;
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ResourceContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ResourceContainer.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ResourceContainer.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -68,17 +68,6 @@
T addResource(File resource) throws IllegalArgumentException;
/**
- * Adds the resource located at the specified {@link URL} to the {@link Archive}. The
- * location within the archive will be equal to the path portion of the
- * specified {@link URL}.
- *
- * @param resource The resource to add
- * @return This virtual archive
- * @throws IllegalArgumentException If the resource is null
- */
- T addResource(URL resource) throws IllegalArgumentException;
-
- /**
* Adds the resource with the specified name
* to the container, returning the container itself.
* <br/><br/>
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/WebContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/WebContainer.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/WebContainer.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -110,14 +110,6 @@
/**
*
- * @param resource {@link URL} resource to add
- * @return This virtual archive
- * @throws IllegalArgumentException if resource is null
- */
- T addWebResource(URL resource) throws IllegalArgumentException;
-
- /**
- *
* @param target The target relative to Web path within the archive into which we'll place the resource
* @param resourceName Name of the {@link ClassLoader} resource to add
* @return This virtual archive
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ContainerBase.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ContainerBase.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -277,16 +277,6 @@
}
/* (non-Javadoc)
- * @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(java.net.URL)
- */
- @Override
- public T addManifestResource(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource should be specified");
- return addManifestResource(AssetUtil.getFullPathForURLResource(resource), new UrlAsset(resource));
- }
-
- /* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(java.lang.String, java.lang.String)
*/
@Override
@@ -414,16 +404,6 @@
Validate.notNull(resource, "Resource should be specified");
return addResource(resource.getName(), new FileAsset(resource));
}
-
- /* (non-Javadoc)
- * @see org.jboss.declarchive.api.container.ResourceContainer#addResource(java.net.URL)
- */
- @Override
- public final T addResource(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource should be specified");
- return addResource(AssetUtil.getFullPathForURLResource(resource), new UrlAsset(resource));
- }
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.ResourceContainer#addResource(java.lang.String, java.lang.String)
@@ -650,16 +630,6 @@
}
/* (non-Javadoc)
- * @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(java.net.URL)
- */
- @Override
- public T addLibrary(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource must be specified");
- return addLibrary(AssetUtil.getFullPathForURLResource(resource), new UrlAsset(resource));
- }
-
- /* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(java.lang.String, java.lang.String)
*/
@Override
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/EnterpriseContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/EnterpriseContainerBase.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/EnterpriseContainerBase.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -129,17 +129,6 @@
return addApplicationResource(resource.getName(), new FileAsset(resource));
}
-
- /* (non-Javadoc)
- * @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(java.net.URL)
- */
- @Override
- public T addApplicationResource(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource must be specified");
-
- return addApplicationResource(AssetUtil.getFullPathForURLResource(resource), new UrlAsset(resource));
- }
/* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(java.lang.String, java.lang.String)
@@ -287,18 +276,6 @@
Path location = new BasicPath(resource.getName());
return addModule(location, resource);
}
-
- /* (non-Javadoc)
- * @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(java.net.URL)
- */
- @Override
- public T addModule(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource must be specified");
-
- final Path location = AssetUtil.getFullPathForURLResource(resource);
- return addModule(location, resource);
- }
/* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(org.jboss.shrinkwrap.api.Path, java.io.File)
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/WebContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/WebContainerBase.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/WebContainerBase.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -135,17 +135,6 @@
}
/* (non-Javadoc)
- * @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(java.net.URL)
- */
- @Override
- public T addWebResource(URL resource) throws IllegalArgumentException
- {
- Validate.notNull(resource, "Resource should be specified");
-
- return addWebResource(AssetUtil.getFullPathForURLResource(resource), new UrlAsset(resource));
- }
-
- /* (non-Javadoc)
* @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(java.lang.String, java.lang.String)
*/
@Override
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtil.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtil.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtil.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -16,8 +16,6 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
-import java.net.URL;
-
import org.jboss.shrinkwrap.api.Path;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -115,17 +113,4 @@
String classFullPath = classResourceDelimiter + ".class";
return new BasicPath(classFullPath);
}
-
- /**
- * Helper to extract a URLs full path.
- * <br/><br/>
- * ie: file:///test/test.properties = /test/test.properties
- *
- * @param resource
- * @return
- */
- public static Path getFullPathForURLResource(URL resource)
- {
- return new BasicPath(resource.getPath());
- }
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -16,8 +16,6 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
-import java.net.URL;
-
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Path;
@@ -69,15 +67,4 @@
new BasicPath("/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.class"),
foundClassResourcePath);
}
-
- @Test
- public void shouldBeAbleToGetFullPathFromURL() throws Exception
- {
- Path foundURLPath = AssetUtil.getFullPathForURLResource(new URL("file:///test/test.properties"));
-
- Assert.assertEquals(
- "The url resource should have it's full path",
- new BasicPath("/test/test.properties"),
- foundURLPath);
- }
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ContainerTestBase.java 2009-10-14 03:58:14 UTC (rev 3594)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ContainerTestBase.java 2009-10-14 13:50:57 UTC (rev 3595)
@@ -149,27 +149,7 @@
.assertTrue("A resource should be located under " + expectedPath.get(), getArchive().contains(expectedPath));
}
-
/**
- * Ensure resources can be added to containers as a URL
- * @throws Exception
- */
- @Test
- public void testAddResourceFromUrl() throws Exception
- {
- ResourceContainer<T> container = getResourceContainer();
-
- URL url = getClass().getResource("/" + TEST_RESOURCE);
-
- container.addResource(url);
-
- Path expectedPath = new BasicPath(getResourcePath(), AssetUtil.getFullPathForURLResource(url));
-
- Assert
- .assertTrue("A resource should be located under " + expectedPath.get(), getArchive().contains(expectedPath));
- }
-
- /**
* Ensure resources can be added to containers as a URL in a specific path
*
* @throws Exception
More information about the jboss-svn-commits
mailing list