diff --git a/broker/appengine/module/MOD-INF/module.properties b/broker/appengine/module/MOD-INF/module.properties
index cf4498b76..26230ac34 100644
--- a/broker/appengine/module/MOD-INF/module.properties
+++ b/broker/appengine/module/MOD-INF/module.properties
@@ -1,4 +1,4 @@
name = broker
-description = Google App Engine implementation of Gridworks Broker
-module-impl = com.google.gridworks.broker.AppEngineGridworksBrokerImpl
+description = Google App Engine implementation of Refine Broker
+module-impl = com.google.refine.broker.AppEngineRefineBrokerImpl
templating = false
diff --git a/broker/appengine/src/com/google/refine/broker/AppEngineGridworksBrokerImpl.java b/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
similarity index 99%
rename from broker/appengine/src/com/google/refine/broker/AppEngineGridworksBrokerImpl.java
rename to broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
index f583e9d31..2cd59180b 100644
--- a/broker/appengine/src/com/google/refine/broker/AppEngineGridworksBrokerImpl.java
+++ b/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
@@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory;
import com.google.appengine.api.datastore.Text;
import com.google.refine.appengine.AppEngineClientConnectionManager;
-import com.google.refine.broker.GridworksBroker;
+import com.google.refine.broker.RefineBroker;
-public class AppEngineGridworksBrokerImpl extends GridworksBroker {
+public class AppEngineRefineBrokerImpl extends RefineBroker {
protected static final Logger logger = LoggerFactory.getLogger("gridworks.broker.appengine");
diff --git a/broker/core/IDEs/eclipse/GridworksBrokerTests.launch b/broker/core/IDEs/eclipse/GridworksBrokerTests.launch
index 077db83a3..f5b4ad810 100644
--- a/broker/core/IDEs/eclipse/GridworksBrokerTests.launch
+++ b/broker/core/IDEs/eclipse/GridworksBrokerTests.launch
@@ -7,10 +7,10 @@
-
+
-
+
diff --git a/broker/core/module/MOD-INF/module.properties b/broker/core/module/MOD-INF/module.properties
index a4778f16d..d6b2fe052 100644
--- a/broker/core/module/MOD-INF/module.properties
+++ b/broker/core/module/MOD-INF/module.properties
@@ -1,4 +1,4 @@
name = broker
-description = Local Gridworks Broker
-module-impl = com.google.gridworks.broker.GridworksBrokerImpl
+description = Local Refine Broker
+module-impl = com.google.refine.broker.RefineBrokerImpl
templating = false
diff --git a/broker/core/src/com/google/refine/broker/GridworksBroker.java b/broker/core/src/com/google/refine/broker/RefineBroker.java
similarity index 99%
rename from broker/core/src/com/google/refine/broker/GridworksBroker.java
rename to broker/core/src/com/google/refine/broker/RefineBroker.java
index 6052b98f3..a11bafbad 100644
--- a/broker/core/src/com/google/refine/broker/GridworksBroker.java
+++ b/broker/core/src/com/google/refine/broker/RefineBroker.java
@@ -43,7 +43,7 @@ import edu.mit.simile.butterfly.ButterflyModuleImpl;
* to extend this abstract class and implement the services that are called via HTTP.
*
*/
-public abstract class GridworksBroker extends ButterflyModuleImpl {
+public abstract class RefineBroker extends ButterflyModuleImpl {
static final public String GET_STATE = "get_state";
static final public String EXPIRE = "expire";
diff --git a/broker/core/src/com/google/refine/broker/GridworksBrokerImpl.java b/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java
similarity index 99%
rename from broker/core/src/com/google/refine/broker/GridworksBrokerImpl.java
rename to broker/core/src/com/google/refine/broker/RefineBrokerImpl.java
index 8b656513f..11ae4522b 100644
--- a/broker/core/src/com/google/refine/broker/GridworksBrokerImpl.java
+++ b/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java
@@ -32,7 +32,7 @@ import com.sleepycat.persist.model.Entity;
import com.sleepycat.persist.model.PrimaryKey;
import com.sleepycat.persist.model.SecondaryKey;
-public class GridworksBrokerImpl extends GridworksBroker {
+public class RefineBrokerImpl extends RefineBroker {
protected static final Logger logger = LoggerFactory.getLogger("gridworks.broker.local");
diff --git a/broker/core/tests/src/com/google/refine/broker/tests/GridworksBrokerTests.java b/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java
similarity index 96%
rename from broker/core/tests/src/com/google/refine/broker/tests/GridworksBrokerTests.java
rename to broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java
index a4469985d..a17c4d095 100644
--- a/broker/core/tests/src/com/google/refine/broker/tests/GridworksBrokerTests.java
+++ b/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java
@@ -1,6 +1,6 @@
package com.google.refine.broker.tests;
-import static com.google.refine.broker.GridworksBroker.*;
+import static com.google.refine.broker.RefineBroker.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -29,10 +29,10 @@ import org.testng.annotations.BeforeSuite;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import com.google.refine.broker.GridworksBroker;
-import com.google.refine.broker.GridworksBrokerImpl;
+import com.google.refine.broker.RefineBroker;
+import com.google.refine.broker.RefineBrokerImpl;
-public class GridworksBrokerTests {
+public class RefineBrokerTests {
Logger logger;
File data;
@@ -53,7 +53,7 @@ public class GridworksBrokerTests {
// ------------------------------------------------------------------------------------
ServletConfig config = null;
- GridworksBroker broker = null;
+ RefineBroker broker = null;
@BeforeTest public void test_init() throws Exception {
logger = LoggerFactory.getLogger(this.getClass());
@@ -61,7 +61,7 @@ public class GridworksBrokerTests {
when(config.getInitParameter("gridworks.data")).thenReturn(data.getAbsolutePath());
when(config.getInitParameter("gridworks.development")).thenReturn("true");
- broker = new GridworksBrokerImpl();
+ broker = new RefineBrokerImpl();
broker.init(config);
}
@@ -406,15 +406,15 @@ public class GridworksBrokerTests {
Assert.assertEquals(o.get(name), value);
}
- private JSONObject success(GridworksBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
+ private JSONObject success(RefineBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
return call(true, broker, request, response, service, params);
}
- private JSONObject failure(GridworksBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
+ private JSONObject failure(RefineBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
return call(false, broker, request, response, service, params);
}
- private JSONObject call(boolean successful, GridworksBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
+ private JSONObject call(boolean successful, RefineBroker broker, HttpServletRequest request, HttpServletResponse response, String service, String... params) throws Exception {
if (params != null) {
for (int i = 0; i < params.length; ) {
String name = params[i++];
diff --git a/gridworks b/gridworks
index aa133322f..e18451ca1 100755
--- a/gridworks
+++ b/gridworks
@@ -622,7 +622,7 @@ run() {
CLASSPATH="$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_LIB_DIR/*"
- RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Gridworks"
+ RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
#echo "$RUN_CMD"
#echo ""
@@ -674,7 +674,7 @@ broker_run() {
CLASSPATH="$GRIDWORKS_CLASSES_DIR${SEP}$GRIDWORKS_LIB_DIR/*"
- RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Gridworks"
+ RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.google.refine.Refine"
#echo "$RUN_CMD"
#echo ""
diff --git a/gridworks.bat b/gridworks.bat
index 7b7ad6de5..a2c4b6c54 100644
--- a/gridworks.bat
+++ b/gridworks.bat
@@ -159,7 +159,7 @@ if ""%ACTION%"" == ""run"" goto doRun
:doRun
set CLASSPATH="%GRIDWORKS_CLASSES_DIR%;%GRIDWORKS_LIB_DIR%\*"
-"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%GRIDWORKS_LIB_DIR%/native/windows com.google.refine.Gridworks
+"%JAVA_HOME%\bin\java.exe" -cp %CLASSPATH% %OPTS% -Djava.library.path=%GRIDWORKS_LIB_DIR%/native/windows com.google.refine.Refine
goto end
:doAnt
diff --git a/main/src/com/google/refine/GridworksServlet.java b/main/src/com/google/refine/RefineServlet.java
similarity index 98%
rename from main/src/com/google/refine/GridworksServlet.java
rename to main/src/com/google/refine/RefineServlet.java
index c25543e8d..6e3cc5243 100644
--- a/main/src/com/google/refine/GridworksServlet.java
+++ b/main/src/com/google/refine/RefineServlet.java
@@ -21,7 +21,7 @@ import com.google.refine.io.FileProjectManager;
import edu.mit.simile.butterfly.Butterfly;
import edu.mit.simile.butterfly.ButterflyModule;
-public class GridworksServlet extends Butterfly {
+public class RefineServlet extends Butterfly {
static private final String VERSION = "1.5";
@@ -29,7 +29,7 @@ public class GridworksServlet extends Butterfly {
private static final String JAVAX_SERVLET_CONTEXT_TEMPDIR = "javax.servlet.context.tempdir";
- static private GridworksServlet s_singleton;
+ static private RefineServlet s_singleton;
static private File s_dataDir;
static final private Map commands = new HashMap();
diff --git a/main/src/com/google/refine/commands/Command.java b/main/src/com/google/refine/commands/Command.java
index 3a44ddc0c..a0c0ab480 100644
--- a/main/src/com/google/refine/commands/Command.java
+++ b/main/src/com/google/refine/commands/Command.java
@@ -16,7 +16,7 @@ import org.json.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.Jsonizable;
import com.google.refine.ProjectManager;
import com.google.refine.ProjectMetadata;
@@ -34,9 +34,9 @@ public abstract class Command {
final static protected Logger logger = LoggerFactory.getLogger("command");
- protected GridworksServlet servlet;
+ protected RefineServlet servlet;
- public void init(GridworksServlet servlet) {
+ public void init(RefineServlet servlet) {
this.servlet = servlet;
}
diff --git a/main/src/com/google/refine/history/History.java b/main/src/com/google/refine/history/History.java
index 25df89cc8..b0b1e8417 100644
--- a/main/src/com/google/refine/history/History.java
+++ b/main/src/com/google/refine/history/History.java
@@ -16,7 +16,7 @@ import java.util.Properties;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.Jsonizable;
import com.google.refine.ProjectManager;
import com.google.refine.model.Project;
@@ -68,7 +68,7 @@ public class History implements Jsonizable {
}
static public void writeOneChange(Writer writer, Change change, Properties options) throws IOException {
- writer.write(GridworksServlet.getVersion()); writer.write('\n');
+ writer.write(RefineServlet.getVersion()); writer.write('\n');
writer.write(change.getClass().getName()); writer.write('\n');
change.save(writer, options);
@@ -76,7 +76,7 @@ public class History implements Jsonizable {
@SuppressWarnings("unchecked")
static public Class extends Change> getChangeClass(String className) throws ClassNotFoundException {
- return (Class extends Change>) GridworksServlet.getClass(className);
+ return (Class extends Change>) RefineServlet.getClass(className);
}
protected long _projectID;
diff --git a/main/src/com/google/refine/model/Project.java b/main/src/com/google/refine/model/Project.java
index a38c58d2d..36cf9fb18 100644
--- a/main/src/com/google/refine/model/Project.java
+++ b/main/src/com/google/refine/model/Project.java
@@ -19,7 +19,7 @@ import org.json.JSONWriter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.ProjectManager;
import com.google.refine.ProjectMetadata;
import com.google.refine.history.History;
@@ -122,7 +122,7 @@ public class Project {
}
protected void saveToWriter(Writer writer, Properties options) throws IOException {
- writer.write(GridworksServlet.getVersion()); writer.write('\n');
+ writer.write(RefineServlet.getVersion()); writer.write('\n');
writer.write("columnModel=\n"); columnModel.save(writer, options);
writer.write("history=\n"); history.save(writer, options);
diff --git a/main/src/com/google/refine/preference/PreferenceStore.java b/main/src/com/google/refine/preference/PreferenceStore.java
index 988620ded..ed829160d 100644
--- a/main/src/com/google/refine/preference/PreferenceStore.java
+++ b/main/src/com/google/refine/preference/PreferenceStore.java
@@ -11,7 +11,7 @@ import org.json.JSONException;
import org.json.JSONObject;
import org.json.JSONWriter;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.Jsonizable;
public class PreferenceStore implements Jsonizable {
@@ -75,7 +75,7 @@ public class PreferenceStore implements Jsonizable {
try {
JSONObject obj2 = (JSONObject) o;
String className = obj2.getString("class");
- Class> klass = GridworksServlet.getClass(className);
+ Class> klass = RefineServlet.getClass(className);
Method method = klass.getMethod("load", JSONObject.class);
return method.invoke(null, obj2);
diff --git a/main/src/com/google/refine/util/FreebaseUtils.java b/main/src/com/google/refine/util/FreebaseUtils.java
index 3d8d46430..bf248a88b 100644
--- a/main/src/com/google/refine/util/FreebaseUtils.java
+++ b/main/src/com/google/refine/util/FreebaseUtils.java
@@ -27,7 +27,7 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.ProjectManager;
import com.google.refine.oauth.Credentials;
import com.google.refine.oauth.OAuthUtilities;
@@ -60,7 +60,7 @@ public class FreebaseUtils {
OAuthConsumer consumer = OAuthUtilities.getConsumer(credentials, provider);
HttpGet httpRequest = new HttpGet(getUserInfoURL(provider.getHost()));
- httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + GridworksServlet.getVersion());
+ httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + RefineServlet.getVersion());
// this is required by the Metaweb API to avoid XSS
httpRequest.setHeader("X-Requested-With", "1");
@@ -103,7 +103,7 @@ public class FreebaseUtils {
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, "UTF-8");
HttpPost httpRequest = new HttpPost(getMQLReadURL(provider.getHost()));
- httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + GridworksServlet.getVersion());
+ httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + RefineServlet.getVersion());
httpRequest.setEntity(entity);
// this is required by the Metaweb API to avoid XSS
@@ -129,7 +129,7 @@ public class FreebaseUtils {
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, "UTF-8");
HttpPost httpRequest = new HttpPost(getMQLWriteURL(provider.getHost()));
- httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + GridworksServlet.getVersion());
+ httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + RefineServlet.getVersion());
httpRequest.setEntity(entity);
// this is required by the Metaweb API to avoid XSS
@@ -188,7 +188,7 @@ public class FreebaseUtils {
UrlEncodedFormEntity entity = new UrlEncodedFormEntity(formparams, "UTF-8");
HttpPost httpRequest = new HttpPost(getFreeQUrl());
- httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + GridworksServlet.getVersion());
+ httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks " + RefineServlet.getVersion());
httpRequest.setEntity(entity);
HttpPost surrogateRequest = new HttpPost(getUserInfoURL(FREEBASE_HOST));
diff --git a/main/src/com/google/refine/util/Pool.java b/main/src/com/google/refine/util/Pool.java
index a6b30d11d..544eb05f2 100644
--- a/main/src/com/google/refine/util/Pool.java
+++ b/main/src/com/google/refine/util/Pool.java
@@ -15,7 +15,7 @@ import java.util.Map.Entry;
import org.json.JSONException;
import org.json.JSONWriter;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.Jsonizable;
import com.google.refine.model.Recon;
import com.google.refine.model.ReconCandidate;
@@ -62,7 +62,7 @@ public class Pool implements Jsonizable {
}
public void save(Writer writer) throws IOException {
- writer.write(GridworksServlet.getVersion()); writer.write('\n');
+ writer.write(RefineServlet.getVersion()); writer.write('\n');
Properties options = new Properties();
options.setProperty("mode", "save");
diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
index a5ba591c2..d5e645bb7 100644
--- a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
+++ b/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.never;
-public class ProjectManagerTests extends GridworksTest {
+public class ProjectManagerTests extends RefineTest {
ProjectManagerStub pm;
ProjectManagerStub SUT;
Project project;
diff --git a/main/tests/server/src/com/google/refine/tests/GridworksServletStub.java b/main/tests/server/src/com/google/refine/tests/RefineServletStub.java
similarity index 82%
rename from main/tests/server/src/com/google/refine/tests/GridworksServletStub.java
rename to main/tests/server/src/com/google/refine/tests/RefineServletStub.java
index 39f2b006f..155b37dee 100644
--- a/main/tests/server/src/com/google/refine/tests/GridworksServletStub.java
+++ b/main/tests/server/src/com/google/refine/tests/RefineServletStub.java
@@ -6,14 +6,14 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.refine.GridworksServlet;
+import com.google.refine.RefineServlet;
import com.google.refine.commands.Command;
/**
- * Exposes protected methods of com.google.refine.GridworksServlet as public for unit testing
+ * Exposes protected methods of com.google.refine.RefineServlet as public for unit testing
*
*/
-public class GridworksServletStub extends GridworksServlet {
+public class RefineServletStub extends RefineServlet {
//requirement of extending HttpServlet, not required for testing
private static final long serialVersionUID = 1L;
diff --git a/main/tests/server/src/com/google/refine/tests/GridworksServletTests.java b/main/tests/server/src/com/google/refine/tests/RefineServletTests.java
similarity index 89%
rename from main/tests/server/src/com/google/refine/tests/GridworksServletTests.java
rename to main/tests/server/src/com/google/refine/tests/RefineServletTests.java
index 41b406341..02f1aec0f 100644
--- a/main/tests/server/src/com/google/refine/tests/GridworksServletTests.java
+++ b/main/tests/server/src/com/google/refine/tests/RefineServletTests.java
@@ -20,7 +20,7 @@ import org.testng.annotations.Test;
import com.google.refine.commands.Command;
-public class GridworksServletTests extends GridworksTest {
+public class RefineServletTests extends RefineTest {
@BeforeTest
public void init() {
@@ -28,7 +28,7 @@ public class GridworksServletTests extends GridworksTest {
}
//System under test
- GridworksServletStub SUT = null;
+ RefineServletStub SUT = null;
//variables
final static private String TEST_COMMAND_NAME = "test-command";
@@ -50,7 +50,7 @@ public class GridworksServletTests extends GridworksTest {
response = mock(HttpServletResponse.class);
command = mock(Command.class);
- SUT = new GridworksServletStub();
+ SUT = new RefineServletStub();
SUT.insertCommand(TEST_COMMAND_NAME,command); //inject mock into command container
}
@@ -65,11 +65,11 @@ public class GridworksServletTests extends GridworksTest {
}
//-------------------AutoSaveTimerTask tests-----------
- //TODO would need to mock Timer and inject it into GridworksServlet. Also need to deal with ProjectManager.singleton
+ //TODO would need to mock Timer and inject it into RefineServlet. Also need to deal with ProjectManager.singleton
//-------------------init tests------------------------
- //TODO need to stub super.init(), mock Timer and inject it into GridworksServlet
+ //TODO need to stub super.init(), mock Timer and inject it into RefineServlet
//-------------------destroy tests---------------------
- //TODO need to mock Timer and inject it into GridworksServlet. Also need to deal with ProjectManager.singleton
+ //TODO need to mock Timer and inject it into RefineServlet. Also need to deal with ProjectManager.singleton
//--------------------doGet tests----------------------
@Test
diff --git a/main/tests/server/src/com/google/refine/tests/GridworksTest.java b/main/tests/server/src/com/google/refine/tests/RefineTest.java
similarity index 98%
rename from main/tests/server/src/com/google/refine/tests/GridworksTest.java
rename to main/tests/server/src/com/google/refine/tests/RefineTest.java
index 3f80e40ae..1bd8dedf6 100644
--- a/main/tests/server/src/com/google/refine/tests/GridworksTest.java
+++ b/main/tests/server/src/com/google/refine/tests/RefineTest.java
@@ -9,7 +9,7 @@ import com.google.refine.model.Column;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-public class GridworksTest {
+public class RefineTest {
protected Logger logger;
diff --git a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java b/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java
index f7eebb891..81be9e533 100644
--- a/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java
+++ b/main/tests/server/src/com/google/refine/tests/commands/CommandTests.java
@@ -20,9 +20,9 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectManager;
import com.google.refine.browsing.Engine;
import com.google.refine.model.Project;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class CommandTests extends GridworksTest {
+public class CommandTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java b/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java
index b8d4a07da..ac7a6a0b7 100644
--- a/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java
+++ b/main/tests/server/src/com/google/refine/tests/commands/util/CancelProcessesCommandTests.java
@@ -24,9 +24,9 @@ import com.google.refine.ProjectManager;
import com.google.refine.commands.history.CancelProcessesCommand;
import com.google.refine.model.Project;
import com.google.refine.process.ProcessManager;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class CancelProcessesCommandTests extends GridworksTest {
+public class CancelProcessesCommandTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
index 3e3a57b91..004258eda 100644
--- a/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/exporters/CsvExporterTests.java
@@ -23,9 +23,9 @@ import com.google.refine.model.Column;
import com.google.refine.model.ModelException;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class CsvExporterTests extends GridworksTest {
+public class CsvExporterTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
index 94bc48d93..ea9e384d9 100644
--- a/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/exporters/TsvExporterTests.java
@@ -23,9 +23,9 @@ import com.google.refine.model.Column;
import com.google.refine.model.ModelException;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class TsvExporterTests extends GridworksTest {
+public class TsvExporterTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java b/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
index 3f73542b7..6b990a3d3 100644
--- a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
+++ b/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java
@@ -18,10 +18,10 @@ import com.google.refine.ProjectMetadata;
import com.google.refine.history.History;
import com.google.refine.history.HistoryEntry;
import com.google.refine.model.Project;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class HistoryTests extends GridworksTest {
+public class HistoryTests extends RefineTest {
@BeforeTest
public void init() {
logger = LoggerFactory.getLogger(this.getClass());
diff --git a/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java b/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java
index 461ecf316..e38788b13 100644
--- a/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java
+++ b/main/tests/server/src/com/google/refine/tests/importers/ImporterUtilitiesTests.java
@@ -18,9 +18,9 @@ import com.google.refine.importers.ImporterUtilities;
import com.google.refine.model.Cell;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class ImporterUtilitiesTests extends GridworksTest {
+public class ImporterUtilitiesTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java
index ea5dc7f02..c2bafa9a3 100644
--- a/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/importers/RdfTripleImporterTests.java
@@ -12,10 +12,10 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectMetadata;
import com.google.refine.importers.RdfTripleImporter;
import com.google.refine.model.Project;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class RdfTripleImporterTests extends GridworksTest {
+public class RdfTripleImporterTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java
index 9be4c7b0a..7ff2eed04 100644
--- a/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/importers/TsvCsvImporterTests.java
@@ -21,9 +21,9 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectMetadata;
import com.google.refine.importers.TsvCsvImporter;
import com.google.refine.model.Project;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class TsvCsvImporterTests extends GridworksTest {
+public class TsvCsvImporterTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java b/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java
index f8ea90464..b931e6685 100644
--- a/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java
+++ b/main/tests/server/src/com/google/refine/tests/importers/XmlImportUtilitiesTests.java
@@ -23,10 +23,10 @@ import com.google.refine.importers.XmlImportUtilities.ImportColumnGroup;
import com.google.refine.importers.XmlImportUtilities.ImportRecord;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class XmlImportUtilitiesTests extends GridworksTest {
+public class XmlImportUtilitiesTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java
index e0c1a29e4..1b7806086 100644
--- a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java
+++ b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java
@@ -18,10 +18,10 @@ import com.google.refine.ProjectMetadata;
import com.google.refine.importers.XmlImporter;
import com.google.refine.model.Project;
import com.google.refine.model.Row;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
-public class XmlImporterTests extends GridworksTest {
+public class XmlImporterTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java b/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java
index a20b1cfaf..be88b4b05 100644
--- a/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java
+++ b/main/tests/server/src/com/google/refine/tests/util/ParsingUtilitiesTests.java
@@ -7,10 +7,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import com.google.refine.tests.GridworksTest;
+import com.google.refine.tests.RefineTest;
import com.google.refine.util.ParsingUtilities;
-public class ParsingUtilitiesTests extends GridworksTest {
+public class ParsingUtilitiesTests extends RefineTest {
@BeforeTest
public void init() {
diff --git a/main/webapp/WEB-INF/web.xml b/main/webapp/WEB-INF/web.xml
index 2d81222b2..9347c8de9 100644
--- a/main/webapp/WEB-INF/web.xml
+++ b/main/webapp/WEB-INF/web.xml
@@ -20,7 +20,7 @@
gridworks
- com.google.refine.GridworksServlet
+ com.google.refine.RefineServlet
diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js
index 518151a24..02497290e 100644
--- a/main/webapp/modules/core/MOD-INF/controller.js
+++ b/main/webapp/modules/core/MOD-INF/controller.js
@@ -12,94 +12,94 @@ var templatedFiles = {
};
function registerCommands() {
- var GS = Packages.com.google.refine.GridworksServlet;
+ var RS = Packages.com.google.refine.RefineServlet;
- GS.registerCommand(module, "create-project-from-upload", new Packages.com.google.refine.commands.project.CreateProjectCommand());
- GS.registerCommand(module, "import-project", new Packages.com.google.refine.commands.project.ImportProjectCommand());
- GS.registerCommand(module, "export-project", new Packages.com.google.refine.commands.project.ExportProjectCommand());
- GS.registerCommand(module, "export-rows", new Packages.com.google.refine.commands.project.ExportRowsCommand());
+ RS.registerCommand(module, "create-project-from-upload", new Packages.com.google.refine.commands.project.CreateProjectCommand());
+ RS.registerCommand(module, "import-project", new Packages.com.google.refine.commands.project.ImportProjectCommand());
+ RS.registerCommand(module, "export-project", new Packages.com.google.refine.commands.project.ExportProjectCommand());
+ RS.registerCommand(module, "export-rows", new Packages.com.google.refine.commands.project.ExportRowsCommand());
- GS.registerCommand(module, "get-project-metadata", new Packages.com.google.refine.commands.project.GetProjectMetadataCommand());
- GS.registerCommand(module, "get-all-project-metadata", new Packages.com.google.refine.commands.workspace.GetAllProjectMetadataCommand());
+ RS.registerCommand(module, "get-project-metadata", new Packages.com.google.refine.commands.project.GetProjectMetadataCommand());
+ RS.registerCommand(module, "get-all-project-metadata", new Packages.com.google.refine.commands.workspace.GetAllProjectMetadataCommand());
- GS.registerCommand(module, "delete-project", new Packages.com.google.refine.commands.project.DeleteProjectCommand());
- GS.registerCommand(module, "rename-project", new Packages.com.google.refine.commands.project.RenameProjectCommand());
+ RS.registerCommand(module, "delete-project", new Packages.com.google.refine.commands.project.DeleteProjectCommand());
+ RS.registerCommand(module, "rename-project", new Packages.com.google.refine.commands.project.RenameProjectCommand());
- GS.registerCommand(module, "get-models", new Packages.com.google.refine.commands.project.GetModelsCommand());
- GS.registerCommand(module, "get-rows", new Packages.com.google.refine.commands.row.GetRowsCommand());
- GS.registerCommand(module, "get-processes", new Packages.com.google.refine.commands.history.GetProcessesCommand());
- GS.registerCommand(module, "get-history", new Packages.com.google.refine.commands.history.GetHistoryCommand());
- GS.registerCommand(module, "get-operations", new Packages.com.google.refine.commands.history.GetOperationsCommand());
- GS.registerCommand(module, "get-columns-info", new Packages.com.google.refine.commands.column.GetColumnsInfoCommand());
- GS.registerCommand(module, "get-scatterplot", new Packages.com.google.refine.commands.browsing.GetScatterplotCommand());
+ RS.registerCommand(module, "get-models", new Packages.com.google.refine.commands.project.GetModelsCommand());
+ RS.registerCommand(module, "get-rows", new Packages.com.google.refine.commands.row.GetRowsCommand());
+ RS.registerCommand(module, "get-processes", new Packages.com.google.refine.commands.history.GetProcessesCommand());
+ RS.registerCommand(module, "get-history", new Packages.com.google.refine.commands.history.GetHistoryCommand());
+ RS.registerCommand(module, "get-operations", new Packages.com.google.refine.commands.history.GetOperationsCommand());
+ RS.registerCommand(module, "get-columns-info", new Packages.com.google.refine.commands.column.GetColumnsInfoCommand());
+ RS.registerCommand(module, "get-scatterplot", new Packages.com.google.refine.commands.browsing.GetScatterplotCommand());
- GS.registerCommand(module, "undo-redo", new Packages.com.google.refine.commands.history.UndoRedoCommand());
- GS.registerCommand(module, "apply-operations", new Packages.com.google.refine.commands.history.ApplyOperationsCommand());
- GS.registerCommand(module, "cancel-processes", new Packages.com.google.refine.commands.history.CancelProcessesCommand());
+ RS.registerCommand(module, "undo-redo", new Packages.com.google.refine.commands.history.UndoRedoCommand());
+ RS.registerCommand(module, "apply-operations", new Packages.com.google.refine.commands.history.ApplyOperationsCommand());
+ RS.registerCommand(module, "cancel-processes", new Packages.com.google.refine.commands.history.CancelProcessesCommand());
- GS.registerCommand(module, "compute-facets", new Packages.com.google.refine.commands.browsing.ComputeFacetsCommand());
- GS.registerCommand(module, "compute-clusters", new Packages.com.google.refine.commands.browsing.ComputeClustersCommand());
+ RS.registerCommand(module, "compute-facets", new Packages.com.google.refine.commands.browsing.ComputeFacetsCommand());
+ RS.registerCommand(module, "compute-clusters", new Packages.com.google.refine.commands.browsing.ComputeClustersCommand());
- GS.registerCommand(module, "edit-one-cell", new Packages.com.google.refine.commands.cell.EditOneCellCommand());
- GS.registerCommand(module, "text-transform", new Packages.com.google.refine.commands.cell.TextTransformCommand());
- GS.registerCommand(module, "mass-edit", new Packages.com.google.refine.commands.cell.MassEditCommand());
- GS.registerCommand(module, "join-multi-value-cells", new Packages.com.google.refine.commands.cell.JoinMultiValueCellsCommand());
- GS.registerCommand(module, "split-multi-value-cells", new Packages.com.google.refine.commands.cell.SplitMultiValueCellsCommand());
- GS.registerCommand(module, "fill-down", new Packages.com.google.refine.commands.cell.FillDownCommand());
- GS.registerCommand(module, "blank-down", new Packages.com.google.refine.commands.cell.BlankDownCommand());
- GS.registerCommand(module, "transpose-columns-into-rows", new Packages.com.google.refine.commands.cell.TransposeColumnsIntoRowsCommand());
- GS.registerCommand(module, "transpose-rows-into-columns", new Packages.com.google.refine.commands.cell.TransposeRowsIntoColumnsCommand());
+ RS.registerCommand(module, "edit-one-cell", new Packages.com.google.refine.commands.cell.EditOneCellCommand());
+ RS.registerCommand(module, "text-transform", new Packages.com.google.refine.commands.cell.TextTransformCommand());
+ RS.registerCommand(module, "mass-edit", new Packages.com.google.refine.commands.cell.MassEditCommand());
+ RS.registerCommand(module, "join-multi-value-cells", new Packages.com.google.refine.commands.cell.JoinMultiValueCellsCommand());
+ RS.registerCommand(module, "split-multi-value-cells", new Packages.com.google.refine.commands.cell.SplitMultiValueCellsCommand());
+ RS.registerCommand(module, "fill-down", new Packages.com.google.refine.commands.cell.FillDownCommand());
+ RS.registerCommand(module, "blank-down", new Packages.com.google.refine.commands.cell.BlankDownCommand());
+ RS.registerCommand(module, "transpose-columns-into-rows", new Packages.com.google.refine.commands.cell.TransposeColumnsIntoRowsCommand());
+ RS.registerCommand(module, "transpose-rows-into-columns", new Packages.com.google.refine.commands.cell.TransposeRowsIntoColumnsCommand());
- GS.registerCommand(module, "add-column", new Packages.com.google.refine.commands.column.AddColumnCommand());
- GS.registerCommand(module, "remove-column", new Packages.com.google.refine.commands.column.RemoveColumnCommand());
- GS.registerCommand(module, "rename-column", new Packages.com.google.refine.commands.column.RenameColumnCommand());
- GS.registerCommand(module, "move-column", new Packages.com.google.refine.commands.column.MoveColumnCommand());
- GS.registerCommand(module, "split-column", new Packages.com.google.refine.commands.column.SplitColumnCommand());
- GS.registerCommand(module, "extend-data", new Packages.com.google.refine.commands.column.ExtendDataCommand());
- GS.registerCommand(module, "add-column-by-fetching-urls", new Packages.com.google.refine.commands.column.AddColumnByFetchingURLsCommand());
- GS.registerCommand(module, "reorder-columns", new Packages.com.google.refine.commands.column.ReorderColumnsCommand());
+ RS.registerCommand(module, "add-column", new Packages.com.google.refine.commands.column.AddColumnCommand());
+ RS.registerCommand(module, "remove-column", new Packages.com.google.refine.commands.column.RemoveColumnCommand());
+ RS.registerCommand(module, "rename-column", new Packages.com.google.refine.commands.column.RenameColumnCommand());
+ RS.registerCommand(module, "move-column", new Packages.com.google.refine.commands.column.MoveColumnCommand());
+ RS.registerCommand(module, "split-column", new Packages.com.google.refine.commands.column.SplitColumnCommand());
+ RS.registerCommand(module, "extend-data", new Packages.com.google.refine.commands.column.ExtendDataCommand());
+ RS.registerCommand(module, "add-column-by-fetching-urls", new Packages.com.google.refine.commands.column.AddColumnByFetchingURLsCommand());
+ RS.registerCommand(module, "reorder-columns", new Packages.com.google.refine.commands.column.ReorderColumnsCommand());
- GS.registerCommand(module, "denormalize", new Packages.com.google.refine.commands.row.DenormalizeCommand());
+ RS.registerCommand(module, "denormalize", new Packages.com.google.refine.commands.row.DenormalizeCommand());
- GS.registerCommand(module, "reconcile", new Packages.com.google.refine.commands.recon.ReconcileCommand());
- GS.registerCommand(module, "recon-match-best-candidates", new Packages.com.google.refine.commands.recon.ReconMatchBestCandidatesCommand());
- GS.registerCommand(module, "recon-mark-new-topics", new Packages.com.google.refine.commands.recon.ReconMarkNewTopicsCommand());
- GS.registerCommand(module, "recon-discard-judgments", new Packages.com.google.refine.commands.recon.ReconDiscardJudgmentsCommand());
- GS.registerCommand(module, "recon-match-specific-topic-to-cells", new Packages.com.google.refine.commands.recon.ReconMatchSpecificTopicCommand());
- GS.registerCommand(module, "recon-judge-one-cell", new Packages.com.google.refine.commands.recon.ReconJudgeOneCellCommand());
- GS.registerCommand(module, "recon-judge-similar-cells", new Packages.com.google.refine.commands.recon.ReconJudgeSimilarCellsCommand());
+ RS.registerCommand(module, "reconcile", new Packages.com.google.refine.commands.recon.ReconcileCommand());
+ RS.registerCommand(module, "recon-match-best-candidates", new Packages.com.google.refine.commands.recon.ReconMatchBestCandidatesCommand());
+ RS.registerCommand(module, "recon-mark-new-topics", new Packages.com.google.refine.commands.recon.ReconMarkNewTopicsCommand());
+ RS.registerCommand(module, "recon-discard-judgments", new Packages.com.google.refine.commands.recon.ReconDiscardJudgmentsCommand());
+ RS.registerCommand(module, "recon-match-specific-topic-to-cells", new Packages.com.google.refine.commands.recon.ReconMatchSpecificTopicCommand());
+ RS.registerCommand(module, "recon-judge-one-cell", new Packages.com.google.refine.commands.recon.ReconJudgeOneCellCommand());
+ RS.registerCommand(module, "recon-judge-similar-cells", new Packages.com.google.refine.commands.recon.ReconJudgeSimilarCellsCommand());
- GS.registerCommand(module, "annotate-one-row", new Packages.com.google.refine.commands.row.AnnotateOneRowCommand());
- GS.registerCommand(module, "annotate-rows", new Packages.com.google.refine.commands.row.AnnotateRowsCommand());
- GS.registerCommand(module, "remove-rows", new Packages.com.google.refine.commands.row.RemoveRowsCommand());
- GS.registerCommand(module, "reorder-rows", new Packages.com.google.refine.commands.row.ReorderRowsCommand());
+ RS.registerCommand(module, "annotate-one-row", new Packages.com.google.refine.commands.row.AnnotateOneRowCommand());
+ RS.registerCommand(module, "annotate-rows", new Packages.com.google.refine.commands.row.AnnotateRowsCommand());
+ RS.registerCommand(module, "remove-rows", new Packages.com.google.refine.commands.row.RemoveRowsCommand());
+ RS.registerCommand(module, "reorder-rows", new Packages.com.google.refine.commands.row.ReorderRowsCommand());
- GS.registerCommand(module, "save-protograph", new Packages.com.google.refine.commands.freebase.SaveProtographCommand());
+ RS.registerCommand(module, "save-protograph", new Packages.com.google.refine.commands.freebase.SaveProtographCommand());
- GS.registerCommand(module, "get-expression-language-info", new Packages.com.google.refine.commands.expr.GetExpressionLanguageInfoCommand());
- GS.registerCommand(module, "get-expression-history", new Packages.com.google.refine.commands.expr.GetExpressionHistoryCommand());
- GS.registerCommand(module, "log-expression", new Packages.com.google.refine.commands.expr.LogExpressionCommand());
+ RS.registerCommand(module, "get-expression-language-info", new Packages.com.google.refine.commands.expr.GetExpressionLanguageInfoCommand());
+ RS.registerCommand(module, "get-expression-history", new Packages.com.google.refine.commands.expr.GetExpressionHistoryCommand());
+ RS.registerCommand(module, "log-expression", new Packages.com.google.refine.commands.expr.LogExpressionCommand());
- GS.registerCommand(module, "preview-expression", new Packages.com.google.refine.commands.expr.PreviewExpressionCommand());
- GS.registerCommand(module, "preview-extend-data", new Packages.com.google.refine.commands.column.PreviewExtendDataCommand());
- GS.registerCommand(module, "preview-protograph", new Packages.com.google.refine.commands.freebase.PreviewProtographCommand());
+ RS.registerCommand(module, "preview-expression", new Packages.com.google.refine.commands.expr.PreviewExpressionCommand());
+ RS.registerCommand(module, "preview-extend-data", new Packages.com.google.refine.commands.column.PreviewExtendDataCommand());
+ RS.registerCommand(module, "preview-protograph", new Packages.com.google.refine.commands.freebase.PreviewProtographCommand());
- GS.registerCommand(module, "guess-types-of-column", new Packages.com.google.refine.commands.freebase.GuessTypesOfColumnCommand());
+ RS.registerCommand(module, "guess-types-of-column", new Packages.com.google.refine.commands.freebase.GuessTypesOfColumnCommand());
- GS.registerCommand(module, "check-authorization", new Packages.com.google.refine.commands.auth.CheckAuthorizationCommand());
- GS.registerCommand(module, "authorize", new Packages.com.google.refine.commands.auth.AuthorizeCommand());
- GS.registerCommand(module, "deauthorize", new Packages.com.google.refine.commands.auth.DeAuthorizeCommand());
- GS.registerCommand(module, "user-badges", new Packages.com.google.refine.commands.auth.GetUserBadgesCommand());
+ RS.registerCommand(module, "check-authorization", new Packages.com.google.refine.commands.auth.CheckAuthorizationCommand());
+ RS.registerCommand(module, "authorize", new Packages.com.google.refine.commands.auth.AuthorizeCommand());
+ RS.registerCommand(module, "deauthorize", new Packages.com.google.refine.commands.auth.DeAuthorizeCommand());
+ RS.registerCommand(module, "user-badges", new Packages.com.google.refine.commands.auth.GetUserBadgesCommand());
- GS.registerCommand(module, "upload-data", new Packages.com.google.refine.commands.freebase.UploadDataCommand());
- GS.registerCommand(module, "import-qa-data", new Packages.com.google.refine.commands.freebase.ImportQADataCommand());
- GS.registerCommand(module, "mqlread", new Packages.com.google.refine.commands.freebase.MQLReadCommand());
- GS.registerCommand(module, "mqlwrite", new Packages.com.google.refine.commands.freebase.MQLWriteCommand());
+ RS.registerCommand(module, "upload-data", new Packages.com.google.refine.commands.freebase.UploadDataCommand());
+ RS.registerCommand(module, "import-qa-data", new Packages.com.google.refine.commands.freebase.ImportQADataCommand());
+ RS.registerCommand(module, "mqlread", new Packages.com.google.refine.commands.freebase.MQLReadCommand());
+ RS.registerCommand(module, "mqlwrite", new Packages.com.google.refine.commands.freebase.MQLWriteCommand());
- GS.registerCommand(module, "get-preference", new Packages.com.google.refine.commands.GetPreferenceCommand());
- GS.registerCommand(module, "get-all-preferences", new Packages.com.google.refine.commands.GetAllPreferencesCommand());
- GS.registerCommand(module, "set-preference", new Packages.com.google.refine.commands.SetPreferenceCommand());
- GS.registerCommand(module, "open-workspace-dir", new Packages.com.google.refine.commands.OpenWorkspaceDirCommand());
+ RS.registerCommand(module, "get-preference", new Packages.com.google.refine.commands.GetPreferenceCommand());
+ RS.registerCommand(module, "get-all-preferences", new Packages.com.google.refine.commands.GetAllPreferencesCommand());
+ RS.registerCommand(module, "set-preference", new Packages.com.google.refine.commands.SetPreferenceCommand());
+ RS.registerCommand(module, "open-workspace-dir", new Packages.com.google.refine.commands.OpenWorkspaceDirCommand());
}
function registerOperations() {
diff --git a/server/IDEs/eclipse/Gridworks.launch b/server/IDEs/eclipse/Gridworks.launch
deleted file mode 100644
index f6a20385c..000000000
--- a/server/IDEs/eclipse/Gridworks.launch
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/server/IDEs/netbeans/nbproject/project.properties b/server/IDEs/netbeans/nbproject/project.properties
index 65af2c283..3f103abdc 100644
--- a/server/IDEs/netbeans/nbproject/project.properties
+++ b/server/IDEs/netbeans/nbproject/project.properties
@@ -72,7 +72,7 @@ javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
-main.class=com.google.gridworks.Gridworks
+main.class=com.google.refine.Refine
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
platform.active=default_platform
diff --git a/server/src/com/google/refine/Gridworks.java b/server/src/com/google/refine/Refine.java
similarity index 95%
rename from server/src/com/google/refine/Gridworks.java
rename to server/src/com/google/refine/Refine.java
index 19e7a4bf8..2caefe818 100644
--- a/server/src/com/google/refine/Gridworks.java
+++ b/server/src/com/google/refine/Refine.java
@@ -35,10 +35,10 @@ import com.codeberry.jdatapath.JDataPathSystem;
import com.google.util.threads.ThreadPoolExecutorAdapter;
/**
- * Main class for Gridworks server application. Starts an instance of the
- * Jetty HTTP server / servlet container (inner class Gridworks Server).
+ * Main class for Refine server application. Starts an instance of the
+ * Jetty HTTP server / servlet container (inner class Refine Server).
*/
-public class Gridworks {
+public class Refine {
static private final String DEFAULT_HOST = "127.0.0.1";
static private final int DEFAULT_PORT = 3333;
@@ -72,23 +72,23 @@ public class Gridworks {
port = Configurations.getInteger("gridworks.port",DEFAULT_PORT);
host = Configurations.get("gridworks.host",DEFAULT_HOST);
- Gridworks gridworks = new Gridworks();
+ Refine gridworks = new Refine();
gridworks.init(args);
}
public void init(String[] args) throws Exception {
- GridworksServer server = new GridworksServer();
+ RefineServer server = new RefineServer();
server.init(host,port);
boolean headless = Configurations.getBoolean("gridworks.headless",false);
if (!headless) {
try {
- GridworksClient client = new GridworksClient();
+ RefineClient client = new RefineClient();
client.init(host,port);
} catch (Exception e) {
- logger.warn("Sorry, some error prevented us from launching the browser for you.\n\n Point your browser to http://" + host + ":" + port + "/ to start using Gridworks.");
+ logger.warn("Sorry, some error prevented us from launching the browser for you.\n\n Point your browser to http://" + host + ":" + port + "/ to start using Refine.");
}
}
@@ -101,9 +101,9 @@ public class Gridworks {
}
}
-/* -------------- Gridworks Server ----------------- */
+/* -------------- Refine Server ----------------- */
-class GridworksServer extends Server {
+class RefineServer extends Server {
final static Logger logger = LoggerFactory.getLogger("gridworks_server");
@@ -352,9 +352,9 @@ class GridworksServer extends Server {
}
-/* -------------- Gridworks Client ----------------- */
+/* -------------- Refine Client ----------------- */
-class GridworksClient extends JFrame implements ActionListener {
+class RefineClient extends JFrame implements ActionListener {
private static final long serialVersionUID = 7886547342175227132L;
@@ -374,7 +374,7 @@ class GridworksClient extends JFrame implements ActionListener {
JMenuBar mb = new JMenuBar();
JMenu m = new JMenu("Open");
- JMenuItem mi = new JMenuItem("Open New Gridworks Window...");
+ JMenuItem mi = new JMenuItem("Open New Refine Window...");
mi.addActionListener(this);
m.add(mi);
mb.add(m);
@@ -387,7 +387,7 @@ class GridworksClient extends JFrame implements ActionListener {
// FIXME(SM): this part below doesn't seem to work, I get a NPE but I have *no* idea why, suggestions?
// PopupMenu dockMenu = new PopupMenu("dock");
-// MenuItem mmi = new MenuItem("Open new Gridworks Window...");
+// MenuItem mmi = new MenuItem("Open new Refine Window...");
// mmi.addActionListener(this);
// dockMenu.add(mmi);
// this.add(dockMenu);