11:51 a.m.
Author: shawkins
Date: 2009-05-20 22:51:37 -0400 (Wed, 20 May 2009)
New Revision: 990
Modified:
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java
trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protocol/URLFactory.java
trunk/server/src/main/java/com/metamatrix/platform/registry/ServiceRegistryBinding.java
trunk/server/src/main/java/com/metamatrix/platform/service/controller/ServiceData.java
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
Log:
TEIID-600 servicetype for registry bindings is actually the routing id, also the server
doesn't need to use the url stream handler factory.
Modified:
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java
===================================================================
---
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/embedded/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedConfigurationService.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -110,7 +110,7 @@
private UDFSource udfSource;
private HashSet<ServerConnection> clientConnections = new
HashSet<ServerConnection>();
- private AbstractClassLoaderManager classLoaderManager = new
AbstractClassLoaderManager(Thread.currentThread().getContextClassLoader(), true) {
+ private AbstractClassLoaderManager classLoaderManager = new
AbstractClassLoaderManager(Thread.currentThread().getContextClassLoader(), true, true) {
@Override
public String getCommonExtensionClassPath() {
Modified:
trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java
===================================================================
---
trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/engine/src/main/java/com/metamatrix/common/application/AbstractClassLoaderManager.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -42,18 +42,22 @@
private URLFilteringClassLoader commonExtensionClassloader;
private Map<String, PostDelegatingClassLoader> postdelegationClassLoaderCache =
new HashMap<String, PostDelegatingClassLoader>();
private boolean usePostDelegationCache;
+ private MetaMatrixURLStreamHandlerFactory factory;
private Object lock = new Object();
- public AbstractClassLoaderManager(ClassLoader parentClassLoader, boolean
usePostDelegationCache) {
+ public AbstractClassLoaderManager(ClassLoader parentClassLoader, boolean
usePostDelegationCache, boolean useStreamHandler) {
this.usePostDelegationCache = usePostDelegationCache;
this.parentClassLoader = parentClassLoader;
+ if (useStreamHandler) {
+ factory = new MetaMatrixURLStreamHandlerFactory();
+ }
}
public ClassLoader getCommonClassLoader(String urls) {
synchronized (lock) {
if (this.commonExtensionClassloader == null) {
// since we are using the extensions, get the common extension path
- this.commonExtensionClassloader = new
URLFilteringClassLoader(parseURLs(getCommonExtensionClassPath()), parentClassLoader, new
MetaMatrixURLStreamHandlerFactory());
+ this.commonExtensionClassloader = new
URLFilteringClassLoader(parseURLs(getCommonExtensionClassPath()), parentClassLoader,
factory);
}
if (urls != null && urls.trim().length() > 0) {
for (URL url : parseURLs(urls)) {
@@ -69,7 +73,7 @@
PostDelegatingClassLoader cl = this.postdelegationClassLoaderCache.get(urls);
if (cl == null) {
if (urls != null && urls.trim().length() > 0) {
- cl = new PostDelegatingClassLoader(parseURLs(urls),
getCommonClassLoader(null), new MetaMatrixURLStreamHandlerFactory());
+ cl = new PostDelegatingClassLoader(parseURLs(urls),
getCommonClassLoader(null), factory);
if (usePostDelegationCache) {
this.postdelegationClassLoaderCache.put(urls, cl);
}
Modified:
trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protocol/URLFactory.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protocol/URLFactory.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/server/src/main/java/com/metamatrix/common/extensionmodule/protocol/URLFactory.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -24,13 +24,8 @@
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
import com.metamatrix.common.extensionmodule.protocol.extensionjar.Handler;
-import com.metamatrix.common.log.LogManager;
-import com.metamatrix.common.util.LogCommonConstants;
/**
* Factory to convert String urls into URL objects. This factory
Modified:
trunk/server/src/main/java/com/metamatrix/platform/registry/ServiceRegistryBinding.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/platform/registry/ServiceRegistryBinding.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/server/src/main/java/com/metamatrix/platform/registry/ServiceRegistryBinding.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -86,7 +86,8 @@
super(si, hostName, bus);
this.serviceData = new ServiceData(ServiceState.STATE_NOT_INITIALIZED);
this.serviceData.setId(serviceID);
- this.serviceData.setServiceType(serviceType);
+ this.serviceData.setRoutingId(serviceType);
+ this.serviceData.setServiceType(componentType);
this.serviceData.setInstanceName(instanceName);
this.deployedComponent = deployedComponent;
this.essential = essential;
@@ -115,7 +116,7 @@
}
public String getServiceType() {
- return this.serviceData.getServiceType();
+ return this.serviceData.getRoutingId();
}
public String getInstanceName() {
Modified:
trunk/server/src/main/java/com/metamatrix/platform/service/controller/ServiceData.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/platform/service/controller/ServiceData.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/server/src/main/java/com/metamatrix/platform/service/controller/ServiceData.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -30,6 +30,7 @@
public class ServiceData implements Serializable {
private int state;
private String serviceType;
+ private String routingId;
private String instanceName;
private ServiceID id;
private Date startTime;
@@ -114,5 +115,13 @@
setStateChangeTime(new Date());
}
}
+
+ public String getRoutingId() {
+ return routingId;
+ }
+
+ public void setRoutingId(String routingId) {
+ this.routingId = routingId;
+ }
}
\ No newline at end of file
Modified:
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java
===================================================================
---
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-05-21
01:07:58 UTC (rev 989)
+++
trunk/server/src/main/java/com/metamatrix/platform/vm/controller/ProcessController.java 2009-05-21
02:51:37 UTC (rev 990)
@@ -168,7 +168,7 @@
* @throws Exception if an error occurs initializing vmController
*/
public ProcessController(Host host, String processname, ClusteredRegistryState
registry, ServerEvents serverEvents, MessageBus bus, HostManagement hostManagement) throws
Exception {
- super(Thread.currentThread().getContextClassLoader(),
PropertiesUtils.getBooleanProperty(CurrentConfiguration.getInstance().getProperties(),
ServerPropertyNames.CACHE_CLASS_LOADERS, true));
+ super(Thread.currentThread().getContextClassLoader(),
PropertiesUtils.getBooleanProperty(CurrentConfiguration.getInstance().getProperties(),
ServerPropertyNames.CACHE_CLASS_LOADERS, true), false);
this.host = host;
this.processName = processname;
@@ -726,7 +726,8 @@
ServiceData serviceData = service.getServiceData();
serviceData.setId(serviceID);
-
serviceData.setServiceType(serviceProps.getProperty(ServicePropertyNames.COMPONENT_TYPE_NAME));
+ serviceData.setServiceType(serviceProps.getProperty(ServicePropertyNames.COMPONENT_TYPE_NAME));
+
serviceData.setRoutingId(serviceProps.getProperty(ServicePropertyNames.SERVICE_ROUTING_ID));
serviceData.setInstanceName(serviceProps.getProperty(ServicePropertyNames.INSTANCE_NAME));
// Create ServiceRegistryBinding and register