[jboss-cvs] JBossAS SVN: r80914 - in trunk: testsuite/imports and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: scott.stark at jboss.org
Date: 2008-11-12 21:51:27 -0500 (Wed, 12 Nov 2008)
New Revision: 80914

Added:
   trunk/server/src/etc/conf/default/bootstrap-norep.xml
Removed:
   trunk/server/src/etc/conf/default/bootstrap-repo.xml
Modified:
   trunk/server/src/etc/conf/default/bootstrap.xml
   trunk/testsuite/imports/server-config.xml
Log:
JBAS-5994, switch to the repository based profile service as the default


Copied: trunk/server/src/etc/conf/default/bootstrap-norep.xml (from rev 80913, trunk/server/src/etc/conf/default/bootstrap.xml)
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-norep.xml	                        (rev 0)
+++ trunk/server/src/etc/conf/default/bootstrap-norep.xml	2008-11-13 02:51:27 UTC (rev 80914)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   The list of URLs for mc beans to load during bootstrap.
+   $Id$
+-->
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+   <url>initialize.xml</url>
+   <url>classloader.xml</url>
+   <url>aop.xml</url>
+   <url>jmx.xml</url>
+   <url>deployers.xml</url>
+   <url>bindings.xml</url>
+   <url>profile.xml</url>
+
+</bootstrap>

Deleted: trunk/server/src/etc/conf/default/bootstrap-repo.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-repo.xml	2008-11-13 01:31:11 UTC (rev 80913)
+++ trunk/server/src/etc/conf/default/bootstrap-repo.xml	2008-11-13 02:51:27 UTC (rev 80914)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   The list of configurations used to bootstrap the server
-   using a repository for the profile service
--->
-<bootstrap xmlns="urn:jboss:bootstrap:1.0">
-
-   <url>initialize.xml</url>
-   <url>classloader.xml</url>
-   <url>aop.xml</url>
-   <url>jmx.xml</url>
-   <url>deployers.xml</url>
-   <url>bindings.xml</url>
-   <url>profile-repository.xml</url>
-
-</bootstrap>

Modified: trunk/server/src/etc/conf/default/bootstrap.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap.xml	2008-11-13 01:31:11 UTC (rev 80913)
+++ trunk/server/src/etc/conf/default/bootstrap.xml	2008-11-13 02:51:27 UTC (rev 80914)
@@ -12,6 +12,6 @@
    <url>jmx.xml</url>
    <url>deployers.xml</url>
    <url>bindings.xml</url>
-   <url>profile.xml</url>
+   <url>profile-repository.xml</url>
 
 </bootstrap>

Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml	2008-11-13 01:31:11 UTC (rev 80913)
+++ trunk/testsuite/imports/server-config.xml	2008-11-13 02:51:27 UTC (rev 80914)
@@ -964,8 +964,6 @@
             <include name="deployers/**"/>
          </fileset>         	
          </copy>
-      	 <copy file="${jboss.dist}/server/@{conf}/conf/bootstrap-repo.xml" 
-      	 	tofile="${jboss.dist}/server/@{conf}/conf/bootstrap.xml" overwrite="true"/>
       	 <copy file="${jboss.dist}/server/@{conf}/deploy/profileservice-jboss-beans.xml.bak" 
       	 	tofile="${jboss.dist}/server/@{conf}/deploy/profileservice-jboss-beans.xml" overwrite="true"/>
          <!-- Overwrite any config content with that from the