[jboss-cvs] JBossAS SVN: r99429 - in projects/demos/microcontainer/trunk: bootstrap and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 14 15:59:33 EST 2010
Author: alesj
Date: 2010-01-14 15:59:32 -0500 (Thu, 14 Jan 2010)
New Revision: 99429
Removed:
projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/system/deployers/EndsWithVirtualFileFilter.java
Modified:
projects/demos/microcontainer/trunk/bootstrap/pom.xml
projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
projects/demos/microcontainer/trunk/classloader/pom.xml
projects/demos/microcontainer/trunk/classloading/pom.xml
projects/demos/microcontainer/trunk/classpath/pom.xml
projects/demos/microcontainer/trunk/igloo/pom.xml
projects/demos/microcontainer/trunk/ioc/pom.xml
projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java
projects/demos/microcontainer/trunk/jmx/pom.xml
projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java
projects/demos/microcontainer/trunk/models/pom.xml
projects/demos/microcontainer/trunk/pom.xml
Log:
Update MC libs to 2.2.x.
Modified: projects/demos/microcontainer/trunk/bootstrap/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/bootstrap/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -49,7 +49,7 @@
<artifactId>jboss-logging-log4j</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -69,12 +69,12 @@
<artifactId>jboss-deployers-core-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<!-- Comment this if you want plain POJO bootstrap -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
<dependency>
Deleted: projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/system/deployers/EndsWithVirtualFileFilter.java
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/system/deployers/EndsWithVirtualFileFilter.java 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/bootstrap/src/main/java/org/jboss/demos/system/deployers/EndsWithVirtualFileFilter.java 2010-01-14 20:59:32 UTC (rev 99429)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.demos.system.deployers;
-
-import org.jboss.deployers.vfs.spi.structure.modified.AbstractPathNameFilter;
-
-/**
- * Only accept files that end with suffix.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class EndsWithVirtualFileFilter extends AbstractPathNameFilter
-{
- private String suffix;
-
- public EndsWithVirtualFileFilter(String suffix)
- {
- this.suffix = suffix;
- }
-
- public boolean accepts(String path)
- {
- return path.endsWith(suffix);
- }
-}
Modified: projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml
===================================================================
--- projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/bootstrap/src/main/resources/META-INF/bootstrap-beans.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -143,11 +143,7 @@
<parameter><inject bean="MainDeployer" /></parameter>
</constructor>
<property name="cache"><inject bean="StructureModCache" /></property>
- <property name="filter">
- <bean class="org.jboss.demos.system.deployers.EndsWithVirtualFileFilter">
- <constructor><parameter>.xml</parameter></constructor>
- </bean>
- </property>
+ <property name="filter"><inject bean="FileStructure"/></property>
</bean>
<!-- HD scanner -->
Modified: projects/demos/microcontainer/trunk/classloader/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/classloader/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/classloader/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -45,7 +45,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -57,7 +57,7 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
Modified: projects/demos/microcontainer/trunk/classloading/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/classloading/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/classloading/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -45,7 +45,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -57,7 +57,7 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
Modified: projects/demos/microcontainer/trunk/classpath/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/classpath/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/classpath/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -15,7 +15,7 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/trunk/igloo/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/igloo/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/igloo/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -45,7 +45,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -57,7 +57,7 @@
<artifactId>jboss-deployers-structure-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
Modified: projects/demos/microcontainer/trunk/ioc/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/ioc/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/ioc/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -15,11 +15,11 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
</dependencies>
Modified: projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java
===================================================================
--- projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/ioc/src/main/java/org/jboss/demos/ioc/lifecycle/LifecycleChecker.java 2010-01-14 20:59:32 UTC (rev 99429)
@@ -25,9 +25,9 @@
import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.dependency.spi.ControllerContext;
import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
import org.jboss.kernel.spi.dependency.KernelController;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
@@ -45,10 +45,10 @@
@Start
public void checkLifecycle()
{
- Set<KernelControllerContext> contexts = controller.getInstantiatedContexts(FullLifecycleBean.class);
+ Set<ControllerContext> contexts = controller.getInstantiatedContexts(FullLifecycleBean.class);
if (contexts != null && contexts.isEmpty() == false)
{
- for (KernelControllerContext context : contexts)
+ for (ControllerContext context : contexts)
{
String name = context.getName().toString();
int state = Integer.parseInt(name.split("-")[1]);
Modified: projects/demos/microcontainer/trunk/jmx/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/jmx/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/jmx/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -45,7 +45,7 @@
<artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
</dependency>
<dependency>
@@ -61,7 +61,7 @@
<artifactId>jboss-deployers-vfs</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
Modified: projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java
===================================================================
--- projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/jmx/src/main/java/org/jboss/demos/deployers/legacy/DirectoryStructure.java 2010-01-14 20:59:32 UTC (rev 99429)
@@ -26,6 +26,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.structure.StructureMetaData;
import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.spi.structure.MetaDataEntry;
import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
import org.jboss.deployers.vfs.spi.structure.StructureContext;
import org.jboss.deployers.vfs.spi.structure.VFSStructuralDeployers;
@@ -89,12 +90,12 @@
StructureMetaData smd = parentContext.getMetaData();
ContextInfo info = smd.getContext("");
- List<String> metadataPaths = info.getMetaDataPath();
+ List<MetaDataEntry> metadataPaths = info.getMetaDataPath();
if (metadataPaths != null && metadataPaths.isEmpty() == false)
{
String relativePath = AbstractStructureDeployer.getRelativePath(context.getParent(), context.getFile());
- for (String path : metadataPaths)
- if (relativePath.equalsIgnoreCase(path))
+ for (MetaDataEntry path : metadataPaths)
+ if (relativePath.equalsIgnoreCase(path.getPath()))
return true;
}
Modified: projects/demos/microcontainer/trunk/models/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/models/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/models/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -19,19 +19,19 @@
</dependency>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-spring-int</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-guice-int</artifactId>
</dependency>
<dependency>
Modified: projects/demos/microcontainer/trunk/pom.xml
===================================================================
--- projects/demos/microcontainer/trunk/pom.xml 2010-01-14 20:45:19 UTC (rev 99428)
+++ projects/demos/microcontainer/trunk/pom.xml 2010-01-14 20:59:32 UTC (rev 99429)
@@ -39,16 +39,16 @@
<properties>
<version.jboss.jbossas>5.1.0.GA</version.jboss.jbossas>
- <version.jboss.vfs>2.2.0-SNAPSHOT</version.jboss.vfs>
- <version.jboss.man>2.1.1.GA</version.jboss.man>
- <version.jboss.mdr>2.0.2.GA</version.jboss.mdr>
- <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
- <version.jboss.classloader>2.0.8-SNAPSHOT</version.jboss.classloader>
- <version.jboss.deployers>2.0.9-SNAPSHOT</version.jboss.deployers>
- <version.jboss.common.core>2.2.16.GA</version.jboss.common.core>
- <version.jboss.common.logging.spi>2.1.0.GA</version.jboss.common.logging.spi>
- <version.jboss.common.logging.log4j>2.1.0.GA</version.jboss.common.logging.log4j>
- <version.jbossxb>2.0.1.GA</version.jbossxb>
+ <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
+ <version.jboss.man>2.1.1.SP1</version.jboss.man>
+ <version.jboss.mdr>2.2.0.Alpha1</version.jboss.mdr>
+ <version.jboss.kernel>2.2.0.Alpha2</version.jboss.kernel>
+ <version.jboss.classloader>2.0.8.GA</version.jboss.classloader>
+ <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ <version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
+ <version.jboss.common.logging.spi>2.1.1.GA</version.jboss.common.logging.spi>
+ <version.jboss.common.logging.log4j>2.1.1.GA</version.jboss.common.logging.log4j>
+ <version.jbossxb>2.0.2.Beta4</version.jbossxb>
<version.jboss.aop>2.0.1.GA</version.jboss.aop>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
@@ -192,29 +192,29 @@
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-spring-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-guice-int</artifactId>
- <version>${version.jboss.microcontainer}</version>
+ <version>${version.jboss.kernel}</version>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
@@ -271,21 +271,61 @@
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading</artifactId>
<version>${version.jboss.classloader}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.cl</groupId>
<artifactId>jboss-classloading-vfs</artifactId>
<version>${version.jboss.classloader}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
<version>${version.jboss.man}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-metatype</artifactId>
<version>${version.jboss.man}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
More information about the jboss-cvs-commits
mailing list