[jboss-svn-commits] JBoss Common SVN: r3931 - in shrinkwrap/trunk: api/src/main/java/org/jboss/shrinkwrap/api/container and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 14 19:55:52 EST 2010
Author: ALRubinger
Date: 2010-01-14 19:55:51 -0500 (Thu, 14 Jan 2010)
New Revision: 3931
Added:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePath.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePaths.java
Removed:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Path.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Paths.java
Modified:
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Filters.java
shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/DirectoryContainer.java
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/api/src/main/java/org/jboss/shrinkwrap/api/formatter/VerboseFormatter.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/MemoryMapArchiveBase.java
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/DirectoryAsset.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/EnterpriseContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/WebContainerBase.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/AbstractExporterDelegate.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/ExcludeRegExpPaths.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeAllPaths.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeRegExpPaths.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterImpl.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/BasicPath.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/PathUtil.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImpl.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImpl.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImpl.java
shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.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/FiltersTestCase.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/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/ZipExporterTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/BasicPathTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathUtilTestCase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestCase.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
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicEnterpriseContainerTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicResourceAdapterContainerTestBase.java
shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicWebContainerTestBase.java
Log:
[SHRINKWRAP-119] Rename Path(s) to ArchivePath(s) to not cause confusion w/ java.nio.file.Path in JDK7
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -52,7 +52,7 @@
* @return
* @throws IllegalArgumentException If no target or assets were specified
*/
- T add(Asset asset, Path target) throws IllegalArgumentException;
+ T add(Asset asset, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the specified asset under the specified target (directory)
@@ -65,7 +65,7 @@
* @return
* @throws IllegalArgumentException If the target, name, or asset was not specified
*/
- T add(Asset asset, Path target, String name) throws IllegalArgumentException;
+ T add(Asset asset, ArchivePath target, String name) throws IllegalArgumentException;
/**
* Adds the specified resource under the context denoted by the specified target
@@ -84,7 +84,7 @@
* @return The asset, or null if nothing is found at the Path
* @throws IllegalArgumentException If the path is not specified
*/
- Asset get(Path path) throws IllegalArgumentException;
+ Asset get(ArchivePath path) throws IllegalArgumentException;
/**
* Obtains the asset located at the specified path
@@ -103,7 +103,7 @@
* @return
* @throws IllegalArgumentException If the path is not specified
*/
- boolean contains(Path path) throws IllegalArgumentException;
+ boolean contains(ArchivePath path) throws IllegalArgumentException;
/**
* Removes the asset in the archive at the specified Path. If the path
@@ -112,21 +112,21 @@
* @param path
* @return Whether or not a deletion was made
*/
- boolean delete(Path path) throws IllegalArgumentException;
+ boolean delete(ArchivePath path) throws IllegalArgumentException;
/**
* Obtains all assets in this archive, along with its respective Path.
* The returned Map will be an immutable view.
* @return
*/
- Map<Path, Asset> getContent();
+ Map<ArchivePath, Asset> getContent();
/**
* Obtains all assets matching given filter in this archive, along with its respective Path.
* The returned Map will be an immutable view.
* @return
*/
- Map<Path, Asset> getContent(Filter<Path> filter);
+ Map<ArchivePath, Asset> getContent(Filter<ArchivePath> filter);
/**
* Add an archive under a specific context and maintain the archive name as context path.
@@ -136,7 +136,7 @@
* @return
* @throws IllegalArgumentException If the path or archive are not specified
*/
- T add(Archive<?> archive, Path path) throws IllegalArgumentException;
+ T add(Archive<?> archive, ArchivePath path) throws IllegalArgumentException;
/**
* Merge the contents from an existing archive without
@@ -152,13 +152,13 @@
* Merge the contents from an existing archive without
* maintaining the archive name in the context path.
*
- * The filter control which {@link Path}s to include form the source {@link Archive}.
+ * The filter control which {@link ArchivePath}s to include form the source {@link Archive}.
*
* @param source Archive to add contents from
* @return
* @throws IllegalArgumentException If the existing archive is not specified
*/
- T merge(Archive<?> source, Filter<Path> filter) throws IllegalArgumentException;
+ T merge(Archive<?> source, Filter<ArchivePath> filter) throws IllegalArgumentException;
/**
* Merge the contents from an existing archive in a specific path
@@ -169,12 +169,12 @@
* @return
* @throws IllegalArgumentException If the path or existing archive is not specified
*/
- T merge(Archive<?> source, Path path) throws IllegalArgumentException;
+ T merge(Archive<?> source, ArchivePath path) throws IllegalArgumentException;
/**
* Merge the contents from an existing archive in a specific path
* without maintaining the archive name in the context path.
- * The filter control which {@link Path}s to include form the source {@link Archive}.
+ * The filter control which {@link ArchivePath}s to include form the source {@link Archive}.
*
* @param source Archive to add contents from
* @param path Path to add contents to
@@ -182,7 +182,7 @@
* @return
* @throws IllegalArgumentException If the path or existing archive is not specified
*/
- T merge(Archive<?> source, Path path, Filter<Path> filter) throws IllegalArgumentException;
+ T merge(Archive<?> source, ArchivePath path, Filter<ArchivePath> filter) throws IllegalArgumentException;
/**
* Acts as a shorthand for {@link Archive#toString(Formatter)}
Copied: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePath.java (from rev 3930, shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Path.java)
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePath.java (rev 0)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePath.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -0,0 +1,34 @@
+/*
+ * 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;
+
+/**
+ * Represents a target context within an {@link Archive} under
+ * which an {@link Asset} may be found.
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public interface ArchivePath extends Comparable<ArchivePath>
+{
+ /**
+ * Obtains the context which this {@link ArchivePath} represents
+ *
+ * @return
+ */
+ String get();
+}
Copied: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePaths.java (from rev 3930, shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Paths.java)
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePaths.java (rev 0)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/ArchivePaths.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -0,0 +1,123 @@
+/*
+ * 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;
+
+/**
+ * A Factory for {@link ArchivePath} creation.
+ *
+ * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
+ * @version $Revision: $
+ */
+public final class ArchivePaths
+{
+ //-------------------------------------------------------------------------------------||
+ // Class Members ----------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ private static final String PATH_IMPL = "org.jboss.shrinkwrap.impl.base.path.BasicPath";
+
+ /**
+ * Creates a new {@link ArchivePath} representing the root path (/).
+ *
+ * @return a new root path
+ */
+ public static ArchivePath root()
+ {
+ return create(null);
+ }
+
+ /**
+ * Creates a new {@link ArchivePath} with the specified context
+ *
+ * @param context The context which this path represents. Null or
+ * blank represents the root. Relative paths will be adjusted
+ * to absolute form.
+ * @return a new path
+ */
+ public static ArchivePath create(String context)
+ {
+ return createInstance(new Class<?>[]
+ {String.class}, new Object[]
+ {context});
+ }
+
+ /**
+ * Creates a new {@link ArchivePath} using the specified base
+ * and specified relative context.
+ *
+ * @param basePath A absolute path
+ * @param context A relative path to basePath
+ * @return a new path
+ */
+ public static ArchivePath create(String basePath, String context)
+ {
+ return createInstance(new Class<?>[]
+ {String.class, String.class}, new Object[]
+ {basePath, context});
+ }
+
+ /**
+ * Creates a new {@link ArchivePath} using the specified base
+ * and specified relative context.
+ *
+ * @param basePath A absolute path
+ * @param context A relative path to basePath
+ * @return a new path
+ */
+ public static ArchivePath create(ArchivePath basePath, String context)
+ {
+ return createInstance(new Class<?>[]
+ {ArchivePath.class, String.class}, new Object[]
+ {basePath, context});
+ }
+
+ /**
+ * Creates a new {@link ArchivePath} using the specified base
+ * and specified relative context.
+ *
+ * @param basePath A absolute path
+ * @param context A relative path to basePath
+ * @return a new path
+ */
+ public static ArchivePath create(ArchivePath basePath, ArchivePath context)
+ {
+ return createInstance(new Class<?>[]
+ {ArchivePath.class, ArchivePath.class}, new Object[]
+ {basePath, context});
+ }
+
+ //-------------------------------------------------------------------------------------||
+ // Class Members - Internal Helpers ---------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ private static ArchivePath createInstance(Class<?>[] argumentTypes, Object[] arguments)
+ {
+ return SecurityActions.newInstance(PATH_IMPL, argumentTypes, arguments, ArchivePath.class);
+ }
+
+ //-------------------------------------------------------------------------------------||
+ // Constructor ------------------------------------------------------------------------||
+ //-------------------------------------------------------------------------------------||
+
+ /**
+ * No instantiation
+ */
+ private ArchivePaths()
+ {
+ }
+
+}
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Filters.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Filters.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Filters.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -54,14 +54,14 @@
}
/**
- * {@link Filter} that includes all {@link Path}s.
+ * {@link Filter} that includes all {@link ArchivePath}s.
*
* Only meant to be used internally.
*
* @return A {@link Filter} that always return true
*/
@SuppressWarnings("unchecked")
- public static Filter<Path> includeAll()
+ public static Filter<ArchivePath> includeAll()
{
return SecurityActions.newInstance(
INCLUDE_ALL_PATHS,
@@ -71,13 +71,13 @@
}
/**
- * {@link Filer} that include all {@link Path}s that match the given Regular Expression {@link Pattern}.
+ * {@link Filer} that include all {@link ArchivePath}s that match the given Regular Expression {@link Pattern}.
*
* @param regexp The expression to include
* @return A Regular Expression based include {@link Filter}
*/
@SuppressWarnings("unchecked")
- public static Filter<Path> include(String regexp)
+ public static Filter<ArchivePath> include(String regexp)
{
return SecurityActions.newInstance(
INCLUDE_REGEXP_PATHS,
@@ -87,13 +87,13 @@
}
/**
- * {@link Filter} that exclude all {@link Path}s that match a given Regular Expression {@link Pattern}.
+ * {@link Filter} that exclude all {@link ArchivePath}s that match a given Regular Expression {@link Pattern}.
*
* @param regexp The expression to exclude
* @return A Regular Expression based exclude {@link Filter}
*/
@SuppressWarnings("unchecked")
- public static Filter<Path> exclude(String regexp)
+ public static Filter<ArchivePath> exclude(String regexp)
{
return SecurityActions.newInstance(
EXCLUDE_REGEXP_PATHS,
Deleted: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Path.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Path.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Path.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -1,34 +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;
-
-/**
- * Represents a target context within an {@link Archive} under
- * which an {@link Asset} may be found.
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface Path extends Comparable<Path>
-{
- /**
- * Obtains the context which this Path represents
- *
- * @return
- */
- String get();
-}
Deleted: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Paths.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Paths.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Paths.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -1,114 +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;
-
-
-/**
- * A Factory for Path creation.
- *
- * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
- * @version $Revision: $
- */
-public final class Paths
-{
- //-------------------------------------------------------------------------------------||
- // Class Members ----------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- private static final String PATH_IMPL = "org.jboss.shrinkwrap.impl.base.path.BasicPath";
-
- /**
- * Creates a new Path representing the root path (/).
- *
- * @return a new root Path
- */
- public static Path root()
- {
- return create(null);
- }
-
- /**
- * Creates a new Path with the specified context
- *
- * @param context The context which this path represents. Null or
- * blank represents the root. Relative paths will be adjusted
- * to absolute form.
- * @return a new Path
- */
- public static Path create(String context)
- {
- return createInstance(new Class<?>[] {String.class}, new Object[]{context});
- }
-
- /**
- * Creates a new Path using the specified base
- * and specified relative context.
- *
- * @param basePath A absolute path
- * @param context A relative path to basePath
- * @return a new Path
- */
- public static Path create(String basePath, String context)
- {
- return createInstance(new Class<?>[] {String.class, String.class}, new Object[]{basePath, context});
- }
-
- /**
- * Creates a new Path using the specified base
- * and specified relative context.
- *
- * @param basePath A absolute path
- * @param context A relative path to basePath
- * @return a new Path
- */
- public static Path create(Path basePath, String context)
- {
- return createInstance(new Class<?>[] {Path.class, String.class}, new Object[]{basePath, context});
- }
-
- /**
- * Creates a new Path using the specified base
- * and specified relative context.
- *
- * @param basePath A absolute path
- * @param context A relative path to basePath
- * @return a new Path
- */
- public static Path create(Path basePath, Path context)
- {
- return createInstance(new Class<?>[] {Path.class, Path.class}, new Object[]{basePath, context});
- }
-
- //-------------------------------------------------------------------------------------||
- // Class Members - Internal Helpers ---------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- private static Path createInstance(Class<?>[] argumentTypes, Object[] arguments)
- {
- return SecurityActions.newInstance(PATH_IMPL, argumentTypes, arguments, Path.class);
- }
-
- //-------------------------------------------------------------------------------------||
- // Constructor ------------------------------------------------------------------------||
- //-------------------------------------------------------------------------------------||
-
- /**
- * No instantiation
- */
- private Paths() {}
-
-}
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/DirectoryContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/DirectoryContainer.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/DirectoryContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -17,7 +17,7 @@
package org.jboss.shrinkwrap.api.container;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* Defines the contract for a component capable of storing
@@ -57,7 +57,7 @@
* @return This archive
* @throws IllegalArgumentException If no path was specified
*/
- T addDirectory(Path path) throws IllegalArgumentException;
+ T addDirectory(ArchivePath path) throws IllegalArgumentException;
/**
* Adds the specified directory to the {@link Archive}.
@@ -66,6 +66,6 @@
* @return This archive
* @throws IllegalArgumentException If no paths were specified
*/
- T addDirectories(Path... paths) throws IllegalArgumentException;
+ T addDirectories(ArchivePath... paths) throws IllegalArgumentException;
}
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/EnterpriseContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* EnterpriseContainer
@@ -104,7 +104,7 @@
* @param resourceName Name of the {@link ClassLoader} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(String resourceName) throws IllegalArgumentException;
@@ -117,7 +117,7 @@
* @param resource {@link File} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(File resource) throws IllegalArgumentException;
@@ -137,7 +137,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(String resourceName, String target) throws IllegalArgumentException;
@@ -153,7 +153,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(File resource, String target) throws IllegalArgumentException;
@@ -170,7 +170,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(URL resource, String target) throws IllegalArgumentException;
@@ -182,7 +182,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
T addApplicationResource(Asset resource, String target) throws IllegalArgumentException;
@@ -201,9 +201,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
- T addApplicationResource(String resourceName, Path target) throws IllegalArgumentException;
+ T addApplicationResource(String resourceName, ArchivePath target) throws IllegalArgumentException;
/**
* Adds a {@link File} to this {@link Archive}s application context.
@@ -217,9 +217,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
- T addApplicationResource(File resource, Path target) throws IllegalArgumentException;
+ T addApplicationResource(File resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds a {@link URL} to this {@link Archive}s application context.
@@ -233,9 +233,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addApplicationResource(Asset, Path)
+ * @see #addApplicationResource(Asset, ArchivePath)
*/
- T addApplicationResource(URL resource, Path target) throws IllegalArgumentException;
+ T addApplicationResource(URL resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds a {@link Asset} to this {@link Archive}s application context.
@@ -246,7 +246,7 @@
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
*/
- T addApplicationResource(Asset resource, Path target) throws IllegalArgumentException;
+ T addApplicationResource(Asset resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds a archive to this {@link Archive}s module context.
@@ -267,7 +267,7 @@
* @param resourceName Name of the {@link ClassLoader} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(String resourceName) throws IllegalArgumentException;
@@ -279,7 +279,7 @@
* @param resource {@link File} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(File resource) throws IllegalArgumentException;
@@ -291,7 +291,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(String resourceName, String targetPath) throws IllegalArgumentException;
@@ -303,7 +303,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(File resource, String targetPath) throws IllegalArgumentException;
@@ -315,7 +315,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(URL resource, String targetPath) throws IllegalArgumentException;
@@ -327,7 +327,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
T addModule(Asset resource, String targetPath) throws IllegalArgumentException;
@@ -339,9 +339,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
- T addModule(String resourceName, Path targetPath) throws IllegalArgumentException;
+ T addModule(String resourceName, ArchivePath targetPath) throws IllegalArgumentException;
/**
* Adds a {@link File} to this {@link Archive}s module context.
@@ -351,9 +351,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
- T addModule(File resource, Path targetPath) throws IllegalArgumentException;
+ T addModule(File resource, ArchivePath targetPath) throws IllegalArgumentException;
/**
* Adds a {@link URL} to this {@link Archive}s module context.
@@ -363,9 +363,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if targetPath is null
- * @see #addModule(Asset, Path)
+ * @see #addModule(Asset, ArchivePath)
*/
- T addModule(URL resource, Path targetPath) throws IllegalArgumentException;
+ T addModule(URL resource, ArchivePath targetPath) throws IllegalArgumentException;
/**
* Adds a {@link Asset} to this {@link Archive}s module context.
@@ -376,5 +376,5 @@
* @throws IllegalArgumentException if targetPath is null
* @throws IllegalArgumentException if resource is null
*/
- T addModule(Asset resource, Path targetPath) throws IllegalArgumentException;
+ T addModule(Asset resource, ArchivePath targetPath) throws IllegalArgumentException;
}
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* LibraryContainer
@@ -52,7 +52,7 @@
* @param resourceName resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(String resourceName) throws IllegalArgumentException;
@@ -64,7 +64,7 @@
* @param resource {@link File} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(File resource) throws IllegalArgumentException;
@@ -78,7 +78,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(String resourceName, String target) throws IllegalArgumentException;
@@ -90,7 +90,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(File resource, String target) throws IllegalArgumentException;
@@ -102,7 +102,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(URL resource, String target) throws IllegalArgumentException;
@@ -114,7 +114,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(Asset resource, String target) throws IllegalArgumentException;
@@ -129,9 +129,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
- T addLibrary(String resourceName, Path target) throws IllegalArgumentException;
+ T addLibrary(String resourceName, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link File} as a library to the container, returning the container itself.
@@ -141,9 +141,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
- T addLibrary(File resource, Path target) throws IllegalArgumentException;
+ T addLibrary(File resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link URL} as a library to the container, returning the container itself.
@@ -153,9 +153,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
- T addLibrary(URL resource, Path target) throws IllegalArgumentException;
+ T addLibrary(URL resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link Asset} as a library to the container, returning the container itself.
@@ -166,7 +166,7 @@
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
*/
- T addLibrary(Asset resource, Path target) throws IllegalArgumentException;
+ T addLibrary(Asset resource, ArchivePath target) throws IllegalArgumentException;
/**
* Add another {@link Archive} to this {@link Archive} as a library to the container, returning the container itself.
@@ -176,7 +176,7 @@
* @param archive {@link Archive} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if {@link Archive} is null
- * @see #addLibrary(Asset, Path)
+ * @see #addLibrary(Asset, ArchivePath)
*/
T addLibrary(Archive<?> archive) 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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ManifestContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* ManifestContainer
@@ -80,7 +80,7 @@
* @param resource {@link File} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T setManifest(Asset resource) throws IllegalArgumentException;
@@ -96,7 +96,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(String resourceName) throws IllegalArgumentException;
@@ -109,7 +109,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if {@link File} resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(File resource) throws IllegalArgumentException;
@@ -123,7 +123,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(String resourceName, String target) throws IllegalArgumentException;
@@ -135,7 +135,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(File resource, String target) throws IllegalArgumentException;
@@ -147,7 +147,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(URL resource, String target) throws IllegalArgumentException;
@@ -159,7 +159,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
T addManifestResource(Asset resource, String target) throws IllegalArgumentException;
@@ -173,9 +173,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
- T addManifestResource(String resourceName, Path target) throws IllegalArgumentException;
+ T addManifestResource(String resourceName, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link File} as a Manifest resource to the container, returning the container itself.
@@ -185,9 +185,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
- T addManifestResource(File resource, Path target) throws IllegalArgumentException;
+ T addManifestResource(File resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link URL} as a Manifest resource to the container, returning the container itself.
@@ -197,9 +197,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addManifestResource(Asset, Path)
+ * @see #addManifestResource(Asset, ArchivePath)
*/
- T addManifestResource(URL resource, Path target) throws IllegalArgumentException;
+ T addManifestResource(URL resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link Asset} as a Manifest resource to the container, returning the container itself.
@@ -210,7 +210,7 @@
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
*/
- T addManifestResource(Asset resource, Path target) throws IllegalArgumentException;
+ T addManifestResource(Asset resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds a META-INF/services/ServiceInterfaceName {@link Asset} representing this service.
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ResourceContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* ResourceContainer
@@ -53,7 +53,7 @@
* @param resourceName resource to add
* @return This virtual archive
* @throws IllegalArgumentException If the resourceName is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(String resourceName) throws IllegalArgumentException;
@@ -65,7 +65,7 @@
* @param resource {@link File} resource to add
* @return This virtual archive
* @throws IllegalArgumentException If the resource is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(File resource) throws IllegalArgumentException;
@@ -79,7 +79,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(String resourceName, String target) throws IllegalArgumentException;
@@ -91,7 +91,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(File resource, String target) throws IllegalArgumentException;
@@ -103,7 +103,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(URL resource, String target) throws IllegalArgumentException;
@@ -115,7 +115,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
T addResource(Asset resource, String target) throws IllegalArgumentException;
@@ -130,7 +130,7 @@
* @throws IllegalArgumentException If the target is null
* @throws IllegalArgumentException If the resourceName is null
*/
- T addResource(String resourceName, Path target) throws IllegalArgumentException;
+ T addResource(String resourceName, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the resource as a resource to the container, returning the container itself.
@@ -142,9 +142,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
- T addResource(String resourceName, Path target, ClassLoader classLoader) throws IllegalArgumentException;
+ T addResource(String resourceName, ArchivePath target, ClassLoader classLoader) throws IllegalArgumentException;
/**
* Adds the {@link File} as a resource to the container, returning the container itself.
@@ -154,9 +154,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
- T addResource(File resource, Path target) throws IllegalArgumentException;
+ T addResource(File resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link URL} as a resource to the container, returning the container itself.
@@ -166,9 +166,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addResource(Asset, Path)
+ * @see #addResource(Asset, ArchivePath)
*/
- T addResource(URL resource, Path target) throws IllegalArgumentException;
+ T addResource(URL resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link Asset} as a resource to the container, returning the container itself.
@@ -179,5 +179,5 @@
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
*/
- T addResource(Asset resource, Path target) throws IllegalArgumentException;
+ T addResource(Asset resource, ArchivePath target) throws IllegalArgumentException;
}
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/WebContainer.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* WebContainer
@@ -80,7 +80,7 @@
* @param resource {@link Asset} resource to add
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T setWebXML(Asset resource) throws IllegalArgumentException;
@@ -96,7 +96,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(String resourceName) throws IllegalArgumentException;
@@ -109,7 +109,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if {@link File} resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(File resource) throws IllegalArgumentException;
@@ -123,7 +123,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(String resourceName, String target) throws IllegalArgumentException;
@@ -135,7 +135,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(File resource, String target) throws IllegalArgumentException;
@@ -147,7 +147,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(URL resource, String target) throws IllegalArgumentException;
@@ -159,7 +159,7 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
T addWebResource(Asset resource, String target) throws IllegalArgumentException;
@@ -174,9 +174,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resourceName is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
- T addWebResource(String resourceName, Path target) throws IllegalArgumentException;
+ T addWebResource(String resourceName, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link File} as a Web resource to the container, returning the container itself.
@@ -186,9 +186,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
- T addWebResource(File resource, Path target) throws IllegalArgumentException;
+ T addWebResource(File resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link URL} as a Web resource to the container, returning the container itself.
@@ -198,9 +198,9 @@
* @return This virtual archive
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
- * @see #addWebResource(Asset, Path)
+ * @see #addWebResource(Asset, ArchivePath)
*/
- T addWebResource(URL resource, Path target) throws IllegalArgumentException;
+ T addWebResource(URL resource, ArchivePath target) throws IllegalArgumentException;
/**
* Adds the {@link Asset} as a Web resource to the container, returning the container itself.
@@ -211,5 +211,5 @@
* @throws IllegalArgumentException if resource is null
* @throws IllegalArgumentException if target is null
*/
- T addWebResource(Asset resource, Path target) throws IllegalArgumentException;
+ T addWebResource(Asset resource, ArchivePath target) throws IllegalArgumentException;
}
Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/formatter/VerboseFormatter.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/formatter/VerboseFormatter.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/formatter/VerboseFormatter.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import java.util.List;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* {@link Formatter} implementation to provide an "ls -l"-esque
@@ -54,11 +54,11 @@
sb.append(archive.getName()).append(FormattingConstants.COLON).append(FormattingConstants.NEWLINE);
// Sort all paths
- final List<Path> paths = new ArrayList<Path>(archive.getContent().keySet());
+ final List<ArchivePath> paths = new ArrayList<ArchivePath>(archive.getContent().keySet());
Collections.sort(paths);
final int numPaths = paths.size();
int count = 0;
- for (final Path path : paths)
+ for (final ArchivePath path : paths)
{
count++;
sb.append(path.get());
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/ArchiveBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -27,7 +27,7 @@
import org.jboss.shrinkwrap.api.ExtensionLoader;
import org.jboss.shrinkwrap.api.Filter;
import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.formatter.Formatter;
import org.jboss.shrinkwrap.api.formatter.Formatters;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
@@ -111,7 +111,7 @@
Validate.notNull(asset, "asset must be specified");
// Make a Path from the target
- final Path path = new BasicPath(target);
+ final ArchivePath path = new BasicPath(target);
// Delegate
return this.add(asset, path);
@@ -119,10 +119,10 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Path, java.lang.String, org.jboss.shrinkwrap.api.Asset)
+ * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.ArchivePath, java.lang.String, org.jboss.shrinkwrap.api.Asset)
*/
@Override
- public T add(final Asset asset, final Path path, final String name)
+ public T add(final Asset asset, final ArchivePath path, final String name)
{
// Precondition checks
Validate.notNull(path, "No path was specified");
@@ -130,7 +130,7 @@
Validate.notNull(asset, "No asset was was specified");
// Make a relative path
- final Path resolvedPath = new BasicPath(path, name);
+ final ArchivePath resolvedPath = new BasicPath(path, name);
// Delegate
return this.add(asset, resolvedPath);
@@ -147,7 +147,7 @@
Validate.notNullOrEmpty(path, "No path was specified");
// Make a Path
- final Path realPath = new BasicPath(path);
+ final ArchivePath realPath = new BasicPath(path);
// Delegate
return get(realPath);
@@ -155,10 +155,10 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Archive)
+ * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.ArchivePath, org.jboss.shrinkwrap.api.Archive)
*/
@Override
- public T add(final Archive<?> archive, final Path path)
+ public T add(final Archive<?> archive, final ArchivePath path)
{
// Precondition checks
Validate.notNull(path, "No path was specified");
@@ -166,7 +166,7 @@
// Make a Path
final String archiveName = archive.getName();
- final Path contentPath = new BasicPath(path, archiveName);
+ final ArchivePath contentPath = new BasicPath(path, archiveName);
// Create ArchiveAsset
ArchiveAsset archiveAsset = new ArchiveAsset(archive);
@@ -198,17 +198,17 @@
* @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Filter)
*/
@Override
- public T merge(Archive<?> source, Filter<Path> filter) throws IllegalArgumentException
+ public T merge(Archive<?> source, Filter<ArchivePath> filter) throws IllegalArgumentException
{
return merge(source, new BasicPath(), filter);
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Archive)
+ * @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.ArchivePath, org.jboss.shrinkwrap.api.Archive)
*/
@Override
- public T merge(final Archive<?> source, final Path path) throws IllegalArgumentException
+ public T merge(final Archive<?> source, final ArchivePath path) throws IllegalArgumentException
{
Validate.notNull(source, "No source archive was specified");
Validate.notNull(path, "No path was specified");
@@ -220,7 +220,7 @@
* @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Filter)
*/
@Override
- public T merge(Archive<?> source, Path path, Filter<Path> filter) throws IllegalArgumentException
+ public T merge(Archive<?> source, ArchivePath path, Filter<ArchivePath> filter) throws IllegalArgumentException
{
// Precondition checks
Validate.notNull(source, "No source archive was specified");
@@ -228,14 +228,14 @@
Validate.notNull(filter, "No filter was specified");
// Get existing contents from source archive
- final Map<Path, Asset> sourceContent = source.getContent();
+ final Map<ArchivePath, Asset> sourceContent = source.getContent();
Validate.notNull(sourceContent, "Source archive content can not be null.");
// Add each asset from the source archive
- for (final Entry<Path, Asset> contentEntry : sourceContent.entrySet())
+ for (final Entry<ArchivePath, Asset> contentEntry : sourceContent.entrySet())
{
final Asset asset = contentEntry.getValue();
- Path assetPath = new BasicPath(path, contentEntry.getKey());
+ ArchivePath assetPath = new BasicPath(path, contentEntry.getKey());
if( !filter.include(assetPath))
{
continue;
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -28,7 +28,7 @@
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.ExtensionLoader;
import org.jboss.shrinkwrap.api.Filter;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -71,12 +71,12 @@
/**
* Storage for the {@link Asset}s.
*/
- private final Map<Path, Asset> content = new ConcurrentHashMap<Path, Asset>();
+ private final Map<ArchivePath, Asset> content = new ConcurrentHashMap<ArchivePath, Asset>();
/**
* Storage for the {@link ArchiveAsset}s. Used to help get access to nested archive content.
*/
- private final Map<Path, ArchiveAsset> nestedArchives = new ConcurrentHashMap<Path, ArchiveAsset>();
+ private final Map<ArchivePath, ArchiveAsset> nestedArchives = new ConcurrentHashMap<ArchivePath, ArchiveAsset>();
//-------------------------------------------------------------------------------------||
// Constructor ------------------------------------------------------------------------||
@@ -116,7 +116,7 @@
* @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T add(Asset asset, Path path)
+ public T add(Asset asset, ArchivePath path)
{
Validate.notNull(asset, "No asset was specified");
Validate.notNull(path, "No path was specified");
@@ -129,13 +129,13 @@
* @see org.jboss.shrinkwrap.impl.base.ArchiveBase#add(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T add(Archive<?> archive, Path path)
+ public T add(Archive<?> archive, ArchivePath path)
{
// Add archive asset
super.add(archive, path);
// Expected Archive Path
- Path archivePath = new BasicPath(path, archive.getName());
+ ArchivePath archivePath = new BasicPath(path, archive.getName());
// Get the Asset that was just added
Asset asset = get(archivePath);
@@ -155,7 +155,7 @@
* @see org.jboss.declarchive.api.Archive#contains(org.jboss.declarchive.api.Path)
*/
@Override
- public boolean contains(Path path)
+ public boolean contains(ArchivePath path)
{
Validate.notNull(path, "No path was specified");
@@ -171,7 +171,7 @@
* @see org.jboss.declarchive.api.Archive#delete(org.jboss.declarchive.api.Path)
*/
@Override
- public boolean delete(Path path)
+ public boolean delete(ArchivePath path)
{
Validate.notNull(path, "No path was specified");
return content.remove(path) != null;
@@ -181,7 +181,7 @@
* @see org.jboss.declarchive.api.Archive#get(org.jboss.declarchive.api.Path)
*/
@Override
- public Asset get(Path path)
+ public Asset get(ArchivePath path)
{
Validate.notNull(path, "No path was specified");
Asset asset = content.get(path);
@@ -196,7 +196,7 @@
* @see org.jboss.declarchive.api.Archive#getContent()
*/
@Override
- public Map<Path, Asset> getContent()
+ public Map<ArchivePath, Asset> getContent()
{
return Collections.unmodifiableMap(content);
}
@@ -205,12 +205,12 @@
* @see org.jboss.shrinkwrap.api.Archive#getContent(org.jboss.shrinkwrap.api.Filter)
*/
@Override
- public Map<Path, Asset> getContent(Filter<Path> filter)
+ public Map<ArchivePath, Asset> getContent(Filter<ArchivePath> filter)
{
Validate.notNull(filter, "Filter must be specified");
- Map<Path, Asset> filteredContent = new HashMap<Path, Asset>();
- for(Map.Entry<Path, Asset> contentEntry : content.entrySet())
+ Map<ArchivePath, Asset> filteredContent = new HashMap<ArchivePath, Asset>();
+ for(Map.Entry<ArchivePath, Asset> contentEntry : content.entrySet())
{
if(filter.include(contentEntry.getKey()))
{
@@ -227,12 +227,12 @@
/**
* Check to see if a path is found in a nested archive
*/
- private boolean nestedContains(Path path)
+ private boolean nestedContains(ArchivePath path)
{
// Iterate through nested archives
- for (Entry<Path, ArchiveAsset> nestedArchiveEntry : nestedArchives.entrySet())
+ for (Entry<ArchivePath, ArchiveAsset> nestedArchiveEntry : nestedArchives.entrySet())
{
- Path archivePath = nestedArchiveEntry.getKey();
+ ArchivePath archivePath = nestedArchiveEntry.getKey();
ArchiveAsset archiveAsset = nestedArchiveEntry.getValue();
// Check to see if the requested path starts with the nested archive path
@@ -241,7 +241,7 @@
Archive<?> nestedArchive = archiveAsset.getArchive();
// Get the asset path from within the nested archive
- Path nestedAssetPath = getNestedPath(path, archivePath);
+ ArchivePath nestedAssetPath = getNestedPath(path, archivePath);
// Recurse the call to the nested archive
return nestedArchive.contains(nestedAssetPath);
@@ -256,12 +256,12 @@
* @param path
* @return
*/
- private Asset getNestedAsset(Path path)
+ private Asset getNestedAsset(ArchivePath path)
{
// Iterate through nested archives
- for (Entry<Path, ArchiveAsset> nestedArchiveEntry : nestedArchives.entrySet())
+ for (Entry<ArchivePath, ArchiveAsset> nestedArchiveEntry : nestedArchives.entrySet())
{
- Path archivePath = nestedArchiveEntry.getKey();
+ ArchivePath archivePath = nestedArchiveEntry.getKey();
ArchiveAsset archiveAsset = nestedArchiveEntry.getValue();
// Check to see if the requested path starts with the nested archive path
@@ -270,7 +270,7 @@
Archive<?> nestedArchive = archiveAsset.getArchive();
// Get the asset path from within the nested archive
- Path nestedAssetPath = getNestedPath(path, archivePath);
+ ArchivePath nestedAssetPath = getNestedPath(path, archivePath);
// Recurse the call to the nested archive
return nestedArchive.get(nestedAssetPath);
@@ -286,7 +286,7 @@
* @param startingPath
* @return
*/
- private boolean startsWith(Path fullPath, Path startingPath)
+ private boolean startsWith(ArchivePath fullPath, ArchivePath startingPath)
{
final String context = fullPath.get();
final String startingContext = startingPath.get();
@@ -302,7 +302,7 @@
* @param basePath
* @return
*/
- private Path getNestedPath(Path fullPath, Path basePath)
+ private ArchivePath getNestedPath(ArchivePath fullPath, ArchivePath basePath)
{
final String context = fullPath.get();
final String baseContent = basePath.get();
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtil.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -16,7 +16,7 @@
*/
package org.jboss.shrinkwrap.impl.base.asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
/**
@@ -71,7 +71,7 @@
* @param resourceName The name of the resource
* @return A Path representation of the give resource
*/
- public static Path getPathForClassloaderResource(String resourceName)
+ public static ArchivePath getPathForClassloaderResource(String resourceName)
{
String extractedPath = null;
if (resourceName.lastIndexOf('/') != -1)
@@ -111,7 +111,7 @@
* @param clazz
* @return
*/
- public static Path getFullPathForClassResource(Class<?> clazz)
+ public static ArchivePath getFullPathForClassResource(Class<?> clazz)
{
String classResourceDelimiter = clazz.getName().replaceAll(
DELIMITER_CLASS_NAME_PATH, DELIMITER_RESOURCE_PATH);
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/DirectoryAsset.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/DirectoryAsset.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/asset/DirectoryAsset.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -20,12 +20,12 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* {@link Asset} implementation used to denote no backing
* resource, but simply a directory structure. When placed
- * into an {@link Archive} under some {@link Path}, only the
+ * into an {@link Archive} under some {@link ArchivePath}, only the
* path context will be respected. Modeled as a singleton
* as this implementation has no real state or identity (all
* directory assets are equal). Calls to {@link DirectoryAsset#openStream()}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -29,8 +29,8 @@
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filter;
import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -117,7 +117,7 @@
* @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T add(Archive<?> archive, Path path)
+ public T add(Archive<?> archive, ArchivePath path)
{
this.archive.add(archive, path);
return covarientReturn();
@@ -127,7 +127,7 @@
* @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T add(Asset asset, Path target) throws IllegalArgumentException
+ public T add(Asset asset, ArchivePath target) throws IllegalArgumentException
{
archive.add(asset, target);
return covarientReturn();
@@ -137,7 +137,7 @@
* @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path, java.lang.String)
*/
@Override
- public T add(Asset asset, Path path, String name)
+ public T add(Asset asset, ArchivePath path, String name)
{
archive.add(asset, path, name);
return covarientReturn();
@@ -157,7 +157,7 @@
* @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Filter)
*/
@Override
- public T merge(Archive<?> source, Filter<Path> filter) throws IllegalArgumentException
+ public T merge(Archive<?> source, Filter<ArchivePath> filter) throws IllegalArgumentException
{
archive.merge(source, filter);
return covarientReturn();
@@ -167,14 +167,14 @@
* @see org.jboss.shrinkwrap.api.Archive#merge(org.jboss.shrinkwrap.api.Archive, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T merge(Archive<?> source, Path path) throws IllegalArgumentException
+ public T merge(Archive<?> source, ArchivePath path) throws IllegalArgumentException
{
archive.merge(source, path);
return covarientReturn();
}
@Override
- public T merge(Archive<?> source, Path path, Filter<Path> filter) throws IllegalArgumentException
+ public T merge(Archive<?> source, ArchivePath path, Filter<ArchivePath> filter) throws IllegalArgumentException
{
archive.merge(source, path, filter);
return covarientReturn();
@@ -194,7 +194,7 @@
* @see org.jboss.declarchive.api.Archive#contains(org.jboss.declarchive.api.Path)
*/
@Override
- public boolean contains(Path path)
+ public boolean contains(ArchivePath path)
{
return archive.contains(path);
}
@@ -203,7 +203,7 @@
* @see org.jboss.declarchive.api.Archive#delete(org.jboss.declarchive.api.Path)
*/
@Override
- public boolean delete(Path path)
+ public boolean delete(ArchivePath path)
{
return archive.delete(path);
}
@@ -212,7 +212,7 @@
* @see org.jboss.declarchive.api.Archive#get(org.jboss.declarchive.api.Path)
*/
@Override
- public Asset get(Path path)
+ public Asset get(ArchivePath path)
{
return archive.get(path);
}
@@ -230,7 +230,7 @@
* @see org.jboss.declarchive.api.Archive#getContent()
*/
@Override
- public Map<Path, Asset> getContent()
+ public Map<ArchivePath, Asset> getContent()
{
return archive.getContent();
}
@@ -239,7 +239,7 @@
* @see org.jboss.shrinkwrap.api.Archive#getContent(org.jboss.shrinkwrap.api.Filter)
*/
@Override
- public Map<Path, Asset> getContent(Filter<Path> filter)
+ public Map<ArchivePath, Asset> getContent(Filter<ArchivePath> filter)
{
return archive.getContent(filter);
}
@@ -306,7 +306,7 @@
*
* @return Base Path for the ManifestContainer resources
*/
- protected abstract Path getManinfestPath();
+ protected abstract ArchivePath getManinfestPath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.ManifestContainer#setManifest(java.lang.String)
@@ -420,7 +420,7 @@
* @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addManifestResource(String resourceName, Path target) throws IllegalArgumentException
+ public T addManifestResource(String resourceName, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName should be specified");
Validate.notNull(target, "Target should be specified");
@@ -432,7 +432,7 @@
* @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addManifestResource(File resource, Path target) throws IllegalArgumentException
+ public T addManifestResource(File resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -444,7 +444,7 @@
* @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addManifestResource(URL resource, Path target) throws IllegalArgumentException
+ public T addManifestResource(URL resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -456,12 +456,12 @@
* @see org.jboss.shrinkwrap.api.container.ManifestContainer#addManifestResource(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addManifestResource(Asset resource, Path target) throws IllegalArgumentException
+ public T addManifestResource(Asset resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
- Path location = new BasicPath(getManinfestPath(), target);
+ ArchivePath location = new BasicPath(getManinfestPath(), target);
return add(resource, location);
}
@@ -472,7 +472,7 @@
Validate.notNullAndNoNullValues(serviceImpls, "ServiceImpls must be specified and can not contain null values");
Asset asset = new ServiceProviderAsset(serviceImpls);
- Path path = new BasicPath("services", serviceInterface.getName());
+ ArchivePath path = new BasicPath("services", serviceInterface.getName());
return addManifestResource(asset, path);
}
@@ -486,7 +486,7 @@
*
* @return Base Path for the ResourceContainer resources
*/
- protected abstract Path getResourcePath();
+ protected abstract ArchivePath getResourcePath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.ResourceContainer#addResource(java.lang.String)
@@ -560,7 +560,7 @@
* @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addResource(String resourceName, Path target) throws IllegalArgumentException
+ public T addResource(String resourceName, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName should be specified");
Validate.notNull(target, "Target should be specified");
@@ -572,7 +572,7 @@
* @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(java.lang.String, org.jboss.shrinkwrap.api.Path, java.lang.ClassLoader)
*/
@Override
- public T addResource(String resourceName, Path target, ClassLoader classLoader) throws IllegalArgumentException
+ public T addResource(String resourceName, ArchivePath target, ClassLoader classLoader) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName should be specified");
Validate.notNull(target, "Target should be specified");
@@ -585,7 +585,7 @@
* @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addResource(File resource, Path target) throws IllegalArgumentException
+ public T addResource(File resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -597,7 +597,7 @@
* @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addResource(URL resource, Path target) throws IllegalArgumentException
+ public T addResource(URL resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -609,12 +609,12 @@
* @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addResource(Asset resource, Path target) throws IllegalArgumentException
+ public T addResource(Asset resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
- Path location = new BasicPath(getResourcePath(), target);
+ ArchivePath location = new BasicPath(getResourcePath(), target);
return add(resource, location);
}
@@ -628,7 +628,7 @@
*
* @return Base Path for the ClassContainer resources
*/
- protected abstract Path getClassesPath();
+ protected abstract ArchivePath getClassesPath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.ClassContainer#addClass(java.lang.Class)
@@ -693,7 +693,7 @@
for(final Class<?> clazz : classes)
{
Asset resource = new ClassAsset(clazz);
- Path location = new BasicPath(getClassesPath(), AssetUtil.getFullPathForClassResource(clazz));
+ ArchivePath location = new BasicPath(getClassesPath(), AssetUtil.getFullPathForClassResource(clazz));
add(resource, location);
// Get all inner classes and add them
@@ -754,7 +754,7 @@
continue;
}
Asset asset = new ClassAsset(clazz);
- Path location = new BasicPath(getClassesPath(), AssetUtil.getFullPathForClassResource(clazz));
+ ArchivePath location = new BasicPath(getClassesPath(), AssetUtil.getFullPathForClassResource(clazz));
add(asset, location);
}
}
@@ -771,7 +771,7 @@
*
* @return Base Path for the LibraryContainer resources
*/
- protected abstract Path getLibraryPath();
+ protected abstract ArchivePath getLibraryPath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.LibraryContainer#addLibrary(org.jboss.declarchive.api.Archive)
@@ -854,7 +854,7 @@
* @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addLibrary(String resourceName, Path target) throws IllegalArgumentException
+ public T addLibrary(String resourceName, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName must be specified");
Validate.notNull(target, "Target must be specified");
@@ -866,7 +866,7 @@
* @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addLibrary(File resource, Path target) throws IllegalArgumentException
+ public T addLibrary(File resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
@@ -878,7 +878,7 @@
* @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addLibrary(URL resource, Path target) throws IllegalArgumentException
+ public T addLibrary(URL resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
@@ -890,12 +890,12 @@
* @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibrary(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addLibrary(Asset resource, Path target) throws IllegalArgumentException
+ public T addLibrary(Asset resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
- Path location = new BasicPath(getLibraryPath(), target);
+ ArchivePath location = new BasicPath(getLibraryPath(), target);
return add(resource, location);
}
@@ -947,10 +947,10 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.container.DirectoryContainer#addDirectory(org.jboss.shrinkwrap.api.Path)
+ * @see org.jboss.shrinkwrap.api.container.DirectoryContainer#addDirectory(org.jboss.shrinkwrap.api.ArchivePath)
*/
@Override
- public T addDirectory(final Path path) throws IllegalArgumentException
+ public T addDirectory(final ArchivePath path) throws IllegalArgumentException
{
// Precondition check
Validate.notNull(path, "path must be specified");
@@ -970,21 +970,21 @@
Validate.notNullOrEmpty(path, "path must be specified");
// Delegate and return
- return this.addDirectory(Paths.create(path));
+ return this.addDirectory(ArchivePaths.create(path));
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.container.DirectoryContainer#addDirectories(org.jboss.shrinkwrap.api.Path[])
+ * @see org.jboss.shrinkwrap.api.container.DirectoryContainer#addDirectories(org.jboss.shrinkwrap.api.ArchivePath[])
*/
@Override
- public T addDirectories(final Path... paths) throws IllegalArgumentException
+ public T addDirectories(final ArchivePath... paths) throws IllegalArgumentException
{
// Precondition check
Validate.notNull(paths, "paths must be specified");
// Add
- for (final Path path : paths)
+ for (final ArchivePath path : paths)
{
this.add(DirectoryAsset.INSTANCE, path);
}
@@ -1004,14 +1004,14 @@
Validate.notNull(paths, "paths must be specified");
// Represent as array of Paths
- final Collection<Path> pathsCollection = new ArrayList<Path>(paths.length);
+ final Collection<ArchivePath> pathsCollection = new ArrayList<ArchivePath>(paths.length);
for (final String path : paths)
{
- pathsCollection.add(Paths.create(path));
+ pathsCollection.add(ArchivePaths.create(path));
}
// Delegate and return
- return this.addDirectories(pathsCollection.toArray(new Path[]{}));
+ return this.addDirectories(pathsCollection.toArray(new ArchivePath[]{}));
}
//-------------------------------------------------------------------------------------||
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/EnterpriseContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/EnterpriseContainerBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/EnterpriseContainerBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.EnterpriseContainer;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.AssetUtil;
@@ -67,7 +67,7 @@
*
* @return Base Path for the EnterpriseContainer application resources
*/
- protected abstract Path getApplicationPath();
+ protected abstract ArchivePath getApplicationPath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.EnterpriseContainer#setApplicationXML(java.lang.String)
@@ -183,7 +183,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addApplicationResource(String resourceName, Path target) throws IllegalArgumentException
+ public T addApplicationResource(String resourceName, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName must be specified");
Validate.notNull(target, "Target must be specified");
@@ -195,7 +195,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addApplicationResource(File resource, Path target) throws IllegalArgumentException
+ public T addApplicationResource(File resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
@@ -207,7 +207,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addApplicationResource(URL resource, Path target) throws IllegalArgumentException
+ public T addApplicationResource(URL resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
@@ -219,12 +219,12 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addApplicationResource(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addApplicationResource(Asset resource, Path target) throws IllegalArgumentException
+ public T addApplicationResource(Asset resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(target, "Target must be specified");
- Path location = new BasicPath(getApplicationPath(), target);
+ ArchivePath location = new BasicPath(getApplicationPath(), target);
return add(resource, location);
}
@@ -238,7 +238,7 @@
*
* @return Base Path for the EnterpriseContainer module resources
*/
- protected abstract Path getModulePath();
+ protected abstract ArchivePath getModulePath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.EnterpriseContainer#addModule(org.jboss.declarchive.api.Archive)
@@ -259,7 +259,7 @@
{
Validate.notNull(resourceName, "ResourceName must be specified");
- Path location = new BasicPath(AssetUtil.getNameForClassloaderResource(resourceName));
+ ArchivePath location = new BasicPath(AssetUtil.getNameForClassloaderResource(resourceName));
return addModule(resourceName, location);
}
@@ -278,7 +278,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addModule(final File resource, final Path targetPath) throws IllegalArgumentException
+ public T addModule(final File resource, final ArchivePath targetPath) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(targetPath, "Target Path must be specified");
@@ -291,7 +291,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addModule(final String resourceName, final Path targetPath) throws IllegalArgumentException
+ public T addModule(final String resourceName, final ArchivePath targetPath) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName must be specified");
Validate.notNull(targetPath, "Target Path must be specified");
@@ -304,7 +304,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addModule(final URL resource, final Path targetPath) throws IllegalArgumentException
+ public T addModule(final URL resource, final ArchivePath targetPath) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(targetPath, "Target Path must be specified");
@@ -365,7 +365,7 @@
* @see org.jboss.shrinkwrap.api.container.EnterpriseContainer#addModule(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addModule(Asset resource, Path targetPath) throws IllegalArgumentException
+ public T addModule(Asset resource, ArchivePath targetPath) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource must be specified");
Validate.notNull(targetPath, "Target Path must be specified");
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/WebContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/WebContainerBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/WebContainerBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.WebContainer;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.AssetUtil;
@@ -71,7 +71,7 @@
*
* @return Base Path for the ManifestContainer resources
*/
- protected abstract Path getWebPath();
+ protected abstract ArchivePath getWebPath();
/* (non-Javadoc)
* @see org.jboss.declarchive.api.container.WebContainer#setWebXML(java.lang.String)
@@ -187,7 +187,7 @@
* @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(java.lang.String, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addWebResource(String resourceName, Path target) throws IllegalArgumentException
+ public T addWebResource(String resourceName, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resourceName, "ResourceName should be specified");
Validate.notNull(target, "Target should be specified");
@@ -199,7 +199,7 @@
* @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(java.io.File, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addWebResource(File resource, Path target) throws IllegalArgumentException
+ public T addWebResource(File resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -211,7 +211,7 @@
* @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(java.net.URL, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addWebResource(URL resource, Path target) throws IllegalArgumentException
+ public T addWebResource(URL resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
@@ -223,12 +223,12 @@
* @see org.jboss.shrinkwrap.api.container.WebContainer#addWebResource(org.jboss.shrinkwrap.api.Asset, org.jboss.shrinkwrap.api.Path)
*/
@Override
- public T addWebResource(Asset resource, Path target) throws IllegalArgumentException
+ public T addWebResource(Asset resource, ArchivePath target) throws IllegalArgumentException
{
Validate.notNull(resource, "Resource should be specified");
Validate.notNull(target, "Target should be specified");
- Path location = new BasicPath(getWebPath(), target);
+ ArchivePath location = new BasicPath(getWebPath(), target);
return add(resource, location);
}
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/AbstractExporterDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/AbstractExporterDelegate.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/AbstractExporterDelegate.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -25,7 +25,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* AbstractExporterDelegate
@@ -82,18 +82,18 @@
}
// Obtain all contents
- final Map<Path, Asset> content = archive.getContent();
+ final Map<ArchivePath, Asset> content = archive.getContent();
// Process in reverse order such that we can check for parent relationships,
// and not write directories twice
- final List<Path> paths = new ArrayList<Path>(content.keySet());
+ final List<ArchivePath> paths = new ArrayList<ArchivePath>(content.keySet());
Collections.reverse(paths);
// For every Path in the Archive
- for (final Path entry : paths)
+ for (final ArchivePath entry : paths)
{
// Get Asset information
- final Path path = entry;
+ final ArchivePath path = entry;
final Asset asset = content.get(entry);
// Process the asset
@@ -111,7 +111,7 @@
* @param path
* @param asset
*/
- protected abstract void processAsset(Path path, Asset asset);
+ protected abstract void processAsset(ArchivePath path, Asset asset);
/**
* Return the results of the export. Should process any tasks required to finalize the export.
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterDelegate.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -25,7 +25,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.exporter.ArchiveExportException;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
@@ -80,10 +80,10 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.exporter.AbstractExporterDelegate#processAsset(Path, Asset)
+ * @see org.jboss.shrinkwrap.impl.base.exporter.AbstractExporterDelegate#processAsset(ArchivePath, Asset)
*/
@Override
- protected void processAsset(Path path, Asset asset)
+ protected void processAsset(ArchivePath path, Asset asset)
{
// Get path to file
final String assetFilePath = path.get();
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExportDelegate.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -29,7 +29,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.exporter.ArchiveExportException;
import org.jboss.shrinkwrap.impl.base.asset.DirectoryAsset;
import org.jboss.shrinkwrap.impl.base.io.IOUtil;
@@ -66,7 +66,7 @@
* A Set of Paths we've exported so far (so that we don't write
* any entries twice)
*/
- private Set<Path> pathsExported = new HashSet<Path>();
+ private Set<ArchivePath> pathsExported = new HashSet<ArchivePath>();
//-------------------------------------------------------------------------------------||
// Constructor ------------------------------------------------------------------------||
@@ -116,10 +116,10 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.exporter.AbstractExporterDelegate#processAsset(Path, Asset)
+ * @see org.jboss.shrinkwrap.impl.base.exporter.AbstractExporterDelegate#processAsset(ArchivePath, Asset)
*/
@Override
- protected void processAsset(final Path path, final Asset asset)
+ protected void processAsset(final ArchivePath path, final Asset asset)
{
// Precondition checks
if (path == null)
@@ -138,12 +138,12 @@
* by recursing first and adding parents that
* haven't already been written.
*/
- final Path parent = PathUtil.getParent(path);
+ final ArchivePath parent = PathUtil.getParent(path);
if (parent != null && !this.pathsExported.contains(parent))
{
// If this is not the root
// SHRINKWRAP-96
- final Path grandParent = PathUtil.getParent(parent);
+ final ArchivePath grandParent = PathUtil.getParent(parent);
final boolean isRoot = grandParent == null;
if (!isRoot)
{
@@ -241,10 +241,10 @@
* @return
*/
//TODO The performance here will degrade geometrically with size of the archive
- private boolean isParentOfAnyPathsExported(final Path path)
+ private boolean isParentOfAnyPathsExported(final ArchivePath path)
{
// For all Paths already exported
- for(final Path exportedPath :this.pathsExported)
+ for(final ArchivePath exportedPath :this.pathsExported)
{
if( this.isParentOfSpecifiedHierarchy(path, exportedPath)){
return true;
@@ -260,9 +260,9 @@
* @param compare
* @return
*/
- private boolean isParentOfSpecifiedHierarchy(final Path path,final Path compare){
+ private boolean isParentOfSpecifiedHierarchy(final ArchivePath path,final ArchivePath compare){
// If we've reached the root, we're not a parent of any paths already exported
- final Path parent = PathUtil.getParent(compare);
+ final ArchivePath parent = PathUtil.getParent(compare);
if(parent==null)
{
return false;
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/ExcludeRegExpPaths.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/ExcludeRegExpPaths.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/ExcludeRegExpPaths.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -17,18 +17,18 @@
package org.jboss.shrinkwrap.impl.base.filter;
import org.jboss.shrinkwrap.api.Filter;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.impl.base.Validate;
/**
* IncludeRegExpPath
*
- * Filter to exclude all {@link Path}s that match a given Regular Expression.
+ * Filter to exclude all {@link ArchivePath}s that match a given Regular Expression.
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public class ExcludeRegExpPaths implements Filter<Path>
+public class ExcludeRegExpPaths implements Filter<ArchivePath>
{
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -54,7 +54,7 @@
* @see org.jboss.shrinkwrap.api.Filter#include(java.lang.Object)
*/
@Override
- public boolean include(Path path)
+ public boolean include(ArchivePath path)
{
if(path.get().matches(expression))
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeAllPaths.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeAllPaths.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeAllPaths.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -17,17 +17,17 @@
package org.jboss.shrinkwrap.impl.base.filter;
import org.jboss.shrinkwrap.api.Filter;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* IncludeAllPaths
*
- * Filter that include all {@link Path}s.
+ * Filter that include all {@link ArchivePath}s.
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public class IncludeAllPaths implements Filter<Path>
+public class IncludeAllPaths implements Filter<ArchivePath>
{
//-------------------------------------------------------------------------------------||
// Required Implementations -----------------------------------------------------------||
@@ -37,7 +37,7 @@
* @see org.jboss.shrinkwrap.api.Filter#include(java.lang.Object)
*/
@Override
- public boolean include(Path object)
+ public boolean include(ArchivePath object)
{
return true;
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeRegExpPaths.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeRegExpPaths.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/filter/IncludeRegExpPaths.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -17,18 +17,18 @@
package org.jboss.shrinkwrap.impl.base.filter;
import org.jboss.shrinkwrap.api.Filter;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.impl.base.Validate;
/**
* IncludeRegExpPath
*
- * Filter to include all {@link Path}s that match a given Regular Expression.
+ * Filter to include all {@link ArchivePath}s that match a given Regular Expression.
*
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public class IncludeRegExpPaths implements Filter<Path>
+public class IncludeRegExpPaths implements Filter<ArchivePath>
{
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -54,7 +54,7 @@
* @see org.jboss.shrinkwrap.api.Filter#include(java.lang.Object)
*/
@Override
- public boolean include(Path path)
+ public boolean include(ArchivePath path)
{
if(path.get().matches(expression))
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterImpl.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/importer/ExplodedImporterImpl.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -21,7 +21,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
import org.jboss.shrinkwrap.impl.base.AssignableBase;
import org.jboss.shrinkwrap.impl.base.Validate;
@@ -126,7 +126,7 @@
{
log.finer("Importing: " + file.getAbsolutePath());
}
- final Path path = calculatePath(root, file);
+ final ArchivePath path = calculatePath(root, file);
if (file.isDirectory())
{
archive.add(DirectoryAsset.INSTANCE,path);
@@ -147,7 +147,7 @@
* The Child file
* @return a Path fort he child relative to root
*/
- private Path calculatePath(File root, File child)
+ private ArchivePath calculatePath(File root, File child)
{
String rootPath = unifyPath(root.getPath());
String childPath = unifyPath(child.getPath());
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/BasicPath.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/BasicPath.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/BasicPath.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* BasicPath
@@ -31,7 +31,7 @@
* @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
* @version $Revision: $
*/
-public class BasicPath implements Path, Comparable<Path>
+public class BasicPath implements ArchivePath, Comparable<ArchivePath>
{
//-------------------------------------------------------------------------------------||
@@ -89,7 +89,7 @@
* @param basePath
* @param context
*/
- public BasicPath(final Path basePath, final Path context)
+ public BasicPath(final ArchivePath basePath, final ArchivePath context)
{
this(basePath, context.get());
}
@@ -101,7 +101,7 @@
* @param basePath
* @param context
*/
- public BasicPath(final Path basePath, final String context)
+ public BasicPath(final ArchivePath basePath, final String context)
{
this(basePath.get(), context);
}
@@ -124,7 +124,7 @@
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.api.Path#get()
+ * @see org.jboss.shrinkwrap.api.ArchivePath#get()
*/
@Override
public String get()
@@ -137,7 +137,7 @@
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
@Override
- public int compareTo(final Path path)
+ public int compareTo(final ArchivePath path)
{
// If a null argument, we're greater
if (path == null)
@@ -147,8 +147,8 @@
/*
* Check for parent relationship
*/
- final Path parentOfSpecified = PathUtil.getParent(path);
- final Path parentOfThis = PathUtil.getParent(this);
+ final ArchivePath parentOfSpecified = PathUtil.getParent(path);
+ final ArchivePath parentOfThis = PathUtil.getParent(this);
// If we're the parent of the specified, we're less
if (this.equals(parentOfSpecified))
{
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/PathUtil.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/PathUtil.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/path/PathUtil.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -17,7 +17,7 @@
*/
package org.jboss.shrinkwrap.impl.base.path;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* PathUtil
@@ -245,7 +245,7 @@
*
* @param path The path whose parent context we should return
*/
- public static Path getParent(final Path path)
+ public static ArchivePath getParent(final ArchivePath path)
{
// Precondition checks
assert path != null : "Path must be specified";
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImpl.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImpl.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.impl.base.container.EnterpriseContainerBase;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -43,27 +43,27 @@
/**
* Path to the manifests inside of the Archive.
*/
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
/**
* Path to the resources inside of the Archive.
*/
- private static final Path PATH_RESOURCE = PATH_MANIFEST;
+ private static final ArchivePath PATH_RESOURCE = PATH_MANIFEST;
/**
* Path to the application resources.
*/
- private static final Path PATH_APPLICATION = PATH_MANIFEST;
+ private static final ArchivePath PATH_APPLICATION = PATH_MANIFEST;
/**
* Path to the application libraries.
*/
- private static final Path PATH_LIBRARY = new BasicPath("lib");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath("lib");
/**
* Path to the application modules.
*/
- private static final Path PATH_MODULE = new BasicPath("/");
+ private static final ArchivePath PATH_MODULE = new BasicPath("/");
//-------------------------------------------------------------------------------------||
// Constructor ------------------------------------------------------------------------||
@@ -87,7 +87,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getLibraryPath()
*/
@Override
- public Path getLibraryPath()
+ public ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -96,7 +96,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getResourcePath()
*/
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@@ -105,7 +105,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
*/
@Override
- protected Path getManinfestPath()
+ protected ArchivePath getManinfestPath()
{
return PATH_MANIFEST;
}
@@ -114,7 +114,7 @@
* @see org.jboss.declarchive.impl.base.EnterpriseContainerBase#getApplicationPath()
*/
@Override
- protected Path getApplicationPath()
+ protected ArchivePath getApplicationPath()
{
return PATH_APPLICATION;
}
@@ -123,7 +123,7 @@
* @see org.jboss.declarchive.impl.base.EnterpriseContainerBase#getModulePath()
*/
@Override
- protected Path getModulePath()
+ protected ArchivePath getModulePath()
{
return PATH_MODULE;
}
@@ -134,7 +134,7 @@
* @throws UnsupportedOperationException EnterpriseArchive does not support classes
*/
@Override
- protected Path getClassesPath()
+ protected ArchivePath getClassesPath()
{
throw new UnsupportedOperationException("EnterpriseArchive does not support classes");
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImpl.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImpl.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.container.ContainerBase;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -47,17 +47,17 @@
/**
* Path to the manifests inside of the Archive.
*/
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
/**
* Path to the resources inside of the Archive.
*/
- private static final Path PATH_RESOURCE = new BasicPath("/");
+ private static final ArchivePath PATH_RESOURCE = new BasicPath("/");
/**
* Path to the classes inside of the Archive.
*/
- private static final Path PATH_CLASSES = new BasicPath("/");
+ private static final ArchivePath PATH_CLASSES = new BasicPath("/");
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -85,7 +85,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
*/
@Override
- protected Path getManinfestPath()
+ protected ArchivePath getManinfestPath()
{
return PATH_MANIFEST;
}
@@ -94,7 +94,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getClassesPath()
*/
@Override
- protected Path getClassesPath()
+ protected ArchivePath getClassesPath()
{
return PATH_CLASSES;
}
@@ -103,7 +103,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getResourcePath()
*/
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@@ -114,7 +114,7 @@
* @throws UnsupportedOperationException Libraries are not supported by JavaArchive
*/
@Override
- public Path getLibraryPath()
+ public ArchivePath getLibraryPath()
{
throw new UnsupportedOperationException("JavaArchive spec does not support Libraries");
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImpl.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImpl.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.spec.ResourceAdapterArchive;
import org.jboss.shrinkwrap.impl.base.container.ResourceAdapterContainerBase;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -43,17 +43,17 @@
/**
* Path to the manifests inside of the Archive.
*/
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
/**
* Path to the resources inside of the Archive.
*/
- private static final Path PATH_RESOURCE = new BasicPath("/");
+ private static final ArchivePath PATH_RESOURCE = new BasicPath("/");
/**
* Path to the application libraries.
*/
- private static final Path PATH_LIBRARY = new BasicPath("/");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath("/");
//-------------------------------------------------------------------------------------||
// Constructor ------------------------------------------------------------------------||
@@ -77,7 +77,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getLibraryPath()
*/
@Override
- public Path getLibraryPath()
+ public ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -86,7 +86,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getResourcePath()
*/
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@@ -95,7 +95,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
*/
@Override
- protected Path getManinfestPath()
+ protected ArchivePath getManinfestPath()
{
return PATH_MANIFEST;
}
@@ -106,7 +106,7 @@
* @throws UnsupportedOperationException ResourceAdapterArchive does not support classes
*/
@Override
- protected Path getClassesPath()
+ protected ArchivePath getClassesPath()
{
throw new UnsupportedOperationException("ResourceAdapterArchive does not support classes");
}
Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.impl.base.container.WebContainerBase;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
@@ -43,27 +43,27 @@
/**
* Path to the web inside of the Archive.
*/
- private static final Path PATH_WEB = new BasicPath("WEB-INF");
+ private static final ArchivePath PATH_WEB = new BasicPath("WEB-INF");
/**
* Path to the manifests inside of the Archive.
*/
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
/**
* Path to the resources inside of the Archive.
*/
- private static final Path PATH_RESOURCE = new BasicPath("/");
+ private static final ArchivePath PATH_RESOURCE = new BasicPath("/");
/**
* Path to the libraries inside of the Archive.
*/
- private static final Path PATH_LIBRARY = new BasicPath(PATH_WEB, "lib");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath(PATH_WEB, "lib");
/**
* Path to the classes inside of the Archive.
*/
- private static final Path PATH_CLASSES = new BasicPath(PATH_WEB, "classes");
+ private static final ArchivePath PATH_CLASSES = new BasicPath(PATH_WEB, "classes");
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -91,7 +91,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
*/
@Override
- protected Path getManinfestPath()
+ protected ArchivePath getManinfestPath()
{
return PATH_MANIFEST;
}
@@ -100,7 +100,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getClassesPath()
*/
@Override
- protected Path getClassesPath()
+ protected ArchivePath getClassesPath()
{
return PATH_CLASSES;
}
@@ -109,7 +109,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getResourcePath()
*/
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@@ -118,7 +118,7 @@
* @see org.jboss.declarchive.impl.base.ContainerBase#getLibraryPath()
*/
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -127,7 +127,7 @@
* @see org.jboss.declarchive.impl.base.WebContainerBase#getWebPath()
*/
@Override
- protected Path getWebPath()
+ protected ArchivePath getWebPath()
{
return PATH_WEB;
}
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/ArchivesTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -26,8 +26,8 @@
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Assignable;
import org.jboss.shrinkwrap.api.ExtensionLoader;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.formatter.Formatter;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.container.ContainerBase;
@@ -151,27 +151,27 @@
}
@Override
- protected Path getClassesPath()
+ protected ArchivePath getClassesPath()
{
- return Paths.root();
+ return ArchivePaths.root();
}
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
- return Paths.root();
+ return ArchivePaths.root();
}
@Override
- protected Path getManinfestPath()
+ protected ArchivePath getManinfestPath()
{
- return Paths.root();
+ return ArchivePaths.root();
}
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
- return Paths.root();
+ return ArchivePaths.root();
}
@Override
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/FiltersTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/FiltersTestCase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/FiltersTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -22,8 +22,8 @@
import org.jboss.shrinkwrap.api.Filter;
import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Assert;
import org.junit.Test;
@@ -40,9 +40,9 @@
@Test
public void shouldIncludeAll() throws Exception
{
- List<Path> paths = Arrays.asList(
- Paths.create("/META-INF/"), Paths.create("/WEB-INF/"));
- List<Path> filteredPaths = executeFilter(Path.class, paths, Filters.includeAll());
+ List<ArchivePath> paths = Arrays.asList(
+ ArchivePaths.create("/META-INF/"), ArchivePaths.create("/WEB-INF/"));
+ List<ArchivePath> filteredPaths = executeFilter(ArchivePath.class, paths, Filters.includeAll());
Assert.assertArrayEquals(
"Should include all paths",
@@ -53,9 +53,9 @@
@Test
public void shouldIncludePathRegExp() throws Exception
{
- List<Path> paths = Arrays.asList(
- Paths.create("/META-INF/"), Paths.create("/WEB-INF/"));
- List<Path> filteredPaths = executeFilter(Path.class, paths, Filters.include(".*META-INF.*"));
+ List<ArchivePath> paths = Arrays.asList(
+ ArchivePaths.create("/META-INF/"), ArchivePaths.create("/WEB-INF/"));
+ List<ArchivePath> filteredPaths = executeFilter(ArchivePath.class, paths, Filters.include(".*META-INF.*"));
Assert.assertEquals(
"Should only contain one",
@@ -64,16 +64,16 @@
Assert.assertEquals(
"Should only contain metainf",
- Paths.create("/META-INF/"),
+ ArchivePaths.create("/META-INF/"),
filteredPaths.get(0));
}
@Test
public void shouldExcludePathRegExp() throws Exception
{
- List<Path> paths = Arrays.asList(
- Paths.create("/META-INF/"), Paths.create("/WEB-INF/"));
- List<Path> filteredPaths = executeFilter(Path.class, paths, Filters.exclude(".*META-INF.*"));
+ List<ArchivePath> paths = Arrays.asList(
+ ArchivePaths.create("/META-INF/"), ArchivePaths.create("/WEB-INF/"));
+ List<ArchivePath> filteredPaths = executeFilter(ArchivePath.class, paths, Filters.exclude(".*META-INF.*"));
Assert.assertEquals(
"Should only contain one",
@@ -82,7 +82,7 @@
Assert.assertEquals(
"Should only contain webinf",
- Paths.create("/WEB-INF/"),
+ ArchivePaths.create("/WEB-INF/"),
filteredPaths.get(0));
}
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 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/asset/AssetUtilTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -18,7 +18,7 @@
import junit.framework.Assert;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
import org.junit.Test;
@@ -38,7 +38,7 @@
@Test
public void shouldBeAbleToGetPathForClassloaderResource() throws Exception
{
- Path foundResourcePath = AssetUtil.getPathForClassloaderResource(EXISTING_RESOURCE);
+ ArchivePath foundResourcePath = AssetUtil.getPathForClassloaderResource(EXISTING_RESOURCE);
Assert.assertEquals(
"The classloader resource path should not contain the file name",
@@ -60,7 +60,7 @@
@Test
public void shouldBeAbleToGetFullPathForClassResoruce() throws Exception
{
- Path foundClassResourcePath = AssetUtil.getFullPathForClassResource(this.getClass());
+ ArchivePath foundClassResourcePath = AssetUtil.getFullPathForClassResource(this.getClass());
Assert.assertEquals(
"The class resource should have a / delimiter and a .class extension",
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExplodedExporterTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -28,7 +28,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.exporter.ArchiveExportException;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
import org.jboss.shrinkwrap.impl.base.TestIOUtil;
@@ -120,12 +120,12 @@
Assert.assertEquals(expectedDirectory, explodedDirectory);
// Validate nested archive entries were written out
- Path nestedArchivePath = new BasicPath(NAME_NESTED_ARCHIVE);
+ ArchivePath nestedArchivePath = new BasicPath(NAME_NESTED_ARCHIVE);
assertAssetInExploded(explodedDirectory, new BasicPath(nestedArchivePath, PATH_ONE), ASSET_ONE);
assertAssetInExploded(explodedDirectory, new BasicPath(nestedArchivePath, PATH_TWO), ASSET_TWO);
- Path nestedArchivePathTwo = new BasicPath(NESTED_PATH, NAME_NESTED_ARCHIVE_2);
+ ArchivePath nestedArchivePathTwo = new BasicPath(NESTED_PATH, NAME_NESTED_ARCHIVE_2);
assertAssetInExploded(explodedDirectory, new BasicPath(nestedArchivePathTwo, PATH_ONE), ASSET_ONE);
assertAssetInExploded(explodedDirectory, new BasicPath(nestedArchivePathTwo, PATH_TWO), ASSET_TWO);
@@ -280,7 +280,7 @@
* @throws IOException
* @throws IllegalArgumentException
*/
- private void assertAssetInExploded(File explodedDirectory, Path path, Asset asset) throws FileNotFoundException
+ private void assertAssetInExploded(File explodedDirectory, ArchivePath path, Asset asset) throws FileNotFoundException
{
File assetFile = new File(explodedDirectory, path.get());
Assert.assertNotNull(assetFile);
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ExportTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -24,8 +24,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.TestIOUtil;
import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
@@ -72,7 +72,7 @@
/**
* Path of for nested content
*/
- protected static final Path NESTED_PATH = new BasicPath("nested");
+ protected static final ArchivePath NESTED_PATH = new BasicPath("nested");
/**
* Name of a nested archive
@@ -92,7 +92,7 @@
/**
* Path used for testing
*/
- protected static final Path PATH_ONE = new BasicPath("Test.properties");
+ protected static final ArchivePath PATH_ONE = new BasicPath("Test.properties");
/**
* Another asset used for testing
@@ -102,17 +102,17 @@
/**
* Another path used for testing
*/
- protected static final Path PATH_TWO = new BasicPath(NESTED_PATH, "Test2.properties");
+ protected static final ArchivePath PATH_TWO = new BasicPath(NESTED_PATH, "Test2.properties");
/**
* Path to a nested empty directory
*/
- protected static final Path PATH_EMPTY_NESTED_DIR = Paths.create("/empty");
+ protected static final ArchivePath PATH_EMPTY_NESTED_DIR = ArchivePaths.create("/empty");
/**
* Path to an empty directory, a child of the nested
*/
- protected static final Path PATH_EMPTY_TOPLEVEL_DIR = Paths.create("/empty/directory");
+ protected static final ArchivePath PATH_EMPTY_TOPLEVEL_DIR = ArchivePaths.create("/empty/directory");
//-------------------------------------------------------------------------------------||
// Functional Methods -----------------------------------------------------------------||
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/exporter/ZipExporterTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -29,7 +29,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.exporter.ArchiveExportException;
import org.jboss.shrinkwrap.api.exporter.FileExistsException;
import org.jboss.shrinkwrap.api.exporter.ZipExporter;
@@ -169,7 +169,7 @@
assertAssetInZip(expectedZip, PATH_TWO, ASSET_TWO);
// Validate nested archive entries were written out
- Path nestedArchivePath = new BasicPath(NAME_NESTED_ARCHIVE);
+ ArchivePath nestedArchivePath = new BasicPath(NAME_NESTED_ARCHIVE);
// Get Zip entry path
String nestedArchiveZipEntryPath = PathUtil.optionallyRemovePrecedingSlash(nestedArchivePath.get());
@@ -187,7 +187,7 @@
assertAssetInZip(nestedZip, PATH_TWO, ASSET_TWO);
// Validate nested archive entries were written out
- Path nestedArchiveTwoPath = new BasicPath(NESTED_PATH, NAME_NESTED_ARCHIVE_2);
+ ArchivePath nestedArchiveTwoPath = new BasicPath(NESTED_PATH, NAME_NESTED_ARCHIVE_2);
// Get Zip entry path
String nestedArchiveTwoZipEntryPath = PathUtil.optionallyRemovePrecedingSlash(nestedArchiveTwoPath.get());
@@ -253,7 +253,7 @@
* @throws IOException
* @throws IllegalArgumentException
*/
- private void assertAssetInZip(ZipFile expectedZip, Path path, Asset asset) throws IllegalArgumentException,
+ private void assertAssetInZip(ZipFile expectedZip, ArchivePath path, Asset asset) throws IllegalArgumentException,
IOException
{
final ZipEntry entry = this.getEntryFromZip(expectedZip, path);
@@ -271,7 +271,7 @@
* @throws IllegalArgumentException
* @throws IOException
*/
- private ZipEntry getEntryFromZip(final ZipFile expectedZip, final Path path) throws IllegalArgumentException,
+ private ZipEntry getEntryFromZip(final ZipFile expectedZip, final ArchivePath path) throws IllegalArgumentException,
IOException
{
String entryPath = PathUtil.optionallyRemovePrecedingSlash(path.get());
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/BasicPathTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/BasicPathTestCase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/BasicPathTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -18,7 +18,7 @@
import java.util.logging.Logger;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
/**
* BasicPathTestCase
@@ -51,27 +51,27 @@
* @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(java.lang.String)
*/
@Override
- Path createPath(final String context)
+ ArchivePath createPath(final String context)
{
return new BasicPath(context);
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Path)
+ * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.ArchivePath, org.jboss.shrinkwrap.api.ArchivePath)
*/
@Override
- Path createPath(Path base, Path context)
+ ArchivePath createPath(ArchivePath base, ArchivePath context)
{
return new BasicPath(base, context);
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.Path, java.lang.String)
+ * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.ArchivePath, java.lang.String)
*/
@Override
- Path createPath(Path base, String context)
+ ArchivePath createPath(ArchivePath base, String context)
{
return new BasicPath(base, context);
}
@@ -81,7 +81,7 @@
* @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(java.lang.String, java.lang.String)
*/
@Override
- Path createPath(String base, String context)
+ ArchivePath createPath(String base, String context)
{
return new BasicPath(base, context);
}
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathUtilTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathUtilTestCase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathUtilTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -4,8 +4,8 @@
import junit.framework.TestCase;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.junit.Assert;
import org.junit.Test;
@@ -192,10 +192,10 @@
final String subpathString = "subpath/";
final String contextString = "context";
final String contextWithFollowingSlashString = "context/";
- final Path root = Paths.create(rootString);
- final Path subpath = Paths.create(subpathString);
- final Path context = Paths.create(subpath, contextString);
- final Path contextWithFollowingSlash = new BasicPath(subpath, contextWithFollowingSlashString);
+ final ArchivePath root = ArchivePaths.create(rootString);
+ final ArchivePath subpath = ArchivePaths.create(subpathString);
+ final ArchivePath context = ArchivePaths.create(subpath, contextString);
+ final ArchivePath contextWithFollowingSlash = new BasicPath(subpath, contextWithFollowingSlashString);
// Test
TestCase.assertEquals("The parent of the context path should be equal to the initial subpath", subpath,
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -18,12 +18,12 @@
import java.util.logging.Logger;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.junit.Assert;
import org.junit.Test;
/**
- * Base support for tests of {@link Path} implementations
+ * Base support for tests of {@link ArchivePath} implementations
* and factories
*
* @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
@@ -45,43 +45,43 @@
//-------------------------------------------------------------------------------------||
/**
- * Creates and returns a new {@link Path}
+ * Creates and returns a new {@link ArchivePath}
* with the specified context
*
* @param context Context to assign the Path
* @throws IllegalArgumentException If the context is not specified
*/
- abstract Path createPath(final String context);
+ abstract ArchivePath createPath(final String context);
/**
- * Creates and returns a new {@link Path}
+ * Creates and returns a new {@link ArchivePath}
* with the specified context and base
*
* @param base Parent context
* @param context Context to assign the Path
* @throws IllegalArgumentException If the context or base is not specified
*/
- abstract Path createPath(final Path base, final Path context);
+ abstract ArchivePath createPath(final ArchivePath base, final ArchivePath context);
/**
- * Creates and returns a new {@link Path}
+ * Creates and returns a new {@link ArchivePath}
* with the specified context and base
*
* @param base Parent context
* @param context Context to assign the Path
* @throws IllegalArgumentException If the context or base is not specified
*/
- abstract Path createPath(final Path base, final String context);
+ abstract ArchivePath createPath(final ArchivePath base, final String context);
/**
- * Creates and returns a new {@link Path}
+ * Creates and returns a new {@link ArchivePath}
* with the specified context and base
*
* @param base Parent context
* @param context Context to assign the Path
* @throws IllegalArgumentException If the context or base is not specified
*/
- abstract Path createPath(final String base, final String context);
+ abstract ArchivePath createPath(final String base, final String context);
//-------------------------------------------------------------------------------------||
// Tests ------------------------------------------------------------------------------||
@@ -98,7 +98,7 @@
log.info("testNullDefaultsToRoot");
// Create a path with null context
- final Path path = this.createPath(null);
+ final ArchivePath path = this.createPath(null);
// Ensure expected
final String resolved = path.get();
@@ -118,7 +118,7 @@
// Create a relative path
final String relative = "relative";
- final Path path = this.createPath(relative);
+ final ArchivePath path = this.createPath(relative);
// Ensure expected
final String resolved = path.get();
@@ -139,7 +139,7 @@
// Create an absolute dir path
final String absoluteDir = "/absoluteDir/";
- final Path path = this.createPath(absoluteDir);
+ final ArchivePath path = this.createPath(absoluteDir);
// Ensure expected
final String resolved = path.get();
@@ -160,12 +160,12 @@
// Create a base path
final String base = "base";
- final Path basePath = this.createPath(base);
+ final ArchivePath basePath = this.createPath(base);
// Create a new path using a relative context to the base
final String context = "context";
- final Path contextPath = this.createPath(context);
- final Path path = this.createPath(basePath, contextPath);
+ final ArchivePath contextPath = this.createPath(context);
+ final ArchivePath path = this.createPath(basePath, contextPath);
// Ensure expected
final String resolved = path.get();
@@ -186,11 +186,11 @@
// Create a base path
final String base = "base";
- final Path basePath = this.createPath(base);
+ final ArchivePath basePath = this.createPath(base);
// Create a new path using a relative context to the base
final String context = "context";
- final Path path = this.createPath(basePath, context);
+ final ArchivePath path = this.createPath(basePath, context);
// Ensure expected
final String resolved = path.get();
@@ -215,7 +215,7 @@
// Create a new path using a relative context to the base
final String context = "context";
- final Path path = this.createPath(base, context);
+ final ArchivePath path = this.createPath(base, context);
// Ensure expected
final String resolved = path.get();
@@ -236,8 +236,8 @@
// Create new paths
final String context = "context";
- final Path path1 = this.createPath(context);
- final Path path2 = this.createPath(context);
+ final ArchivePath path1 = this.createPath(context);
+ final ArchivePath path2 = this.createPath(context);
// Obtain hash
final int hash1 = path1.hashCode();
@@ -261,9 +261,9 @@
// Create new paths
final String context = "context";
final String contextWithFollowingSlash = context + PathUtil.SLASH;
- final Path path1 = this.createPath(context);
- final Path path2 = this.createPath(context);
- final Path pathWithFollowingSlash = this.createPath(contextWithFollowingSlash);
+ final ArchivePath path1 = this.createPath(context);
+ final ArchivePath path2 = this.createPath(context);
+ final ArchivePath pathWithFollowingSlash = this.createPath(contextWithFollowingSlash);
// Ensure expected
Assert.assertEquals("Paths with same context should be equal by value", path1, path2);
@@ -285,8 +285,8 @@
// Create new paths
final String context1 = "context1";
final String context2 = "context2";
- final Path path1 = this.createPath(context1);
- final Path path2 = this.createPath(context2);
+ final ArchivePath path1 = this.createPath(context1);
+ final ArchivePath path2 = this.createPath(context2);
// Ensure expected
Assert.assertTrue("Paths with different contexts should not be equal by value", !path1.equals(path2));
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestCase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/path/PathsTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -18,13 +18,13 @@
import java.util.logging.Logger;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
/**
* PathsTestCase
*
- * Tests to ensure that the {@link Paths}
+ * Tests to ensure that the {@link ArchivePaths}
* implementation creates Paths as expected
* from various specified contexts
*
@@ -52,29 +52,29 @@
* @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(java.lang.String)
*/
@Override
- Path createPath(final String context)
+ ArchivePath createPath(final String context)
{
- return Paths.create(context);
+ return ArchivePaths.create(context);
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.Path, org.jboss.shrinkwrap.api.Path)
+ * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.ArchivePath, org.jboss.shrinkwrap.api.ArchivePath)
*/
@Override
- Path createPath(Path base, Path context)
+ ArchivePath createPath(ArchivePath base, ArchivePath context)
{
- return Paths.create(base, context);
+ return ArchivePaths.create(base, context);
}
/**
* {@inheritDoc}
- * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.Path, java.lang.String)
+ * @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(org.jboss.shrinkwrap.api.ArchivePath, java.lang.String)
*/
@Override
- Path createPath(Path base, String context)
+ ArchivePath createPath(ArchivePath base, String context)
{
- return Paths.create(base, context);
+ return ArchivePaths.create(base, context);
}
/**
@@ -82,8 +82,8 @@
* @see org.jboss.shrinkwrap.impl.base.path.PathsTestBase#createPath(java.lang.String, java.lang.String)
*/
@Override
- Path createPath(String base, String context)
+ ArchivePath createPath(String base, String context)
{
- return Paths.create(base, context);
+ return ArchivePaths.create(base, context);
}
}
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/EnterpriseArchiveImplTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.EnterpriseContainer;
@@ -48,11 +48,11 @@
//-------------------------------------------------------------------------------------||
// Class Members ----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private static final Path PATH_APPLICATION = new BasicPath("META-INF");
+ private static final ArchivePath PATH_APPLICATION = new BasicPath("META-INF");
- private static final Path PATH_LIBRARY = new BasicPath("lib");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath("lib");
- private static final Path PATH_MODULE = new BasicPath("/");
+ private static final ArchivePath PATH_MODULE = new BasicPath("/");
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -110,7 +110,7 @@
}
@Override
- protected Path getClassPath()
+ protected ArchivePath getClassPath()
{
throw new UnsupportedOperationException("EnterpriseArchives do not support classes");
}
@@ -132,19 +132,19 @@
}
@Override
- protected Path getManifestPath()
+ protected ArchivePath getManifestPath()
{
return PATH_APPLICATION;
}
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_APPLICATION;
}
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -165,11 +165,11 @@
// Required Impls - DynamicEnterpriseContainerTestBase --------------------------------||
//-------------------------------------------------------------------------------------||
- protected Path getModulePath() {
+ protected ArchivePath getModulePath() {
return PATH_MODULE;
}
- protected Path getApplicationPath() {
+ protected ArchivePath getApplicationPath() {
return PATH_APPLICATION;
}
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/JavaArchiveImplTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -44,11 +44,11 @@
@ArchiveType(JavaArchive.class)
public class JavaArchiveImplTestCase extends DynamicContainerTestBase<JavaArchive>
{
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
- private static final Path PATH_CLASS = new BasicPath("/");
+ private static final ArchivePath PATH_CLASS = new BasicPath("/");
- private static final Path PATH_RESOURCE = new BasicPath();
+ private static final ArchivePath PATH_RESOURCE = new BasicPath();
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -134,25 +134,25 @@
}
@Override
- protected Path getManifestPath()
+ protected ArchivePath getManifestPath()
{
return PATH_MANIFEST;
}
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@Override
- protected Path getClassPath()
+ protected ArchivePath getClassPath()
{
return PATH_CLASS;
}
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
throw new UnsupportedOperationException("JavaArchive does not support libraries");
}
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/ResourceAdapterArchiveImplTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -49,11 +49,11 @@
// Class Members ----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private static final Path PATH_RESOURCE = new BasicPath("/");
+ private static final ArchivePath PATH_RESOURCE = new BasicPath("/");
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
- private static final Path PATH_LIBRARY = new BasicPath("/");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath("/");
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -111,7 +111,7 @@
}
@Override
- protected Path getClassPath()
+ protected ArchivePath getClassPath()
{
throw new UnsupportedOperationException("ResourceAdapterArchive do not support classes");
}
@@ -133,19 +133,19 @@
}
@Override
- protected Path getManifestPath()
+ protected ArchivePath getManifestPath()
{
return PATH_MANIFEST;
}
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -167,7 +167,7 @@
//-------------------------------------------------------------------------------------||
@Override
- protected Path getResourceAdapterPath()
+ protected ArchivePath getResourceAdapterPath()
{
return getManifestPath();
}
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import java.util.UUID;
import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -49,15 +49,15 @@
// Class Members ----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- private static final Path PATH_WEBINF = new BasicPath("WEB-INF");
+ private static final ArchivePath PATH_WEBINF = new BasicPath("WEB-INF");
- private static final Path PATH_LIBRARY = new BasicPath(PATH_WEBINF, "lib");
+ private static final ArchivePath PATH_LIBRARY = new BasicPath(PATH_WEBINF, "lib");
- private static final Path PATH_CLASSES = new BasicPath(PATH_WEBINF, "classes");
+ private static final ArchivePath PATH_CLASSES = new BasicPath(PATH_WEBINF, "classes");
- private static final Path PATH_MANIFEST = new BasicPath("META-INF");
+ private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
- private static final Path PATH_RESOURCE = new BasicPath();
+ private static final ArchivePath PATH_RESOURCE = new BasicPath();
//-------------------------------------------------------------------------------------||
// Instance Members -------------------------------------------------------------------||
@@ -140,25 +140,25 @@
}
@Override
- protected Path getManifestPath()
+ protected ArchivePath getManifestPath()
{
return PATH_MANIFEST;
}
@Override
- protected Path getResourcePath()
+ protected ArchivePath getResourcePath()
{
return PATH_RESOURCE;
}
@Override
- protected Path getClassPath()
+ protected ArchivePath getClassPath()
{
return PATH_CLASSES;
}
@Override
- protected Path getLibraryPath()
+ protected ArchivePath getLibraryPath()
{
return PATH_LIBRARY;
}
@@ -174,7 +174,7 @@
}
@Override
- public Path getWebPath()
+ public ArchivePath getWebPath()
{
return PATH_WEBINF;
}
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-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/ArchiveTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -25,7 +25,7 @@
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filters;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.Validate;
import org.jboss.shrinkwrap.impl.base.asset.ArchiveAsset;
@@ -104,7 +104,7 @@
{
Archive<T> archive = getArchive();
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
archive.add(asset, location);
@@ -123,7 +123,7 @@
try
{
- archive.add(asset, (Path) null);
+ archive.add(asset, (ArchivePath) null);
Assert.fail("Should have throw an IllegalArgumentException");
}
catch (IllegalArgumentException expectedException)
@@ -158,7 +158,7 @@
{
Archive<T> archive = getArchive();
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
archive.add(asset, location.get());
@@ -214,11 +214,11 @@
Archive<T> archive = getArchive();
final String name = "test.properties";
final Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
- Path location = new BasicPath("/");
+ ArchivePath location = new BasicPath("/");
archive.add(asset, location, name);
- Path expectedPath = new BasicPath("/", "test.properties");
+ ArchivePath expectedPath = new BasicPath("/", "test.properties");
Assert.assertTrue("Asset should be placed on " + expectedPath.get(), archive.contains(expectedPath));
}
@@ -251,7 +251,7 @@
public void testAddAssetWithNameRequiresName() throws Exception
{
Archive<T> archive = getArchive();
- final Path path = new BasicPath("/", "Test.properties");
+ final ArchivePath path = new BasicPath("/", "Test.properties");
final String resource = NAME_TEST_PROPERTIES;
try
{
@@ -272,7 +272,7 @@
{
Archive<T> archive = getArchive();
final String name = "test.properties";
- final Path path = new BasicPath("/", "Test.properties");
+ final ArchivePath path = new BasicPath("/", "Test.properties");
try
{
archive.add(null, path, name);
@@ -292,7 +292,7 @@
{
Archive<T> archive = getArchive();
String resource = NAME_TEST_PROPERTIES;
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
archive.add(new ClassLoaderAsset(resource), location);
Assert.assertTrue(archive.contains(location)); // Sanity check
@@ -310,7 +310,7 @@
public void testDeleteMissingAsset() throws Exception
{
Archive<T> archive = getArchive();
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
Assert.assertFalse("Deleting a non-existent Asset should return false", archive.delete(location));
}
@@ -341,7 +341,7 @@
public void testGetAsset() throws Exception
{
Archive<T> archive = getArchive();
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
archive.add(asset, location);
@@ -360,7 +360,7 @@
Archive<T> archive = getArchive();
try
{
- archive.get((Path) null);
+ archive.get((ArchivePath) null);
Assert.fail("Should have throw an IllegalArgumentException");
}
catch (IllegalArgumentException expectedException)
@@ -376,7 +376,7 @@
public void testGetAssetWithString() throws Exception
{
Archive<T> archive = getArchive();
- Path location = new BasicPath("/", "test.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
archive.add(asset, location);
@@ -411,14 +411,14 @@
public void testToGetContent() throws Exception
{
Archive<T> archive = getArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
archive.add(asset, location).add(assetTwo, locationTwo);
- Map<Path, Asset> content = archive.getContent();
+ Map<ArchivePath, Asset> content = archive.getContent();
final Asset asset1 = content.get(location);
final Asset asset2 = content.get(locationTwo);
@@ -438,14 +438,14 @@
public void testToGetContentFiltered() throws Exception
{
Archive<T> archive = getArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
archive.add(asset, location).add(assetTwo, locationTwo);
- Map<Path, Asset> content = archive.getContent(Filters.include(".*test2.*"));
+ Map<ArchivePath, Asset> content = archive.getContent(Filters.include(".*test2.*"));
final Asset asset1 = content.get(location);
final Asset asset2 = content.get(locationTwo);
@@ -526,8 +526,8 @@
{
Archive<T> archive = getArchive();
Archive<T> sourceArchive = createNewArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
@@ -550,19 +550,19 @@
{
Archive<T> archive = getArchive();
Archive<T> sourceArchive = createNewArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
sourceArchive.add(asset, location).add(assetTwo, locationTwo);
- Path baseLocation = new BasicPath("somewhere");
+ ArchivePath baseLocation = new BasicPath("somewhere");
archive.merge(sourceArchive, baseLocation);
- Path expectedPath = new BasicPath(baseLocation, location);
- Path expectedPathTwo = new BasicPath(baseLocation, locationTwo);
+ ArchivePath expectedPath = new BasicPath(baseLocation, location);
+ ArchivePath expectedPathTwo = new BasicPath(baseLocation, locationTwo);
Assert.assertTrue("Asset should have been added to path: " + expectedPath.get(), this.compareAssets(archive
.get(expectedPath), asset));
@@ -580,14 +580,14 @@
{
Archive<?> archive = getArchive();
Archive<T> sourceArchive = createNewArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
sourceArchive.add(asset, location).add(assetTwo, locationTwo);
- Path baseLocation = new BasicPath("somewhere");
+ ArchivePath baseLocation = new BasicPath("somewhere");
archive.merge(sourceArchive, baseLocation, Filters.include(".*test2.*"));
@@ -596,7 +596,7 @@
1,
archive.getContent().size());
- Path expectedPath = new BasicPath(baseLocation, locationTwo);
+ ArchivePath expectedPath = new BasicPath(baseLocation, locationTwo);
Assert.assertTrue(
"Asset should have been added to path: " + expectedPath.get(),
@@ -612,8 +612,8 @@
{
Archive<?> archive = getArchive();
Archive<T> sourceArchive = createNewArchive();
- Path location = new BasicPath("/", "test.properties");
- Path locationTwo = new BasicPath("/", "test2.properties");
+ ArchivePath location = new BasicPath("/", "test.properties");
+ ArchivePath locationTwo = new BasicPath("/", "test2.properties");
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
Asset assetTwo = new ClassLoaderAsset(NAME_TEST_PROPERTIES_2);
@@ -641,7 +641,7 @@
Archive<T> archive = getArchive();
try
{
- archive.merge(createNewArchive(), (Path)null);
+ archive.merge(createNewArchive(), (ArchivePath)null);
Assert.fail("Should have throw an IllegalArgumentException");
}
catch (IllegalArgumentException expectedException)
@@ -659,11 +659,11 @@
Archive<T> archive = getArchive();
Archive<T> sourceArchive = createNewArchive();
- Path baseLocation = new BasicPath("somewhere");
+ ArchivePath baseLocation = new BasicPath("somewhere");
archive.add(sourceArchive, baseLocation);
- Path expectedPath = new BasicPath(baseLocation, sourceArchive.getName());
+ ArchivePath expectedPath = new BasicPath(baseLocation, sourceArchive.getName());
Asset asset = archive.get(expectedPath);
Assert.assertNotNull("Asset should have been added to path: " + expectedPath.get(), asset);
@@ -689,17 +689,17 @@
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
- Path nestedAssetPath = new BasicPath("/", "test.properties");
+ ArchivePath nestedAssetPath = new BasicPath("/", "test.properties");
sourceArchive.add(asset, nestedAssetPath);
- Path baseLocation = new BasicPath("somewhere");
+ ArchivePath baseLocation = new BasicPath("somewhere");
archive.add(sourceArchive, baseLocation);
- Path archivePath = new BasicPath(baseLocation, sourceArchive.getName());
+ ArchivePath archivePath = new BasicPath(baseLocation, sourceArchive.getName());
- Path expectedPath = new BasicPath(archivePath, "test.properties");
+ ArchivePath expectedPath = new BasicPath(archivePath, "test.properties");
Assert.assertTrue("Nested archive assets should be verified through a fully qualified path", archive
.contains(expectedPath));
@@ -716,7 +716,7 @@
Archive<T> nestedArchive = createNewArchive();
- Path baseLocation = new BasicPath("somewhere");
+ ArchivePath baseLocation = new BasicPath("somewhere");
archive.add(nestedArchive, baseLocation);
@@ -726,15 +726,15 @@
Asset asset = new ClassLoaderAsset(NAME_TEST_PROPERTIES);
- Path nestedAssetPath = new BasicPath("/", "test.properties");
+ ArchivePath nestedAssetPath = new BasicPath("/", "test.properties");
nestedNestedArchive.add(asset, nestedAssetPath);
- Path nestedArchivePath = new BasicPath(baseLocation, nestedArchive.getName());
+ ArchivePath nestedArchivePath = new BasicPath(baseLocation, nestedArchive.getName());
- Path nestedNestedArchivePath = new BasicPath(nestedArchivePath, nestedNestedArchive.getName());
+ ArchivePath nestedNestedArchivePath = new BasicPath(nestedArchivePath, nestedNestedArchive.getName());
- Path expectedPath = new BasicPath(nestedNestedArchivePath, "test.properties");
+ ArchivePath expectedPath = new BasicPath(nestedNestedArchivePath, "test.properties");
Asset nestedAsset = archive.get(expectedPath);
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -26,8 +26,8 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.Asset;
import org.jboss.shrinkwrap.api.Filter;
-import org.jboss.shrinkwrap.api.Path;
-import org.jboss.shrinkwrap.api.Paths;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.container.ClassContainer;
import org.jboss.shrinkwrap.api.container.DirectoryContainer;
import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -67,13 +67,13 @@
// Contracts ----------------------------------------------------------------------||
//-------------------------------------------------------------------------------------||
- protected abstract Path getResourcePath();
+ protected abstract ArchivePath getResourcePath();
protected abstract ResourceContainer<T> getResourceContainer();
- protected abstract Path getClassPath();
+ protected abstract ArchivePath getClassPath();
protected abstract ClassContainer<T> getClassContainer();
- protected abstract Path getManifestPath();
+ protected abstract ArchivePath getManifestPath();
protected abstract ManifestContainer<T> getManifestContainer();
- protected abstract Path getLibraryPath();
+ protected abstract ArchivePath getLibraryPath();
protected abstract LibraryContainer<T> getLibraryContainer();
protected abstract DirectoryContainer<T> getDirectoryContainer();
@@ -98,7 +98,7 @@
public void testSetManifestResource() throws Exception {
getManifestContainer().setManifest(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -109,7 +109,7 @@
public void testSetManifestFile() throws Exception {
getManifestContainer().setManifest(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -120,7 +120,7 @@
public void testSetManifestURL() throws Exception {
getManifestContainer().setManifest(getURLForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -131,7 +131,7 @@
public void testSetManifestAsset() throws Exception {
getManifestContainer().setManifest(getAssetForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -142,7 +142,7 @@
public void testAddManifestResource() throws Exception {
getManifestContainer().addManifestResource(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getManifestPath(), NAME_TEST_PROPERTIES);
+ ArchivePath testPath = new BasicPath(getManifestPath(), NAME_TEST_PROPERTIES);
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -153,7 +153,7 @@
public void testAddManifestFile() throws Exception {
getManifestContainer().addManifestResource(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getManifestPath(), "Test.properties");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -162,9 +162,9 @@
@Test
@ArchiveType(ManifestContainer.class)
public void testAddManifestURL() throws Exception {
- Path targetPath = new BasicPath("Test.properties");
+ ArchivePath targetPath = new BasicPath("Test.properties");
getManifestContainer().addManifestResource(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path testPath = new BasicPath(getManifestPath(), targetPath);
+ ArchivePath testPath = new BasicPath(getManifestPath(), targetPath);
Assert.assertTrue("Archive should contain " + testPath, getArchive().contains(testPath));
}
@@ -173,7 +173,7 @@
public void testAddManifestStringTargetResource() throws Exception {
getManifestContainer().addManifestResource(NAME_TEST_PROPERTIES, "Test.txt");
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -184,7 +184,7 @@
public void testAddManifestStringTargetFile() throws Exception {
getManifestContainer().addManifestResource(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -195,7 +195,7 @@
public void testAddManifestStringTargetURL() throws Exception {
getManifestContainer().addManifestResource(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -206,7 +206,7 @@
public void testAddManifestStringTargetAsset() throws Exception {
getManifestContainer().addManifestResource(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -217,7 +217,7 @@
public void testAddManifestPathTargetResource() throws Exception {
getManifestContainer().addManifestResource(NAME_TEST_PROPERTIES, new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -228,7 +228,7 @@
public void testAddManifestPathTargetFile() throws Exception {
getManifestContainer().addManifestResource(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -239,7 +239,7 @@
public void testAddManifestPathTargetURL() throws Exception {
getManifestContainer().addManifestResource(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -250,7 +250,7 @@
public void testAddManifestPathTargetAsset() throws Exception {
getManifestContainer().addManifestResource(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getManifestPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getManifestPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -261,7 +261,7 @@
public void testAddServiceProvider() throws Exception {
getManifestContainer().addServiceProvider(DummyInterfaceForTest.class, DummyClassForTest.class);
- Path testPath = new BasicPath(getManifestPath(), "services/" + DummyInterfaceForTest.class.getName());
+ ArchivePath testPath = new BasicPath(getManifestPath(), "services/" + DummyInterfaceForTest.class.getName());
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -276,7 +276,7 @@
public void testAddResourceResource() throws Exception {
getResourceContainer().addResource(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getResourcePath(), NAME_TEST_PROPERTIES);
+ ArchivePath testPath = new BasicPath(getResourcePath(), NAME_TEST_PROPERTIES);
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -287,7 +287,7 @@
public void testAddResourceFile() throws Exception {
getResourceContainer().addResource(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getResourcePath(), "Test.properties");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -296,9 +296,9 @@
@Test
@ArchiveType(ResourceContainer.class)
public void testAddResourceURL() throws Exception {
- Path targetPath = new BasicPath("Test.properties");
+ ArchivePath targetPath = new BasicPath("Test.properties");
getResourceContainer().addResource(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path testPath = new BasicPath(getResourcePath(), targetPath);
+ ArchivePath testPath = new BasicPath(getResourcePath(), targetPath);
Assert.assertTrue("Archive should contain " + testPath, getArchive().contains(testPath));
}
@@ -307,7 +307,7 @@
public void testAddResourceStringTargetResource() throws Exception {
getResourceContainer().addResource("Test.txt", NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -318,7 +318,7 @@
public void testAddResourceStringTargetFile() throws Exception {
getResourceContainer().addResource(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -330,7 +330,7 @@
getResourceContainer().addResource(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -341,7 +341,7 @@
public void testAddResourceStringTargetAsset() throws Exception {
getResourceContainer().addResource(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -352,7 +352,7 @@
public void testAddResourcePathTargetResource() throws Exception {
getResourceContainer().addResource(NAME_TEST_PROPERTIES, new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -363,7 +363,7 @@
public void testAddResourcePathTargetFile() throws Exception {
getResourceContainer().addResource(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -374,7 +374,7 @@
public void testAddResourcePathTargetURL() throws Exception {
getResourceContainer().addResource(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -385,7 +385,7 @@
public void testAddResourcePathTargetAsset() throws Exception {
getResourceContainer().addResource(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getResourcePath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -428,7 +428,7 @@
*/
private void ensureClassesAdded()
{
- Path expectedPath = new BasicPath(getClassPath(), AssetUtil
+ ArchivePath expectedPath = new BasicPath(getClassPath(), AssetUtil
.getFullPathForClassResource(DummyClassA.class));
Assert.assertTrue(
@@ -437,9 +437,9 @@
// SHRINKWRAP-106
// Ensure inner classes are added
- final Path expectedPathInnerClass = new BasicPath(
+ final ArchivePath expectedPathInnerClass = new BasicPath(
getClassPath(), AssetUtil.getFullPathForClassResource(DummyClassA.InnerClass.class));
- final Path expectedPathInnerClassParent = new BasicPath(
+ final ArchivePath expectedPathInnerClassParent = new BasicPath(
getClassPath(), AssetUtil.getFullPathForClassResource(DummyClassParent.ParentInnerClass.class));
Assert.assertTrue(
@@ -450,13 +450,13 @@
getArchive().contains(expectedPathInnerClassParent));
// Ensure anonymous/private inner classes are added
- final Path expectedPathPrivateInnerClass = new BasicPath(
+ final ArchivePath expectedPathPrivateInnerClass = new BasicPath(
getClassPath(),
AssetUtil.getFullPathForClassResource(
DummyClassA.InnerClass.class)
.get().replaceAll("InnerClass", "Test"));
- final Path expectedPathAnonymousInnerClass = new BasicPath(
+ final ArchivePath expectedPathAnonymousInnerClass = new BasicPath(
getClassPath(),
AssetUtil.getFullPathForClassResource(
DummyClassA.InnerClass.class)
@@ -484,7 +484,7 @@
getClassContainer().addClass(classToAdd.getName());
- Path expectedPath = new BasicPath(getClassPath(), AssetUtil.getFullPathForClassResource(classToAdd));
+ ArchivePath expectedPath = new BasicPath(getClassPath(), AssetUtil.getFullPathForClassResource(classToAdd));
Assert.assertTrue("A class should be located at " + expectedPath.get(), getArchive().contains(expectedPath));
}
@@ -501,7 +501,7 @@
getClassContainer().addClass(classToAdd.getName(), classToAdd.getClassLoader());
- Path expectedPath = new BasicPath(getClassPath(), AssetUtil.getFullPathForClassResource(classToAdd));
+ ArchivePath expectedPath = new BasicPath(getClassPath(), AssetUtil.getFullPathForClassResource(classToAdd));
Assert.assertTrue("A class should be located at " + expectedPath.get(), getArchive().contains(expectedPath));
}
@@ -516,7 +516,7 @@
{
getClassContainer().addPackage(DummyClassA.class.getPackage());
- Path expectedPath = new BasicPath(getClassPath(), AssetUtil
+ ArchivePath expectedPath = new BasicPath(getClassPath(), AssetUtil
.getFullPathForClassResource(DummyClassA.class));
Assert.assertTrue(
@@ -535,7 +535,7 @@
{
getClassContainer().addPackages(false, DummyClassA.class.getPackage());
- Path expectedPath = new BasicPath(getClassPath(), AssetUtil
+ ArchivePath expectedPath = new BasicPath(getClassPath(), AssetUtil
.getFullPathForClassResource(DummyClassA.class));
Assert.assertTrue(
@@ -561,7 +561,7 @@
}
}, DynamicContainerTestBase.class.getPackage());
- Path expectedPath = new BasicPath(
+ ArchivePath expectedPath = new BasicPath(
getClassPath(), AssetUtil.getFullPathForClassResource(DynamicContainerTestBase.class));
Assert.assertEquals(
@@ -583,7 +583,7 @@
public void testAddLibraryResource() throws Exception {
getLibraryContainer().addLibrary(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES);
+ ArchivePath testPath = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES);
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -594,7 +594,7 @@
public void testAddLibraryFile() throws Exception {
getLibraryContainer().addLibrary(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getLibraryPath(), "Test.properties");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -603,9 +603,9 @@
@Test
@ArchiveType(LibraryContainer.class)
public void testAddLibraryURL() throws Exception {
- final Path targetPath = new BasicPath("Test.properties");
+ final ArchivePath targetPath = new BasicPath("Test.properties");
getLibraryContainer().addLibrary(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path testPath = new BasicPath(getLibraryPath(), targetPath);
+ ArchivePath testPath = new BasicPath(getLibraryPath(), targetPath);
Assert.assertTrue("Archive should contain " + testPath, getArchive().contains(testPath));
}
@@ -614,7 +614,7 @@
public void testAddLibraryStringTargetResource() throws Exception {
getLibraryContainer().addLibrary(NAME_TEST_PROPERTIES, "Test.txt");
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -625,7 +625,7 @@
public void testAddLibraryStringTargetFile() throws Exception {
getLibraryContainer().addLibrary(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -636,7 +636,7 @@
public void testAddLibraryStringTargetURL() throws Exception {
getLibraryContainer().addLibrary(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -647,7 +647,7 @@
public void testAddLibraryStringTargetAsset() throws Exception {
getLibraryContainer().addLibrary(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -658,7 +658,7 @@
public void testAddLibraryPathTargetResource() throws Exception {
getLibraryContainer().addLibrary(NAME_TEST_PROPERTIES, new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -669,7 +669,7 @@
public void testAddLibraryPathTargetFile() throws Exception {
getLibraryContainer().addLibrary(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -680,7 +680,7 @@
public void testAddLibraryPathTargetURL() throws Exception {
getLibraryContainer().addLibrary(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -691,7 +691,7 @@
public void testAddLibraryPathTargetAsset() throws Exception {
getLibraryContainer().addLibrary(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getLibraryPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -703,7 +703,7 @@
Archive<?> archive = createNewArchive();
getLibraryContainer().addLibrary(archive);
- Path testPath = new BasicPath(getLibraryPath(), archive.getName());
+ ArchivePath testPath = new BasicPath(getLibraryPath(), archive.getName());
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -714,8 +714,8 @@
public void testAddLibriesResource() throws Exception {
getLibraryContainer().addLibraries(NAME_TEST_PROPERTIES, NAME_TEST_PROPERTIES_2);
- Path testPath = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES);
- Path testPath2 = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES_2);
+ ArchivePath testPath = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES);
+ ArchivePath testPath2 = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES_2);
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -731,8 +731,8 @@
getFileForClassResource(NAME_TEST_PROPERTIES),
getFileForClassResource(NAME_TEST_PROPERTIES_2));
- Path testPath = new BasicPath(getLibraryPath(), "Test.properties");
- Path testPath2 = new BasicPath(getLibraryPath(), "Test2.properties");
+ ArchivePath testPath = new BasicPath(getLibraryPath(), "Test.properties");
+ ArchivePath testPath2 = new BasicPath(getLibraryPath(), "Test2.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -749,8 +749,8 @@
getLibraryContainer().addLibraries(archive, archive2);
- Path testPath = new BasicPath(getLibraryPath(), archive.getName());
- Path testPath2 = new BasicPath(getLibraryPath(), archive.getName());
+ ArchivePath testPath = new BasicPath(getLibraryPath(), archive.getName());
+ ArchivePath testPath2 = new BasicPath(getLibraryPath(), archive.getName());
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -772,9 +772,9 @@
final DirectoryContainer<T> container = getDirectoryContainer();
// Get Paths to add
- final Path path1 = Paths.create("path/to/dir");
- final Path path2 = Paths.create("path/to/dir2");
- final Path path3 = Paths.create("path/to");
+ final ArchivePath path1 = ArchivePaths.create("path/to/dir");
+ final ArchivePath path2 = ArchivePaths.create("path/to/dir2");
+ final ArchivePath path3 = ArchivePaths.create("path/to");
// Add
container.addDirectories(path1, path2, path3);
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicEnterpriseContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicEnterpriseContainerTestBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicEnterpriseContainerTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.EnterpriseContainer;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
import org.junit.Test;
@@ -34,8 +34,8 @@
public abstract class DynamicEnterpriseContainerTestBase<T extends Archive<T>> extends DynamicContainerTestBase<T>
{
- protected abstract Path getModulePath();
- protected abstract Path getApplicationPath();
+ protected abstract ArchivePath getModulePath();
+ protected abstract ArchivePath getApplicationPath();
protected abstract EnterpriseContainer<T> getEnterpriseContainer();
//-------------------------------------------------------------------------------------||
@@ -47,7 +47,7 @@
public void testSetApplicationXMLResource() throws Exception {
getEnterpriseContainer().setApplicationXML(NAME_TEST_PROPERTIES);
- Path expectedPath = new BasicPath(getApplicationPath(), "application.xml");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "application.xml");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -58,7 +58,7 @@
public void testSetApplicationXMLFile() throws Exception {
getEnterpriseContainer().setApplicationXML(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path expectedPath = new BasicPath(getApplicationPath(), "application.xml");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "application.xml");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -69,7 +69,7 @@
public void testSetApplicationXMLURL() throws Exception {
getEnterpriseContainer().setApplicationXML(getURLForClassResource(NAME_TEST_PROPERTIES));
- Path expectedPath = new BasicPath(getApplicationPath(), "application.xml");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "application.xml");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -80,7 +80,7 @@
public void testSetApplicationXMLAsset() throws Exception {
getEnterpriseContainer().setApplicationXML(getAssetForClassResource(NAME_TEST_PROPERTIES));
- Path expectedPath = new BasicPath(getApplicationPath(), "application.xml");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "application.xml");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -91,7 +91,7 @@
public void testAddApplicationResource() throws Exception {
getEnterpriseContainer().addApplicationResource(NAME_TEST_PROPERTIES);
- Path expectedPath = new BasicPath(getApplicationPath(), NAME_TEST_PROPERTIES);
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), NAME_TEST_PROPERTIES);
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -102,7 +102,7 @@
public void testAddApplicationFile() throws Exception {
getEnterpriseContainer().addApplicationResource(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -111,9 +111,9 @@
@Test
@ArchiveType(EnterpriseContainer.class)
public void testAddApplicationURL() throws Exception {
- final Path targetPath = new BasicPath("Test.properties");;
+ final ArchivePath targetPath = new BasicPath("Test.properties");;
getEnterpriseContainer().addApplicationResource(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path expectedPath = new BasicPath(getApplicationPath(), targetPath);
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), targetPath);
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -122,7 +122,7 @@
public void testAddApplicationStringTargetResource() throws Exception {
getEnterpriseContainer().addApplicationResource(NAME_TEST_PROPERTIES, "Test.txt");
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -133,7 +133,7 @@
public void testAddApplicationStringTargetFile() throws Exception {
getEnterpriseContainer().addApplicationResource(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -144,7 +144,7 @@
public void testAddApplicationStringTargetURL() throws Exception {
getEnterpriseContainer().addApplicationResource(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -155,7 +155,7 @@
public void testAddApplicationStringTargetAsset() throws Exception {
getEnterpriseContainer().addApplicationResource(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -166,7 +166,7 @@
public void testAddApplicationPathTargetResource() throws Exception {
getEnterpriseContainer().addApplicationResource(NAME_TEST_PROPERTIES, new BasicPath("Test.txt"));
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -177,7 +177,7 @@
public void testAddApplicationPathTargetFile() throws Exception {
getEnterpriseContainer().addApplicationResource(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -188,7 +188,7 @@
public void testAddApplicationPathTargetURL() throws Exception {
getEnterpriseContainer().addApplicationResource(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -199,7 +199,7 @@
public void testAddApplicationPathTargetAsset() throws Exception {
getEnterpriseContainer().addApplicationResource(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
+ ArchivePath expectedPath = new BasicPath(getApplicationPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -210,7 +210,7 @@
public void testAddModuleResource() throws Exception {
getEnterpriseContainer().addModule(NAME_TEST_PROPERTIES);
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -221,7 +221,7 @@
public void testAddModuleFile() throws Exception {
getEnterpriseContainer().addModule(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
@@ -230,9 +230,9 @@
@Test
@ArchiveType(EnterpriseContainer.class)
public void testAddModuleURL() throws Exception {
- final Path targetPath = new BasicPath("Test.properties");
+ final ArchivePath targetPath = new BasicPath("Test.properties");
getEnterpriseContainer().addModule(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path expectedPath = new BasicPath(getModulePath(), targetPath);
+ ArchivePath expectedPath = new BasicPath(getModulePath(), targetPath);
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -240,7 +240,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModuleStringTargetResource() throws Exception {
getEnterpriseContainer().addModule(NAME_TEST_PROPERTIES, "Test.properties");
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -248,7 +248,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModuleStringTargetFile() throws Exception {
getEnterpriseContainer().addModule(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.properties");
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -256,7 +256,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModuleStringTargetURL() throws Exception {
getEnterpriseContainer().addModule(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.properties");
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -264,7 +264,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModuleStringTargetAsset() throws Exception {
getEnterpriseContainer().addModule(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.properties");
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -272,7 +272,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModulePathTargetResource() throws Exception {
getEnterpriseContainer().addModule(NAME_TEST_PROPERTIES, new BasicPath("Test.properties"));
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -280,7 +280,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModulePathTargetFile() throws Exception {
getEnterpriseContainer().addModule(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.properties"));
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -288,7 +288,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModulePathTargetURL() throws Exception {
getEnterpriseContainer().addModule(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.properties"));
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -296,7 +296,7 @@
@ArchiveType(EnterpriseContainer.class)
public void testAddModulePathTargetAsset() throws Exception {
getEnterpriseContainer().addModule(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.properties"));
- Path expectedPath = new BasicPath(getModulePath(), "Test.properties");
+ ArchivePath expectedPath = new BasicPath(getModulePath(), "Test.properties");
Assert.assertTrue("Archive should contain " + expectedPath, getArchive().contains(expectedPath));
}
@@ -306,7 +306,7 @@
Archive<?> archive = createNewArchive();
getEnterpriseContainer().addModule(archive);
- Path expectedPath = new BasicPath(getModulePath(), archive.getName());
+ ArchivePath expectedPath = new BasicPath(getModulePath(), archive.getName());
Assert.assertTrue(
"Archive should contain " + expectedPath,
getArchive().contains(expectedPath));
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicResourceAdapterContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicResourceAdapterContainerTestBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicResourceAdapterContainerTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -3,7 +3,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.ResourceAdapterContainer;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
import org.junit.Test;
@@ -11,7 +11,7 @@
public abstract class DynamicResourceAdapterContainerTestBase<T extends Archive<T>> extends DynamicContainerTestBase<T>
{
- protected abstract Path getResourceAdapterPath();
+ protected abstract ArchivePath getResourceAdapterPath();
protected abstract ResourceAdapterContainer<T> getResourceAdapterContainer();
@Test
@@ -19,7 +19,7 @@
public void testSetResourceAdapterXMLResource() throws Exception {
getResourceAdapterContainer().setResourceAdapterXML(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
+ ArchivePath testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -30,7 +30,7 @@
public void testSetResourceAdapterXMLFile() throws Exception {
getResourceAdapterContainer().setResourceAdapterXML(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
+ ArchivePath testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -41,7 +41,7 @@
public void testSetResourceAdapterXMLURL() throws Exception {
getResourceAdapterContainer().setResourceAdapterXML(getURLForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
+ ArchivePath testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -52,7 +52,7 @@
public void testSetResourceAdapterXMLAsset() throws Exception {
getResourceAdapterContainer().setResourceAdapterXML(getAssetForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
+ ArchivePath testPath = new BasicPath(getResourceAdapterPath(), "ra.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicWebContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicWebContainerTestBase.java 2010-01-13 23:56:26 UTC (rev 3930)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicWebContainerTestBase.java 2010-01-15 00:55:51 UTC (rev 3931)
@@ -19,7 +19,7 @@
import junit.framework.Assert;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.Path;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.container.WebContainer;
import org.jboss.shrinkwrap.impl.base.path.BasicPath;
import org.junit.Test;
@@ -33,7 +33,7 @@
*/
public abstract class DynamicWebContainerTestBase<T extends Archive<T>> extends DynamicContainerTestBase<T>
{
- public abstract Path getWebPath();
+ public abstract ArchivePath getWebPath();
public abstract WebContainer<T> getWebContainer();
//-------------------------------------------------------------------------------------||
@@ -45,7 +45,7 @@
public void testSetWebXMLResource() throws Exception {
getWebContainer().setWebXML(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getWebPath(), "web.xml");
+ ArchivePath testPath = new BasicPath(getWebPath(), "web.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -56,7 +56,7 @@
public void testSetWebXMLFile() throws Exception {
getWebContainer().setWebXML(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getWebPath(), "web.xml");
+ ArchivePath testPath = new BasicPath(getWebPath(), "web.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -67,7 +67,7 @@
public void testSetWebXMLURL() throws Exception {
getWebContainer().setWebXML(getURLForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getWebPath(), "web.xml");
+ ArchivePath testPath = new BasicPath(getWebPath(), "web.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -78,7 +78,7 @@
public void testSetWebXMLAsset() throws Exception {
getWebContainer().setWebXML(getAssetForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getWebPath(), "web.xml");
+ ArchivePath testPath = new BasicPath(getWebPath(), "web.xml");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -89,7 +89,7 @@
public void testAddWebResourceResource() throws Exception {
getWebContainer().addWebResource(NAME_TEST_PROPERTIES);
- Path testPath = new BasicPath(getWebPath(), "Test.properties");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -100,7 +100,7 @@
public void testAddWebResourceFile() throws Exception {
getWebContainer().addWebResource(getFileForClassResource(NAME_TEST_PROPERTIES));
- Path testPath = new BasicPath(getWebPath(), "Test.properties");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.properties");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -109,9 +109,9 @@
@Test
@ArchiveType(WebContainer.class)
public void testAddWebResourceURL() throws Exception {
- Path targetPath = new BasicPath("Test.properties");
+ ArchivePath targetPath = new BasicPath("Test.properties");
getWebContainer().addWebResource(getURLForClassResource(NAME_TEST_PROPERTIES), targetPath);
- Path testPath = new BasicPath(getWebPath(), targetPath);
+ ArchivePath testPath = new BasicPath(getWebPath(), targetPath);
Assert.assertTrue("Archive should contain " + testPath, getArchive().contains(testPath));
}
@@ -120,7 +120,7 @@
public void testAddWebResourceStringTargetResource() throws Exception {
getWebContainer().addWebResource(NAME_TEST_PROPERTIES, "Test.txt");
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -131,7 +131,7 @@
public void testAddWebResourceStringTargetFile() throws Exception {
getWebContainer().addWebResource(getFileForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -142,7 +142,7 @@
public void testAddWebResourceStringTargetURL() throws Exception {
getWebContainer().addWebResource(getURLForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -153,7 +153,7 @@
public void testAddWebResourceStringTargetAsset() throws Exception {
getWebContainer().addWebResource(getAssetForClassResource(NAME_TEST_PROPERTIES), "Test.txt");
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -164,7 +164,7 @@
public void testAddWebResourcePathTargetResource() throws Exception {
getWebContainer().addWebResource(NAME_TEST_PROPERTIES, new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -175,7 +175,7 @@
public void testAddWebResourcePathTargetFile() throws Exception {
getWebContainer().addWebResource(getFileForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -186,7 +186,7 @@
public void testAddWebResourcePathTargetURL() throws Exception {
getWebContainer().addWebResource(getURLForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
@@ -197,7 +197,7 @@
public void testAddWebResourcePathTargetAsset() throws Exception {
getWebContainer().addWebResource(getAssetForClassResource(NAME_TEST_PROPERTIES), new BasicPath("Test.txt"));
- Path testPath = new BasicPath(getWebPath(), "Test.txt");
+ ArchivePath testPath = new BasicPath(getWebPath(), "Test.txt");
Assert.assertTrue(
"Archive should contain " + testPath,
getArchive().contains(testPath));
More information about the jboss-svn-commits
mailing list