Author: rareddy Date: 2009-02-26 15:52:47 -0500 (Thu, 26 Feb 2009) New Revision: 511 Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarURLConnection.java trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.java trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java trunk/embedded/src/main/resources/jboss-cache-configuration.xml trunk/embedded/src/test/resources/jboss-cache-configuration.xml trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModule.java trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java Log: Replacing federate name with teiid Modified: trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java =================================================================== --- trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/cache-jbosscache/src/main/java/com/metamatrix/cache/jboss/JBossCacheFactory.java 2009-02-26 20:52:47 UTC (rev 511) @@ -61,7 +61,7 @@ try { CacheJmxWrapperMBean wrapper = new CacheJmxWrapper(cacheStore); MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - this.jmxName = new ObjectName("Federate:service=JBossCache,name=cache"); //$NON-NLS-1$ + this.jmxName = new ObjectName("Teiid:service=JBossCache,name=cache"); //$NON-NLS-1$ mbs.registerMBean(wrapper, this.jmxName); wrapper.create(); wrapper.start(); @@ -78,7 +78,7 @@ */ public Cache get(Type type, CacheConfiguration config) { if (!destroyed) { - Node cacheRoot = this.cacheStore.getRoot().addChild(Fqn.fromString("Federate")); //$NON-NLS-1$ + Node cacheRoot = this.cacheStore.getRoot().addChild(Fqn.fromString("Teiid")); //$NON-NLS-1$ Node node = cacheRoot.addChild(Fqn.fromString(type.location())); Modified: trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarURLConnection.java =================================================================== --- trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarURLConnection.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-core/src/main/java/com/metamatrix/common/protocol/jar/JarURLConnection.java 2009-02-26 20:52:47 UTC (rev 511) @@ -45,10 +45,10 @@ /** * Jar protocol connection class. The class extends the JDK provided JarURLConnection factory. - * However Jar protocol can not understand the federate specific protocols like mmfile, mmrofile etc. + * However Jar protocol can not understand the teiid specific protocols like mmfile, mmrofile etc. * The issue is if you can register application specific protocols during start-up * using system properties the bulit in JAR protocol understands those protocols. - * However in the Federate model this need to work by just dropping in in any + * However in the Teiid model this need to work by just dropping in in any * container. This handler will be called for any class loaders registered * with {@link MetaMatrixURLStreamHandlerFactory}, so that they understand the application specific protocols. */ Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/config/CurrentConfiguration.java 2009-02-26 20:52:47 UTC (rev 511) @@ -92,7 +92,7 @@ public String getClusterName() throws ConfigurationException { Properties props = getResourceProperties(ResourceNames.JGROUPS); - return props.getProperty(CLUSTER_NAME, "Federate-Cluster"); //$NON-NLS-1$ + return props.getProperty(CLUSTER_NAME, "Teiid-Cluster"); //$NON-NLS-1$ } /** Modified: trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/util/VMNaming.java 2009-02-26 20:52:47 UTC (rev 511) @@ -123,7 +123,7 @@ try { nvalue = InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { - nvalue = "federate-system"; //$NON-NLS-1$ + nvalue = "teiid-system"; //$NON-NLS-1$ } } return nvalue; Modified: trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java =================================================================== --- trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/common-internal/src/main/java/com/metamatrix/common/vdb/api/VDBArchive.java 2009-02-26 20:52:47 UTC (rev 511) @@ -239,7 +239,7 @@ private void open() { if (!open) { - this.tempDirectory = new TempDirectory(FileUtils.TEMP_DIRECTORY+File.separator+"federate", System.currentTimeMillis(), RANDOM.nextLong()); //$NON-NLS-1$ + this.tempDirectory = new TempDirectory(FileUtils.TEMP_DIRECTORY+File.separator+"teiid", System.currentTimeMillis(), RANDOM.nextLong()); //$NON-NLS-1$ this.tempDirectory.create(); open = true; } Modified: trunk/embedded/src/main/resources/jboss-cache-configuration.xml =================================================================== --- trunk/embedded/src/main/resources/jboss-cache-configuration.xml 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/embedded/src/main/resources/jboss-cache-configuration.xml 2009-02-26 20:52:47 UTC (rev 511) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <server> - <mbean code="org.jboss.cache.pojo.jmx.CacheJmxWrapper" name="jboss.cache:service=FederateCache"> + <mbean code="org.jboss.cache.pojo.jmx.CacheJmxWrapper" name="jboss.cache:service=TeiidCache"> <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> <attribute name="IsolationLevel">READ_COMMITTED</attribute> <attribute name="LockParentForChildInsertRemove">true</attribute> Modified: trunk/embedded/src/test/resources/jboss-cache-configuration.xml =================================================================== --- trunk/embedded/src/test/resources/jboss-cache-configuration.xml 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/embedded/src/test/resources/jboss-cache-configuration.xml 2009-02-26 20:52:47 UTC (rev 511) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <server> - <mbean code="org.jboss.cache.pojo.jmx.CacheJmxWrapper" name="jboss.cache:service=FederateCache"> + <mbean code="org.jboss.cache.pojo.jmx.CacheJmxWrapper" name="jboss.cache:service=TeiidCache"> <attribute name="TransactionManagerLookupClass">org.jboss.cache.transaction.GenericTransactionManagerLookup</attribute> <attribute name="IsolationLevel">READ_COMMITTED</attribute> <attribute name="LockParentForChildInsertRemove">true</attribute> @@ -39,7 +39,7 @@ <cacheloader> <class>org.jboss.cache.loader.FileCacheLoader</class> - <properties>location=./target/scratch/federate</properties> + <properties>location=./target/scratch/teiid</properties> <!--fetch the persistent state of a cache when joining a cluster--> <fetchPersistentState>true</fetchPersistentState> Modified: trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java =================================================================== --- trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/engine/src/main/java/com/metamatrix/dqp/internal/process/RequestWorkItem.java 2009-02-26 20:52:47 UTC (rev 511) @@ -271,7 +271,7 @@ if (this.transactionState == TransactionState.ACTIVE) { boolean end = true; /* - * FEDERATE-111 if we are done producing batches, then proactively close transactional + * TEIID-14 if we are done producing batches, then proactively close transactional * executions even ones that were intentionally kept alive. this may * break the read of a lob from a transactional source under a transaction * if the source does not support holding the clob open after commit Modified: trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/ChannelProvider.java 2009-02-26 20:52:47 UTC (rev 511) @@ -45,7 +45,7 @@ Channel c = this.channelMap.get(id); if (c == null) { try { - c = this.mux.createMuxChannel(id.toString(), "Federate"); //$NON-NLS-1$ + c = this.mux.createMuxChannel(id.toString(), "teiid"); //$NON-NLS-1$ this.channelMap.put(id, c); } catch (Exception e) { throw new MetaMatrixRuntimeException("Failed to create a Channel"); //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModule.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModule.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/HostControllerGuiceModule.java 2009-02-26 20:52:47 UTC (rev 511) @@ -72,7 +72,7 @@ try { systemName = CurrentConfiguration.getInstance().getClusterName(); } catch (ConfigurationException err) { - systemName = "Federate-Cluster"; //$NON-NLS-1$ + systemName = "Teiid-Cluster"; //$NON-NLS-1$ } Modified: trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/JGroupsProvider.java 2009-02-26 20:52:47 UTC (rev 511) @@ -104,7 +104,7 @@ // register the channel with the JMX server try { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); - ObjectName on = new ObjectName("Federate:service=JChannel,name=JGroups"); //$NON-NLS-1$ + ObjectName on = new ObjectName("Teiid:service=JChannel,name=JGroups"); //$NON-NLS-1$ mbs.registerMBean(new org.jgroups.jmx.JChannel(channel), on); } catch (MalformedObjectNameException e) { LogManager.logWarning(LogCommonConstants.CTX_CONFIG, "Failed to register JChannel to JMX"); //$NON-NLS-1$ Modified: trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java =================================================================== --- trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java 2009-02-26 20:34:03 UTC (rev 510) +++ trunk/server/src/main/java/com/metamatrix/server/ServerGuiceModule.java 2009-02-26 20:52:47 UTC (rev 511) @@ -75,7 +75,7 @@ try { systemName = CurrentConfiguration.getInstance().getClusterName(); } catch (ConfigurationException err) { - systemName = "Federate-Cluster"; //$NON-NLS-1$ + systemName = "Teiid-Cluster"; //$NON-NLS-1$ } bindConstant().annotatedWith(Names.named(Configuration.HOSTNAME)).to(host.getFullName());