[jboss-cvs] JBossAS SVN: r111821 - in projects/jboss-deployers/branches/Branch_2_2: deployers-client and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Jul 24 09:21:36 EDT 2011
Author: alesj
Date: 2011-07-24 09:21:35 -0400 (Sun, 24 Jul 2011)
New Revision: 111821
Added:
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/resources/structure/explicit/z.ear
Modified:
projects/jboss-deployers/branches/Branch_2_2/
projects/jboss-deployers/branches/Branch_2_2/deployers-client/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-core/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
projects/jboss-deployers/branches/Branch_2_2/deployers-impl/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-jmx/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-structure-spi/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs-spi/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/pom.xml
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/AbstractEARStructureTest.java
projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_2/pom.xml
Log:
Port JBDEPLOY-276, 277
Property changes on: projects/jboss-deployers/branches/Branch_2_2
___________________________________________________________________
Modified: svn:mergeinfo
- /projects/jboss-deployers/trunk:110263,110265-110968,111070-111111
+ /projects/jboss-deployers/trunk:110263,110265-110968,111070-111111,111581-111820
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-client/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-client/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-client/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -47,11 +47,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-core/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-core/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-core/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -38,15 +38,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-core/src/main/java/org/jboss/deployers/plugins/structure/ContextInfoImpl.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -313,6 +313,9 @@
boolean isNullComparator = in.readBoolean();
if (isNullComparator == false)
setComparatorClassName(in.readUTF());
+ boolean isNullMT = in.readBoolean();
+ if (isNullMT == false)
+ setModificationType(ModificationType.values()[in.readInt()]);
}
/**
@@ -338,5 +341,9 @@
out.writeBoolean(isNullComparator);
if (isNullComparator == false)
out.writeUTF(comparator);
+ boolean isNullMT = (getModificationType() == null);
+ out.writeBoolean(isNullMT);
+ if (isNullMT == false)
+ out.writeInt(getModificationType().ordinal());
}
}
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-impl/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-impl/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-impl/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -287,11 +287,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-jmx/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-jmx/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-jmx/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -168,11 +168,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-structure-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-structure-spi/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-structure-spi/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <artifactId>jboss-logging</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -114,11 +114,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -38,12 +38,18 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.deployers</groupId>
+ <groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.kernel</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.scanning</groupId>
@@ -109,6 +115,10 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -131,11 +141,21 @@
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloader</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
@@ -186,6 +206,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
@@ -213,6 +239,10 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- Test dependencies -->
@@ -277,14 +307,19 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -320,6 +355,10 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -21,9 +21,9 @@
*/
package org.jboss.deployers.vfs.plugins.dependency;
+import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
-import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.HashSet;
import java.util.Set;
@@ -56,7 +56,9 @@
String line;
while ((line = br.readLine()) != null)
{
- alises.add(line);
+ line = line.trim();
+ if (line.length() > 0)
+ alises.add(line);
}
}
finally
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSArchiveStructureDeployer.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -21,6 +21,8 @@
*/
package org.jboss.deployers.vfs.plugins.structure;
+import java.io.IOException;
+
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.structure.StructureContext;
import org.jboss.deployers.vfs.spi.structure.StructureDeployer;
@@ -28,8 +30,6 @@
import org.jboss.vfs.util.automount.Automounter;
import org.jboss.vfs.util.automount.MountOption;
-import java.io.IOException;
-
/**
* Abstract {@link StructureDeployer} used to help mount VFS archive based {@link StructureDeployer}s.
*
@@ -144,4 +144,26 @@
{
Automounter.mount(file, MountOption.COPY);
}
+
+ /**
+ * Perform expanded mount.
+ *
+ * @param file the file to mount
+ * @throws IOException for any IO error
+ */
+ protected void performExpandedMount(VirtualFile file) throws IOException
+ {
+ Automounter.mount(file, MountOption.EXPANDED, MountOption.COPY);
+ }
+
+ /**
+ * Is the file web archive.
+ *
+ * @param file the file
+ * @return true if file is web archive, false otherwise
+ */
+ protected boolean isWAR(VirtualFile file)
+ {
+ return file.getName().endsWith(".war");
+ }
}
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/VFSStructureBuilder.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -42,8 +42,8 @@
import org.jboss.vfs.VFSUtils;
import org.jboss.vfs.VirtualFile;
import org.jboss.vfs.VisitorAttributes;
+import org.jboss.vfs.util.SuffixMatchFilter;
import org.jboss.vfs.util.automount.Automounter;
-import org.jboss.vfs.util.SuffixMatchFilter;
/**
* VFSStructureBuilder.
@@ -188,6 +188,9 @@
{
throw DeploymentException.rethrowAsDeploymentException("Unable to find class path entry " + entry + " from " + root.getName(), t);
}
+ // check if this child actually exists
+ if (child.exists() == false)
+ throw new DeploymentException("Unable to find class path entry " + entry + " from " + root.getName());
}
if (suffixes == null)
{
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/DeclaredStructure.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -27,6 +27,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.spi.structure.ModificationType;
import org.jboss.deployers.spi.structure.StructureMetaData;
import org.jboss.deployers.vfs.plugins.structure.AbstractVFSArchiveStructureDeployer;
import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
@@ -41,6 +42,7 @@
*
* @author Scott.Stark at jboss.org
* @author <a href="jbailey at redhat.com">John Bailey</a>
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class DeclaredStructure extends AbstractVFSArchiveStructureDeployer
@@ -49,8 +51,13 @@
* Set of suffixes used to determine if an archive mount is needed
*/
private final Set<String> suffixes;
-
+
/**
+ * Ignore relative path
+ */
+ private boolean ignoreRelativePath;
+
+ /**
* Construct with a default jar suffixes
*/
public DeclaredStructure()
@@ -97,10 +104,21 @@
if (trace)
log.trace("... context has a META-INF/jboss-structure.xml");
+ StructureMetaDataObjectFactory ofactory;
+ // check if this is a sub-context
+ if (ignoreRelativePath == false && (structureContext.getParentContext() != null))
+ {
+ String relativePath = file.getPathNameRelativeTo(structureContext.getRoot()) + "/";
+ ofactory = new StructureMetaDataObjectFactory(relativePath);
+ }
+ else
+ {
+ ofactory = new StructureMetaDataObjectFactory();
+ }
+
URL url = jbossStructure.toURL();
UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
Unmarshaller unmarshaller = factory.newUnmarshaller();
- StructureMetaDataObjectFactory ofactory = new StructureMetaDataObjectFactory();
unmarshaller.unmarshal(url.toString(), ofactory, structureContext.getMetaData());
mountChildren(structureContext);
isJBossStructure = true;
@@ -131,8 +149,8 @@
protected void mountChildren(StructureContext structureContext) throws IOException
{
final StructureMetaData structureMetaData = structureContext.getMetaData();
- final VirtualFile structureRoot = structureContext.getRoot();
- for(ContextInfo contextInfo : structureMetaData.getContexts())
+ final VirtualFile structureRoot = structureContext.getFile();
+ for(ContextInfo contextInfo : structureMetaData.getContexts())
{
final String contextPath = contextInfo.getPath();
if(hasValidSuffix(contextPath))
@@ -140,9 +158,22 @@
final VirtualFile child = structureRoot.getChild(contextPath);
if(child.exists() && child.isFile())
{
- performMount(child);
+ if ((contextInfo.getModificationType() == ModificationType.EXPLODE) || isWAR(child))
+ performExpandedMount(child);
+ else
+ performMount(child);
}
}
}
}
+
+ /**
+ * Set ignore relative path flag.
+ *
+ * @param ignoreRelativePath the ignore relative path flag
+ */
+ public void setIgnoreRelativePath(boolean ignoreRelativePath)
+ {
+ this.ignoreRelativePath = ignoreRelativePath;
+ }
}
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/explicit/StructureMetaDataObjectFactory.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -45,6 +45,18 @@
*/
public class StructureMetaDataObjectFactory implements ObjectModelFactory
{
+ private final String relativePath;
+
+ public StructureMetaDataObjectFactory()
+ {
+ this("");
+ }
+
+ public StructureMetaDataObjectFactory(String relativePath)
+ {
+ this.relativePath = relativePath;
+ }
+
public StructureMetaDataImpl newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs)
{
StructureMetaDataImpl metaData;
@@ -113,7 +125,7 @@
{
String name = attrs.getValue("name");
String suffixes = attrs.getValue("suffixes");
- ClassPathEntry path = new ClassPathEntryImpl(name, suffixes);
+ ClassPathEntry path = new ClassPathEntryImpl(relativePath + name, suffixes);
parent.add(path);
}
return child;
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/AbstractEARStructureTest.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/AbstractEARStructureTest.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/AbstractEARStructureTest.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -24,6 +24,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure;
import org.jboss.deployers.vfs.plugins.structure.file.FileStructure;
import org.jboss.deployers.vfs.plugins.structure.jar.JARStructure;
import org.jboss.deployers.vfs.plugins.structure.war.WARStructure;
@@ -75,7 +76,7 @@
Set<String> suffixes = new HashSet<String>(jarStructure.getSuffixes());
suffixes.add(".ejb3");
jarStructure.setSuffixes(suffixes);
- return determineStructureWithStructureDeployers(deployment, new FileStructure(), new WARStructure(), jarStructure, createEarStructureDeployer());
+ return determineStructureWithStructureDeployers(deployment, new DeclaredStructure(), new FileStructure(), new WARStructure(), jarStructure, createEarStructureDeployer());
}
finally
{
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/ear/test/EARStructureUnitTestCase.java 2011-07-24 13:21:35 UTC (rev 111821)
@@ -24,6 +24,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.vfs.VirtualFile;
/**
* Mock ear structure deployer tests
@@ -142,4 +143,28 @@
VFSDeploymentContext ear = assertDeploy("/structure/ear", "scanning.ear");
assertChildContexts(ear, "appc.jar", "ejbs.jar", "web.jar", "services.jar");
}
+
+ /**
+ * Test inner declared.
+ *
+ * @throws Throwable for any error
+ */
+ public void testInnerStructure() throws Throwable
+ {
+ VFSDeploymentContext root = assertDeploy("/structure/explicit", "z.ear");
+ try
+ {
+ VirtualFile rar = root.getRoot().getChild("x.rar");
+ VirtualFile lib = rar.getChild("lib");
+ assertTrue(lib.exists());
+ VirtualFile archive = lib.getChild("archive.jar");
+ assertTrue(archive.exists());
+ VirtualFile empty = archive.getChild("empty");
+ assertTrue(empty.exists());
+ }
+ finally
+ {
+ root.cleanup();
+ }
+ }
}
Copied: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs/src/test/resources/structure/explicit/z.ear (from rev 111820, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/structure/explicit/z.ear)
===================================================================
(Binary files differ)
Modified: projects/jboss-deployers/branches/Branch_2_2/deployers-vfs-spi/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/deployers-vfs-spi/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/deployers-vfs-spi/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -36,6 +36,10 @@
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: projects/jboss-deployers/branches/Branch_2_2/pom.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_2/pom.xml 2011-07-24 12:22:52 UTC (rev 111820)
+++ projects/jboss-deployers/branches/Branch_2_2/pom.xml 2011-07-24 13:21:35 UTC (rev 111821)
@@ -31,8 +31,7 @@
<version.jboss.scanning>1.0.0.Alpha6</version.jboss.scanning>
<version.jboss.classloading.spi>6.0.0-Alpha8</version.jboss.classloading.spi>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
- <version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
- <version.jboss.logging.log4j>2.2.0.CR1</version.jboss.logging.log4j>
+ <version.jboss.logging>3.0.0.CR1</version.jboss.logging>
<version.jbossxb>2.0.3.GA</version.jbossxb>
<version.jboss.aop>2.2.1.GA</version.jboss.aop>
<version.org.jboss.test>1.1.5.GA</version.org.jboss.test>
@@ -314,15 +313,10 @@
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
+ <artifactId>jboss-logging</artifactId>
+ <version>${version.jboss.logging}</version>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <version>${version.jboss.logging.log4j}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${version.jbossxb}</version>
More information about the jboss-cvs-commits
mailing list