[teiid-commits] teiid SVN: r754 - in branches/remove_psc/server/src/test: java/com/metamatrix/platform/config/spi/xml and 1 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Fri Apr 10 23:03:47 EDT 2009


Author: vhalbert at redhat.com
Date: 2009-04-10 23:03:46 -0400 (Fri, 10 Apr 2009)
New Revision: 754

Modified:
   branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java
   branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java
   branches/remove_psc/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXMLConfigReader.java
   branches/remove_psc/server/src/test/resources/config/config-original.xml
   branches/remove_psc/server/src/test/resources/config/config.xml
   branches/remove_psc/server/src/test/resources/config/config_format.xml
   branches/remove_psc/server/src/test/resources/config/config_next.xml
   branches/remove_psc/server/src/test/resources/config/config_out.xml
   branches/remove_psc/server/src/test/resources/config/config_wconnector.xml
   branches/remove_psc/server/src/test/resources/config/config_wgateaconnector.xml
   branches/remove_psc/server/src/test/resources/config/config_woresources.xml
Log:
Teiid 323 - refactured the xml configuration classes to simplify importing/exporting and to clean up the removal of psc, resourcepool and product type related info

Modified: branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java
===================================================================
--- branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/FakeConfigurationService.java	2009-04-11 03:03:46 UTC (rev 754)
@@ -397,7 +397,7 @@
         List results = new ArrayList();
         
         SharedResourceID resourceID1 = new SharedResourceID("resource1"); //$NON-NLS-1$
-        SharedResource resource1 = new BasicSharedResource(resourceID1, SharedResource.JDBC_COMPONENT_TYPE_ID);
+        SharedResource resource1 = new BasicSharedResource(resourceID1, SharedResource.MISC_COMPONENT_TYPE_ID);
         ConfigurationObjectEditorHelper.addProperty(resource1, "prop1", "value1"); //$NON-NLS-1$ //$NON-NLS-2$
         ConfigurationObjectEditorHelper.addProperty(resource1, Resource.RESOURCE_POOL, "pool"); //$NON-NLS-1$ 
         
@@ -405,7 +405,7 @@
         
         
         SharedResourceID resourceID2 = new SharedResourceID("resource2"); //$NON-NLS-1$
-        SharedResource resource2 = new BasicSharedResource(resourceID2, SharedResource.JDBC_COMPONENT_TYPE_ID);
+        SharedResource resource2 = new BasicSharedResource(resourceID2, SharedResource.MISC_COMPONENT_TYPE_ID);
         results.add(resource2);
 
         

Modified: branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java
===================================================================
--- branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/java/com/metamatrix/admin/server/TestServerMonitoringAdminImpl.java	2009-04-11 03:03:46 UTC (rev 754)
@@ -417,7 +417,7 @@
         
         MMResource resource = (MMResource) results.iterator().next();
         assertEquals("resource1", resource.getIdentifier()); //$NON-NLS-1$
-        assertEquals(SharedResource.JDBC_COMPONENT_TYPE_NAME, resource.getResourceType());
+        assertEquals(SharedResource.MISC_COMPONENT_TYPE_NAME, resource.getResourceType());
         assertEquals("pool", resource.getConnectionPoolIdentifier()); //$NON-NLS-1$
         
         

Modified: branches/remove_psc/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXMLConfigReader.java
===================================================================
--- branches/remove_psc/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXMLConfigReader.java	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/java/com/metamatrix/platform/config/spi/xml/TestXMLConfigReader.java	2009-04-11 03:03:46 UTC (rev 754)
@@ -25,15 +25,14 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.Map;
 
 import com.metamatrix.common.config.CurrentConfiguration;
 import com.metamatrix.common.config.api.ComponentType;
 import com.metamatrix.common.config.api.ComponentTypeDefn;
 import com.metamatrix.common.config.api.ComponentTypeID;
 import com.metamatrix.common.config.api.Configuration;
-import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.ConfigurationModelContainer;
+import com.metamatrix.common.config.api.ConnectorBinding;
 import com.metamatrix.common.config.api.SharedResource;
 import com.metamatrix.platform.config.BaseTest;
 import com.metamatrix.platform.config.util.CurrentConfigHelper;

Modified: branches/remove_psc/server/src/test/resources/config/config-original.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config-original.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config-original.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -75,12 +75,12 @@
                     <Property Name="vm.enabled">true</Property>
                     <Property Name="vm.forced.shutdown.time">30</Property>
                 </Properties>
-                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
              </Process>
         </Host>
     </Configuration>

Modified: branches/remove_psc/server/src/test/resources/config/config.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -75,12 +75,12 @@
                     <Property Name="vm.enabled">true</Property>
                     <Property Name="vm.forced.shutdown.time">30</Property>
                 </Properties>
-                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
              </Process>
         </Host>
     </Configuration>

Modified: branches/remove_psc/server/src/test/resources/config/config_format.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_format.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_format.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -144,74 +144,27 @@
 	<Configuration Name="Next Startup" ComponentType="Configuration">
 		<Host Name="slwxp141" ComponentType="Host">
 			<Process Name="MetaMatrixProcess" ComponentType="VM">
-					<Service Name="DirectoryService" ComponentType="DirectoryService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
-					<Service Name="IndexingService" ComponentType="IndexingService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
+					<DeployedService Name="DirectoryService" ComponentType="DirectoryService">
+					</DeployedService>
+					<DeployedService Name="IndexingService" ComponentType="IndexingService">
+					</DeployedService>
 
-					<ChangeHistory>
-						<Property Name="LastChangedBy">ConfigurationStartup</Property>
-						<Property Name="CreatedBy">ConfigurationStartup</Property>
-					</ChangeHistory>					
+					<DeployedService Name="MembershipService" ComponentType="MembershipService">
+					</DeployedService>
 
-					<Service Name="MembershipService" ComponentType="MembershipService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
+					<DeployedService Name="SessionService" ComponentType="SessionService">
+					</DeployedService>
 
-					<Service Name="SessionService" ComponentType="SessionService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
+					<DeployedService Name="AuthorizationService" ComponentType="AuthorizationService">
+					</DeployedService>
 
-					<Service Name="AuthorizationService" ComponentType="AuthorizationService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
+					<DeployedService Name="ConfigurationService" ComponentType="ConfigurationService">
+					</DeployedService>
+					<DeployedService Name="QueryService" ComponentType="QueryService">
+					</DeployedService>
 
-					<Service Name="ConfigurationService" ComponentType="ConfigurationService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
-
-					<ChangeHistory>
-						<Property Name="LastChangedBy">ConfigurationStartup</Property>
-						<Property Name="CreatedBy">ConfigurationStartup</Property>
-					</ChangeHistory>
-					<Service Name="QueryService" ComponentType="QueryService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
-
-					<Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService">
-						<ChangeHistory>
-							<Property Name="LastChangedBy">ConfigurationStartup</Property>
-							<Property Name="CreatedBy">ConfigurationStartup</Property>
-						</ChangeHistory>
-					</Service>
-
-					<ChangeHistory>
-						<Property Name="LastChangedBy">ConfigurationStartup</Property>
-						<Property Name="CreatedBy">ConfigurationStartup</Property>
-					</ChangeHistory>
+					<DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService">
+					</DeployedService>
 				<Properties>
 					<Property Name="vm.starter.maxHeapSize">1024</Property>
 					<Property Name="vm.starter.minHeapSize">256</Property>

Modified: branches/remove_psc/server/src/test/resources/config/config_next.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_next.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_next.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -71,14 +71,14 @@
                     <Property Name="vm.starter.minHeapSize">256</Property>
                     <Property Name="vm.timetolive">30000</Property>
                 </Properties>
-                     <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
-                    <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
-                     <Service Name="IndexingService" ComponentType="IndexingService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.628-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.628-06:00" />
-                    <Service Name="DirectoryService" ComponentType="DirectoryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.628-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.628-06:00" />
-                    <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.630-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.630-06:00" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.630-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.630-06:00" />
+                     <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
+                    <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.629-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.629-06:00" />
+                     <DeployedService Name="IndexingService" ComponentType="IndexingService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.628-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.628-06:00" />
+                    <DeployedService Name="DirectoryService" ComponentType="DirectoryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.628-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.628-06:00" />
+                    <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.630-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.630-06:00" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-19T10:18:51.630-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-19T10:18:51.630-06:00" />
             </Process>
         </Host>
     </Configuration>

Modified: branches/remove_psc/server/src/test/resources/config/config_out.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_out.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_out.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -76,14 +76,14 @@
                     <Property Name="vm.starter.minHeapSize">256</Property>
                     <Property Name="vm.timetolive">30000</Property>
                 </Properties>
-                     <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
-                    <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
-                     <Service Name="IndexingService" ComponentType="IndexingService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
-                    <Service Name="DirectoryService" ComponentType="DirectoryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
-                    <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
+                     <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
+                    <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
+                     <DeployedService Name="IndexingService" ComponentType="IndexingService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
+                    <DeployedService Name="DirectoryService" ComponentType="DirectoryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.316-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.316-06:00" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
+                    <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.317-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.317-06:00" />
             </Process>
         </Host>
         <Host Name="DummyHost" ComponentType="Host" LastChangedBy="ConfigurationStartup" LastChangedDate="2008-03-17T16:56:33.312-06:00" CreatedBy="ConfigurationStartup" CreationDate="2008-03-17T16:56:33.313-06:00">

Modified: branches/remove_psc/server/src/test/resources/config/config_wconnector.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_wconnector.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_wconnector.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -75,12 +75,12 @@
                     <Property Name="vm.enabled">true</Property>
                     <Property Name="vm.forced.shutdown.time">30</Property>
                 </Properties>
-                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
              </Process>
         </Host>
     </Configuration>

Modified: branches/remove_psc/server/src/test/resources/config/config_wgateaconnector.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_wgateaconnector.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_wgateaconnector.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -75,12 +75,12 @@
                     <Property Name="vm.enabled">true</Property>
                     <Property Name="vm.forced.shutdown.time">30</Property>
                 </Properties>
-                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
              </Process>
         </Host>
     </Configuration>

Modified: branches/remove_psc/server/src/test/resources/config/config_woresources.xml
===================================================================
--- branches/remove_psc/server/src/test/resources/config/config_woresources.xml	2009-04-11 02:54:02 UTC (rev 753)
+++ branches/remove_psc/server/src/test/resources/config/config_woresources.xml	2009-04-11 03:03:46 UTC (rev 754)
@@ -75,12 +75,12 @@
                     <Property Name="vm.enabled">true</Property>
                     <Property Name="vm.forced.shutdown.time">30</Property>
                 </Properties>
-                     <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                     <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
-                    <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                     <DeployedService Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
+                    <DeployedService Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup" />
              </Process>
         </Host>
     </Configuration>




More information about the teiid-commits mailing list