[jboss-cvs] JBossAS SVN: r86609 - in projects/reloaded/trunk/vdf-bootstrap: src/main/resources/lib and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 1 14:05:32 EDT 2009
Author: wolfc
Date: 2009-04-01 14:05:32 -0400 (Wed, 01 Apr 2009)
New Revision: 86609
Added:
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop-6.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/conf/
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/conf/jboss-service.xml
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deploy/
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deploy/README
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deployers/
projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deployers/README
Removed:
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/lib/jboss-system.jar
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/aop.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/deployers.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/jmx.xml
projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile.xml
projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java
Log:
RELOADED-5: reverted changes made to the MC deployment descriptors, note that AS 6 uses a different profile service
Modified: projects/reloaded/trunk/vdf-bootstrap/pom.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/pom.xml 2009-04-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/pom.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -3,12 +3,12 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>4</version>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-build</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ <relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.reloaded</groupId>
<artifactId>jboss-reloaded-vdf-bootstrap</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -18,13 +18,14 @@
</description>
<properties>
- <version.org.jboss.aop>2.1.0.CR1</version.org.jboss.aop>
+ <version.org.jboss.aop>2.0.1.GA</version.org.jboss.aop>
+ <version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
+ <version.org.jboss.integration>6.0.0.Alpha7</version.org.jboss.integration>
+ <version.org.jboss.jbossas>6.0.0-SNAPSHOT</version.org.jboss.jbossas>
<version.org.jboss.mx>6.0.0-SNAPSHOT</version.org.jboss.mx>
</properties>
<build>
- <outputDirectory>${outputDirectory}</outputDirectory>
- <testOutputDirectory>${testOutputDirectory}</testOutputDirectory>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -43,9 +44,184 @@
<stripVersion>true</stripVersion>
</configuration>
</execution>
+ <execution>
+ <id>copy</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-lgpl</artifactId>
+ <version>3.2.6</version>
+ <destFileName>wstx.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </artifactItem>
+ <!-- TODO: see EJBTHREE-1734 -->
+ <!--
+ <artifactItem>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-aop-deployers</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </artifactItem>
+ -->
+ <artifactItem>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ <version>${version.org.jboss.integration}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <classifier>jboss-aop-jboss5</classifier>
+ <destFileName>jboss-aop-jboss5.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <destFileName>jboss-system.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>${version.org.jboss.jbossas}</version>
+ <destFileName>jboss-system-jmx.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-varia</artifactId>
+ <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>
+ <destFileName>jboss-bindingservice.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-mbeans</artifactId>
+ <version>${version.org.jboss.mx}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>1.3.4-jboss-update1</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.1.9</version>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/dist/lib</outputDirectory>
+ <stripVersion>true</stripVersion>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <!-- maven-archiver 2.4 -->
+ <classpathLayoutType>custom</classpathLayoutType>
+ <customClasspathLayout>lib/$${artifact.artifactId}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout>
+ </manifest>
+ </archive>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.3</version>
<executions>
@@ -61,7 +237,7 @@
<resource>
<directory>src/main/resources</directory>
</resource>
- </resources>
+ </resources>
</configuration>
</execution>
</executions>
@@ -69,144 +245,100 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ <version>2.1.0.CR5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
+ <!-- test cases -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
+ <!-- vfs.xml -->
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-lgpl</artifactId>
- <version>3.2.6</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
<version>2.1.0.GA</version>
<scope>runtime</scope>
</dependency>
+ <!-- excluded from jboss-aop-mc-int -->
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- <version>${version.org.jboss.aop}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <!-- TODO: does AOP really depend on Ant? -->
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
</exclusion>
- </exclusions>
- <scope>runtime</scope>
+ </exclusions>
</dependency>
+ <!-- bootstrap.xml -->
<dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-jmx</artifactId>
- <version>${version.org.jboss.aop}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-jmx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </exclusion>
- </exclusions>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- <version>${version.org.jboss.aop}</version>
- <scope>runtime</scope>
- </dependency>
- <!-- TODO: see EJBTHREE-1734 -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-aop-deployers</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <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>
- <artifactId>jboss-deployers-vfs</artifactId>
+ <artifactId>jboss-deployers-client</artifactId>
<version>2.0.5.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- urn:jboss:classloader:1.0 -->
+ <dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading-vfs</artifactId>
+ <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.mx</groupId>
- <artifactId>jboss-j2se</artifactId>
- <version>${version.org.jboss.mx}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-jmx</artifactId>
- <version>${version.org.jboss.mx}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-mbeans</artifactId>
- <version>${version.org.jboss.mx}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.logbridge</groupId>
<artifactId>jboss-logbridge</artifactId>
<version>1.0.0.CR3</version>
<scope>runtime</scope>
</dependency>
+ <!-- jboss-logbridge has a dependency on org.jboss.logging.log4j.JDKLevel, but doesn't declare it -->
<dependency>
- <!-- jboss-logbridge has a dependency on org.jboss.logging.log4j.JDKLevel, but doesn't declare it -->
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
<version>2.0.6.GA</version>
<scope>runtime</scope>
</dependency>
+ <!-- urn:jboss:aop-beans:1.0 -->
<dependency>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>2.0.4.GA</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <outputDirectory>target/classes</outputDirectory>
- <testOutputDirectory>target/test-classes</testOutputDirectory>
- </properties>
- </profile>
-
- <profile>
- <id>eclipse</id>
- <properties>
- <outputDirectory>eclipse-target/classes</outputDirectory>
- <testOutputDirectory>eclipse-target/test-classes</testOutputDirectory>
- </properties>
- </profile>
- </profiles>
</project>
Deleted: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/lib/jboss-system.jar
===================================================================
(Binary files differ)
Copied: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop-6.xml (from rev 86592, trunk/server/src/etc/conf/default/bootstrap/aop.xml)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop-6.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop-6.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ AOP configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="aop-classloader:0.0.0"/></classloader>
+
+ <classloader name="aop-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
+ <root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
+ <root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
+ <root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
+ </classloader>
+
+ <!-- Integration -->
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
+
+ <bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
+ <property name="managerBean">AspectManager</property>
+ <property name="managerProperty">aspectManager</property>
+ </bean>
+
+
+ <!--
+ Valid values for the AspectManager bean for use with enableTransformer=true are:
+ * org.jboss.aop.deployers.AspectManagerJDK5 - works with the -javaagent:pluggable-instrumentor.jar switch
+ * org.jboss.aop.deployers.AspectManagerJRockit - works with JRockit and the -Xmanagement:class=org.jboss.aop.hook.JRockitPluggableClassPreProcessor switch
+ -->
+ <bean name="AspectManager" class="org.jboss.aop.deployers.AspectManagerJDK5">
+ <constructor>
+ <parameter><![CDATA[
+ <aop>
+ <aspect name="mainDeployer" class="org.jboss.profileservice.aop.MainDeployerAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.deployers.spi.deployment.MainDeployer}->process(..))">
+ <advice name="process" aspect="mainDeployer"/>
+ </bind>
+ <aspect name="persist" class="org.jboss.profileservice.aop.PersistAspect"/>
+ <bind pointcut="execution(* $instanceof{org.jboss.managed.api.ManagedProperty}->setValue(..))">
+ <advice name="setValue" aspect="persist"/>
+ </bind>
+ </aop>]]>
+ </parameter>
+ </constructor>
+
+ <property name="jbossIntegration"><inject bean="AOPJBossIntegration"/></property>
+
+ <property name="enableLoadtimeWeaving">false</property>
+ <!-- only relevant when EnableLoadtimeWeaving is true.
+ When transformer is on, every loaded class gets
+ transformed. If AOP can't find the class, then it
+ throws an exception. Sometimes, classes may not have
+ all the classes they reference. So, the Suppressing
+ is needed. (i.e. Jboss cache in the default configuration -->
+ <property name="suppressTransformationErrors">true</property>
+ <property name="prune">true</property>
+ <property name="include">org.jboss.test., org.jboss.injbossaop.</property>
+ <property name="exclude">org.jboss.</property>
+ <!-- This avoids instrumentation of hibernate cglib enhanced proxies
+ <property name="ignore">*$$EnhancerByCGLIB$$*</property> -->
+ <property name="optimized">true</property>
+ <property name="verbose">false</property>
+ <!--
+ Available choices for this attribute are:
+ org.jboss.aop.instrument.ClassicInstrumentor (default)
+ org.jboss.aop.instrument.GeneratedAdvisorInstrumentor
+ <property name="instrumentor">org.jboss.aop.instrument.ClassicInstrumentor</property>
+ -->
+ <!--
+ By default the deployment of the aspects contained in
+ ../deployers/jboss-aop-jboss5.deployer/base-aspects.xml
+ are not deployed. To turn on deployment uncomment this property
+ <property name="useBaseXml">true</property>
+ -->
+ </bean>
+
+</deployment>
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop.xml 2009-04-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/aop.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -11,10 +11,7 @@
<root>${jboss.lib.url}jboss-aop-asintegration-core.jar</root>
<root>${jboss.lib.url}jboss-aop-asintegration-jmx.jar</root>
<root>${jboss.lib.url}jboss-aop-asintegration-mc.jar</root>
- <!-- TODO: see EJBTHREE-1734
<root>${jboss.lib.url}jboss-aop-jboss5.jar</root>
- -->
- <root>${jboss.lib.url}jboss-ejb3-aop-deployers.jar</root>
</classloader>
<!-- Integration -->
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/deployers.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/deployers.xml 2009-04-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/deployers.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -24,15 +24,13 @@
<!-- JAXB impl here, api is in endorsed -->
<root>${jboss.lib.url}jaxb-impl.jar</root>
<!-- STAX2 impl here, api is in endorsed -->
- <root>${jboss.lib.url}wstx-lgpl.jar</root>
+ <root>${jboss.lib.url}wstx.jar</root>
</classloader>
- <!-- use legacy ordering -->
- <!-- TODO: not in Reloaded
+ <!-- use legacy ordering -->
<bean name="topContextComparator">
<constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
</bean>
- -->
<!-- MetaValueFactory -->
<bean name="MetaValueFactory" >
@@ -58,18 +56,14 @@
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
<property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
<property name="deployers"><inject bean="Deployers"/></property>
- <!-- TODO: optional injecting isn't working properly
- <property name="mgtDeploymentCreator"><inject option="optional" bean="ManagedDeploymentCreator"/></property>
- <property name="comparator"><inject option="optional" bean="topContextComparator"/></property>
- -->
+ <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
+ <property name="comparator"><inject bean="topContextComparator"/></property>
</bean>
<!-- The ManagedDeploymentCreator implementation that supports mapping
attachment types to ManagedDeployment#getTypes
-->
- <!-- TODO: not in Reloaded
<bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
- -->
<!-- ModificationType structure processor -->
<bean name="ModificationTypeStructureProcessor" class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
@@ -199,7 +193,6 @@
<uncallback method="removeAnnotationPlugin"/>
</bean>
- <!-- TODO: not in Reloaded
<bean name="BeanMetaDataICF" class="org.jboss.deployers.plugins.managed.BeanMetaDataICF">
<property name="controller"><inject bean="jboss.kernel:service=KernelController"/></property>
<property name="delegateICF"><inject bean="ManagedObjectFactory" property="defaultInstanceFactory"/></property>
@@ -207,12 +200,10 @@
<bean name="KernelDeploymentManagedObjectCreator" class="org.jboss.deployers.plugins.managed.KernelDeploymentManagedObjectCreator">
<constructor><parameter><inject bean="ManagedObjectFactory"/></parameter></constructor>
</bean>
- -->
<bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer">
<property name="suffix">jboss-beans.xml</property>
</bean>
<bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer">
- <!-- TODO: not available in Reloaded and can't make it optional
<install bean="ManagedDeploymentCreator" method="addAttachmentType">
<parameter>
<value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
@@ -226,17 +217,13 @@
<value>org.jboss.kernel.spi.deployment.KernelDeployment</value>
</parameter>
</uninstall>
- -->
- <!-- TODO: optional injecting isn't working properly
- <property name="mgtObjectCreator"><inject option="optional" bean="KernelDeploymentManagedObjectCreator"/></property>
- -->
+ <property name="mgtObjectCreator"><inject bean="KernelDeploymentManagedObjectCreator"/></property>
</bean>
<bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
<constructor><parameter class="org.jboss.kernel.Kernel"><inject bean="jboss.kernel:service=Kernel"/></parameter></constructor>
</bean>
<!-- JMX Deployment -->
- <!-- FIXME: needs to be separated from AS
<bean name="ServiceMetaDataICF" class="org.jboss.system.deployers.managed.ServiceMetaDataICF">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
</bean>
@@ -246,7 +233,6 @@
<bean name="ServiceDeployer" class="org.jboss.system.deployers.ServiceDeployer">
<constructor><parameter><inject bean="JMXKernel" property="serviceController"/></parameter></constructor>
</bean>
- -->
<bean name="ClassLoadingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
<constructor>
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/jmx.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/jmx.xml 2009-04-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/jmx.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -11,29 +11,25 @@
<root>${jboss.lib.url}jboss-j2se.jar</root>
<root>${jboss.lib.url}jboss-mbeans.jar</root>
<root>${jboss.lib.url}jboss-jmx.jar</root>
- <!-- TODO: fix me
<root>${jboss.lib.url}jboss-system-jmx.jar</root>
- -->
<root>${jboss.lib.url}dom4j.jar</root>
+
+ <!-- TODO: needs to be fixed in AS -->
+ <root>${jboss.lib.url}concurrent.jar</root>
</classloader>
- <!-- TODO: in jboss-system-jmx.jar
<bean name="ServerInfo" class="org.jboss.system.server.ServerInfo">
<alias>jboss.system:type=ServerInfo</alias>
</bean>
- -->
<!-- The legacy JMX kernel -->
- <!-- TODO: in jboss-system-jmx.jar
<bean name="JMXKernel" class="org.jboss.system.server.jmx.JMXKernel">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="serverImpl"><inject bean="JBossServer"/></property>
<property name="serverInfo"><inject bean="ServerInfo"/></property>
</bean>
- -->
<!-- Support for @JMX -->
- <!-- TODO: in jboss-system-jmx.jar
<lifecycle-configure xmlns="urn:jboss:aop-beans:1.0"
name="JMXRegistrationAdvice"
class="org.jboss.system.microcontainer.jmx.ServiceControllerRegistrationLifecycleCallback"
@@ -58,14 +54,11 @@
manager-property="aspectManager">
<property name="serviceController"><inject bean="JMXKernel" property="serviceController"/></property>
</lifecycle-install>
- -->
<!-- MBean for making sure that the underlying AspectManagerService gets registered in JMX -->
- <!-- TODO: depends on ServiceMBean, which is in jboss-system-jmx.jar
<bean name="AspectManagerJMXRegistrar" class="org.jboss.aop.deployers.AspectManagerJMXRegistrar">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="aspectManager"><inject bean="AspectManager" property="delegate"/></property>
</bean>
- -->
</deployment>
Copied: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml (from rev 86587, trunk/server/src/etc/conf/default/bootstrap/profile.xml)
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile-6.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ The ProfileService.
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="profile-classloader:0.0.0" /></classloader>
+
+ <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>
+ </classloader>
+
+ <!--
+ The profile configuration
+ This contains required properties:
+ The uri to jboss-service.xml.
+ The uri to the deployers folder.
+ A list of uris to deploy folders. -->
+ <bean name="BootstrapProfileFactory" class="org.jboss.system.server.profileservice.repository.StaticProfileFactory">
+ <property name="bootstrapURI">${jboss.server.home.url}conf/jboss-service.xml</property>
+ <property name="deployersURI">${jboss.server.home.url}deployers</property>
+ <property name="applicationURIs">
+ <list elementClass="java.net.URI">
+ <value>${jboss.server.home.url}deploy</value>
+ </list>
+ </property>
+ <property name="attachmentStoreRoot">${jboss.server.data.dir}/attachments</property>
+ <property name="profileFactory"><inject bean="ProfileFactory" /></property>
+ </bean>
+
+ <!-- The default profile key -->
+ <bean name="DefaultProfileKey" class="org.jboss.profileservice.spi.ProfileKey">
+ <constructor><parameter>${jboss.server.name}</parameter></constructor>
+ </bean>
+
+ <!-- The ProfileService -->
+ <bean name="ProfileService" class="org.jboss.system.server.profileservice.repository.AbstractProfileService">
+ <constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor>
+ <property name="deployer"><inject bean="ProfileServiceDeployer" /></property>
+ <property name="defaultProfile"><inject bean="DefaultProfileKey" /></property>
+ </bean>
+
+ <!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <property name="profileKey"><inject bean="DefaultProfileKey" /></property>
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+ <property name="profileService"><inject bean="ProfileService" /></property>
+ <property name="mof"><inject bean="ManagedObjectFactory" /></property>
+ <property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator" /></property>
+ <property name="bootstrapProfileFactory"><inject bean="BootstrapProfileFactory" /></property>
+ <property name="configurator"><inject bean="jboss.kernel:service=Kernel" property="configurator"/></property>
+ </bean>
+
+ <!-- The profile factory -->
+ <bean name="ProfileFactory" class="org.jboss.system.server.profileservice.repository.AbstractProfileFactory">
+ <property name="profileRepository"><inject bean="ProfileRepositoryFactory" /></property>
+ </bean>
+
+ <!-- The profile repository factory -->
+ <bean name="ProfileRepositoryFactory" class="org.jboss.system.server.profileservice.repository.TypedProfileRepository">
+ <!-- Accept any DeploymentRepositoryFactory -->
+ <incallback method="addRepositoryFactory" />
+ <uncallback method="removeRepositoryFactory" />
+ </bean>
+
+ <!-- The structure modification cache and checker -->
+
+ <bean name="StructureModCache" class="org.jboss.deployers.vfs.spi.structure.modified.DefaultStructureCache">
+ <destroy method="flush"/>
+ </bean>
+
+ <bean name="StructureModificationChecker" class="org.jboss.deployers.vfs.spi.structure.modified.MetaDataStructureModificationChecker">
+ <constructor>
+ <parameter><inject bean="MainDeployer" /></parameter>
+ </constructor>
+ <property name="cache"><inject bean="StructureModCache" /></property>
+ <property name="filter"><bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter" /></property>
+ </bean>
+
+ <!-- The default deployment repository factory -->
+ <bean name="DefaultDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.DefaultDeploymentRepositoryFactory">
+ <property name="deploymentFilter"><inject bean="DeploymentFilter" /></property>
+ <property name="checker"><inject bean="StructureModificationChecker" /></property>
+ </bean>
+
+ <!-- The attachment store -->
+ <bean name="AttachmentStore" class="org.jboss.system.server.profileservice.repository.AbstractAttachmentStore">
+ <constructor><parameter><inject bean="BootstrapProfileFactory" property="attachmentStoreRoot" /></parameter></constructor>
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+ <property name="serializer"><inject bean="AttachmentsSerializer" /></property>
+ </bean>
+
+ <bean name="AttachmentsSerializer" class="org.jboss.system.server.profileservice.repository.JAXBAttachmentSerializer">
+ <constructor><parameter><inject bean="BootstrapProfileFactory" property="attachmentStoreRoot" /></parameter></constructor>
+ </bean>
+
+ <bean name="ProfileServiceDeployer" class="org.jboss.system.server.profileservice.repository.MainDeployerAdapter">
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+ <property name="attachmentStore"><inject bean="AttachmentStore" /></property>
+ </bean>
+
+ <bean name="ProfileServicePersistenceDeployer" class="org.jboss.system.server.profileservice.persistence.deployer.ProfileServicePersistenceDeployer" />
+
+ <!-- A filter for excluding files from the scanner -->
+ <bean name="DeploymentFilter" class="org.jboss.virtual.plugins.vfs.helpers.ExtensibleFilter">
+ <!-- Files starting with theses strings are ignored -->
+ <property name="prefixes">#,%,\,,.,_$</property>
+ <!-- Files ending with theses strings are ignored -->
+ <property name="suffixes">#,$,%,~,\,v,.BAK,.bak,.old,.orig,.tmp,.rej,.sh</property>
+ <!-- Files matching with theses strings are ignored -->
+ <property name="matches">.make.state,.nse_depinfo,CVS,CVS.admin,RCS,RCSLOG,SCCS,TAGS,core,tags</property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile.xml 2009-04-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap/profile.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -50,6 +50,7 @@
<property name="mof"><inject bean="ManagedObjectFactory" /></property>
<property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator" /></property>
<property name="bootstrapProfileFactory"><inject bean="BootstrapProfileFactory" /></property>
+ <property name="configurator"><inject bean="jboss.kernel:service=Kernel" property="configurator"/></property>
</bean>
<!-- The profile factory -->
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-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/main/resources/server/default/conf/bootstrap.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -7,15 +7,10 @@
<url>bootstrap/logging.xml</url>
<url>bootstrap/vfs.xml</url>
<url>bootstrap/classloader.xml</url>
- <url>bootstrap/aop.xml</url>
- <url>bootstrap/jmx-jdk.xml</url>
- <!-- TODO: needs jboss-system-jmx.jar -->
+ <url>bootstrap/aop-6.xml</url>
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
- <!-- TODO: why is this here?
<url>bootstrap/bindings.xml</url>
- -->
- <!-- TODO: not yet available
- <url>bootstrap/profile.xml</url>
- -->
+ <url>bootstrap/profile-6.xml</url>
+
</bootstrap>
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-01 17:55:41 UTC (rev 86608)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/java/org/jboss/reloaded/vdf/bootstrap/test/maindeployer/unit/MainDeployerTestCase.java 2009-04-01 18:05:32 UTC (rev 86609)
@@ -58,11 +58,19 @@
@BeforeClass
public static void beforeClass() throws Exception
{
+ // TODO: proper setup
+ System.setProperty("jboss.bind.address", "localhost");
+
server = new ServerImpl();
Properties props = new Properties();
- // either target or eclipse-target
- props.put(ServerConfig.HOME_DIR, findDirContainingResource("server"));
- props.put(ServerConfig.LIBRARY_URL, new File("target/dist/lib").toURI().toURL().toString());
+ // either target or eclipse-target test-classes
+ String homeDir = findDirContainingResource("server/default/conf/jboss-service.xml");
+ String serverConfigDir = new File("target/dist/server/default/conf").getAbsolutePath();
+ 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());
server.init(props);
server.start();
Added: projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/conf/jboss-service.xml
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/conf/jboss-service.xml (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/conf/jboss-service.xml 2009-04-01 18:05:32 UTC (rev 86609)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 81277 2008-11-19 09:54:09Z dimitris at jboss.org $ -->
+
+<!-- ===================================================================== -->
+<!-- JBoss Server Configuration -->
+<!-- ===================================================================== -->
+
+<server>
+</server>
\ No newline at end of file
Added: projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deploy/README
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deploy/README (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deploy/README 2009-04-01 18:05:32 UTC (rev 86609)
@@ -0,0 +1 @@
+Just a file to make surefire happy
\ No newline at end of file
Added: projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deployers/README
===================================================================
--- projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deployers/README (rev 0)
+++ projects/reloaded/trunk/vdf-bootstrap/src/test/resources/server/default/deployers/README 2009-04-01 18:05:32 UTC (rev 86609)
@@ -0,0 +1 @@
+Just a file to make surefire happy
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list