[jboss-cvs] JBossAS SVN: r103256 - in projects/jboss-deployers/trunk: deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 30 08:38:23 EDT 2010
Author: alesj
Date: 2010-03-30 08:38:21 -0400 (Tue, 30 Mar 2010)
New Revision: 103256
Added:
projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/
projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/DeploymentMetaData.java
projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/FilterMetaData.java
Removed:
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java
Modified:
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentValidationDeployer.java
projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoadingLifeCycleUnitTestCase.java
projects/jboss-deployers/trunk/deployers-spi/pom.xml
projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java
projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
Log:
[JBDEPLOY-255]; move DeploymentMD to spi
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/AbstractDeploymentClassLoaderPolicyModule.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -32,6 +32,8 @@
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.spi.classloading.DeploymentMetaData;
+import org.jboss.deployers.spi.classloading.FilterMetaData;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
Deleted: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.deployers.plugins.classloading;
-
-import javax.xml.bind.annotation.*;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import org.jboss.deployers.spi.deployer.DeploymentStage;
-import org.jboss.deployers.spi.deployer.DeploymentStageXmlAdapter;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * Deployment meta data.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
- at JBossXmlSchema(namespace="urn:jboss:deployment:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlRootElement(name="deployment")
- at XmlType(name="deploymentType", propOrder={"filters"})
-public class DeploymentMetaData implements Serializable
-{
- private static final long serialVersionUID = 1l;
-
- private DeploymentStage requiredStage = DeploymentStages.DESCRIBE;
- private boolean lazyResolve;
- private boolean lazyStart;
- private Set<FilterMetaData> filters;
-
- public DeploymentStage getRequiredStage()
- {
- return requiredStage;
- }
-
- @XmlAttribute(name = "required-stage")
- @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
- public void setRequiredStage(DeploymentStage requiredStage)
- {
- if (requiredStage == null)
- requiredStage = DeploymentStages.DESCRIBE;
-
- this.requiredStage = requiredStage;
- }
-
- public boolean isLazyResolve()
- {
- return lazyResolve;
- }
-
- @XmlAttribute(name = "lazy-resolve")
- public void setLazyResolve(boolean lazyResolve)
- {
- this.lazyResolve = lazyResolve;
- }
-
- public boolean isLazyStart()
- {
- return lazyStart || (filters != null && filters.isEmpty() == false);
- }
-
- @XmlAttribute(name = "lazy-start")
- public void setLazyStart(boolean lazyStart)
- {
- this.lazyStart = lazyStart;
- }
-
- public Set<FilterMetaData> getFilters()
- {
- return filters;
- }
-
- @XmlElement(name = "lazy-start-filter", type = FilterMetaData.class)
- public void setFilters(Set<FilterMetaData> filters)
- {
- this.filters = filters;
- }
-}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentValidationDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentValidationDeployer.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentValidationDeployer.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -25,6 +25,7 @@
import org.jboss.dependency.spi.ControllerState;
import org.jboss.dependency.spi.ControllerStateModel;
import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.classloading.DeploymentMetaData;
import org.jboss.deployers.spi.deployer.DeploymentStage;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
Deleted: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -1,92 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.deployers.plugins.classloading;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import java.io.Serializable;
-
-/**
- * Filter meta data.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
- at XmlRootElement(name="lazy-start-filter")
- at XmlType(name="lazyStartFilterType")
-public class FilterMetaData implements Serializable
-{
- private static final long serialVersionUID = 1l;
-
- private boolean recurse;
- private String value;
-
- public boolean isRecurse()
- {
- return recurse;
- }
-
- @XmlAttribute
- public void setRecurse(boolean recurse)
- {
- this.recurse = recurse;
- }
-
- public String getValue()
- {
- if (value == null)
- throw new IllegalArgumentException("Null value");
-
- return value;
- }
-
- @XmlValue
- public void setValue(String value)
- {
- this.value = value;
- }
-
- @Override
- public int hashCode()
- {
-
- return getValue().hashCode();
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (obj == null)
- return false;
-
- if (obj == this)
- return true;
-
- if (obj instanceof FilterMetaData == false)
- return false;
-
- FilterMetaData other = (FilterMetaData) obj;
- return recurse == other.isRecurse() && getValue().equals(other.getValue());
- }
-}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/deployers/DeployersImpl.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -21,48 +21,23 @@
*/
package org.jboss.deployers.plugins.deployers;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerContextActions;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.ControllerStateModel;
-import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.dependency.spi.DependencyItem;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.jboss.dependency.spi.*;
import org.jboss.dependency.spi.asynchronous.AsynchronousController;
-import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.client.spi.IncompleteDeploymentException;
-import org.jboss.deployers.client.spi.IncompleteDeployments;
-import org.jboss.deployers.client.spi.MissingAsynchronousDependency;
-import org.jboss.deployers.client.spi.MissingDependency;
+import org.jboss.deployers.client.spi.*;
import org.jboss.deployers.plugins.sort.NewStagedSortedDeployers;
import org.jboss.deployers.plugins.sort.StagedSortedDeployers;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.DeploymentState;
-import org.jboss.deployers.spi.deployer.Deployer;
-import org.jboss.deployers.spi.deployer.Deployers;
-import org.jboss.deployers.spi.deployer.DeployersChangeExt;
-import org.jboss.deployers.spi.deployer.DeploymentStage;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.*;
import org.jboss.deployers.spi.deployer.exceptions.ExceptionNotificationListener;
import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
import org.jboss.deployers.structure.spi.DeploymentContext;
Modified: projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoadingLifeCycleUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoadingLifeCycleUnitTestCase.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/classloading/test/ClassLoadingLifeCycleUnitTestCase.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -24,18 +24,15 @@
import java.util.Collections;
import java.util.Set;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.jboss.classloading.spi.dependency.LifeCycle;
import org.jboss.classloading.spi.dependency.Module;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.dependency.spi.Controller;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
-import org.jboss.deployers.plugins.classloading.DeploymentMetaData;
import org.jboss.deployers.plugins.classloading.DeploymentValidationDeployer;
-import org.jboss.deployers.plugins.classloading.FilterMetaData;
+import org.jboss.deployers.spi.classloading.DeploymentMetaData;
+import org.jboss.deployers.spi.classloading.FilterMetaData;
import org.jboss.deployers.spi.deployer.Deployer;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -44,6 +41,9 @@
import org.jboss.test.deployers.classloading.support.a.A;
import org.jboss.test.deployers.classloading.support.b.B;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
* ClassLoadingLifeCycleUnitTestCase
*
Modified: projects/jboss-deployers/trunk/deployers-spi/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/pom.xml 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-spi/pom.xml 2010-03-30 12:38:21 UTC (rev 103256)
@@ -18,6 +18,10 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.mcann</groupId>
<artifactId>mcann-core</artifactId>
<exclusions>
Copied: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/DeploymentMetaData.java (from rev 102530, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/DeploymentMetaData.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/DeploymentMetaData.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/DeploymentMetaData.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.deployers.spi.classloading;
+
+import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import java.io.Serializable;
+import java.util.Set;
+
+import org.jboss.deployers.spi.deployer.DeploymentStage;
+import org.jboss.deployers.spi.deployer.DeploymentStageXmlAdapter;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * Deployment meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at JBossXmlSchema(namespace="urn:jboss:deployment:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="deployment")
+ at XmlType(name="deploymentType", propOrder={"filters"})
+public class DeploymentMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1l;
+
+ private DeploymentStage requiredStage = DeploymentStages.DESCRIBE;
+ private boolean lazyResolve;
+ private boolean lazyStart;
+ private Set<FilterMetaData> filters;
+
+ public DeploymentStage getRequiredStage()
+ {
+ return requiredStage;
+ }
+
+ @XmlAttribute(name = "required-stage")
+ @XmlJavaTypeAdapter(DeploymentStageXmlAdapter.class)
+ public void setRequiredStage(DeploymentStage requiredStage)
+ {
+ if (requiredStage == null)
+ requiredStage = DeploymentStages.DESCRIBE;
+
+ this.requiredStage = requiredStage;
+ }
+
+ public boolean isLazyResolve()
+ {
+ return lazyResolve;
+ }
+
+ @XmlAttribute(name = "lazy-resolve")
+ public void setLazyResolve(boolean lazyResolve)
+ {
+ this.lazyResolve = lazyResolve;
+ }
+
+ public boolean isLazyStart()
+ {
+ return lazyStart || (filters != null && filters.isEmpty() == false);
+ }
+
+ @XmlAttribute(name = "lazy-start")
+ public void setLazyStart(boolean lazyStart)
+ {
+ this.lazyStart = lazyStart;
+ }
+
+ public Set<FilterMetaData> getFilters()
+ {
+ return filters;
+ }
+
+ @XmlElement(name = "lazy-start-filter", type = FilterMetaData.class)
+ public void setFilters(Set<FilterMetaData> filters)
+ {
+ this.filters = filters;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/FilterMetaData.java (from rev 102530, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/classloading/FilterMetaData.java)
===================================================================
--- projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/FilterMetaData.java (rev 0)
+++ projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/classloading/FilterMetaData.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.deployers.spi.classloading;
+
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+import java.io.Serializable;
+
+/**
+ * Filter meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at XmlRootElement(name="lazy-start-filter")
+ at XmlType(name="lazyStartFilterType")
+public class FilterMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1l;
+
+ private boolean recurse;
+ private String value;
+
+ public boolean isRecurse()
+ {
+ return recurse;
+ }
+
+ @XmlAttribute
+ public void setRecurse(boolean recurse)
+ {
+ this.recurse = recurse;
+ }
+
+ public String getValue()
+ {
+ if (value == null)
+ throw new IllegalArgumentException("Null value");
+
+ return value;
+ }
+
+ @XmlValue
+ public void setValue(String value)
+ {
+ this.value = value;
+ }
+
+ @Override
+ public int hashCode()
+ {
+
+ return getValue().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ return false;
+
+ if (obj == this)
+ return true;
+
+ if (obj instanceof FilterMetaData == false)
+ return false;
+
+ FilterMetaData other = (FilterMetaData) obj;
+ return recurse == other.isRecurse() && getValue().equals(other.getValue());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloading/test/DeploymentMetaDataUnitTestCase.java 2010-03-30 12:38:21 UTC (rev 103256)
@@ -23,8 +23,8 @@
import java.util.Set;
-import org.jboss.deployers.plugins.classloading.DeploymentMetaData;
-import org.jboss.deployers.plugins.classloading.FilterMetaData;
+import org.jboss.deployers.spi.classloading.DeploymentMetaData;
+import org.jboss.deployers.spi.classloading.FilterMetaData;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.BootstrapDeployersTest;
Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml 2010-03-30 12:35:05 UTC (rev 103255)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml 2010-03-30 12:38:21 UTC (rev 103256)
@@ -107,7 +107,7 @@
</bean>
<bean name="DeploymentMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
<constructor>
- <parameter>org.jboss.deployers.plugins.classloading.DeploymentMetaData</parameter>
+ <parameter>org.jboss.deployers.spi.classloading.DeploymentMetaData</parameter>
</constructor>
<property name="name">jboss-deployment.xml</property>
<property name="registerWithJBossXB">true</property>
More information about the jboss-cvs-commits
mailing list