[jboss-cvs] JBossAS SVN: r94017 - in projects/embedded/trunk: testsuite/src/test/java/org/jboss and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 25 02:26:46 EDT 2009
Author: ALRubinger
Date: 2009-09-25 02:26:46 -0400 (Fri, 25 Sep 2009)
New Revision: 94017
Modified:
projects/embedded/trunk/assembly/embedded-assembly.xml
projects/embedded/trunk/assembly/pom.xml
projects/embedded/trunk/testsuite/src/test/java/org/jboss/ServerTestCase.java
Log:
[EMB-50] Correct the test case (still hacky and copy/pasted) and the assembly to get JBOSS_HOME launch mode working (requires a patch to AS which is not yet committed)
Modified: projects/embedded/trunk/assembly/embedded-assembly.xml
===================================================================
--- projects/embedded/trunk/assembly/embedded-assembly.xml 2009-09-25 02:06:40 UTC (rev 94016)
+++ projects/embedded/trunk/assembly/embedded-assembly.xml 2009-09-25 06:26:46 UTC (rev 94017)
@@ -17,6 +17,12 @@
<include>org.jboss.bootstrap:jboss-bootstrap-api</include>
<include>org.jboss.embedded:jboss-embedded-api</include>
<include>org.jboss.tmpdpl:tmpdpl-api</include>
+ <!--
+ TODO:
+ Below this line can likely be removed if put into JBOSS_HOME/lib or common/lib or something
+ -->
+ <include>org.jboss.tmpdpl:tmpdpl-impl-vdf</include>
+ <include>org.jboss.tmpdpl:tmpdpl-spi-vdf</include>
</includes>
</dependencySet>
</dependencySets>
Modified: projects/embedded/trunk/assembly/pom.xml
===================================================================
--- projects/embedded/trunk/assembly/pom.xml 2009-09-25 02:06:40 UTC (rev 94016)
+++ projects/embedded/trunk/assembly/pom.xml 2009-09-25 06:26:46 UTC (rev 94017)
@@ -29,6 +29,7 @@
<!-- Versioning -->
<version.org.jboss.embedded_jboss.embedded.core>0.1.0-SNAPSHOT</version.org.jboss.embedded_jboss.embedded.core>
+ <version.org.jboss.tmpdpl_tmpdpl.impl.vdf>0.1.0-SNAPSHOT</version.org.jboss.tmpdpl_tmpdpl.impl.vdf>
</properties>
Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/ServerTestCase.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/ServerTestCase.java 2009-09-25 02:06:40 UTC (rev 94016)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/ServerTestCase.java 2009-09-25 06:26:46 UTC (rev 94017)
@@ -174,38 +174,7 @@
* JNDI name suffix appended to local business EJB3 views
*/
private static final String JNDI_SUFFIX_LOCAL_BUSINESS = "/local";
-
-
- //FIXME Remove this
- @Deprecated
- public static final String[] DEFAULT_BOOT_LIBRARY_LIST =
- {
- // Concurrent
- "concurrent.jar",
- // Logging
- "log4j-boot.jar", "jboss-logging-spi.jar",
- "jboss-logging-log4j.jar",
- "jboss-logging-jdk.jar",
- "jboss-logmanager.jar",
- "jboss-logbridge.jar",
- // Common jars
- "jboss-common-core.jar",
- "jboss-xml-binding.jar",
- // Bootstrap
- "jboss-bootstrap-spi.jar", "jboss-bootstrap-spi-as.jar", "jboss-bootstrap-spi-mc.jar",
- "jboss-bootstrap-impl-base.jar", "jboss-bootstrap-impl-as.jar",
- "jboss-bootstrap-impl-mc.jar","jboss-bootstrap-api-as.jar","jboss-bootstrap-api-mc.jar",
- "jboss-bootstrap-api.jar",
- // Microcontainer
- "javassist.jar", "jboss-reflect.jar", "jboss-mdr.jar", "jboss-dependency.jar", "jboss-kernel.jar",
- "jboss-metatype.jar", "jboss-managed.jar",
- // Fixme ClassLoading
- "jboss-vfs.jar", "jboss-classloading-spi.jar", "jboss-classloader.jar", "jboss-classloading.jar",
- "jboss-classloading-vfs.jar",
- // Fixme aop
- "jboss-aop.jar", "jboss-aop-mc-int.jar", "trove.jar",};
-
//-------------------------------------------------------------------------------||
// Lifecycle --------------------------------------------------------------------||
//-------------------------------------------------------------------------------||
@@ -229,45 +198,30 @@
final File jbossHomeFile = new File(jbossHome);
final URL jbossHomeUrl = jbossHomeFile.toURI().toURL();
final URL jbossLib = new URL(jbossHomeUrl, "lib/");
- final URL jbossBin = new URL(jbossHomeUrl, "bin/");
log.info("JBOSS Lib: " + jbossLib);
-
-
+
final File libDir = new File(jbossLib.toURI());
-// final File[] libs = libDir.listFiles();
-// for (final File lib : libs)
-// {
-// urls.add(lib.toURI().toURL());
-// }
-
- for(final String libName:DEFAULT_BOOT_LIBRARY_LIST)
+ final File[] libs = libDir.listFiles();
+ for (final File lib : libs)
{
- urls.add(new URL(jbossLib,libName));
+ urls.add(lib.toURI().toURL());
}
- final URL runJar = new URL(jbossBin,"run.jar");
- urls.add(runJar);
-
- final URL[] urlarray = urls.toArray(new URL[]{});
-
+
+ final URL[] urlarray = urls.toArray(new URL[]
+ {});
+
+ final ClassLoader oldCl = SecurityActions.getThreadContextClassLoader();
final URLClassLoader urlcl = new URLClassLoader(urls.toArray(new URL[]
- {}));
+ {}), oldCl);
log.info("URLs: " + urls);
log.info("Number of URLs: " + urlarray.length);
-
+
// Set TCCL to the URLCL
- final ClassLoader oldCl = SecurityActions.getThreadContextClassLoader();
+
SecurityActions.setThreadContextClassLoader(urlcl);
-
- final URL[] roundtripURls = urlcl.getURLs();
- log.info("Number of URLs: " + roundtripURls.length);
-// final String className="org.jboss.bootstrap.impl.as.server.AbstractJBossASServerBase";
- final String className = "org.jboss.bootstrap.impl.mc.server.AbstractMCServerBase";
- Class<?> clazz = Class.forName(className, false, urlcl);
- ClassLoader loading = clazz.getClassLoader();
- log.info("Got:"+clazz + " via: " + loading + ", tried via: " + urlcl);
// Make Server (will pull JBOSS_HOME from env var or sys prop)
- server = JBossASEmbeddedServerFactory.createServer(urlcl);
+ server = JBossASEmbeddedServerFactory.createServer();
try
{
More information about the jboss-cvs-commits
mailing list