[jboss-cvs] JBossAS SVN: r104178 - in trunk: embedded and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 22 15:54:42 EDT 2010
Author: ALRubinger
Date: 2010-04-22 15:54:41 -0400 (Thu, 22 Apr 2010)
New Revision: 104178
Modified:
trunk/component-matrix/pom.xml
trunk/embedded/pom.xml
trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
Log:
[JBAS-7963] Update to latest org.jboss.embedded:1.0.0-alpha-3 and ShrinKWrap:1.0.0-alpha-9. A one-time exception, see JIRA for reasons why this was permitted so close to M3 cutoff.
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-22 19:39:54 UTC (rev 104177)
+++ trunk/component-matrix/pom.xml 2010-04-22 19:54:41 UTC (rev 104178)
@@ -100,7 +100,7 @@
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
<version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
- <version.org.jboss.embedded>1.0.0-alpha-2</version.org.jboss.embedded>
+ <version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
<version.org.jboss.integration>6.0.0.Alpha9</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.Beta3</version.org.jboss.jopr>
@@ -135,7 +135,7 @@
<version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
- <version.org.jboss.shrinkwrap>1.0.0-alpha-7</version.org.jboss.shrinkwrap>
+ <version.org.jboss.shrinkwrap>1.0.0-alpha-9</version.org.jboss.shrinkwrap>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
<version.org.jboss.threads>2.0.0.CR4</version.org.jboss.threads>
Modified: trunk/embedded/pom.xml
===================================================================
--- trunk/embedded/pom.xml 2010-04-22 19:39:54 UTC (rev 104177)
+++ trunk/embedded/pom.xml 2010-04-22 19:54:41 UTC (rev 104178)
@@ -171,7 +171,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.util.logging.manager=org.jboss.logmanager.LogManager -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} -Djboss.boot.server.log.dir=${JBOSS_HOME}</argLine>
</configuration>
</execution>
</executions>
Modified: trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-04-22 19:39:54 UTC (rev 104177)
+++ trunk/embedded/src/test/java/org/jboss/jbossas/embedded/testsuite/ServerIntegrationTest.java 2010-04-22 19:54:41 UTC (rev 104178)
@@ -68,7 +68,7 @@
import org.jboss.jbossas.embedded.testsuite.servlet.JspForwardingServlet;
import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.junit.AfterClass;
@@ -255,7 +255,7 @@
// Make a deployment
final String name = "slsb.jar";
- final JavaArchive archive = Archives.create(name, JavaArchive.class).addClasses(OutputBean.class,
+ final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class).addClasses(OutputBean.class,
OutputLocalBusiness.class);
log.info(archive.toString(true));
// Deploy
@@ -292,7 +292,7 @@
final String appName = "testServletJsp";
final String name = appName + ".war";
final Class<?> servletClass = JspForwardingServlet.class;
- final WebArchive archive = Archives.create(name, WebArchive.class);
+ final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
archive.addWebResource(PATH_ACTUAL_WEB_XML, targetPathWebXml).addResource(PATH_JSP).addClass(servletClass);
log.info(archive.toString(true));
@@ -347,7 +347,7 @@
// Create a virtual archive for the MDB deployment
final String name = "jms-mdb-test.jar";
- final JavaArchive archive = Archives.create(name, JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
final ArchivePath queuesTargetPath = ArchivePaths.create(FILENAME_QUEUE_SERVICE_XML);
archive.addClass(MessageStoringMdb.class).addResource(PATH_QUEUE_SERVICE_XML, queuesTargetPath);
@@ -407,7 +407,7 @@
final String name = "datasource-entity-test.jar";
final ArchivePath targetDsPath = ArchivePaths.create(FILENAME_EMBEDDED_DS);
final ArchivePath targetPersistencePath = ArchivePaths.create(PATH_DESTINATION_PERSISTENCE_XML);
- final JavaArchive archive = Archives.create(name, JavaArchive.class);
+ final JavaArchive archive = ShrinkWrap.create(name, JavaArchive.class);
archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
.addResource(PATH_RESOURCE_DS_XML_EMBEDDED, targetDsPath).addManifestResource(
PATH_RESOURCE_PERSISTENCE_XML_EMBEDDED, targetPersistencePath);
@@ -461,7 +461,7 @@
// Make a deployment
final String appName = "webservice";
final String name = appName + ".war";
- final WebArchive archive = Archives.create(name, WebArchive.class);
+ final WebArchive archive = ShrinkWrap.create(name, WebArchive.class);
final String targetPathWebXml = "web.xml";
archive.addWebResource(PATH_ACTUAL_WEB_XML_WS, targetPathWebXml).addClass(
org.jboss.jbossas.embedded.testsuite.ws.EmbeddedWs.class);
More information about the jboss-cvs-commits
mailing list