[jboss-cvs] JBossAS SVN: r86701 - in projects/reloaded/trunk/vdf-bootstrap: src/main/resources and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 2 17:44:50 EDT 2009
Author: wolfc
Date: 2009-04-02 17:44:50 -0400 (Thu, 02 Apr 2009)
New Revision: 86701
Added:
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/log4j.xml
Modified:
projects/reloaded/trunk/vdf-bootstrap/pom.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml
projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java
Log:
RELOADED-5: made vdf-bootstrap capable of launching AS 6 via reloaded-main
Modified: projects/reloaded/trunk/vdf-bootstrap/pom.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/pom.xml 2009-04-02 21:42:44 UTC (rev 86700)
+++ projects/reloaded/trunk/vdf-bootstrap/pom.xml 2009-04-02 21:44:50 UTC (rev 86701)
@@ -40,7 +40,7 @@
</goals>
<configuration>
<includeScope>runtime</includeScope>
- <outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
<stripVersion>true</stripVersion>
</configuration>
</execution>
@@ -166,7 +166,7 @@
<version>${version.org.jboss.jbossas}</version>
<classifier>jboss-bindingservice</classifier>
<!-- TODO: fix me, bindingservice doesn't really belong here -->
- <outputDirectory>${project.build.directory}/dist/common/lib</outputDirectory>
+ <outputDirectory>${project.build.directory}/common/lib</outputDirectory>
<destFileName>jboss-bindingservice.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -190,12 +190,18 @@
<version>1.3.4-jboss-update1</version>
</artifactItem>
<artifactItem>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0</version>
+ <outputDirectory>${project.build.directory}/lib/endorsed</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.1.9</version>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
<stripVersion>true</stripVersion>
</configuration>
</execution>
@@ -210,6 +216,7 @@
<!-- maven-archiver 2.4 -->
<classpathLayoutType>custom</classpathLayoutType>
<customClasspathLayout>lib/$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
+ <mainClass>org.jboss.reloaded.main.Main</mainClass>
</manifest>
</archive>
</configuration>
@@ -284,13 +291,6 @@
</exclusion>
</exclusions>
</dependency>
- <!-- bootstrap.xml -->
- <dependency>
- <groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
<!-- test case -->
<dependency>
<groupId>org.jboss.deployers</groupId>
@@ -305,14 +305,6 @@
<version>2.0.4.GA</version>
<scope>runtime</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>2.0.5.GA</version>
- <scope>runtime</scope>
- </dependency>
- -->
<!-- logging.xml -->
<dependency>
<groupId>org.jboss.logbridge</groupId>
@@ -340,5 +332,12 @@
</exclusion>
</exclusions>
</dependency>
+ <!-- bootstrap.xml -->
+ <dependency>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-main</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
Added: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/log4j.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/log4j.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/log4j.xml 2009-04-02 21:44:50 UTC (rev 86701)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- The basic Log4j Configuration for Reloaded VDF Bootstrap -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 68671 2008-01-08 10:04:25Z wolfc $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+ <!-- While bootstrapping do not preserver any messages in a file -->
+
+ <!-- Direct all to System.out -->
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="ALL"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- Use INFO as a basic level -->
+ <root>
+ <priority value="INFO" />
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml 2009-04-02 21:42:44 UTC (rev 86700)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml 2009-04-02 21:44:50 UTC (rev 86701)
@@ -9,6 +9,8 @@
<classloader name="profile-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
<root>${jboss.lib.url}jboss-profileservice-spi.jar</root>
+ <root>${jboss.server.home.url}/conf</root>
+ <root>${jboss.lib.url}/endorsed/stax-api.jar</root>
</classloader>
<!--
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml 2009-04-02 21:42:44 UTC (rev 86700)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml 2009-04-02 21:44:50 UTC (rev 86701)
@@ -5,7 +5,9 @@
<bootstrap xmlns="urn:jboss:bootstrap:1.0">
<url>bootstrap/logging.xml</url>
+ <!-- Disable VFSCache because of a bug
<url>bootstrap/vfs.xml</url>
+ -->
<url>bootstrap/classloader.xml</url>
<url>bootstrap/aop-6.xml</url>
<url>bootstrap/jmx.xml</url>
Modified: projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java 2009-04-02 21:42:44 UTC (rev 86700)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java 2009-04-02 21:44:50 UTC (rev 86701)
@@ -69,8 +69,8 @@
props.put(ServerConfig.HOME_DIR, homeDir);
//props.put(ServerConfig.SERVER_BASE_DIR, findDirContainingResource("server/default/conf/jboss-service.xml") + "/server");
props.put(ServerConfig.SERVER_CONFIG_URL, new File(serverConfigDir).toURI().toURL().toExternalForm());
- props.setProperty(ServerConfig.COMMON_LIBRARY_URL, new File("target/dist/common/lib").toURI().toURL().toExternalForm());
- props.put(ServerConfig.LIBRARY_URL, new File("target/dist/lib").toURI().toURL().toExternalForm());
+ props.setProperty(ServerConfig.COMMON_LIBRARY_URL, new File("target/common/lib").toURI().toURL().toExternalForm());
+ props.put(ServerConfig.LIBRARY_URL, new File("target/lib").toURI().toURL().toExternalForm());
server.init(props);
server.start();
More information about the jboss-cvs-commits
mailing list