diff --git a/NOTICE.txt b/NOTICE.txt index 6756033d5a..81f986289d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -4,7 +4,4 @@ Copyright 2009 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -This product includes software developed by The Groovy community -(http://groovy.codehaus.org/). -Copyright 2003-2007 The respective authors and developers. Developers and Contributors are listed in the project POM file diff --git a/conf/storage-conf.xml b/conf/storage-conf.xml index 3865f8424d..3728ade26d 100644 --- a/conf/storage-conf.xml +++ b/conf/storage-conf.xml @@ -138,7 +138,6 @@ /var/cassandra/data - /var/cassandra/callouts /var/cassandra/bootstrap /var/cassandra/staging diff --git a/lib/groovy-1.5.6.jar b/lib/groovy-1.5.6.jar deleted file mode 100644 index 8f61940d7f..0000000000 Binary files a/lib/groovy-1.5.6.jar and /dev/null differ diff --git a/lib/licenses/groovy-1.5.6.jar.LICENSE b/lib/licenses/groovy-1.5.6.jar.LICENSE deleted file mode 100644 index 7a4a3ea242..0000000000 --- a/lib/licenses/groovy-1.5.6.jar.LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 33c426ca73..743bb7ad75 100644 --- a/pom.xml +++ b/pom.xml @@ -180,11 +180,6 @@ antlr-runtime 3.1.3 - - org.codehaus.groovy - groovy - 1.5.6 - com.google.collections google-collections diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 91e35ef151..90166761fa 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -113,8 +113,6 @@ public class DatabaseDescriptor * high throughput on reads but at the cost of consistency. */ private static boolean doConsistencyCheck_ = true; - /* Callout directories */ - private static String calloutLocation_; /* Job Jar Location */ private static String jobJarFileLocation_; /* Address where to run the job tracker */ @@ -222,9 +220,6 @@ public class DatabaseDescriptor throw new ConfigurationException("Invalid endpointsnitch class " + endPointSnitchClassName); } - /* Callout location */ - calloutLocation_ = xmlUtils.getNodeValue("/Storage/CalloutLocation"); - /* JobTracker address */ jobTrackerHost_ = xmlUtils.getNodeValue("/Storage/JobTrackerHost"); @@ -673,11 +668,6 @@ public class DatabaseDescriptor return replicaPlacementStrategyClass_; } - public static String getCalloutLocation() - { - return calloutLocation_; - } - public static String getJobTrackerAddress() { return jobTrackerHost_; diff --git a/src/java/org/apache/cassandra/db/CalloutDeployMessage.java b/src/java/org/apache/cassandra/db/CalloutDeployMessage.java deleted file mode 100644 index 8b15492cae..0000000000 --- a/src/java/org/apache/cassandra/db/CalloutDeployMessage.java +++ /dev/null @@ -1,89 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.db; - -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; - -import org.apache.cassandra.io.ICompactSerializer; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.service.StorageService; - - -public class CalloutDeployMessage -{ - private static ICompactSerializer serializer_; - - static - { - serializer_ = new CalloutDeployMessageSerializer(); - } - - public static ICompactSerializer serializer() - { - return serializer_; - } - - public static Message getCalloutDeployMessage(CalloutDeployMessage cdMessage) throws IOException - { - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - DataOutputStream dos = new DataOutputStream(bos); - serializer_.serialize(cdMessage, dos); - Message message = new Message(StorageService.getLocalStorageEndPoint(), "", StorageService.calloutDeployVerbHandler_, bos.toByteArray()); - return message; - } - - /* Name of the callout */ - private String callout_; - /* The actual procedure */ - private String script_; - - public CalloutDeployMessage(String callout, String script) - { - callout_ = callout; - script_ = script; - } - - String getCallout() - { - return callout_; - } - - String getScript() - { - return script_; - } -} - -class CalloutDeployMessageSerializer implements ICompactSerializer -{ - public void serialize(CalloutDeployMessage cdMessage, DataOutputStream dos) throws IOException - { - dos.writeUTF(cdMessage.getCallout()); - dos.writeUTF(cdMessage.getScript()); - } - - public CalloutDeployMessage deserialize(DataInputStream dis) throws IOException - { - String callout = dis.readUTF(); - String script = dis.readUTF(); - return new CalloutDeployMessage(callout, script); - } -} diff --git a/src/java/org/apache/cassandra/db/CalloutDeployVerbHandler.java b/src/java/org/apache/cassandra/db/CalloutDeployVerbHandler.java deleted file mode 100644 index 3c50b720c7..0000000000 --- a/src/java/org/apache/cassandra/db/CalloutDeployVerbHandler.java +++ /dev/null @@ -1,49 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.db; - -import java.io.IOException; - -import org.apache.cassandra.io.DataInputBuffer; -import org.apache.cassandra.net.IVerbHandler; -import org.apache.cassandra.net.Message; -import org.apache.cassandra.utils.LogUtil; -import org.apache.log4j.Logger; - - -public class CalloutDeployVerbHandler implements IVerbHandler -{ - private static Logger logger_ = Logger.getLogger(CalloutDeployVerbHandler.class); - - public void doVerb(Message message) - { - byte[] bytes = message.getMessageBody(); - DataInputBuffer bufIn = new DataInputBuffer(); - bufIn.reset(bytes, bytes.length); - try - { - CalloutDeployMessage cdMessage = CalloutDeployMessage.serializer().deserialize(bufIn); - /* save the callout to callout cache and to disk. */ - CalloutManager.instance().addCallout( cdMessage.getCallout(), cdMessage.getScript() ); - } - catch ( IOException ex ) - { - logger_.warn(LogUtil.throwableToString(ex)); - } - } -} diff --git a/src/java/org/apache/cassandra/db/CalloutManager.java b/src/java/org/apache/cassandra/db/CalloutManager.java deleted file mode 100644 index a7e6a9b1d0..0000000000 --- a/src/java/org/apache/cassandra/db/CalloutManager.java +++ /dev/null @@ -1,211 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.cassandra.db; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import javax.script.Bindings; -import javax.script.Invocable; -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.Compilable; -import javax.script.CompiledScript; -import javax.script.ScriptException; -import javax.script.SimpleBindings; - -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.procedures.GroovyScriptRunner; -import org.apache.cassandra.utils.LogUtil; -import org.apache.cassandra.utils.FileUtils; - -import org.apache.log4j.Logger; - -public class CalloutManager -{ - private final static Logger logger_ = Logger.getLogger(CalloutManager.class); - private static final String extn_ = ".groovy"; - /* Used to lock the factory for creation of CalloutManager instance */ - private static Lock createLock_ = new ReentrantLock(); - /* An instance of the CalloutManager */ - private static CalloutManager instance_; - - public static CalloutManager instance() - { - if ( instance_ == null ) - { - CalloutManager.createLock_.lock(); - try - { - if ( instance_ == null ) - { - instance_ = new CalloutManager(); - } - } - finally - { - CalloutManager.createLock_.unlock(); - } - } - return instance_; - } - - /* Map containing the name of callout as key and the callout script as value */ - private Map calloutCache_ = new HashMap(); - /* The Groovy Script compiler instance */ - private Compilable compiler_; - /* The Groovy script invokable instance */ - private Invocable invokable_; - - private CalloutManager() - { - ScriptEngineManager scriptManager = new ScriptEngineManager(); - ScriptEngine groovyEngine = scriptManager.getEngineByName("groovy"); - compiler_ = (Compilable)groovyEngine; - invokable_ = (Invocable)groovyEngine; - } - - /** - * Compile the script and cache the compiled script. - * @param script to be compiled - * @throws ScriptException - */ - private void compileAndCache(String scriptId, String script) throws ScriptException - { - if ( compiler_ != null ) - { - CompiledScript compiledScript = compiler_.compile(script); - calloutCache_.put(scriptId, compiledScript); - } - } - - /** - * Invoked on start up to load all the stored callouts, compile - * and cache them. - * - * @throws IOException - */ - public void onStart() throws IOException - { - String location = DatabaseDescriptor.getCalloutLocation(); - if ( location == null ) - return; - - FileUtils.createDirectory(location); - - File[] files = new File(location).listFiles(); - - for ( File file : files ) - { - String f = file.getName(); - /* Get the callout name from the file */ - String callout = f.split(extn_)[0]; - FileInputStream fis = new FileInputStream(file); - byte[] bytes = new byte[fis.available()]; - fis.read(bytes); - fis.close(); - /* cache the callout after compiling it */ - try - { - compileAndCache(callout, new String(bytes)); - } - catch ( ScriptException ex ) - { - logger_.warn(LogUtil.throwableToString(ex)); - } - } - } - - /** - * Store the callout in cache and write it out - * to disk. - * @param callout the name of the callout - * @param script actual implementation of the callout - */ - public void addCallout(String callout, String script) throws IOException - { - /* cache the script */ - /* cache the callout after compiling it */ - try - { - compileAndCache(callout, script); - } - catch ( ScriptException ex ) - { - logger_.warn(LogUtil.throwableToString(ex)); - } - /* save the script to disk */ - String scriptFile = DatabaseDescriptor.getCalloutLocation() + File.separator + callout + extn_; - File file = new File(scriptFile); - if ( file.exists() ) - { - if (logger_.isDebugEnabled()) - logger_.debug("Deleting the old script file ..."); - file.delete(); - } - FileOutputStream fos = new FileOutputStream(scriptFile); - fos.write(script.getBytes()); - fos.close(); - } - - /** - * Remove the registered callout and delete the - * script on the disk. - * @param callout to be removed - */ - public void removeCallout(String callout) - { - /* remove the script from cache */ - calloutCache_.remove(callout); - String scriptFile = DatabaseDescriptor.getCalloutLocation() + File.separator + callout + ".grv"; - File file = new File(scriptFile); - file.delete(); - } - - /** - * Execute the specified callout. - * @param callout to be executed. - * @param args arguments to be passed to the callouts. - */ - public Object executeCallout(String callout, Object ... args) - { - Object result = null; - CompiledScript script = calloutCache_.get(callout); - if ( script != null ) - { - try - { - Bindings binding = new SimpleBindings(); - binding.put("args", args); - result = script.eval(binding); - } - catch(ScriptException ex) - { - logger_.warn(LogUtil.throwableToString(ex)); - } - } - return result; - } -} diff --git a/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java b/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java index 6df394d28d..e69de29bb2 100644 --- a/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java +++ b/src/java/org/apache/cassandra/procedures/GroovyScriptRunner.java @@ -1,31 +0,0 @@ -/* -* Licensed to the Apache Software Foundation (ASF) under one -* or more contributor license agreements. See the NOTICE file -* distributed with this work for additional information -* regarding copyright ownership. The ASF licenses this file -* to you under the Apache License, Version 2.0 (the -* "License"); you may not use this file except in compliance -* with the License. You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, -* software distributed under the License is distributed on an -* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -* KIND, either express or implied. See the License for the -* specific language governing permissions and limitations -* under the License. -*/ -package org.apache.cassandra.procedures; - -import groovy.lang.GroovyShell; - -public class GroovyScriptRunner -{ - private static GroovyShell groovyShell_ = new GroovyShell(); - - public static String evaluateString(String script) - { - return groovyShell_.evaluate(script).toString(); - } -} diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index a3111b63ef..97bc5ac6a1 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -36,7 +36,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.db.Table; import org.apache.cassandra.db.RecoveryManager; -import org.apache.cassandra.db.CalloutManager; /** * This class supports two methods for creating a Cassandra node daemon, @@ -77,8 +76,6 @@ public class CassandraDaemon }); // initialize stuff - CalloutManager.instance().onStart(); - Set tables = DatabaseDescriptor.getTableToColumnFamilyMap().keySet(); for (String table : tables) { diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 5d6c3ef192..03b6bba61b 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -76,7 +76,6 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto public final static String dataFileVerbHandler_ = "DATA-FILE-VERB-HANDLER"; public final static String mbrshipCleanerVerbHandler_ = "MBRSHIP-CLEANER-VERB-HANDLER"; public final static String bsMetadataVerbHandler_ = "BS-METADATA-VERB-HANDLER"; - public final static String calloutDeployVerbHandler_ = "CALLOUT-DEPLOY-VERB-HANDLER"; public final static String rangeVerbHandler_ = "RANGE-VERB-HANDLER"; public static enum ConsistencyLevel @@ -252,7 +251,6 @@ public final class StorageService implements IEndPointStateChangeSubscriber, Sto MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.dataFileVerbHandler_, new DataFileVerbHandler() ); MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.mbrshipCleanerVerbHandler_, new MembershipCleanerVerbHandler() ); MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.bsMetadataVerbHandler_, new BootstrapMetadataVerbHandler() ); - MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.calloutDeployVerbHandler_, new CalloutDeployVerbHandler() ); MessagingService.getMessagingInstance().registerVerbHandlers(StorageService.rangeVerbHandler_, new RangeVerbHandler()); /* register the stage for the mutations */ diff --git a/test/conf/storage-conf.xml b/test/conf/storage-conf.xml index e0ac28fc0c..20f33778cd 100644 --- a/test/conf/storage-conf.xml +++ b/test/conf/storage-conf.xml @@ -37,7 +37,6 @@ build/test/cassandra/data - build/test/cassandra/callouts build/test/cassandra/bootstrap build/test/cassandra/staging 1