[teiid-commits] teiid SVN: r747 - in branches/remove_psc/common-internal/src: main/java/com/metamatrix/common/config/model and 2 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Fri Apr 10 11:55:55 EDT 2009
Author: vhalbert at redhat.com
Date: 2009-04-10 11:55:55 -0400 (Fri, 10 Apr 2009)
New Revision: 747
Modified:
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefn.java
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicServiceComponentDefn.java
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java
branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java
branches/remove_psc/common-internal/src/test/resources/config-original.xml
branches/remove_psc/common-internal/src/test/resources/config.xml
Log:
Teiid 323 - removed the QueuedService attribute for a service, it's not used
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefn.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefn.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/api/ServiceComponentDefn.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -31,7 +31,6 @@
// public static final String COMPONENT_TYPE_NAME = "Service";
- boolean isQueuedService();
void accept(ConfigurationVisitor visitor);
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicConfigurationObjectEditor.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -1230,8 +1230,7 @@
// originalServiceComponentDefn.getComponentTypeID(),
// newName);
- serviceDefn.setIsQueuedService(originalServiceComponentDefn.isQueuedService());
- if (serviceDefn.getComponentTypeID().getName().equals(RuntimeMetadataServiceComponentType.RUNTIME_METADATA_SERVICE_TYPE_NAME)) {
+ if (serviceDefn.getComponentTypeID().getName().equals(RuntimeMetadataServiceComponentType.RUNTIME_METADATA_SERVICE_TYPE_NAME)) {
/**
* This is done because the RuntimeMetadataService is a Service
* that must be treated as a Connector for only the RuntimeMetadata
@@ -2668,8 +2667,6 @@
defn.setRoutingUUID( originalConnector.getRoutingUUID() );
- defn.setIsQueuedService(originalConnector.isQueuedService());
-
createCreationAction(defn.getID(), defn);
this.modifyProperties(defn, originalConnector.getProperties(), ADD);
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicServiceComponentDefn.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicServiceComponentDefn.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/model/BasicServiceComponentDefn.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -33,7 +33,6 @@
public class BasicServiceComponentDefn extends BasicComponentDefn implements ServiceComponentDefn, Serializable {
- private boolean isQueuedService;
private String routingUUID;
public BasicServiceComponentDefn(ConfigurationID configurationID, ServiceComponentDefnID componentID, ComponentTypeID typeID) {
@@ -43,18 +42,9 @@
protected BasicServiceComponentDefn(BasicServiceComponentDefn component) {
super(component);
- setIsQueuedService(component.isQueuedService());
this.setRoutingUUID(component.getRoutingUUID());
}
- public boolean isQueuedService() {
- return isQueuedService;
- }
-
- public void setIsQueuedService(boolean isQueued) {
- isQueuedService = isQueued;
- }
-
/**
* Returns the String globally unique routing UUID for this
* ServiceComponentDefn if it is a Connector Binding;
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_ElementNames.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -167,7 +167,6 @@
public static final String ELEMENT = "Service"; //$NON-NLS-1$
public static class Attributes extends ComponentObject.Attributes{
- public static final String QUEUED_SERVICE = "QueuedService"; //$NON-NLS-1$
public static final String ROUTING_UUID = "routingUUID"; //$NON-NLS-1$
}
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLConfig_42_HelperImpl.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -257,7 +257,6 @@
Assertion.isNotNull(defn);
Element serviceComponentDefnElement = createComponentObjectElement(XMLConfig_42_ElementNames.Configuration.DeployedService.ELEMENT, defn);
- serviceComponentDefnElement.setAttribute(XMLConfig_42_ElementNames.Configuration.DeployedService.Attributes.QUEUED_SERVICE, Boolean.valueOf(defn.isQueuedService()).toString());
serviceComponentDefnElement.setAttribute(XMLConfig_42_ElementNames.Configuration.DeployedService.Attributes.ROUTING_UUID, defn.getRoutingUUID());
return serviceComponentDefnElement;
}
@@ -273,7 +272,6 @@
Assertion.isNotNull(defn);
Element serviceComponentDefnElement = createComponentObjectElement(XMLConfig_42_ElementNames.ServiceComponentDefns.ServiceComponentDefn.ELEMENT, defn);
- serviceComponentDefnElement.setAttribute(XMLConfig_42_ElementNames.ServiceComponentDefns.ServiceComponentDefn.Attributes.QUEUED_SERVICE, Boolean.valueOf(defn.isQueuedService()).toString());
serviceComponentDefnElement.setAttribute(XMLConfig_42_ElementNames.ServiceComponentDefns.ServiceComponentDefn.Attributes.ROUTING_UUID, defn.getRoutingUUID());
return serviceComponentDefnElement;
}
@@ -1638,16 +1636,9 @@
Element connectorElement = createComponentObjectElement(XMLConfig_42_ElementNames.ConnectorComponents.ConnectorComponent.ELEMENT, connector);
- connectorElement.setAttribute(XMLConfig_42_ElementNames.ConnectorComponents.ConnectorComponent.Attributes.QUEUED_SERVICE, Boolean.valueOf(connector.isQueuedService()).toString());
- // vah - 09-24-2003
- // when exporting a configuration, export the routing uuid to
- // otherwise do not export it so that upon import
- // the routingUUID to be regenerated.
- // This is done to help ensure there are no duplicate UUIDs
-// if (isExportConfig) {
- connectorElement.setAttribute(XMLConfig_42_ElementNames.ConnectorComponents.ConnectorComponent.Attributes.ROUTING_UUID, connector.getRoutingUUID());
-// }
+ connectorElement.setAttribute(XMLConfig_42_ElementNames.ConnectorComponents.ConnectorComponent.Attributes.ROUTING_UUID, connector.getRoutingUUID());
+
return connectorElement;
}
Modified: branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java
===================================================================
--- branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/main/java/com/metamatrix/common/config/xml/XMLElementNames.java 2009-04-10 15:55:55 UTC (rev 747)
@@ -158,8 +158,7 @@
public static final String ELEMENT = "ServiceComponentDefn"; //$NON-NLS-1$
public static class Attributes extends ComponentObject.Attributes{
- public static final String QUEUED_SERVICE = "QueuedService"; //$NON-NLS-1$
- public static final String ROUTING_UUID = "routingUUID"; //$NON-NLS-1$
+ public static final String ROUTING_UUID = "routingUUID"; //$NON-NLS-1$
}
}
}
Modified: branches/remove_psc/common-internal/src/test/resources/config-original.xml
===================================================================
--- branches/remove_psc/common-internal/src/test/resources/config-original.xml 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/test/resources/config-original.xml 2009-04-10 15:55:55 UTC (rev 747)
@@ -85,7 +85,7 @@
</Host>
</Configuration>
<Services>
- <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="RuntimeMetadataService" ComponentType="RuntimeMetadataService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="ConnectorClass">com.metamatrix.connector.metadata.IndexConnector</Property>
<Property Name="ServiceClassName">com.metamatrix.server.connector.service.ConnectorService</Property>
@@ -97,7 +97,7 @@
<Property Name="Immutable">true</Property>
</Properties>
</Service>
- <Service Name="MembershipService" ComponentType="MembershipService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="MembershipService" ComponentType="MembershipService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="security.membership.admin.username">(admin.username)</Property>
<Property Name="security.membership.admin.password">(admin.password)</Property>
@@ -107,7 +107,7 @@
<Property Name="ServiceClassName">com.metamatrix.platform.security.membership.service.MembershipServiceImpl</Property>
</Properties>
</Service>
- <Service Name="ODBCService" ComponentType="ODBCService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="ODBCService" ComponentType="ODBCService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="metamatrix.service.essentialservice">false</Property>
<Property Name="ServiceClassName">com.metamatrix.odbc.ODBCServiceImpl</Property>
@@ -115,27 +115,27 @@
<Property Name="ServerKey">license/oaserverkey.lic</Property>
</Properties>
</Service>
- <Service Name="ConfigurationService" ComponentType="ConfigurationService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="ConfigurationService" ComponentType="ConfigurationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="metamatrix.service.essentialservice">true</Property>
<Property Name="ServiceClassName">com.metamatrix.platform.config.service.ConfigurationServiceImpl</Property>
</Properties>
</Service>
- <Service Name="AuthorizationService" ComponentType="AuthorizationService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="AuthorizationService" ComponentType="AuthorizationService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="metamatrix.service.essentialservice">true</Property>
<Property Name="security.authorization.connection.Retries">4</Property>
<Property Name="ServiceClassName">com.metamatrix.platform.security.authorization.service.AuthorizationServiceImpl</Property>
</Properties>
</Service>
- <Service Name="SessionService" ComponentType="SessionService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="SessionService" ComponentType="SessionService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="security.session.terminationHandlers">com.metamatrix.server.util.DataServerSessionTerminationHandler</Property>
<Property Name="metamatrix.service.essentialservice">true</Property>
<Property Name="ServiceClassName">com.metamatrix.platform.security.session.service.SessionServiceImpl</Property>
</Properties>
</Service>
- <Service Name="QueryService" ComponentType="QueryService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="metamatrix.service.essentialservice">false</Property>
<Property Name="ProcessPoolMaxThreads">64</Property>
Modified: branches/remove_psc/common-internal/src/test/resources/config.xml
===================================================================
--- branches/remove_psc/common-internal/src/test/resources/config.xml 2009-04-10 15:41:05 UTC (rev 746)
+++ branches/remove_psc/common-internal/src/test/resources/config.xml 2009-04-10 15:55:55 UTC (rev 747)
@@ -36,7 +36,7 @@
<Configuration CreatedBy="ConfigurationStartup" LastChangedBy="ConfigurationStartup" ComponentType="Configuration" Name="Next Startup"><Properties/></Configuration>
<Services>
- <Service Name="QueryService" ComponentType="QueryService" QueuedService="false" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
+ <Service Name="QueryService" ComponentType="QueryService" LastChangedBy="ConfigurationStartup" CreatedBy="ConfigurationStartup">
<Properties>
<Property Name="metamatrix.service.essentialservice">false</Property>
<Property Name="ProcessPoolMaxThreads">64</Property>
More information about the teiid-commits
mailing list