[jboss-cvs] JBossAS SVN: r83391 - in trunk/testsuite: src/resources/test-configs and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jan 23 18:47:10 EST 2009
Author: emuckenhuber
Date: 2009-01-23 18:47:09 -0500 (Fri, 23 Jan 2009)
New Revision: 83391
Added:
trunk/testsuite/src/resources/test-configs/embedded/
trunk/testsuite/src/resources/test-configs/embedded/conf/
trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/
trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile-service.xml
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/aop.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/ejb3.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-metadata.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-web.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jca.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jmx.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jta.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/root.profile
trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/security.profile
Modified:
trunk/testsuite/build.xml
Log:
xml based profile service bootstrap prototype
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-01-23 23:46:03 UTC (rev 83390)
+++ trunk/testsuite/build.xml 2009-01-23 23:47:09 UTC (rev 83391)
@@ -1078,6 +1078,11 @@
<target name="profileservice-config" description="Create the full featured profile service config">
<create-profileservice-config baseconf="default" conf="profileservice"/>
</target>
+
+ <!-- Create the embedded configuration -->
+ <target name="embedded-config" description="Create the xml based configuration.">
+ <create-profileservice-config baseconf="all" conf="embedded"/>
+ </target>
<target name="tests-web-profile" description="Tests with the web profile">
<server:start name="web"/>
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile-service.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile-service.xml (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/bootstrap/profile-service.xml 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,80 @@
+<?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 -->
+ <bean name="ProfileFactory" class="org.jboss.system.server.profileservice.repository.XmlProfileFactory">
+ <constructor><parameter>
+ <array elementClass="java.net.URI">
+ <value>${jboss.server.config.url}profiles</value>
+ </array>
+ </parameter></constructor>
+ <property name="attachmentStoreRoot">${jboss.server.data.dir}/attachments</property>
+ <property name="profileRepository"><inject bean="ProfileRepositoryFactory" /></property>
+ </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="MainDeployer" /></property>
+ </bean>
+
+ <!-- The Bootstrap implementation that loads the Profile from the ProfileService -->
+ <bean name="ProfileServiceBootstrap" class="org.jboss.system.server.profileservice.ProfileServiceBootstrap">
+ <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="profileFactory"><inject bean="ProfileFactory" /></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 default deployment repository factory -->
+ <bean name="DefaultDeploymentRepositoryFactory" class="org.jboss.system.server.profileservice.repository.FilteredDeploymentRepositoryFactory">
+ <property name="attachmentStore"><inject bean="AttachmentStore" /></property>
+ <!--
+ <property name="mainDeployer"><inject bean="MainDeployer" /></property>
+ <property name="deploymentFilter"><inject bean="DeploymentFilter" /></property>
+ <property name="hotDeploymentFilter"><bean class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter" /></property>
+ -->
+ </bean>
+
+ <!-- The attachment store -->
+ <bean name="AttachmentStore" class="org.jboss.system.server.profileservice.repository.AbstractAttachmentStore">
+ <constructor><parameter><inject bean="ProfileFactory" 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="ProfileFactory" property="attachmentStoreRoot" /></parameter></constructor>
+ </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
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/aop.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/aop.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/aop.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="aop">
+
+ <profile name="aop-deployers">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+ <deployment>jboss-aop-jboss5.deployer</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/ejb3.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/ejb3.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/ejb3.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="ejb3">
+
+ <profile name="ejb3-deployers">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+
+ <sub-profile>jboss-metadata</sub-profile>
+
+ <deployment>ejb3.deployer</deployment>
+ </profile>
+
+ <profile name="ejb3-runtime">
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+
+ <deployment>ejb3-connectors-jboss-beans.xml</deployment>
+ <deployment>ejb3-container-jboss-beans.xml</deployment>
+ <deployment>ejb3-interceptors-aop.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-metadata.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-metadata.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-metadata.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0">
+
+ <profile name="jboss-metadata">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+ <deployment>metadata-deployer-jboss-beans.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-web.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-web.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jboss-web.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="jboss-web">
+
+ <profile name="jboss-web-deployers">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+
+ <sub-profile>jboss-metadata</sub-profile>
+
+ <deployment>jbossweb.deployer</deployment>
+ </profile>
+
+ <profile name="jboss-web-runtime">
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+
+ <deployment>jbossweb.sar</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jca.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jca.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jca.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="jca">
+
+ <profile name="jca-deployers">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+ <deployment>jboss-jca.deployer</deployment>
+ </profile>
+
+ <profile name="jca-ds">
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+
+ <sub-profile>jta</sub-profile>
+
+ <deployment>jboss-local-jdbc.rar</deployment>
+ <deployment>jboss-xa-jdbc.rar</deployment>
+ </profile>
+
+ <profile name="jca-runtime">
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+
+ <sub-profile>security</sub-profile>
+
+ <deployment>hsqldb-ds.xml</deployment>
+ <deployment>jca-jboss-beans.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jmx.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jmx.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jmx.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0">
+
+ <profile name="jmx">
+ <!-- A immutable profile source -->
+ <profile-source>
+ <source>${jboss.server.home.url}conf</source>
+ </profile-source>
+ <deployment>jboss-service.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jta.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jta.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/jta.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="jta">
+
+ <profile name="transaction-manager">
+ <!-- A immutable profile source -->
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+ <deployment>transaction-jboss-beans.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/root.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/root.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/root.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles xmlns="urn:jboss:profileservice:profiles:1.0">
+
+ <!-- define the embedded profile -->
+ <profile name="embedded">
+ <!-- A immutable profile source -->
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+
+ <!-- the required sub-profiles -->
+ <sub-profile>jmx</sub-profile>
+ <sub-profile>aop</sub-profile>
+
+ <!-- jca -->
+ <sub-profile>jca</sub-profile>
+
+ <!-- ejb3 -->
+ <sub-profile>ejb3</sub-profile>
+
+ <!-- jboss web -->
+ <sub-profile>jboss-web</sub-profile>
+
+ <!-- the embedded deployments -->
+ <deployment>jmx-console.war</deployment>
+ <deployment>ROOT.war</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
Added: trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/security.profile
===================================================================
--- trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/security.profile (rev 0)
+++ trunk/testsuite/src/resources/test-configs/embedded/conf/profiles/security.profile 2009-01-23 23:47:09 UTC (rev 83391)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles
+ xmlns="urn:jboss:profileservice:profiles:1.0"
+ name="security">
+
+ <profile name="security-deployers">
+ <profile-source>
+ <source>${jboss.server.home.url}deployers</source>
+ </profile-source>
+ <deployment>security-deployer-jboss-beans.xml</deployment>
+ </profile>
+
+ <profile name="security-runtime">
+ <profile-source>
+ <source>${jboss.server.home.url}deploy</source>
+ </profile-source>
+ <deployment>security/security-jboss-beans.xml</deployment>
+ <deployment>security/security-policies-jboss-beans.xml</deployment>
+ </profile>
+
+</profiles>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list