[jboss-cvs] JBossAS SVN: r70569 - in projects/microcontainer/trunk: aop-mc-int and 26 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 7 21:06:47 EST 2008
Author: adrian at jboss.org
Date: 2008-03-07 21:06:46 -0500 (Fri, 07 Mar 2008)
New Revision: 70569
Added:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/package-info.java
Removed:
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SchemaPrinter.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/TestSchemaResolver.java
Modified:
projects/microcontainer/trunk/aop-mc-int/.classpath
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/DescribeLifecycleBeanMetaDataFactory.java
projects/microcontainer/trunk/build/pom-jdk14.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/classloader/.classpath
projects/microcontainer/trunk/classloader/pom.xml
projects/microcontainer/trunk/classloading-vfs/.classpath
projects/microcontainer/trunk/classloading-vfs/pom.xml
projects/microcontainer/trunk/classloading/.classpath
projects/microcontainer/trunk/classloading/pom.xml
projects/microcontainer/trunk/dependency/.classpath
projects/microcontainer/trunk/dependency/pom-jdk14.xml
projects/microcontainer/trunk/dependency/pom.xml
projects/microcontainer/trunk/deployers-client-spi/.classpath
projects/microcontainer/trunk/deployers-client-spi/pom.xml
projects/microcontainer/trunk/deployers-client/.classpath
projects/microcontainer/trunk/deployers-client/pom.xml
projects/microcontainer/trunk/deployers-core-spi/.classpath
projects/microcontainer/trunk/deployers-core-spi/pom.xml
projects/microcontainer/trunk/deployers-core/.classpath
projects/microcontainer/trunk/deployers-impl/.classpath
projects/microcontainer/trunk/deployers-impl/pom.xml
projects/microcontainer/trunk/deployers-spi/.classpath
projects/microcontainer/trunk/deployers-spi/pom.xml
projects/microcontainer/trunk/deployers-structure-spi/.classpath
projects/microcontainer/trunk/deployers-structure-spi/pom.xml
projects/microcontainer/trunk/deployers-vfs-spi/.classpath
projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
projects/microcontainer/trunk/deployers-vfs/.classpath
projects/microcontainer/trunk/deployers-vfs/pom.xml
projects/microcontainer/trunk/guice-int/pom.xml
projects/microcontainer/trunk/kernel/.classpath
projects/microcontainer/trunk/kernel/pom-jdk14.xml
projects/microcontainer/trunk/kernel/pom.xml
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractBuilderTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractPolicyTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CallbackTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/FactoryTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/JBossXBTestDelegate.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java
projects/microcontainer/trunk/managed/.classpath
projects/microcontainer/trunk/managed/pom-jdk14.xml
projects/microcontainer/trunk/managed/pom.xml
projects/microcontainer/trunk/metatype/.classpath
projects/microcontainer/trunk/metatype/pom-jdk14.xml
projects/microcontainer/trunk/metatype/pom.xml
projects/microcontainer/trunk/osgi-int/.classpath
projects/microcontainer/trunk/osgi-int/pom.xml
projects/microcontainer/trunk/pom.xml
projects/microcontainer/trunk/reliance-identity/pom.xml
projects/microcontainer/trunk/reliance-rules/pom.xml
projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml
projects/microcontainer/trunk/spring-int/.classpath
projects/microcontainer/trunk/spring-int/pom.xml
Log:
[JBMICROCONT-219] - Cutover to using JAXB style annotations for parsing
Modified: projects/microcontainer/trunk/aop-mc-int/.classpath
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/aop-mc-int/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -5,33 +5,9 @@
<classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
<classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar" sourcepath="/M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
+ <classpathentry exported="true" kind="src" path="/jboss-kernel"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar" sourcepath="/M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -211,83 +211,57 @@
<artifactId>jboss-aop</artifactId>
<exclusions>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
<exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <!-- HERE exclusions>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
</exclusion>
- </exclusions-->
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <!-- HERE exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-container</artifactId>
</exclusion>
- </exclusions-->
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
</exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>javassist</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
- <!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -305,12 +279,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
<profiles>
<profile>
@@ -665,4 +633,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/DescribeLifecycleBeanMetaDataFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/DescribeLifecycleBeanMetaDataFactory.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/DescribeLifecycleBeanMetaDataFactory.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -21,6 +21,8 @@
*/
package org.jboss.aop.microcontainer.beans.beanmetadatafactory;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.jboss.dependency.spi.ControllerState;
/**
@@ -28,6 +30,7 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
+ at XmlRootElement(name="lifecycle-describe")
public class DescribeLifecycleBeanMetaDataFactory extends LifecycleBeanMetaDataFactory
{
private static final long serialVersionUID = 1L;
Added: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/package-info.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/package-info.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/beanmetadatafactory/package-info.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -0,0 +1,47 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.
+*/
+ at JBossXmlAdaptedTypes
+({
+ @JBossXmlAdaptedType(type=Cardinality.class, valueAdapter=CardinalityValueAdapter.class),
+ @JBossXmlAdaptedType(type=ControllerMode.class, valueAdapter= ControllerModeValueAdapter.class),
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class),
+ @JBossXmlAdaptedType(type=FromContext.class, valueAdapter=FromContextValueAdapter.class),
+ @JBossXmlAdaptedType(type= InjectOption.class, valueAdapter=InjectionOptionValueAdapter.class),
+ @JBossXmlAdaptedType(type=AutowireType.class, valueAdapter= AutowireTypeValueAdapter.class)
+})
+package org.jboss.aop.microcontainer.beans.beanmetadatafactory;
+
+import org.jboss.beans.metadata.api.model.AutowireTypeValueAdapter;
+import org.jboss.beans.metadata.plugins.CardinalityValueAdapter;
+import org.jboss.beans.metadata.plugins.ControllerModeValueAdapter;
+import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.api.model.FromContextValueAdapter;
+import org.jboss.beans.metadata.api.model.InjectOption;
+import org.jboss.beans.metadata.api.model.InjectionOptionValueAdapter;
+import org.jboss.beans.metadata.api.model.AutowireType;
+import org.jboss.dependency.spi.Cardinality;
+import org.jboss.dependency.spi.ControllerMode;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
Modified: projects/microcontainer/trunk/build/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/build/pom-jdk14.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/build/pom-jdk14.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -37,6 +37,8 @@
<version.jbossxb>2.0.0.CR3</version.jbossxb>
<version.osgi.r4.core>1.0</version.osgi.r4.core>
<version.jboss.vfs>2.0.4.snapshot</version.jboss.vfs>
+ <version.org.jboss.reflect>2.0.0.Beta11</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.0.0.Beta11</version.org.jboss.mdr>
<version.javassist>3.6-beta</version.javassist>
<version.jaxb.api>2.0</version.jaxb.api>
<version.jboss.aop>2.0.0-SNAPSHOT</version.jboss.aop>
@@ -185,18 +187,6 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
<artifactId>jboss-dependency-jdk14</artifactId>
<version>${project.version}</version>
</dependency>
@@ -336,6 +326,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect-jdk14</artifactId>
+ <version>${version.org.jboss.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr-jdk14</artifactId>
+ <version>${version.org.jboss.mdr}</version>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
<version>${version.osgi.r4.core}</version>
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/build/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -33,19 +33,19 @@
<properties>
<version.jboss.common.core>2.2.3.GA</version.jboss.common.core>
- <version.jbossxb>2.0.0.CR6</version.jbossxb>
+ <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
+ <version.jbossxb>2.0.0-SNAPSHOT</version.jbossxb>
<version.osgi.r4.core>1.0</version.osgi.r4.core>
<version.jboss.vfs>2.0.0.Beta7</version.jboss.vfs>
<version.javassist>3.6.0.GA</version.javassist>
- <version.jaxb.api>2.0</version.jaxb.api>
<version.jboss.aop>2.0.0.CR3</version.jboss.aop>
- <version.jboss.logging.spi>2.0.3.GA</version.jboss.logging.spi>
<version.jboss.classloading.spi>5.0.0.Beta3</version.jboss.classloading.spi>
+ <version.org.jboss.reflect>2.0.0.Beta11</version.org.jboss.reflect>
+ <version.org.jboss.mdr>2.0.0.Beta11</version.org.jboss.mdr>
<version.org.jboss.test>1.0.4.GA</version.org.jboss.test>
<version.junit>3.8.1</version.junit>
<version.jboss.profiler.jvmti>1.0.0.CR5</version.jboss.profiler.jvmti>
<version.ant.junit>1.6.5</version.ant.junit>
- <version.apache-xerces.xml-apis>2.7.1</version.apache-xerces.xml-apis>
<version.jboss.drools>4.0.1</version.jboss.drools>
<version.jboss.jbpm>3.1.1</version.jboss.jbpm>
<version.google.guice>1.0</version.google.guice>
@@ -196,18 +196,6 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${project.version}</version>
</dependency>
@@ -352,19 +340,24 @@
<version>${version.jboss.common.core}</version>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ <version>${version.jboss.common.logging.spi}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
<version>${version.jbossxb}</version>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${version.apache-xerces.xml-apis}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.reflect}</version>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${version.apache-xerces.xml-apis}</version>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.org.jboss.mdr}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -389,21 +382,11 @@
<version>${version.javassist}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${version.jaxb.api}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<version>${version.jboss.aop}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-classloading-spi</artifactId>
<version>${version.jboss.classloading.spi}</version>
Modified: projects/microcontainer/trunk/classloader/.classpath
===================================================================
--- projects/microcontainer/trunk/classloader/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloader/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,20 +1,15 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/resources/tests" output="target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/classloader/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloader/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloader/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -41,27 +41,37 @@
<artifactId>jboss-classloading-spi</artifactId>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-spi</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
+ <version>2.2.3.GA</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -71,11 +81,28 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <optional>true</optional>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/classloading/.classpath
===================================================================
--- projects/microcontainer/trunk/classloading/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloading/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -4,29 +4,7 @@
<classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
<classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-classloader"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-container"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-dependency"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-kernel"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-metatype"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-managed"/>
+ <classpathentry exported="true" kind="src" path="/jboss-classloader"/>
+ <classpathentry exported="true" kind="src" path="/jboss-kernel"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/classloading/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloading/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloading/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -22,38 +22,17 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloader</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -68,6 +47,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/classloading-vfs/.classpath
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloading-vfs/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -4,31 +4,7 @@
<classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
<classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-classloader"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-container"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-dependency"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-kernel"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-metatype"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-managed"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-classloading"/>
+ <classpathentry exported="true" kind="src" path="/jboss-classloading"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/classloading-vfs/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloading-vfs/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/classloading-vfs/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -28,46 +28,27 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloading</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
<exclusions>
<exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -82,6 +63,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/dependency/.classpath
===================================================================
--- projects/microcontainer/trunk/dependency/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/dependency/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,25 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.0.Beta11/jboss-mdr-2.0.0.Beta11.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/dependency/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom-jdk14.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/dependency/pom-jdk14.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -133,12 +133,6 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core-jdk14</artifactId>
</dependency>
@@ -146,14 +140,20 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-common-logging-spi-jdk14</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr-jdk14</artifactId>
+ </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test-jdk14</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<!-- Runtime dependencies -->
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/dependency/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -44,27 +44,14 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jboss-mdr</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -80,5 +67,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <scope>test</scope>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/deployers-client/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-client/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-client/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,34 +1,9 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-client-spi"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-client/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-client/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -53,10 +53,6 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
<scope>test</scope>
</dependency>
Modified: projects/microcontainer/trunk/deployers-client-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-client-spi/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,25 +1,8 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core-spi"/>
+ <classpathentry exported="true" kind="src" path="/jboss-managed"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-client-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-client-spi/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -21,9 +21,5 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-managed</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/deployers-core/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-core/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-core/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,19 +1,13 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core-spi"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-core-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-core-spi/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,11 +1,8 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-core-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-core-spi/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -21,11 +21,19 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/deployers-impl/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-impl/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-impl/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,41 +1,12 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="src" path="/jboss-classloading"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-deployers-client"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
- <classpathentry kind="src" path="/jboss-deployers-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-aop-mc-int"/>
+ <classpathentry exported="true" kind="src" path="/jboss-classloading"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-spi"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-client"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-impl/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-impl/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-impl/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -37,55 +37,27 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloading</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-classloading-spi</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
@@ -103,31 +75,6 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
<exclusions>
<exclusion>
Modified: projects/microcontainer/trunk/deployers-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-spi/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-spi/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,30 +1,8 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-structure-spi"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-spi/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-spi/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -17,9 +17,5 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/deployers-structure-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-structure-spi/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,36 +1,11 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-deployers-client"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-dependency"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-client-spi"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-client"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-structure-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-structure-spi/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-structure-spi/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -36,10 +36,6 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
@@ -56,20 +52,13 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-core</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Modified: projects/microcontainer/trunk/deployers-vfs/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-vfs/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,50 +1,13 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/resources/tests" output="target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="src" path="/jboss-classloading"/>
- <classpathentry kind="src" path="/jboss-classloading-vfs"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-deployers-client"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
- <classpathentry kind="src" path="/jboss-deployers-impl"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-vfs-spi"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-client"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-core"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-impl"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-vfs-spi"/>
+ <classpathentry exported="true" kind="src" path="/jboss-classloading-vfs"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/deployers-vfs/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-vfs/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -31,54 +31,10 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
</dependency>
<dependency>
@@ -93,13 +49,11 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-impl</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -112,35 +66,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
Modified: projects/microcontainer/trunk/deployers-vfs-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-vfs-spi/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -2,32 +2,10 @@
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
+ <classpathentry kind="src" path="/jboss-deployers-spi"/>
+ <classpathentry kind="src" path="/jboss-deployers-core"/>
<classpathentry kind="src" path="/jboss-classloading"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossxb-2.0.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/microcontainer/trunk/deployers-vfs-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/deployers-vfs-spi/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -16,43 +16,9 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-classloading</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
<exclusions>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
<exclusion>
@@ -62,16 +28,12 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-classloading</artifactId>
</dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/guice-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/guice-int/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/guice-int/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -31,24 +31,18 @@
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
Modified: projects/microcontainer/trunk/kernel/.classpath
===================================================================
--- projects/microcontainer/trunk/kernel/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,35 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/resources/main" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/resources/tests" output="target/tests-classes" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/resources/main"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/tests-classes" path="src/resources/tests"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-dependency"/>
+ <classpathentry exported="true" kind="src" path="/jboss-managed"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0-SNAPSHOT/jbossxb-2.0.0-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/kernel/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom-jdk14.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/pom-jdk14.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -173,12 +173,6 @@
</plugin>
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
- </dependency>
- </dependencies>
</profile>
</profiles>
@@ -202,18 +196,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <!--<dependency>
<groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
- <scope>runtime</scope>
- </dependency>-->
- <dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
<artifactId>jboss-dependency-jdk14</artifactId>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/kernel/pom.xml
===================================================================
--- projects/microcontainer/trunk/kernel/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -73,10 +73,6 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -85,28 +81,17 @@
</dependency>
<dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>javassist</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
</dependency>
- <!-- Jaxb builder tests -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <optional>true</optional>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -116,34 +101,29 @@
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
<exclusion>
<groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
<!-- Test dependencies -->
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractLazyMetaData.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -134,7 +134,7 @@
return exposeClass;
}
- @XmlAttribute
+ @XmlAttribute(name="exposeClass")
public void setExposeClass(boolean exposeClass)
{
this.exposeClass = exposeClass;
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractBuilderTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractBuilderTest.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractBuilderTest.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -28,14 +28,10 @@
import org.jboss.test.AbstractTestDelegate;
import org.jboss.util.UnreachableStatementException;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultHandlers;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.ParticleBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.ParticleHandler;
import org.jboss.xb.binding.sunday.unmarshalling.SequenceBinding;
import org.jboss.xb.binding.sunday.unmarshalling.TermBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.ParticleHandler;
-import org.jboss.xb.builder.JBossXBBuilder;
/**
* AbstractBuilderTest.
@@ -96,50 +92,12 @@
simpleHandler = null;
}
- protected <T> T unmarshalObjectFromSchema(Class<T> expected) throws Exception
+ protected <T> T unmarshalObject(Class<T> expected) throws Exception
{
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- // TODO this is a mess
- String nsURI = "http://www.jboss.org/test/xml/" + rootName;
- String packageName = getClass().getPackage().getName();
- packageName = packageName.replace(".", "/");
- String name = getClass().getName();
- int dot = name.lastIndexOf('.');
- if (dot != -1)
- name = name.substring(dot + 1);
- dot = name.lastIndexOf("UnitTestCase");
- if (dot != -1)
- name = name.substring(0, dot);
- String testXsd = packageName + '/' + name + ".xsd";
- resolver.addSchemaLocation(nsURI, testXsd);
- resolver.addSchemaInitializer(nsURI, JBossXBBuilder.newInitializer(expected));
-
String testXml = findTestXml();
- Object o = unmarshal(testXml, expected, resolver);
+ Object o = unmarshal(testXml);
assertNotNull(o);
getLog().debug("Unmarshalled " + o + " of type " + o.getClass().getName());
- return expected.cast(o);
- }
-
- protected <T, U> T unmarshalObject(Class<T> expected, Class<U> reference, Class<?>... others) throws Exception
- {
- TestSchemaResolver resolver = new TestSchemaResolver();
-
- SchemaBinding schemaBinding = JBossXBBuilder.build(reference);
- resolver.addSchemaBinding(schemaBinding);
- if (others != null)
- {
- for (Class<?> other : others)
- {
- SchemaBinding otherBinding = JBossXBBuilder.build(other);
- resolver.addSchemaBinding(otherBinding);
- }
- }
-
- String testXml = findTestXml();
- Object o = unmarshal(testXml, schemaBinding);
- assertNotNull(o);
- getLog().debug("Unmarshalled " + o + " of type " + o.getClass().getName());
try
{
return expected.cast(o);
@@ -155,38 +113,13 @@
* Unmarshal some xml
*
* @param name the name
- * @param schema the schema
- * @return the unmarshalled object
- * @throws Exception for any error
- */
- protected Object unmarshal(String name, SchemaBinding schema) throws Exception
- {
- String url = findXML(name);
- return getJBossXBDelegate().unmarshal(url, schema);
- }
-
- protected <T, U> T unmarshalObject(Class<T> expected, Class<U> reference) throws Exception
- {
- return unmarshalObject(expected, reference, null);
- }
-
- protected <T> T unmarshalObject(Class<T> expected) throws Exception
- {
- return unmarshalObject(expected, expected, null);
- }
-
- /**
- * Unmarshal some xml
- *
- * @param name the name
* @param expected the expected type
- * @param resolver the resolver
* @return the unmarshalled object
* @throws Exception for any error
*/
- protected Object unmarshal(String name, Class<?> expected, SchemaBindingResolver resolver) throws Exception
+ protected Object unmarshal(String name, Class<?> expected) throws Exception
{
- Object object = unmarshal(name, resolver);
+ Object object = unmarshal(name);
if (object == null)
fail("No object from " + name);
assertTrue("Object '" + object + "' cannot be assigned to " + expected.getName(), expected.isAssignableFrom(object.getClass()));
@@ -197,14 +130,13 @@
* Unmarshal some xml
*
* @param name the name
- * @param resolver the resolver
* @return the unmarshalled object
* @throws Exception for any error
*/
- protected Object unmarshal(String name, SchemaBindingResolver resolver) throws Exception
+ protected Object unmarshal(String name) throws Exception
{
String url = findXML(name);
- return getJBossXBDelegate().unmarshal(url, resolver);
+ return getJBossXBDelegate().unmarshal(url);
}
protected String findTestXml()
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractMCTest.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -43,13 +43,12 @@
import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.DependencyMetaData;
import org.jboss.beans.metadata.spi.InstallMetaData;
+import org.jboss.beans.metadata.spi.LazyMetaData;
import org.jboss.beans.metadata.spi.ParameterMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
-import org.jboss.beans.metadata.spi.LazyMetaData;
import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
-import org.jboss.javabean.plugins.jaxb.JavaBean10;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.xb.binding.JBossXBException;
@@ -69,17 +68,17 @@
protected AbstractKernelDeployment unmarshalDeployment() throws Exception
{
- return unmarshalObject(AbstractKernelDeployment.class, AbstractKernelDeployment.class, JavaBean10.class);
+ return unmarshalObject(AbstractKernelDeployment.class);
}
protected AbstractBeanMetaData unmarshalBean() throws Exception
{
- return unmarshalObject(AbstractBeanMetaData.class, AbstractKernelDeployment.class, JavaBean10.class);
+ return unmarshalObject(AbstractBeanMetaData.class);
}
protected GenericBeanFactoryMetaData unmarshalBeanFactory() throws Exception
{
- return unmarshalObject(GenericBeanFactoryMetaData.class, AbstractKernelDeployment.class, JavaBean10.class);
+ return unmarshalObject(GenericBeanFactoryMetaData.class);
}
protected void assertAnnotations(Set<String> expected, Set<AnnotationMetaData> annotations)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractPolicyTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractPolicyTest.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractPolicyTest.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -24,7 +24,6 @@
import org.jboss.beans.metadata.plugins.policy.AbstractBindingMetaData;
import org.jboss.beans.metadata.plugins.policy.AbstractPolicyMetaData;
import org.jboss.beans.metadata.plugins.policy.AbstractScopeMetaData;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -38,7 +37,7 @@
private <T> T unmarshal(Class<T> expected) throws Exception
{
- return unmarshalObject(expected, AbstractPolicyMetaData.class, AbstractKernelDeployment.class);
+ return unmarshalObject(expected);
}
protected AbstractPolicyMetaData unmarshalPolicy() throws Exception
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AbstractXMLTest.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -38,7 +38,6 @@
import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
import org.jboss.beans.metadata.plugins.StringValueMetaData;
import org.jboss.beans.metadata.plugins.ThisValueMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.CallbackMetaData;
@@ -50,6 +49,7 @@
import org.jboss.beans.metadata.spi.SupplyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.LazyMetaData;
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
@@ -184,17 +184,12 @@
protected void assertBeanFactoryProperties(Set<String> expected, GenericBeanFactoryMetaData factory)
{
assertNotNull(factory);
- PropertyMetaData propertiesProperty = factory.getProperty("properties");
- assertNotNull(propertiesProperty);
- AbstractMapMetaData map = (AbstractMapMetaData) propertiesProperty.getValue();
- assertNotNull(map);
- Set<AbstractValueMetaData> properties = (Set) map.keySet();
+ Set<PropertyMetaData> properties = factory.getProperties();
assertEquals(expected.size(), properties.size());
HashSet<String> clonedExpected = new HashSet<String>(expected);
- for (Iterator<AbstractValueMetaData> i = properties.iterator(); i.hasNext();)
+ for (PropertyMetaData property : properties)
{
- AbstractValueMetaData property = i.next();
- if (clonedExpected.remove(property.getUnderlyingValue()) == false)
+ if (clonedExpected.remove(property.getName()) == false)
fail("Did not expect " + property + " expected " + expected);
}
if (clonedExpected.size() != 0)
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AnnotationTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -88,45 +88,6 @@
assertEquals("Annotations are nice", ann1.str());
}
- public void testAnnotationBadNoContent() throws Exception
- {
- try
- {
- unmarshalBean("AnnotationBadNoContent.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testAnnotationBadNoContent2() throws Exception
- {
- try
- {
- unmarshalBean("AnnotationBadNoContent2.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testAnnotationBadNoLeadingAt() throws Exception
- {
- try
- {
- unmarshalBean("AnnotationBadNoLeadingAt.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(AnnotationTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanFactoryTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -25,8 +25,8 @@
import java.util.HashSet;
import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
+
+import org.jboss.beans.metadata.spi.factory.GenericBeanFactoryMetaData;
import org.jboss.dependency.spi.ControllerMode;
/**
@@ -41,21 +41,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithName.xml");
assertEquals("Name1", factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -68,21 +61,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithClass.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals(Object.class.getName(), factory.getBeanClass());
+ assertEquals(Object.class.getName(), factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -95,21 +81,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithMode.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertEquals(ControllerMode.MANUAL, factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -122,21 +101,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithClassLoader.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNotNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -149,21 +121,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithConstructor.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
assertNotNull(factory.getConstructor());
- assertNotNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -176,23 +141,16 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithProperty.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
+ assertNull(factory.getConstructor());
HashSet<String> expected = new HashSet<String>();
expected.add("Property1");
assertBeanFactoryProperties(expected, factory);
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -205,24 +163,18 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithProperties.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
+ assertNull(factory.getConstructor());
HashSet<String> expected = new HashSet<String>();
expected.add("Property1");
expected.add("Property2");
expected.add("Property3");
- assertBeanFactoryProperties(expected, factory);
+ assertProperties(expected, factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -235,20 +187,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithCreate.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
- assertNull(factory.getCreate());
- assertNotNull(factory.getProperty("create"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
+ assertNotNull(factory.getCreate());
assertNull(factory.getStart());
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -261,20 +207,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithStart.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getStart());
- assertNotNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
+ assertNotNull(factory.getStart());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -287,21 +227,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithDependency.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Depends1");
assertDepends(expected, factory.getDepends());
@@ -316,21 +249,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithDependencies.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Depends1");
expected.add("Depends2");
@@ -347,21 +273,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithDemand.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Demand1");
assertDemands(expected, factory.getDemands());
@@ -376,21 +295,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithDemands.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
HashSet<String> expected = new HashSet<String>();
expected.add("Demand1");
expected.add("Demand2");
@@ -407,21 +319,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithSupply.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
HashSet<String> expected = new HashSet<String>();
expected.add("Supply1");
@@ -436,21 +341,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithSupplies.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
HashSet<String> expected = new HashSet<String>();
expected.add("Supply1");
@@ -467,21 +365,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithInstall.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
ArrayList<String> expected = new ArrayList<String>();
@@ -496,21 +387,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithInstalls.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
ArrayList<String> expected = new ArrayList<String>();
@@ -527,21 +411,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithUninstall.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -556,21 +433,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithUninstalls.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -588,21 +458,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithInstallCallback.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -617,21 +480,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithInstallCallbacks.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -648,21 +504,14 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithUninstallCallback.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
- assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
- assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getConstructor());
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -677,21 +526,16 @@
{
GenericBeanFactoryMetaData factory = unmarshalBeanFactory("BeanFactoryWithUninstallCallbacks.xml");
assertNull(factory.getName());
- assertEquals(GenericBeanFactory.class.getName(), factory.getBean());
- assertEquals("Dummy", factory.getBeanClass());
+ assertEquals("Dummy", factory.getBean());
assertNull(factory.getMode());
assertNull(factory.getAnnotations());
assertNull(factory.getClassLoader());
assertNotNull(factory.getConstructor());
- assertNull(factory.getProperty("constructor"));
+ assertNull(factory.getConstructor());
assertNotNull(factory.getProperties());
- assertNull(factory.getProperty("properties"));
+ assertNull(factory.getProperties());
assertNull(factory.getCreate());
- assertNull(factory.getProperty("create"));
assertNull(factory.getStart());
- assertNull(factory.getProperty("start"));
- assertNull(factory.getStop());
- assertNull(factory.getDestroy());
assertNull(factory.getDemands());
assertNull(factory.getSupplies());
assertNull(factory.getInstalls());
@@ -704,45 +548,6 @@
assertCallbacks(expected, factory.getUninstallCallbacks());
}
*/
-
- public void testBeanFactoryBadNoClassOrConstructor() throws Exception
- {
- try
- {
- unmarshalBeanFactory("BeanFactoryBadNoClassOrConstructor.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testBeanFactoryBadNoClassOrFactoryMethod() throws Exception
- {
- try
- {
- unmarshalBeanFactory("BeanFactoryBadNoClassOrFactoryMethod.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testBeanFactoryBadNoClassOrFactory() throws Exception
- {
- try
- {
- unmarshalBeanFactory("BeanFactoryBadNoClassOrFactory.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
public static Test suite()
{
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/BeanTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -685,45 +685,6 @@
assertCallbacks(expected, bean.getUninstallCallbacks());
}
- public void testBeanBadNoClassOrConstructor() throws Exception
- {
- try
- {
- unmarshalBean("BeanBadNoClassOrConstructor.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testBeanBadNoClassOrFactoryMethod() throws Exception
- {
- try
- {
- unmarshalBean("BeanBadNoClassOrFactoryMethod.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testBeanBadNoClassOrFactory() throws Exception
- {
- try
- {
- unmarshalBean("BeanBadNoClassOrFactory.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public void testBeanWithCandidate() throws Exception
{
AbstractBeanMetaData bean = unmarshalBean("BeanWithCandidate.xml");
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CallbackTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/CallbackTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -146,19 +146,6 @@
assertEquals(install.getCardinality(), Cardinality.ONE_TO_MANY);
}
- public void testInstallBothMethodProperty() throws Exception
- {
- try
- {
- unmarshalBean("CallbackInstallBadMethodProperty.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
// --- Uninstall
public void testUninstallWithProperty() throws Exception
@@ -237,18 +224,4 @@
assertNotNull(install.getCardinality());
assertEquals(install.getCardinality(), Cardinality.fromString("2..10"));
}
-
- public void testUninstallBothMethodProperty() throws Exception
- {
- try
- {
- unmarshalBean("CallbackUninstallBadMethodProperty.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ClassLoaderTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -65,19 +65,6 @@
assertWildcard(classLoader.getClassLoader());
}
- public void testClassLoaderBadNoValue() throws Exception
- {
- try
- {
- unmarshalDeployment("ClassLoaderBadNoValue.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(ClassLoaderTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ConstructorTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -254,32 +254,6 @@
assertWildcard(constructor.getValue());
}
- public void testConstructorBadFactoryClassNoFactoryMethod() throws Exception
- {
- try
- {
- unmarshalBean("ConstructorBadFactoryClassNoFactoryMethod.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testConstructorBadFactoryNoFactoryMethod() throws Exception
- {
- try
- {
- unmarshalBean("ConstructorBadFactoryNoFactoryMethod.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(ConstructorTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DemandTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -70,19 +70,6 @@
assertEquals("default", demand.getTransformer());
}
- public void testDemandBadNoValue() throws Exception
- {
- try
- {
- unmarshalBean("DemandBadNoValue.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(DemandTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DependencyTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -54,19 +54,6 @@
assertEquals("Dependency", dependency.getDependency());
}
- public void testDependencyBadNoValue() throws Exception
- {
- try
- {
- unmarshalBean("DependencyBadNoValue.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(DependencyTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/FactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/FactoryTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/FactoryTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -83,19 +83,6 @@
assertWildcard(getFactory("FactoryWithWildcard.xml"));
}
- public void testFactoryBadNoBeanOrWildcard() throws Exception
- {
- try
- {
- unmarshalBean("FactoryBadNoBeanOrWildcard.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(FactoryTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/InstallTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -150,19 +150,6 @@
assertParameters(expected, install.getParameters());
}
- public void testInstallBadNoMethod() throws Exception
- {
- try
- {
- unmarshalBean("InstallBadNoMethod.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(InstallTestCase.class);
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/JBossXBTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/JBossXBTestDelegate.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/JBossXBTestDelegate.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -21,17 +21,12 @@
*/
package org.jboss.test.kernel.deployment.xml.test;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-import org.jboss.net.protocol.URLStreamHandlerFactory;
import org.jboss.test.AbstractTestDelegate;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.XsdBinder;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
/**
* JBossXBTestDelegate.
@@ -42,34 +37,13 @@
*/
public class JBossXBTestDelegate extends AbstractTestDelegate
{
- /** Whether initialization has been done */
- private static boolean done = false;
-
/** The unmarshaller factory */
protected UnmarshallerFactory unmarshallerFactory;
/** The resolver */
- protected SchemaBindingResolver defaultResolver;
+ protected SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
/**
- * Initialize
- */
- public synchronized static void init()
- {
- if (done)
- return;
- done = true;
- URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory());
- URLStreamHandlerFactory.preload();
- String handlerPkgs = System.getProperty("java.protocol.handler.pkgs");
- if (handlerPkgs != null)
- handlerPkgs += "|org.jboss.net.protocol";
- else
- handlerPkgs = "org.jboss.net.protocol";
- System.setProperty("java.protocol.handler.pkgs", handlerPkgs);
- }
-
- /**
* Create a new JBossXBTestDelegate.
*
* @param clazz the test class
@@ -83,37 +57,18 @@
public void setUp() throws Exception
{
super.setUp();
- init();
unmarshallerFactory = UnmarshallerFactory.newInstance();
- initResolver();
}
- protected void initResolver() throws Exception
- {
- try
- {
- Method method = clazz.getMethod("initResolver", null);
- defaultResolver = (SchemaBindingResolver) method.invoke(null, null);
- }
- catch (NoSuchMethodException ignored)
- {
- defaultResolver = new DefaultSchemaResolver();
- }
- }
-
/**
* Unmarshal an object
*
* @param url the url
- * @param resolver the resolver
* @return the object
* @throws Exception for any error
*/
- public Object unmarshal(String url, SchemaBindingResolver resolver) throws Exception
+ public Object unmarshal(String url) throws Exception
{
- if (resolver == null)
- resolver = defaultResolver;
-
long start = System.currentTimeMillis();
Unmarshaller unmarshaller = unmarshallerFactory.newUnmarshaller();
log.debug("Initialized parsing in " + (System.currentTimeMillis() - start) + "ms");
@@ -155,17 +110,4 @@
throw e;
}
}
-
- /**
- * Bind a schema
- *
- * @param url the url
- * @param resolver the resolver
- * @return the object
- * @throws Exception for any error
- */
- public SchemaBinding bind(String url, SchemaBindingResolver resolver) throws Exception
- {
- return XsdBinder.bind(url, resolver);
- }
}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/PropertyTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -25,8 +25,9 @@
import java.util.Set;
import junit.framework.Test;
+
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.plugins.StringValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.ValueMetaData;
@@ -71,11 +72,8 @@
PropertyMetaData property = getProperty("PropertyWithClass.xml");
assertNotNull("PropertyName", property.getName());
assertNull(property.getAnnotations());
- ValueMetaData value = property.getValue();
- assertNotNull(value);
- assertTrue(value instanceof StringValueMetaData);
- StringValueMetaData string = (StringValueMetaData) value;
- assertEquals("PropertyClass", string.getType());
+ AbstractPropertyMetaData apmd = assertInstanceOf(property, AbstractPropertyMetaData.class);
+ assertEquals("PropertyClass", apmd.getPropertyType());
}
public void testPropertyWithAnnotation() throws Exception
@@ -197,19 +195,6 @@
assertWildcard(property.getValue());
}
- public void testPropertyBadNoName() throws Exception
- {
- try
- {
- unmarshalBean("PropertyBadNoName.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(PropertyTestCase.class);
Deleted: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SchemaPrinter.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SchemaPrinter.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SchemaPrinter.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,277 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.kernel.deployment.xml.test;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.xml.XMLConstants;
-
-import org.jboss.xb.binding.sunday.unmarshalling.AllBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.AttributeBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.ChoiceBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.ModelGroupBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.ParticleBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SequenceBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.TermBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.WildcardBinding;
-
-/**
- * SchemaPrinter.
- *
- * TODO finish this off properly
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class SchemaPrinter
-{
- @SuppressWarnings("unchecked")
- public static String printSchema(SchemaBinding schemaBinding)
- {
- String nsURI = (String) schemaBinding.getNamespaces().iterator().next();
- StringBuilder builder = new StringBuilder();
- builder.append("<xsd:schema xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n");
- if (XMLConstants.NULL_NS_URI.equals(nsURI) == false)
- {
- builder.append(" targetNamespace=\"").append(nsURI).append("\"\n");
- builder.append(" xmlns=\"").append(nsURI).append("\"\n");
- }
- builder.append(">\n");
- int pad=3;
- Iterator<ParticleBinding> elements = schemaBinding.getElementParticles();
- while (elements != null && elements.hasNext())
- printElement(builder, pad, elements.next());
- Iterator<TypeBinding> types = schemaBinding.getTypes();
- while (types != null && types.hasNext())
- printType(builder, pad, types.next());
- builder.append("</xsd:schema>");
- return builder.toString();
- }
-
- public static void printElement(StringBuilder builder, int pad, ParticleBinding particle)
- {
- ElementBinding element = (ElementBinding) particle.getTerm();
- pad(builder, pad);
- builder.append("<element name=\"").append(element.getQName()).append("\"");
- int minOccurs = particle.getMinOccurs();
- if (minOccurs != 1)
- builder.append(" minOccurs=\"").append(minOccurs).append("\"");
- int maxOccurs = particle.getMaxOccurs();
- if (maxOccurs != 1)
- {
- builder.append(" maxOccurs=\"");
- if (maxOccurs == -1)
- builder.append("unbounded");
- else
- builder.append(maxOccurs);
- builder.append("\"");
- }
- TypeBinding type = element.getType();
- if (type != null && type.getQName() != null)
- builder.append(" type=\"").append(type.getQName()).append("\"");
- builder.append(">");
- if (type != null && type.getQName() == null)
- printAnonymousType(builder, pad + 3, type);
- pad(builder, pad);
- builder.append("</element>");
- }
-
- public static void printAnonymousType(StringBuilder builder, int pad, TypeBinding type)
- {
- pad(builder, pad);
- builder.append("<complexType>");
- TypeBinding baseTypeBinding = type.getBaseType();
- String qName;
- if (baseTypeBinding != null)
- qName = baseTypeBinding.getQName().toString();
- else
- qName = "xsd:anyType";
- pad(builder, pad);
- builder.append(" <restriction base=\"").append(qName).append("\">");
- printTypeInfo(builder, pad+6, type);
- pad(builder, pad);
- builder.append(" </restriction>");
- pad(builder, pad);
- builder.append("</complexType>");
- }
-
- public static void printType(StringBuilder builder, int pad, TypeBinding type)
- {
- if (type.isSimple())
- printSimpleType(builder, pad, type);
- else
- printComplexType(builder, pad, type);
- }
-
- public static void printSimpleType(StringBuilder builder, int pad, TypeBinding type)
- {
- pad(builder, pad);
- builder.append("<simpleType name=\"").append(type.getQName()).append("\"");
- TypeBinding baseTypeBinding = type.getBaseType();
- String qName = null;
- if (baseTypeBinding != null)
- qName = baseTypeBinding.getQName().toString();
- else
- qName = "xsd:anySimpleType";
- builder.append(" base=\"").append(qName).append("\">");
- printTypeInfo(builder, pad+3, type);
- pad(builder, pad);
- builder.append("</simpleType>");
- }
-
- public static void printComplexType(StringBuilder builder, int pad, TypeBinding type)
- {
- pad(builder, pad);
- builder.append("<complexType name=\"").append(type.getQName()).append("\"");
- TypeBinding baseTypeBinding = type.getBaseType();
- String qName = null;
- if (baseTypeBinding != null)
- qName = baseTypeBinding.getQName().toString();
- else
- qName = "xsd:anyType";
- builder.append(" base=\"").append(qName).append("\">");
- printTypeInfo(builder, pad+3, type);
- pad(builder, pad);
- builder.append("</complexType>");
- }
-
- @SuppressWarnings("unchecked")
- public static void printTypeInfo(StringBuilder builder, int pad, TypeBinding type)
- {
- ParticleBinding particle = type.getParticle();
- if (particle != null)
- {
- printParticle(builder, pad, particle);
- }
-
- Collection<AttributeBinding> attributes = type.getAttributes();
- if (attributes != null)
- {
- for (AttributeBinding attribute : attributes)
- {
- printAttribute(builder, pad, attribute);
- }
- }
- }
-
- public static void printParticle(StringBuilder builder, int pad, ParticleBinding particle)
- {
- TermBinding term = particle.getTerm();
- if (term instanceof ElementBinding)
- printElement(builder, pad, particle);
- else if (term instanceof WildcardBinding)
- printWildcard(builder, pad, particle);
- else if (term instanceof SequenceBinding)
- printModel(builder, pad, particle, "sequence");
- else if (term instanceof AllBinding)
- printModel(builder, pad, particle, "all");
- else if (term instanceof ChoiceBinding)
- printModel(builder, pad, particle, "choice");
- }
-
- @SuppressWarnings("unchecked")
- public static void printModel(StringBuilder builder, int pad, ParticleBinding particle, String prefix)
- {
- pad(builder, pad);
- builder.append("<").append(prefix);
- int minOccurs = particle.getMinOccurs();
- if (minOccurs != 1)
- builder.append(" minOccurs=\"").append(minOccurs).append("\"");
- int maxOccurs = particle.getMaxOccurs();
- if (maxOccurs != 1)
- {
- builder.append(" maxOccurs=\"");
- if (maxOccurs == -1)
- builder.append("unbounded");
- else
- builder.append(maxOccurs);
- builder.append("\"");
- }
- builder.append(">");
- ModelGroupBinding model = (ModelGroupBinding) particle.getTerm();
- Collection<ParticleBinding> particles = model.getParticles();
- boolean newLine = true;
- if (particles != null)
- {
- for (ParticleBinding component : particles)
- printParticle(builder, pad+3, component);
- }
- else
- {
- newLine = false;
- }
- pad(builder, pad, newLine);
- builder.append("</").append(prefix).append(">");
- }
-
- public static void printWildcard(StringBuilder builder, int pad, ParticleBinding particle)
- {
- pad(builder, pad);
- builder.append("<any");
- int minOccurs = particle.getMinOccurs();
- if (minOccurs != 1)
- builder.append(" minOccurs=\"").append(minOccurs).append("\"");
- int maxOccurs = particle.getMaxOccurs();
- if (maxOccurs != 1)
- {
- builder.append(" maxOccurs=\"");
- if (maxOccurs == -1)
- builder.append("unbounded");
- else
- builder.append(maxOccurs);
- builder.append("\"");
- }
- builder.append("/>");
- }
-
- public static void printAttribute(StringBuilder builder, int pad, AttributeBinding attribute)
- {
- pad(builder, pad);
- TypeBinding typeBinding = attribute.getType();
- String qName = null;
- if (typeBinding != null && typeBinding.getQName() != null)
- qName = typeBinding.getQName().toString();
- else
- qName = "CDATA";
- builder.append("<attribute name=\"").append(attribute.getQName().getLocalPart()).append("\"");
- builder.append(" type=\"").append(qName).append("\"");
- if (attribute.getRequired() == false)
- builder.append(" optional=\"true\"/>");
- }
-
- public static void pad(StringBuilder builder, int pad)
- {
- pad(builder, pad, true);
- }
-
- public static void pad(StringBuilder builder, int pad, boolean newLine)
- {
- if (newLine)
- builder.append("\n");
- for (int i = 0; i < pad; ++ i)
- builder.append(' ');
- }
-}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/SupplyTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -60,19 +60,6 @@
assertEquals(123, supply.getSupply());
assertEquals("java.lang.Integer", supply.getType());
}
-
- public void testSupplyBadNoValue() throws Exception
- {
- try
- {
- unmarshalBean("SupplyBadNoValue.xml");
- fail("Should not be here");
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
public static Test suite()
{
Deleted: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/TestSchemaResolver.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/TestSchemaResolver.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/TestSchemaResolver.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,78 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt 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.test.kernel.deployment.xml.test;
-
-import java.util.HashMap;
-
-import org.jboss.logging.Logger;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.w3c.dom.ls.LSInput;
-
-/**
- * TestSchemaResolver.
- *
- * @author <a href="ales.justin at jboss.com">Ales Justin</a>
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class TestSchemaResolver implements SchemaBindingResolver
-{
- private static final Logger log = Logger.getLogger(TestSchemaResolver.class);
-
- private HashMap<String, SchemaBinding> bindings = new HashMap<String, SchemaBinding>();
-
- public String getBaseURI()
- {
- return null;
- }
-
- public void addSchemaBinding(SchemaBinding schemaBinding)
- {
- schemaBinding.setSchemaResolver(this);
- String nsURI = (String) schemaBinding.getNamespaces().iterator().next();
- bindings.put(nsURI, schemaBinding);
- if (log.isTraceEnabled())
- {
- String schema = SchemaPrinter.printSchema(schemaBinding);
- log.trace("Bound: " + nsURI + "\n" + schema);
- }
- }
-
- public SchemaBinding resolve(String nsUri, String baseURI, String schemaLocation)
- {
- SchemaBinding result = bindings.get(nsUri);
- if (result == null)
- throw new RuntimeException("Schema not bound: " + nsUri + " available: " + bindings.keySet());
- return result;
- }
-
- public LSInput resolveAsLSInput(String nsUri, String baseUri, String schemaLocation)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setBaseURI(String baseURI)
- {
- throw new org.jboss.util.NotImplementedException("setBaseURI");
- }
-}
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/ValueFactoryTestCase.java 2008-03-08 02:06:46 UTC (rev 70569)
@@ -66,16 +66,8 @@
AbstractValueFactoryMetaData dependency = getValueFactory("ValueFactoryWithParameter.xml");
assertEquals("Dummy", dependency.getValue());
assertEquals("getValue", dependency.getMethod());
- List<ParameterMetaData> parameters = dependency.getParameters();
- assertNotNull(parameters);
- assertFalse(parameters.isEmpty());
- assertTrue(parameters.size() == 1);
- ParameterMetaData pmd = parameters.get(0);
- assertNotNull(pmd);
- ValueMetaData value = pmd.getValue();
- assertNotNull(value);
- assertEquals("foo.bar.key", value.getUnderlyingValue());
- assertNull(dependency.getDependentState());
+ assertNull(dependency.getParameters());
+ assertEquals("foo.bar.key", dependency.getParameter());
}
public void testValueFactoryWithParameters() throws Exception
@@ -125,32 +117,6 @@
assertEquals(ControllerState.CREATE, dependency.getWhenRequiredState());
}
- public void testValueFactoryBadNoBean() throws Exception
- {
- try
- {
- AbstractValueFactoryMetaData dependency = getValueFactory("ValueFactoryBadNoBean.xml");
- assertNull(dependency.getValue());
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
- public void testValueFactoryBadNoMethod() throws Exception
- {
- try
- {
- AbstractValueFactoryMetaData dependency = getValueFactory("ValueFactoryBadNoMethod.xml");
- assertNull(dependency.getValue());
- }
- catch (Exception expected)
- {
- checkJBossXBException(IllegalArgumentException.class, expected);
- }
- }
-
public static Test suite()
{
return suite(ValueFactoryTestCase.class);
Modified: projects/microcontainer/trunk/managed/.classpath
===================================================================
--- projects/microcontainer/trunk/managed/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/managed/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,28 +1,8 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="src" path="/jboss-metatype"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/managed/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom-jdk14.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/managed/pom-jdk14.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -140,8 +140,8 @@
<artifactId>jboss-aop-jdk14</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
+ <groupId>org.jboss.reflect</groupId>
+ <artifactId>jboss-reflect-jdk14</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer-jdk14</groupId>
Modified: projects/microcontainer/trunk/managed/pom.xml
===================================================================
--- projects/microcontainer/trunk/managed/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/managed/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -28,30 +28,13 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-metatype</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -64,12 +47,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/metatype/.classpath
===================================================================
--- projects/microcontainer/trunk/metatype/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/metatype/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -1,25 +1,14 @@
-<classpath>
- <classpathentry kind="src" path="src/main"/>
- <classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.0.Beta11/jboss-reflect-2.0.0.Beta11.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: projects/microcontainer/trunk/metatype/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom-jdk14.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/metatype/pom-jdk14.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -136,8 +136,8 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer-jdk14</groupId>
- <artifactId>jboss-container-jdk14</artifactId>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect-jdk14</artifactId>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -147,10 +147,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test-jdk14</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/metatype/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -25,23 +25,9 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>jboss-reflect</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/microcontainer/trunk/osgi-int/.classpath
===================================================================
--- projects/microcontainer/trunk/osgi-int/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/osgi-int/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -5,44 +5,7 @@
<classpathentry kind="src" output="target/tests-classes" path="src/tests"/>
<classpathentry kind="src" path="target/generated-sources/javacc"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-vfs-spi"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="var" path="M2_REPO/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-classloading"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-impl"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-deployers-vfs"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jboss-classloading-vfs"/>
+ <classpathentry exported="true" kind="src" path="/jboss-deployers-vfs"/>
+ <classpathentry exported="true" kind="var" path="M2_REPO/org/osgi/osgi_R4_core/1.0/osgi_R4_core-1.0.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: projects/microcontainer/trunk/osgi-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/osgi-int/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/osgi-int/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -54,94 +54,59 @@
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi_R4_core</artifactId>
</dependency>
<dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<exclusions>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
<exclusion>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</exclusion>
<exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-spi</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
<exclusion>
<groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
+ <artifactId>jboss-common-logging-log4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -166,6 +131,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/pom.xml
===================================================================
--- projects/microcontainer/trunk/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -31,27 +31,26 @@
<modules>
<module>build</module>
- <module>container</module>
<module>dependency</module>
- <module>kernel</module>
- <module>aop-mc-int</module>
<module>metatype</module>
<module>managed</module>
+ <module>kernel</module>
+ <module>aop-mc-int</module>
<module>deployers-core-spi</module>
<module>deployers-core</module>
<module>deployers-client-spi</module>
<module>deployers-client</module>
<module>deployers-structure-spi</module>
<module>deployers-spi</module>
+ <module>classloader</module>
+ <module>classloading</module>
+ <module>classloading-vfs</module>
<module>deployers-impl</module>
<module>deployers-vfs-spi</module>
<module>deployers-vfs</module>
<module>spring-int</module>
<module>guice-int</module>
<module>osgi-int</module>
- <module>classloader</module>
- <module>classloading</module>
- <module>classloading-vfs</module>
<module>varia</module>
<module>reliance-identity</module>
<module>reliance-rules</module>
Modified: projects/microcontainer/trunk/reliance-identity/pom.xml
===================================================================
--- projects/microcontainer/trunk/reliance-identity/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/reliance-identity/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -29,10 +29,6 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
<!-- Test dependencies -->
</dependencies>
</project>
Modified: projects/microcontainer/trunk/reliance-rules/pom.xml
===================================================================
--- projects/microcontainer/trunk/reliance-rules/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/reliance-rules/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -21,20 +21,21 @@
<directory>src/resources/tests</directory>
</testResource>
</testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>true</testFailureIgnore>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<!-- Do not add version information here, use ../build/pom.xml instead -->
<dependencies>
<!-- Global dependencies -->
<dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
<dependency>
@@ -42,10 +43,6 @@
<artifactId>jboss-deployers-vfs-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
<groupId>org.drools</groupId>
<artifactId>drools-core</artifactId>
</dependency>
@@ -61,44 +58,21 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-reliance-identity</artifactId>
</dependency>
+ <!-- Test dependencies -->
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <!-- Test dependencies -->
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -110,11 +84,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/reliance-rules/src/resources/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -9,47 +9,47 @@
</bean>
<!-- intercepts any StatefulSession creation from our RuleBase bean -->
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0"
+ <interceptor xmlns="urn:jboss:aop-beans:1.0"
name="WrapStatefulSessionAdvice"
class="org.jboss.reliance.drools.core.aspects.StatefulSessionCreationInterceptor"/>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.reliance.drools.core.RuleBaseBean->newStatefulSession(..))">
- <aop:interceptor-ref name="WrapStatefulSessionAdvice"/>
- </aop:bind>
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* org.jboss.reliance.drools.core.RuleBaseBean->newStatefulSession(..))">
+ <interceptor-ref name="WrapStatefulSessionAdvice"/>
+ </bind>
<!-- invokes fireAllRules after any CRUD method invocation on WorkingMemory instance -->
- <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
+ <aspect xmlns="urn:jboss:aop-beans:1.0"
name="FireAllRulesCheckAdvice"
class="org.jboss.reliance.drools.core.aspects.CRUDAwareAspect"/>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.drools.StatefulSession}->$implements{org.drools.WorkingMemory}(..))">
- <aop:advice aspect="FireAllRulesCheckAdvice" name="invoke"/>
- </aop:bind>
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* $instanceof{org.drools.StatefulSession}->$implements{org.drools.WorkingMemory}(..))">
+ <advice aspect="FireAllRulesCheckAdvice" name="invoke"/>
+ </bind>
<!-- disables fireAllRules if @DisableFireAllRules is present -->
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0"
+ <interceptor xmlns="urn:jboss:aop-beans:1.0"
name="DisableFireAllRulesAdvice"
class="org.jboss.reliance.drools.core.aspects.DisableFireAllRulesInterceptor"/>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.reliance.drools.core.aspects.DisableFireAllRules->*(..)) OR execution(* *->@org.jboss.reliance.drools.core.aspects.DisableFireAllRulesAllRules(..))">
- <aop:interceptor-ref name="DisableFireAllRulesAdvice"/>
- </aop:bind>
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.reliance.drools.core.aspects.DisableFireAllRules->*(..)) OR execution(* *->@org.jboss.reliance.drools.core.aspects.DisableFireAllRulesAllRules(..))">
+ <interceptor-ref name="DisableFireAllRulesAdvice"/>
+ </bind>
<!-- only invokes fireAllRules at the end of invocation -->
- <aop:interceptor xmlns:aop="urn:jboss:aop-beans:1.0"
+ <interceptor xmlns="urn:jboss:aop-beans:1.0"
name="FireAllRulesAfterInvocationAdvice"
class="org.jboss.reliance.drools.core.aspects.FireAllRulesAfterInvocationInterceptor">
<constructor>
<parameter><inject bean="WorkingMemory" property="statefulSession"/></parameter>
</constructor>
- </aop:interceptor>
- <aop:bind xmlns:aop="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.reliance.drools.core.aspects.FireAllRulesAfter->*(..)) OR execution(* *->@org.jboss.reliance.drools.core.aspects.FireAllRulesAfterlesAfter(..))">
- <aop:interceptor-ref name="FireAllRulesAfterInvocationAdvice"/>
- </aop:bind>
+ </interceptor>
+ <bind xmlns="urn:jboss:aop-beans:1.0" pointcut="execution(* @org.jboss.reliance.drools.core.aspects.FireAllRulesAfter->*(..)) OR execution(* *->@org.jboss.reliance.drools.core.aspects.FireAllRulesAfterlesAfter(..))">
+ <interceptor-ref name="FireAllRulesAfterInvocationAdvice"/>
+ </bind>
<!-- applies RuleBasedDependencyItem to all @RulesAware beans -->
- <aop:lifecycle-describe xmlns:aop="urn:jboss:aop-beans:1.0"
+ <lifecycle-describe xmlns="urn:jboss:aop-beans:1.0"
name="RulesMapper"
class="org.jboss.reliance.drools.dependency.RuleDependencyMapper"
classes="@org.jboss.reliance.drools.dependency.RulesAware">
<property name="factory"><inject bean="RuleBasedDependencyFactory"/></property>
- </aop:lifecycle-describe>
+ </lifecycle-describe>
<bean name="RuleBasedDependencyFactory" class="org.jboss.reliance.drools.dependency.RuleBasedDependencyItemFactory">
<property name="whenRequired">Create</property>
Modified: projects/microcontainer/trunk/spring-int/.classpath
===================================================================
--- projects/microcontainer/trunk/spring-int/.classpath 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/spring-int/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
@@ -5,32 +5,6 @@
<classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
+ <classpathentry kind="src" path="/jboss-kernel"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
</classpath>
\ No newline at end of file
Modified: projects/microcontainer/trunk/spring-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/spring-int/pom.xml 2008-03-08 00:38:47 UTC (rev 70568)
+++ projects/microcontainer/trunk/spring-int/pom.xml 2008-03-08 02:06:46 UTC (rev 70569)
@@ -26,45 +26,14 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-common-logging-spi</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
+ <scope>test</scope>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
@@ -77,14 +46,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-container</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
More information about the jboss-cvs-commits
mailing list