[jboss-cvs] JBossAS SVN: r64910 - in projects/microcontainer/trunk: build and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 28 08:50:51 EDT 2007
Author: adrian at jboss.org
Date: 2007-08-28 08:50:51 -0400 (Tue, 28 Aug 2007)
New Revision: 64910
Removed:
projects/microcontainer/trunk/container/src/main/org/jboss/util/
projects/microcontainer/trunk/deployers-core-spi/src/main/org/jboss/util/
Modified:
projects/microcontainer/trunk/aop-mc-int/pom.xml
projects/microcontainer/trunk/build/pom-jdk14.xml
projects/microcontainer/trunk/build/pom.xml
projects/microcontainer/trunk/classloader/pom.xml
projects/microcontainer/trunk/container/.classpath
projects/microcontainer/trunk/container/pom.xml
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java
projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
projects/microcontainer/trunk/dependency/pom.xml
projects/microcontainer/trunk/deployers-client-spi/pom.xml
projects/microcontainer/trunk/deployers-core-spi/.classpath
projects/microcontainer/trunk/deployers-core-spi/pom.xml
projects/microcontainer/trunk/deployers-core/pom.xml
projects/microcontainer/trunk/deployers-vfs-spi/.classpath
projects/microcontainer/trunk/metatype/pom.xml
Log:
Force the Microcontainer to use jboss-common-core-2.2.1-snapshot instead of picking up the version from jboss-vfs. Also remove use collection classes now ported to jboss-common-core
Modified: projects/microcontainer/trunk/aop-mc-int/pom.xml
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/aop-mc-int/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -207,7 +207,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/build/pom-jdk14.xml
===================================================================
--- projects/microcontainer/trunk/build/pom-jdk14.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/build/pom-jdk14.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -344,6 +344,13 @@
<groupId>jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>${version.jboss.vfs}</version>
+ <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/microcontainer/trunk/build/pom.xml
===================================================================
--- projects/microcontainer/trunk/build/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/build/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -33,7 +33,7 @@
</scm>
<properties>
- <version.jboss.common.core>2.0.4.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.1-SNAPSHOT</version.jboss.common.core>
<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>
@@ -316,7 +316,7 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
</dependency>
@@ -334,6 +334,13 @@
<groupId>jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>${version.jboss.vfs}</version>
+ <!-- FIXME http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4077827#4077827 -->
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/microcontainer/trunk/classloader/pom.xml
===================================================================
--- projects/microcontainer/trunk/classloader/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/classloader/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -42,7 +42,7 @@
<artifactId>jboss-classloading-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/container/.classpath
===================================================================
--- projects/microcontainer/trunk/container/.classpath 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/container/.classpath 2007-08-28 12:50:51 UTC (rev 64910)
@@ -8,7 +8,7 @@
<classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/jboss-vfs/2.0.4.snapshot/jboss-vfs-2.0.4.snapshot.jar" sourcepath="M2_REPO/jboss/jboss-vfs/2.0.4.snapshot/jboss-vfs-2.0.4.snapshot-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6-beta/javassist-3.6-beta.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6-beta/javassist-3.6-beta-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/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT.jar" sourcepath="M2_REPO/jboss/jboss-test/1.0.4-SNAPSHOT/jboss-test-1.0.4-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.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"/>
Modified: projects/microcontainer/trunk/container/pom.xml
===================================================================
--- projects/microcontainer/trunk/container/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/container/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -76,6 +76,10 @@
<artifactId>jbossxb</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-logging-spi</artifactId>
</dependency>
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java 2007-08-28 12:50:51 UTC (rev 64910)
@@ -42,7 +42,7 @@
import org.jboss.reflect.spi.PrimitiveInfo;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.util.JBossStringBuilder;
-import org.jboss.util.collection.temp.WeakValueHashMap;
+import org.jboss.util.collection.WeakValueHashMap;
/**
* A bean info factory.
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/reflect/plugins/introspection/IntrospectionTypeInfoFactoryImpl.java 2007-08-28 12:50:51 UTC (rev 64910)
@@ -56,7 +56,7 @@
import org.jboss.reflect.spi.PrimitiveInfo;
import org.jboss.reflect.spi.TypeInfo;
import org.jboss.reflect.spi.TypeInfoFactory;
-import org.jboss.util.collection.temp.WeakTypeCache;
+import org.jboss.util.collection.WeakTypeCache;
/**
* An introspection type factory.
Modified: projects/microcontainer/trunk/dependency/pom.xml
===================================================================
--- projects/microcontainer/trunk/dependency/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/dependency/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -47,7 +47,7 @@
<dependencies>
<!-- Global dependencies -->
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
<dependency>
Modified: projects/microcontainer/trunk/deployers-client-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-client-spi/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/deployers-client-spi/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -23,7 +23,7 @@
<artifactId>jboss-managed</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
</dependencies>
Modified: projects/microcontainer/trunk/deployers-core/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/deployers-core/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -34,7 +34,7 @@
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
<!-- Test dependencies -->
Modified: projects/microcontainer/trunk/deployers-core-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/.classpath 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/deployers-core-spi/.classpath 2007-08-28 12:50:51 UTC (rev 64910)
@@ -1,6 +1,7 @@
<classpath>
<classpathentry kind="src" path="src/main"/>
<classpathentry kind="src" path="src/tests" output="eclipse-target/tests-classes"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="output" path="eclipse-target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified: projects/microcontainer/trunk/deployers-core-spi/pom.xml
===================================================================
--- projects/microcontainer/trunk/deployers-core-spi/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/deployers-core-spi/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -12,4 +12,12 @@
<url>http://www.jboss.com/products/jbossmc</url>
<description>JBoss Deployers Core SPI</description>
<!-- Do not add version information here, use ../build/pom.xml instead -->
+ <!-- Do not add version information here, use ../build/pom.xml instead -->
+ <dependencies>
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: projects/microcontainer/trunk/deployers-vfs-spi/.classpath
===================================================================
--- projects/microcontainer/trunk/deployers-vfs-spi/.classpath 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/deployers-vfs-spi/.classpath 2007-08-28 12:50:51 UTC (rev 64910)
@@ -25,7 +25,7 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0-SNAPSHOT/jboss-aop-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-aop/2.0.0-SNAPSHOT/jboss-aop-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="src" path="/jboss-deployers-client-spi"/>
<classpathentry kind="src" path="/jboss-metatype"/>
- <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/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT.jar" sourcepath="M2_REPO/org/jboss/jboss-common-core/2.2.1-SNAPSHOT/jboss-common-core-2.2.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
<classpathentry kind="src" path="/jboss-classloader"/>
<classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
Modified: projects/microcontainer/trunk/metatype/pom.xml
===================================================================
--- projects/microcontainer/trunk/metatype/pom.xml 2007-08-28 10:58:40 UTC (rev 64909)
+++ projects/microcontainer/trunk/metatype/pom.xml 2007-08-28 12:50:51 UTC (rev 64910)
@@ -19,7 +19,7 @@
<artifactId>jboss-container</artifactId>
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
<!-- Test dependencies -->
More information about the jboss-cvs-commits
mailing list