[jboss-cvs] JBossAS SVN: r86579 - in projects/reloaded/trunk/as5_0_1-profile: src/main/resources and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 1 04:11:28 EDT 2009
Author: wolfc
Date: 2009-04-01 04:11:28 -0400 (Wed, 01 Apr 2009)
New Revision: 86579
Added:
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/jbossxb.xml
Removed:
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/common/lib/
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/xmdesc/
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/default/
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/deploy/
Modified:
projects/reloaded/trunk/as5_0_1-profile/pom.xml
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap.xml
projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/profile-repository.xml
projects/reloaded/trunk/as5_0_1-profile/src/test/java/org/jboss/reloaded/as5_0_1/profile/test/boot/unit/BootASTestCase.java
Log:
RELOADED-3: clean up of residual stuff and creating a proper cp for profile-repository
Modified: projects/reloaded/trunk/as5_0_1-profile/pom.xml
===================================================================
--- projects/reloaded/trunk/as5_0_1-profile/pom.xml 2009-04-01 07:57:34 UTC (rev 86578)
+++ projects/reloaded/trunk/as5_0_1-profile/pom.xml 2009-04-01 08:11:28 UTC (rev 86579)
@@ -23,7 +23,7 @@
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<!-- urn:jboss:aop-beans:1.0 -->
<dependency>
@@ -33,8 +33,21 @@
</dependency>
<dependency>
<groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-compoundclassloader</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.reloaded</groupId>
<artifactId>jboss-reloaded-repoclassloader</artifactId>
<version>0.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.5.GA</version>
<scope>test</scope>
</dependency>
</dependencies>
Added: projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/jbossxb.xml
===================================================================
--- projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/jbossxb.xml (rev 0)
+++ projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/jbossxb.xml 2009-04-01 08:11:28 UTC (rev 86579)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="JBossXBSchemaService" class="org.jboss.reloaded.compoundclassloader.xb.spi.JaxbSchemaService"/>
+</deployment>
Modified: projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/profile-repository.xml
===================================================================
--- projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/profile-repository.xml 2009-04-01 07:57:34 UTC (rev 86578)
+++ projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap/profile-repository.xml 2009-04-01 08:11:28 UTC (rev 86579)
@@ -7,7 +7,16 @@
<classloader><inject bean="profile-classloader:0.0.0"/></classloader>
- <classloader name="profile-classloader" xmlns="urn:jboss:repoclassloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <classloader name="profile-classloader" xmlns="urn:jboss:compoundclassloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <delegate>profile1-classloader:0.0.0</delegate>
+ <delegate>profile2-classloader:0.0.0</delegate>
+ </classloader>
+
+ <classloader name="profile1-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.server.home.url}/conf</root>
+ </classloader>
+
+ <classloader name="profile2-classloader" xmlns="urn:jboss:repoclassloader:1.0" export-all="NON_EMPTY" import-all="true">
<descriptor>
<ivy-module version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -15,6 +24,8 @@
<info organisation="org.jboss.reloaded" module="profile-classloader"/>
<dependencies>
<dependency org="org.jboss.integration" name="jboss-profileservice-spi" rev="5.0.3.GA" conf="default" transitive="false"/>
+ <!-- For running on Java 5 -->
+ <dependency org="sun-jaxb" name="jaxb-impl" rev="2.1.9" conf="default" transitive="false"/>
</dependencies>
</ivy-module>
</descriptor>
Modified: projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap.xml
===================================================================
--- projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap.xml 2009-04-01 07:57:34 UTC (rev 86578)
+++ projects/reloaded/trunk/as5_0_1-profile/src/main/resources/conf/bootstrap.xml 2009-04-01 08:11:28 UTC (rev 86579)
@@ -6,6 +6,7 @@
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
<url>bootstrap/vfs.xml</url>
+ <url>bootstrap/jbossxb.xml</url>
<url>bootstrap/repo.xml</url>
<url>bootstrap/classloader.xml</url>
<url>bootstrap/aop.xml</url>
Modified: projects/reloaded/trunk/as5_0_1-profile/src/test/java/org/jboss/reloaded/as5_0_1/profile/test/boot/unit/BootASTestCase.java
===================================================================
--- projects/reloaded/trunk/as5_0_1-profile/src/test/java/org/jboss/reloaded/as5_0_1/profile/test/boot/unit/BootASTestCase.java 2009-04-01 07:57:34 UTC (rev 86578)
+++ projects/reloaded/trunk/as5_0_1-profile/src/test/java/org/jboss/reloaded/as5_0_1/profile/test/boot/unit/BootASTestCase.java 2009-04-01 08:11:28 UTC (rev 86579)
@@ -25,11 +25,18 @@
import java.io.IOException;
import java.net.URI;
import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
import org.jboss.bootstrap.microcontainer.ServerImpl;
import org.jboss.bootstrap.spi.ServerConfig;
import org.jboss.bootstrap.spi.microcontainer.MCServer;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
+import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -54,11 +61,11 @@
{
System.setProperty("jboss.bind.address", "localhost");
- server = new ServerImpl();
Properties props = new Properties();
// either target or eclipse-target
String dir = getTargetDirectory() + "/classes";
mkdir(dir + "/lib");
+ /*
props.put(ServerConfig.SERVER_NAME, "test");
props.put(ServerConfig.HOME_DIR, dir);
String serverBaseDir = getTargetDirectory() + "/test-classes";
@@ -70,11 +77,37 @@
props.put(ServerConfig.SERVER_HOME_URL, findDirURL(dir).toString());
//props.put(ServerConfig.LIBRARY_URL, new File("target/dist/lib").toURI().toURL().toString());
//props.put(ServerConfig.SERVER_CONFIG_URL, findDirURL("src/test/resources/conf").toString());
+ */
+ /* AS 5.0.1 */
+ //props.put(ServerConfig.BOOTSTRAP_URL, findURL("src/main/resources/conf/bootstrap.xml").toString());
+ props.setProperty(ServerConfig.SERVER_CONFIG_URL, findDirURL("src/main/resources/conf").toString());
+ String jbossHome = getJBossHome();
+ props.setProperty(ServerConfig.HOME_DIR, jbossHome);
+ //props.setProperty(ServerConfig.SERVER_NAME, "default");
+ props.setProperty(ServerConfig.HOME_URL, new File(jbossHome).toURI().toURL().toString());
+ props.setProperty(ServerConfig.BLOCKING_SHUTDOWN, "true");
+ props.setProperty(ServerConfig.EXIT_ON_SHUTDOWN, "false");
+ System.setProperty("jboss.shutdown.forceHalt", "false");
System.out.println(props);
+
+ server = new ServerImpl();
server.init(props);
server.start();
}
+ private static String getJBossHome()
+ {
+ String home = System.getProperty("jboss.home", null);
+ if(home != null)
+ return home;
+
+ home = System.getenv("JBOSS_HOME");
+ if(home != null)
+ return home;
+
+ throw new IllegalStateException("either system property jboss.home or environment variable JBOSS_HOME must be set");
+ }
+
private static URL findDirURL(String path) throws IOException
{
return findDirURI(path).toURL();
@@ -89,6 +122,15 @@
return file.toURI();
}
+ private static URL findURL(String path) throws IOException
+ {
+ File file = new File(path);
+ boolean success = file.exists();
+ if(!success)
+ throw new IOException("failed to find " + path);
+ return file.toURI().toURL();
+ }
+
private static String getTargetDirectory()
{
boolean isSurefire = System.getProperty("surefire.test.class.path", null) != null;
@@ -108,6 +150,14 @@
@Test
public void test1()
{
-
+ MainDeployer mainDeployer = (MainDeployer) server.getKernel().getController().getInstalledContext("MainDeployer").getTarget();
+ Map<String, Deployment> topLevelDeployments = new HashMap<String, Deployment>();
+ for(Deployment deployment : mainDeployer.getTopLevel())
+ topLevelDeployments.put(deployment.getSimpleName(), deployment);
+ VFSDeployment deployment = (VFSDeployment) topLevelDeployments.get("ROOT.war");
+ // TODO: will this hold?
+ MainDeployerStructure structure = (MainDeployerStructure) mainDeployer;
+ DeploymentUnit unit = structure.getDeploymentUnit(deployment.getName());
+ System.err.println(unit.getAttachments());
}
}
More information about the jboss-cvs-commits
mailing list