[jboss-cvs] JBossAS SVN: r104596 - in projects/ejb-book/trunk: ch08-messagedestinationlink and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 10 00:18:24 EDT 2010
Author: ALRubinger
Date: 2010-05-10 00:18:23 -0400 (Mon, 10 May 2010)
New Revision: 104596
Modified:
projects/ejb-book/trunk/build/pom.xml
projects/ejb-book/trunk/ch08-messagedestinationlink/pom.xml
projects/ejb-book/trunk/ch08-statusupdate/pom.xml
projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java
Log:
[EJBBOOK-21] Upgrade to JBossAS 6.0.0.M3
Modified: projects/ejb-book/trunk/build/pom.xml
===================================================================
--- projects/ejb-book/trunk/build/pom.xml 2010-05-10 04:17:09 UTC (rev 104595)
+++ projects/ejb-book/trunk/build/pom.xml 2010-05-10 04:18:23 UTC (rev 104596)
@@ -19,7 +19,7 @@
<version.junit_junit>4.7</version.junit_junit>
<version.org.jboss.embedded>1.0.0-alpha-1</version.org.jboss.embedded>
- <version.org.jboss.jbossas>6.0.0.M1</version.org.jboss.jbossas>
+ <version.org.jboss.jbossas>6.0.0.20100429-M3</version.org.jboss.jbossas>
<version.org.jboss.shrinkwrap>1.0.0-alpha-9</version.org.jboss.shrinkwrap>
<version.org.jboss.ejb3_jboss.ejb3.api>3.1.0-Alpha1</version.org.jboss.ejb3_jboss.ejb3.api>
<version.org.jboss.ejb3_jboss.ejb3.ext.api>1.0.0</version.org.jboss.ejb3_jboss.ejb3.ext.api>
@@ -135,14 +135,15 @@
<version>${version.org.jboss.logging_jboss.logging.spi}</version>
<optional>true</optional>
</dependency>
-
+
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- <version>${version.org.jboss.embedded}</version>
- <scope>test</scope>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
Modified: projects/ejb-book/trunk/ch08-messagedestinationlink/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch08-messagedestinationlink/pom.xml 2010-05-10 04:17:09 UTC (rev 104595)
+++ projects/ejb-book/trunk/ch08-messagedestinationlink/pom.xml 2010-05-10 04:18:23 UTC (rev 104596)
@@ -36,82 +36,22 @@
<dependencies>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <!-- Must exclude jboss-metadata to prevent class leaking onto the appCL which breaks booting AS?
- In an isolated CL context this is not a problem EJBBOOK-12
- -->
- <exclusions>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ <version>${version.org.jboss.jbossas}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <!-- TODO: Resolve this need for extra configuration -->
- <!-- Must exclude jboss-metadata to prevent class leaking onto the appCL which breaks booting AS?
- In an isolated CL context this is not a problem EJBBOOK-12
- -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
<!--
-
Test Dependencies
-->
-
<dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
</dependency>
- <!-- TODO: Remove the dependency on the full AS depchain; it pollutes the CP. EJBBOOK-12
--->
- <dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-depchain</artifactId>
- <scope>test</scope>
- <version>${version.org.jboss.embedded}</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- </dependency>
+
</dependencies>
<profiles>
@@ -137,7 +77,7 @@
</goals>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${JBOSS_HOME}/bin/run.jar</additionalClasspathElement>
+ <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
</additionalClasspathElements>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>
@@ -146,7 +86,7 @@
<include>**/*IntegrationTest.java</include>
</includes>
<forkMode>always</forkMode>
- <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME}</argLine>
+ <argLine>-disableassertions -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} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
</configuration>
</execution>
</executions>
@@ -176,25 +116,6 @@
</artifactItems>
</configuration>
</execution>
- <!-- Other deps, not part of AS, into "target/deps" -->
- <execution>
- <id>copy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-core</artifactId>
- <version>${version.org.jboss.embedded}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/deps</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
Modified: projects/ejb-book/trunk/ch08-statusupdate/pom.xml
===================================================================
--- projects/ejb-book/trunk/ch08-statusupdate/pom.xml 2010-05-10 04:17:09 UTC (rev 104595)
+++ projects/ejb-book/trunk/ch08-statusupdate/pom.xml 2010-05-10 04:18:23 UTC (rev 104596)
@@ -37,76 +37,18 @@
<dependencies>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <!-- Must exclude jboss-metadata to prevent class leaking onto the appCL which breaks booting AS?
- In an isolated CL context this is not a problem EJBBOOK-12
- -->
- <exclusions>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-depchain</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ <version>${version.org.jboss.jbossas}</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- <!-- TODO: Resolve this need for extra configuration -->
- <!-- Must exclude jboss-metadata to prevent class leaking onto the appCL which breaks booting AS?
- In an isolated CL context this is not a problem EJBBOOK-12
- -->
- <exclusions>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- TODO Remove this when we can, or when it's addressed at another CL level; this is needed at runtime
- TODO We need all jnpserver just to be a client of JNDI?
- EJBBOOK-12
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <version>5.0.4.GA</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
--->
-
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
-
<!--
http://yusuke.homeip.net/twitter4j/en/index.html
-->
@@ -121,51 +63,10 @@
Test Dependencies
-->
- <dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-api</artifactId>
- </dependency>
- <!-- TODO: Remove the dependency on the full AS depchain; it pollutes the CP. EJBBOOK-12
--->
- <dependency>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-depchain</artifactId>
- <scope>test</scope>
- <version>${version.org.jboss.embedded}</version>
- <type>pom</type>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- </dependency>
-
</dependencies>
<dependencyManagement>
- <dependencies>
- <!--
- Manually use an older version of ShrinkWrap to support EmbeddedAS
- for now
- -->
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-impl-base</artifactId>
- <version>1.0.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-api</artifactId>
- <version>1.0.0-alpha-2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.shrinkwrap</groupId>
- <artifactId>shrinkwrap-spi</artifactId>
- <version>1.0.0-alpha-2</version>
- </dependency>
-</dependencies>
-
</dependencyManagement>
<profiles>
@@ -191,7 +92,7 @@
</goals>
<configuration>
<additionalClasspathElements>
- <additionalClasspathElement>${JBOSS_HOME}/bin/run.jar</additionalClasspathElement>
+ <additionalClasspathElement>${JBOSS_HOME}/client/jbossws-native-client.jar</additionalClasspathElement>
</additionalClasspathElements>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<trimStackTrace>false</trimStackTrace>
@@ -200,7 +101,7 @@
<include>**/*IntegrationTest.java</include>
</includes>
<forkMode>always</forkMode>
- <argLine>-Xmx512m -XX:MaxPermSize=256m -Djava.net.preferIPv4Stack=true -Djava.endorsed.dirs=${JBOSS_HOME}/lib/endorsed -Djboss.home=${JBOSS_HOME}</argLine>
+ <argLine>-disableassertions -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} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
</configuration>
</execution>
</executions>
@@ -230,25 +131,6 @@
</artifactItems>
</configuration>
</execution>
- <!-- Other deps, not part of AS, into "target/deps" -->
- <execution>
- <id>copy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.embedded</groupId>
- <artifactId>jboss-embedded-core</artifactId>
- <version>${version.org.jboss.embedded}</version>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/deps</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
Modified: projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java
===================================================================
--- projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java 2010-05-10 04:17:09 UTC (rev 104595)
+++ projects/ejb-book/trunk/ch08-statusupdate/src/test/java/org/jboss/ejb3/examples/ch08/statusupdate/mdb/StatusUpdateIntegrationTest.java 2010-05-10 04:18:23 UTC (rev 104596)
@@ -48,7 +48,7 @@
import org.jboss.embedded.api.server.JBossASEmbeddedServer;
import org.jboss.embedded.api.server.JBossASEmbeddedServerFactory;
import org.jboss.embedded.api.server.JBossHomeClassLoader;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -210,7 +210,7 @@
}
// Package up the test MDB, all required classes, and a Topic descriptor
- final JavaArchive archive = Archives.create(NAME_MDB_ARCHIVE, JavaArchive.class).addClasses(StatusUpdate.class,
+ final JavaArchive archive = ShrinkWrap.create(NAME_MDB_ARCHIVE, JavaArchive.class).addClasses(StatusUpdate.class,
StatusUpdateConstants.class, LoggingStatusUpdateMdb.class, StatusUpdateBeanBase.class,
TwitterUpdateBlockingTestMdb.class, SecurityActions.class, TwitterUpdateMdb.class).addResource(
NAME_RESOURCE_TOPIC_DEPLOYMENT);
More information about the jboss-cvs-commits
mailing list