[webbeans-commits] Webbeans SVN: r1544 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging: war and 1 other directory.
Author: pete.muir(a)jboss.org
Date: 2009-02-16 13:24:24 -0500 (Mon, 16 Feb 2009)
New Revision: 1544
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
Log:
Make sure all temp files are deleted
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16
17:59:43 UTC (rev 1543)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactDescriptor.java 2009-02-16
18:24:24 UTC (rev 1544)
@@ -212,6 +212,7 @@
private File explodedJar;
private File classesRoot;
+ private File librariesRoot;
public ArtifactDescriptor(Class<?> declaringClass)
{
@@ -402,9 +403,7 @@
{
if (classesRoot == null)
{
- classesRoot = new File(archiveRoot, getClassesRoot());
- classesRoot.mkdirs();
- classesRoot.deleteOnExit();
+ classesRoot = makeDirectoryStructure(archiveRoot, getClassesRoot());
}
return classesRoot;
}
@@ -437,9 +436,18 @@
public File getLibraryRoot(File archiveRoot)
{
- return archiveRoot;
+ if (librariesRoot == null)
+ {
+ librariesRoot = makeDirectoryStructure(archiveRoot, getLibrariesRoot());
+ }
+ return librariesRoot;
}
+ protected String getLibrariesRoot()
+ {
+ return "/";
+ }
+
public boolean isLibrariesSupported()
{
return false;
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java
===================================================================
---
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16
17:59:43 UTC (rev 1543)
+++
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/war/WarArtifactDescriptor.java 2009-02-16
18:24:24 UTC (rev 1544)
@@ -53,18 +53,9 @@
}
@Override
- public File getLibraryRoot(File archiveRoot)
+ protected String getLibrariesRoot()
{
- if (webInfLib == null)
- {
- File webInf = new File(archiveRoot, "WEB-INF");
- webInf.mkdir();
- webInf.deleteOnExit();
- webInfLib = new File(webInf, "lib");
- webInfLib.deleteOnExit();
- webInfLib.mkdirs();
- }
- return webInfLib;
+ return "WEB-INF/lib";
}
@Override