[jboss-cvs] JBossAS SVN: r103538 - in projects/embedded/trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 5 15:24:50 EDT 2010
Author: ALRubinger
Date: 2010-04-05 15:24:49 -0400 (Mon, 05 Apr 2010)
New Revision: 103538
Added:
projects/embedded/trunk/testsuite/src/test/resources/queues/hornetq-jms.xml
Removed:
projects/embedded/trunk/testsuite/src/test/resources/queues/mdb-queue-service.xml
Modified:
projects/embedded/trunk/assembly/pom.xml
projects/embedded/trunk/build/pom.xml
projects/embedded/trunk/core/pom.xml
projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java
projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
projects/embedded/trunk/depchain/pom.xml
projects/embedded/trunk/testsuite/pom.xml
projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java
projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java
Log:
[EMB-85] Update for compatibility with AS 6.0.0.M3
Modified: projects/embedded/trunk/assembly/pom.xml
===================================================================
--- projects/embedded/trunk/assembly/pom.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/assembly/pom.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -64,12 +64,6 @@
We get dependencies transitively through these
-->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <type>pom</type>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-depchain</artifactId>
<type>pom</type>
Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/build/pom.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -8,7 +8,7 @@
<!-- Parent -->
<parent>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-component-matrix</artifactId>
+ <artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version> <!-- Must match version.org.jboss.jbossas below -->
</parent>
@@ -29,7 +29,7 @@
<!-- Versioning -->
<version.junit_junit>4.7</version.junit_junit>
<version.org.jboss.jbossas>6.0.0-SNAPSHOT</version.org.jboss.jbossas>
- <version.org.jboss.shrinkwrap>1.0.0-alpha-6</version.org.jboss.shrinkwrap>
+ <version.org.jboss.shrinkwrap>1.0.0-alpha-7</version.org.jboss.shrinkwrap>
</properties>
@@ -155,15 +155,253 @@
<artifactId>shrinkwrap-spi</artifactId>
<version>${version.org.jboss.shrinkwrap}</version>
</dependency>
-
- <!-- AS modules and 3rdparty deps -->
+
+ <!-- HACK to work around boot errors -->
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>${version.org.jboss.jbossas}</version>
- <type>pom</type>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.2.Beta4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>wutka-dtdparser</groupId>
+ <artifactId>dtdparser121</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!--
+ AS Module Dependencies (should eventually come in through a
+ single AS dependency declaration)
+ -->
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-distribution</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <classifier>jboss-aspect-library</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-cluster</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-common-jdbc-wrapper</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca-deployer</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-local-jdbc</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-console</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <classifier>jboss-jsr88</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <classifier>client</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hibernate-int</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hornetq-int</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-iiop</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jbossas-remoting</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-main</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>ejb-management</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77-client</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jboss</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-adaptor-plugin</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-service</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-deployer</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <classifier>jboss-srp</classifier>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
Modified: projects/embedded/trunk/core/pom.xml
===================================================================
--- projects/embedded/trunk/core/pom.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/core/pom.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?xml version="1.0" encoding="UTF-8"?>
<!--
vi:ts=2:sw=2:expandtab:
-->
@@ -23,6 +23,8 @@
<!-- Properties -->
<properties>
+
+ <version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
</properties>
@@ -40,12 +42,14 @@
<dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap-impl-as</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- org.jboss.deployers:jboss-deployers-vfs-spi -->
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- org.jboss:jboss-common-core -->
@@ -73,14 +77,14 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
+ <artifactId>jboss-as-distribution</artifactId>
<scope>test</scope>
<type>pom</type>
</dependency>
-
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.reflect}</version>
<scope>test</scope>
</dependency>
Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java 2010-04-05 19:24:49 UTC (rev 103538)
@@ -61,5 +61,14 @@
// Just init the logging system
@SuppressWarnings("unused")
Object obj = Level.ERROR;
+
+ String pluginClass = System.getProperty("org.jboss.logging.Logger.pluginClass");
+ if (pluginClass == null)
+ {
+ System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.logmanager.LoggerPluginImpl");
+ // disable log4j configuration, in case any early modules trigger it
+ System.setProperty("log4j.defaultInitOverride", "true");
+ }
+
}
}
Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java 2010-04-05 19:24:49 UTC (rev 103538)
@@ -23,6 +23,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
@@ -59,8 +60,8 @@
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.logging.Logger;
import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* JBossASEmbeddedServer
@@ -152,7 +153,7 @@
{
throw new IllegalArgumentException("JBOSS_HOME must be specified");
}
-
+
// Override JBOSS_HOME by setting the system property
SecurityActions.setJBossHomeSystemProperty(jbossHome);
}
@@ -248,9 +249,9 @@
final VirtualFile vf;
try
{
- vf = VFS.createNewRoot(target);
+ vf = VFS.getChild(target);
}
- catch (final IOException e)
+ catch (final URISyntaxException e)
{
throw new RuntimeException("Could not create new VFS root from " + target, e);
}
Modified: projects/embedded/trunk/depchain/pom.xml
===================================================================
--- projects/embedded/trunk/depchain/pom.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/depchain/pom.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -35,12 +35,13 @@
-->
<version.jboss.web>3.0.0-beta-2</version.jboss.web>
- <version.jboss.messaging>1.4.6.GA</version.jboss.messaging>
+ <version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
<version.org.slf4j_slf4j.jboss.logging>1.0.2.GA</version.org.slf4j_slf4j.jboss.logging>
<version.org.jboss.cache_jbosscache.pojo>3.0.0.GA</version.org.jboss.cache_jbosscache.pojo>
<version.xerces_xercesImpl>2.9.1</version.xerces_xercesImpl>
<version.org.codehaus.woodstox>3.2.6</version.org.codehaus.woodstox>
<version.com.sun.xml.bind>2.2</version.com.sun.xml.bind>
+ <version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>
</properties>
@@ -58,97 +59,238 @@
-->
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
+ <artifactId>jboss-as-distribution</artifactId>
<type>pom</type>
</dependency>
+
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-core</artifactId>
- <version>${version}</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+
</dependency>
-
- <!--
-
- AS Module Dependencies
- (should eventually come in through a single AS dependency declaration)
-
- -->
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-aspects</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <classifier>jboss-aspect-library</classifier>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-cluster</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-connector</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-common-jdbc-wrapper</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-jca-deployer</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-connector</artifactId>
+ <classifier>jboss-local-jdbc</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-console</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ <classifier>jboss-jsr88</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
<exclusions>
<exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3.timeout</groupId>
+ <artifactId>jboss-ejb3-timeout-3.0</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-ejb3</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <classifier>client</classifier>
+
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hibernate-int</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-hornetq-int</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-iiop</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-jbossas-remoting</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-main</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-management</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>ejb-management</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-management</artifactId>
+ <classifier>jsr77-client</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-profileservice</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-security</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jboss</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <classifier>jmx-adaptor-plugin</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-system-jmx</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-varia</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <artifactId>jboss-as-tomcat</artifactId>
+
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-tomcat</artifactId>
- <version>${version.org.jboss.jbossas}</version>
+ <classifier>jboss-web-service</classifier>
+
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-tomcat</artifactId>
+ <classifier>jboss-web-deployer</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <classifier>jboss-srp</classifier>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-webservices</artifactId>
+
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.embedded</groupId>
+ <artifactId>jboss-embedded-core</artifactId>
+ <version>${version}</version>
+ </dependency>
<!--
Deps in the runtime of AS but *not* part of the AS dependency tree
@@ -164,25 +306,10 @@
</dependency>
<dependency>
<groupId>jboss.web</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${version.jboss.web}</version>
- </dependency>
- <dependency>
- <groupId>jboss.web</groupId>
- <artifactId>el-api</artifactId>
- <version>${version.jboss.web}</version>
- </dependency>
- <dependency>
- <groupId>jboss.web</groupId>
<artifactId>jasper-jdt</artifactId>
<version>${version.jboss.web}</version>
</dependency>
<dependency>
- <groupId>jboss.messaging</groupId>
- <artifactId>jboss-messaging</artifactId>
- <version>${version.jboss.messaging}</version>
- </dependency>
- <dependency>
<groupId>org.jboss.slf4j</groupId>
<artifactId>slf4j-jboss-logging</artifactId>
<version>${version.org.slf4j_slf4j.jboss.logging}</version>
@@ -191,6 +318,12 @@
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-pojo</artifactId>
<version>${version.org.jboss.cache_jbosscache.pojo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -219,6 +352,37 @@
<artifactId>jbossws-native-core</artifactId>
<version>${version.jboss.jbossws}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads-metadata</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.threads</groupId>
+ <artifactId>jboss-threads</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-impl-as</artifactId>
+ </dependency>
+
</dependencies>
Modified: projects/embedded/trunk/testsuite/pom.xml
===================================================================
--- projects/embedded/trunk/testsuite/pom.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/testsuite/pom.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -26,10 +26,10 @@
<!-- Versioning -->
<version.org.apache.httpcomponents_httpclient>4.0-beta2</version.org.apache.httpcomponents_httpclient>
- <version.org.jboss.javaee_jboss.jms.api>1.1.0.GA</version.org.jboss.javaee_jboss.jms.api>
- <version.org.jboss.javaee_jboss.persistence.api>3.0.0.CR1</version.org.jboss.javaee_jboss.persistence.api>
- <version.org.jboss.javaee_jboss.servlet.api>2.5.0.GA</version.org.jboss.javaee_jboss.servlet.api>
- <version.org.jboss.javaee_jboss.ejb.api>3.0.0.GA</version.org.jboss.javaee_jboss.ejb.api>
+ <version.org.hibernate.javax.persistence>1.0.0-CR-1</version.org.hibernate.javax.persistence>
+ <version.org.jboss.spec.javaee>1.0.0.Beta1</version.org.jboss.spec.javaee>
+ <version.spec.javaee.ejb.api>1.0.0.Beta2</version.spec.javaee.ejb.api>
+ <version.spec.javaee.servlet.api>1.0.0.Beta2</version.spec.javaee.servlet.api>
</properties>
@@ -53,7 +53,11 @@
<configuration>
<additionalClasspathElements>
<additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
- <!-- Because jbossweb.sar contains shared web.xml, which must be visible from same CL as TomcatDeployer.class.getClassLoader -->
+ <!--
+ Because jbossweb.sar contains shared web.xml, which
+ must be visible from same CL as
+ TomcatDeployer.class.getClassLoader
+ -->
<additionalClasspathElement>${JBOSS_HOME}/server/default/deploy/jbossweb.sar</additionalClasspathElement>
</additionalClasspathElements>
@@ -70,7 +74,7 @@
data like classes, methods, etc. EMB-41. Endorsed
required for things like WS support (EMB-61)
-->
- <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME}</argLine>
+ <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME}</argLine>
</configuration>
</execution>
</executions>
@@ -103,7 +107,6 @@
</executions>
</plugin>
-
</plugins>
</build>
@@ -129,7 +132,7 @@
Dependencies below this line are for APIs used in the tests
themselves
-->
-
+
<!-- Apache HttpClient -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -139,33 +142,33 @@
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- <version>${version.org.jboss.javaee_jboss.jms.api}</version>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ <version>${version.org.jboss.spec.javaee}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-persistence-api</artifactId>
- <version>${version.org.jboss.javaee_jboss.persistence.api}</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>${version.org.hibernate.javax.persistence}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-servlet-api</artifactId>
- <version>${version.org.jboss.javaee_jboss.servlet.api}</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>${version.spec.javaee.servlet.api}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- <version>${version.org.jboss.javaee_jboss.ejb.api}</version>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <version>${version.spec.javaee.ejb.api}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java 2010-04-05 19:24:49 UTC (rev 103538)
@@ -54,11 +54,10 @@
import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
-import org.jboss.bootstrap.api.as.server.JBossASServer;
import org.jboss.bootstrap.api.lifecycle.LifecycleState;
+import org.jboss.bootstrap.api.mc.server.MCBasedServer;
import org.jboss.embedded.api.server.JBossASEmbeddedServer;
import org.jboss.embedded.api.server.JBossASEmbeddedServerFactory;
-import org.jboss.embedded.core.server.JBossASEmbeddedServerImpl;
import org.jboss.embedded.testsuite.ejb3.entity.Jbossian;
import org.jboss.embedded.testsuite.ejb3.entity.JbossianRegistrarBean;
import org.jboss.embedded.testsuite.ejb3.entity.JbossianRegistrarLocalBusiness;
@@ -103,7 +102,6 @@
* The server instance
*/
private static JBossASEmbeddedServer server;
- JBossASServer server2;
/**
* Path, relative to the resources base, of the directory containing web.xml descriptor for tests
@@ -118,7 +116,7 @@
/**
* Filename of a test queue *-service.xml
*/
- private static final String FILENAME_QUEUE_SERVICE_XML = "mdb-queue-service.xml";
+ private static final String FILENAME_QUEUE_SERVICE_XML = "hornetq-jms.xml";
/**
* Path, relative to the resources base, of a test queue *-service.xml
@@ -210,7 +208,7 @@
*/
@BeforeClass
public static void startEmbedddedASAndSetNamingContext() throws Exception
- {
+ {
// Make Server (will pull JBOSS_HOME from env var or sys prop)
server = JBossASEmbeddedServerFactory.createServer();
log.info("Created: " + server);
@@ -500,8 +498,8 @@
// Lookup the bean
final String context = MC_NAME_STATEREPORTING_BEAN;
- final StateReportingBean bean = (StateReportingBean) ((JBossASEmbeddedServerImpl) server).getKernel()
- .getController().getInstalledContext(context).getTarget();
+ final StateReportingBean bean = (StateReportingBean) ((MCBasedServer<?, ?>) server).getKernel().getController()
+ .getInstalledContext(context).getTarget();
TestCase.assertNotNull("Bean was not found installed in expected context: " + context, bean);
// Ensure started
@@ -531,8 +529,8 @@
// Lookup the bean
final String context = MC_NAME_STATEREPORTING_BEAN;
- final StateReportingBean bean = (StateReportingBean) ((JBossASEmbeddedServerImpl) server).getKernel()
- .getController().getInstalledContext(context).getTarget();
+ final StateReportingBean bean = (StateReportingBean) ((MCBasedServer<?, ?>) server).getKernel().getController()
+ .getInstalledContext(context).getTarget();
TestCase.assertNotNull("Bean was not found installed in expected context: " + context, bean);
// Ensure started
Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ejb3/mdb/MessageStoringMdb.java 2010-04-05 19:24:49 UTC (rev 103538)
@@ -34,8 +34,6 @@
import javax.jms.MessageListener;
import javax.jms.TextMessage;
-import org.jboss.ejb3.annotation.Depends;
-
/**
* MessageStoringMdb
*
@@ -52,7 +50,6 @@
@MessageDriven(activationConfig =
{@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
@ActivationConfigProperty(propertyName = "destination", propertyValue = MessageStoringMdb.NAME_QUEUE)})
- at Depends("jboss.messaging.destination:service=Queue,name=EmbeddedQueue") // Matches the name in the queue descriptor XML
public class MessageStoringMdb implements MessageListener
{
//-------------------------------------------------------------------------------------||
Copied: projects/embedded/trunk/testsuite/src/test/resources/queues/hornetq-jms.xml (from rev 103535, projects/embedded/trunk/testsuite/src/test/resources/queues/mdb-queue-service.xml)
===================================================================
--- projects/embedded/trunk/testsuite/src/test/resources/queues/hornetq-jms.xml (rev 0)
+++ projects/embedded/trunk/testsuite/src/test/resources/queues/hornetq-jms.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="urn:hornetq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:hornetq /schema/hornetq-jms.xsd">
+
+ <queue name="EmbeddedQueue">
+ <entry name="/queue/EmbeddedQueue" />
+ </queue>
+
+</configuration>
\ No newline at end of file
Deleted: projects/embedded/trunk/testsuite/src/test/resources/queues/mdb-queue-service.xml
===================================================================
--- projects/embedded/trunk/testsuite/src/test/resources/queues/mdb-queue-service.xml 2010-04-05 16:14:25 UTC (rev 103537)
+++ projects/embedded/trunk/testsuite/src/test/resources/queues/mdb-queue-service.xml 2010-04-05 19:24:49 UTC (rev 103538)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=EmbeddedQueue"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-</server>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list