diff --git a/broker/appengine/.settings/com.google.appengine.eclipse.core.prefs b/broker/appengine/.settings/com.google.appengine.eclipse.core.prefs index 88d528198..03841005e 100644 --- a/broker/appengine/.settings/com.google.appengine.eclipse.core.prefs +++ b/broker/appengine/.settings/com.google.appengine.eclipse.core.prefs @@ -1,3 +1,3 @@ #Tue Aug 03 15:54:32 PDT 2010 eclipse.preferences.version=1 -validationExclusions=src/com/google/gridworks/appengine/*ClientConnection*.java +validationExclusions=src/com/google/refine/appengine/*ClientConnection*.java diff --git a/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java b/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java index 2cd59180b..3308f8811 100644 --- a/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java +++ b/broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java @@ -31,7 +31,7 @@ import com.google.refine.broker.RefineBroker; public class AppEngineRefineBrokerImpl extends RefineBroker { - protected static final Logger logger = LoggerFactory.getLogger("gridworks.broker.appengine"); + protected static final Logger logger = LoggerFactory.getLogger("refine.broker.appengine"); PersistenceManagerFactory pmfInstance; diff --git a/broker/core/IDEs/eclipse/GridworksBrokerTests.launch b/broker/core/IDEs/eclipse/GridworksBrokerTests.launch index f5b4ad810..2d43e73a3 100644 --- a/broker/core/IDEs/eclipse/GridworksBrokerTests.launch +++ b/broker/core/IDEs/eclipse/GridworksBrokerTests.launch @@ -2,15 +2,15 @@ - + - + - + - + diff --git a/broker/core/IDEs/eclipse/README.txt b/broker/core/IDEs/eclipse/README.txt index 15ee509e5..8392a7b73 100644 --- a/broker/core/IDEs/eclipse/README.txt +++ b/broker/core/IDEs/eclipse/README.txt @@ -1,26 +1,26 @@ - Gridworks Helpers for Eclipse - ----------------------------- + Google Refine Helpers for Eclipse + --------------------------------- This file contains Eclipse-specific help files that can get simplify your life - developing Gridworks with Eclipse (http://www.eclipse.org/). + developing Google Refine with Eclipse (http://www.eclipse.org/). Launch Files (*.launch) ----------------------- - These are files that help you running Gridworks directly from eclipse without having to execute + These are files that help you running Google Refine directly from eclipse without having to execute the shell scripts. To run, right click on the files directly from Eclipse, then do "Run As -> ". - Code Style Format Configurations (Gridworks.style.xml) + Code Style Format Configurations (Refine.style.xml) ------------------------------------------------------ - This is the code formatting configurations that all Gridworks developers should follow. + This is the code formatting configurations that all Google Refine developers should follow. To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter" and click the "Import" button and load the file. @@ -33,6 +33,6 @@ Thank you for your interest. - The Freebase Gridworks Development Team - http://code.google.com/p/freebase-gridworks/ + The Google Refine Development Team + http://code.google.com/p/google-refine/ \ No newline at end of file diff --git a/broker/core/WEB-INF/web.xml b/broker/core/WEB-INF/web.xml index 133a9f960..40b1a547f 100644 --- a/broker/core/WEB-INF/web.xml +++ b/broker/core/WEB-INF/web.xml @@ -7,12 +7,12 @@ - gridworks-broker + refine-broker edu.mit.simile.butterfly.Butterfly - gridworks-broker + refine-broker /* diff --git a/broker/core/src/com/google/refine/broker/RefineBroker.java b/broker/core/src/com/google/refine/broker/RefineBroker.java index a11bafbad..63304ba1b 100644 --- a/broker/core/src/com/google/refine/broker/RefineBroker.java +++ b/broker/core/src/com/google/refine/broker/RefineBroker.java @@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory; import edu.mit.simile.butterfly.ButterflyModuleImpl; /** - * This class contains all the code shared by various implementations of a Gridworks Broker. + * This class contains all the code shared by various implementations of a Google Refine Broker. * - * A broker is a server used by multiple Gridworks installations to enable collaborative + * A broker is a server used by multiple Google Refine installations to enable collaborative * development over the same project. * * Broker implementations differ in how they store their state but all of them are required @@ -57,7 +57,7 @@ public abstract class RefineBroker extends ButterflyModuleImpl { static final public int COL = 1; static final public int CELL = 2; - static final protected Logger logger = LoggerFactory.getLogger("gridworks.broker"); + static final protected Logger logger = LoggerFactory.getLogger("refine.broker"); static final protected String USER_INFO_URL = "http://www.freebase.com/api/service/user_info"; static final protected String DELEGATED_OAUTH_HEADER = "X-Freebase-Credentials"; @@ -87,7 +87,7 @@ public abstract class RefineBroker extends ButterflyModuleImpl { public void init(ServletConfig config) throws Exception { super.init(config); httpclient = getHttpClient(); - developmentMode = Boolean.parseBoolean(config.getInitParameter("gridworks.development")); + developmentMode = Boolean.parseBoolean(config.getInitParameter("refine.development")); if (developmentMode) logger.warn("Running in development mode"); } @@ -195,7 +195,7 @@ public abstract class RefineBroker extends ButterflyModuleImpl { HttpPost httpRequest = new HttpPost(USER_INFO_URL); httpRequest.setHeader(OAUTH_HEADER, oauth); - httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Gridworks Broker"); + httpRequest.getParams().setParameter(CoreProtocolPNames.USER_AGENT, "Google Refine Broker"); httpRequest.setEntity(entity); ResponseHandler responseHandler = new BasicResponseHandler(); diff --git a/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java b/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java index 11ae4522b..5ea567f2b 100644 --- a/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java +++ b/broker/core/src/com/google/refine/broker/RefineBrokerImpl.java @@ -34,7 +34,7 @@ import com.sleepycat.persist.model.SecondaryKey; public class RefineBrokerImpl extends RefineBroker { - protected static final Logger logger = LoggerFactory.getLogger("gridworks.broker.local"); + protected static final Logger logger = LoggerFactory.getLogger("refine.broker.local"); Environment env; @@ -59,7 +59,7 @@ public class RefineBrokerImpl extends RefineBroker { expirer = new Expirer(); timer.schedule(expirer, 0, LOCK_EXPIRATION_CHECK_DELAY); - String dataDir = config.getInitParameter("gridworks.data"); + String dataDir = config.getInitParameter("refine.data"); if (dataDir == null) dataDir = "data"; File dataPath = new File(dataDir); if (!dataPath.exists()) dataPath.mkdirs(); diff --git a/broker/core/tests/conf/tests.xml b/broker/core/tests/conf/tests.xml index 2876b8cbe..e31c616a2 100644 --- a/broker/core/tests/conf/tests.xml +++ b/broker/core/tests/conf/tests.xml @@ -1,9 +1,9 @@ - + - + diff --git a/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java b/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java index a17c4d095..9f410c0c0 100644 --- a/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java +++ b/broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java @@ -58,8 +58,8 @@ public class RefineBrokerTests { @BeforeTest public void test_init() throws Exception { logger = LoggerFactory.getLogger(this.getClass()); config = mock(ServletConfig.class); - when(config.getInitParameter("gridworks.data")).thenReturn(data.getAbsolutePath()); - when(config.getInitParameter("gridworks.development")).thenReturn("true"); + when(config.getInitParameter("refine.data")).thenReturn(data.getAbsolutePath()); + when(config.getInitParameter("refine.development")).thenReturn("true"); broker = new RefineBrokerImpl(); broker.init(config); diff --git a/extensions/jython/build.xml b/extensions/jython/build.xml index b321a6515..3626806b1 100644 --- a/extensions/jython/build.xml +++ b/extensions/jython/build.xml @@ -2,11 +2,11 @@ - + @@ -28,11 +28,11 @@ - - - - - + + + + + @@ -44,10 +44,10 @@ - + - + diff --git a/extensions/jython/module/MOD-INF/module.properties b/extensions/jython/module/MOD-INF/module.properties index faeeed362..888ea9278 100644 --- a/extensions/jython/module/MOD-INF/module.properties +++ b/extensions/jython/module/MOD-INF/module.properties @@ -1,4 +1,4 @@ name = jython-extension -description = Gridworks Jython Extension +description = Google Refine Jython Extension templating = false requires = core diff --git a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java index 9dd016502..f20407126 100644 --- a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java +++ b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java @@ -36,7 +36,7 @@ public class JythonEvaluable implements Evaluable { private static PythonInterpreter _engine; // FIXME(SM): this initialization logic depends on the fact that the JVM's - // current working directory is the root of the Gridworks distributions + // current working directory is the root of the Google Refine distributions // or the development checkouts. While this works in practice, it would // be preferable to have a more reliable address space, but since we // don't have access to the servlet context from this class this is diff --git a/extensions/sample-extension/build.xml b/extensions/sample-extension/build.xml index 88e5f90ad..e3bf83efc 100644 --- a/extensions/sample-extension/build.xml +++ b/extensions/sample-extension/build.xml @@ -2,11 +2,11 @@ - + @@ -28,11 +28,11 @@ - - - - - + + + + + @@ -44,10 +44,10 @@ - + - + diff --git a/extensions/sample-extension/module/MOD-INF/module.properties b/extensions/sample-extension/module/MOD-INF/module.properties index 385cb3402..d056477ed 100644 --- a/extensions/sample-extension/module/MOD-INF/module.properties +++ b/extensions/sample-extension/module/MOD-INF/module.properties @@ -1,4 +1,4 @@ name = sample-extension -description = Gridworks Sample Extension +description = Google Refine Sample Extension templating.macros = macros.vm requires = core diff --git a/main/IDEs/eclipse/GridworksTests.launch b/main/IDEs/eclipse/GridworksTests.launch index 0cc57b89a..669461565 100644 --- a/main/IDEs/eclipse/GridworksTests.launch +++ b/main/IDEs/eclipse/GridworksTests.launch @@ -2,10 +2,10 @@ - + - + diff --git a/main/IDEs/eclipse/README.txt b/main/IDEs/eclipse/README.txt index 15ee509e5..8392a7b73 100644 --- a/main/IDEs/eclipse/README.txt +++ b/main/IDEs/eclipse/README.txt @@ -1,26 +1,26 @@ - Gridworks Helpers for Eclipse - ----------------------------- + Google Refine Helpers for Eclipse + --------------------------------- This file contains Eclipse-specific help files that can get simplify your life - developing Gridworks with Eclipse (http://www.eclipse.org/). + developing Google Refine with Eclipse (http://www.eclipse.org/). Launch Files (*.launch) ----------------------- - These are files that help you running Gridworks directly from eclipse without having to execute + These are files that help you running Google Refine directly from eclipse without having to execute the shell scripts. To run, right click on the files directly from Eclipse, then do "Run As -> ". - Code Style Format Configurations (Gridworks.style.xml) + Code Style Format Configurations (Refine.style.xml) ------------------------------------------------------ - This is the code formatting configurations that all Gridworks developers should follow. + This is the code formatting configurations that all Google Refine developers should follow. To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter" and click the "Import" button and load the file. @@ -33,6 +33,6 @@ Thank you for your interest. - The Freebase Gridworks Development Team - http://code.google.com/p/freebase-gridworks/ + The Google Refine Development Team + http://code.google.com/p/google-refine/ \ No newline at end of file diff --git a/main/IDEs/netbeans/build.xml b/main/IDEs/netbeans/build.xml index 970b7abd3..4910fd41a 100644 --- a/main/IDEs/netbeans/build.xml +++ b/main/IDEs/netbeans/build.xml @@ -7,8 +7,8 @@ - - Builds, tests, and runs the project gridworks main. + + Builds, tests, and runs the project refine main. - + @@ -484,7 +484,7 @@ is divided into following sections: - + @@ -833,7 +833,7 @@ is divided into following sections: - + diff --git a/main/IDEs/netbeans/nbproject/project.properties b/main/IDEs/netbeans/nbproject/project.properties index 9a54e8685..642fd6e00 100644 --- a/main/IDEs/netbeans/nbproject/project.properties +++ b/main/IDEs/netbeans/nbproject/project.properties @@ -2,7 +2,7 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=gridworks main +application.title=refine main application.vendor=dfhuynh build.classes.dir=${build.dir}/ build.classes.excludes=**/*.java,**/*.form @@ -22,7 +22,7 @@ debug.test.classpath=\ ${run.test.classpath} # This directory is removed when the project is cleaned: dist.dir=dist -dist.jar=${dist.dir}/gridworks main.jar +dist.jar=${dist.dir}/refine main.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= diff --git a/main/IDEs/netbeans/nbproject/project.xml b/main/IDEs/netbeans/nbproject/project.xml index 08f939cdb..ae6b1ce7f 100644 --- a/main/IDEs/netbeans/nbproject/project.xml +++ b/main/IDEs/netbeans/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.java.j2seproject - gridworks main + refine main diff --git a/main/src/com/google/refine/ClientSideResourceManager.java b/main/src/com/google/refine/ClientSideResourceManager.java index 170bf937a..b18efe5f0 100644 --- a/main/src/com/google/refine/ClientSideResourceManager.java +++ b/main/src/com/google/refine/ClientSideResourceManager.java @@ -15,7 +15,7 @@ import edu.mit.simile.butterfly.MountPoint; public class ClientSideResourceManager { - final static Logger logger = LoggerFactory.getLogger("gridworks_clientSideResourceManager"); + final static Logger logger = LoggerFactory.getLogger("refine_clientSideResourceManager"); static public class QualifiedPath { public ButterflyModule module; diff --git a/main/src/com/google/refine/ProjectManager.java b/main/src/com/google/refine/ProjectManager.java index c8616c7c7..bff49951f 100644 --- a/main/src/com/google/refine/ProjectManager.java +++ b/main/src/com/google/refine/ProjectManager.java @@ -102,9 +102,9 @@ public abstract class ProjectManager { */ protected abstract Project loadProject(long id); - //------------Import and Export from Gridworks archive----------------- + //------------Import and Export from Google Refine archive----------------- /** - * Import project from a Gridworks archive + * Import project from a Google Refine archive * @param projectID * @param inputStream * @param gziped @@ -113,7 +113,7 @@ public abstract class ProjectManager { public abstract void importProject(long projectID, InputStream inputStream, boolean gziped) throws IOException; /** - * Export project to a Gridworks archive + * Export project to a Google Refine archive * @param projectId * @param tos * @throws IOException diff --git a/main/src/com/google/refine/RefineServlet.java b/main/src/com/google/refine/RefineServlet.java index 6e3cc5243..e61168987 100644 --- a/main/src/com/google/refine/RefineServlet.java +++ b/main/src/com/google/refine/RefineServlet.java @@ -37,7 +37,7 @@ public class RefineServlet extends Butterfly { // timer for periodically saving projects static private Timer _timer; - final static Logger logger = LoggerFactory.getLogger("gridworks"); + final static Logger logger = LoggerFactory.getLogger("refine"); public static String getVersion() { return VERSION; @@ -67,10 +67,10 @@ public class RefineServlet extends Butterfly { logger.trace("> initialize"); - String data = getInitParameter("gridworks.data"); + String data = getInitParameter("refine.data"); if (data == null) { - throw new ServletException("can't find servlet init config 'gridworks.data', I have to give up initializing"); + throw new ServletException("can't find servlet init config 'refine.data', I have to give up initializing"); } s_dataDir = new File(data); @@ -225,6 +225,9 @@ public class RefineServlet extends Butterfly { if (className.startsWith("com.metaweb.")) { className = "com.google." + className.substring("com.metaweb.".length()); } + if (className.startsWith("com.google.gridworks.")) { + className = "com.google.refine." + className.substring("com.google.gridworks.".length()); + } return Class.forName(className); } } \ No newline at end of file diff --git a/main/src/com/google/refine/clustering/binning/BinningClusterer.java b/main/src/com/google/refine/clustering/binning/BinningClusterer.java index bac0593ba..292c71653 100644 --- a/main/src/com/google/refine/clustering/binning/BinningClusterer.java +++ b/main/src/com/google/refine/clustering/binning/BinningClusterer.java @@ -61,7 +61,7 @@ public class BinningClusterer extends Clusterer { _params = new Object[1]; _params[0] = size; } catch (JSONException e) { - //Gridworks.warn("No params specified, using default"); + //Refine.warn("No params specified, using default"); } } } diff --git a/main/src/com/google/refine/clustering/knn/kNNClusterer.java b/main/src/com/google/refine/clustering/knn/kNNClusterer.java index 005c71158..72565f94a 100644 --- a/main/src/com/google/refine/clustering/knn/kNNClusterer.java +++ b/main/src/com/google/refine/clustering/knn/kNNClusterer.java @@ -76,7 +76,7 @@ public class kNNClusterer extends Clusterer { JSONObject params = o.getJSONObject("params"); _radius = params.getDouble("radius"); } catch (JSONException e) { - //Gridworks.warn("No parameters found, using defaults"); + //Refine.warn("No parameters found, using defaults"); } } diff --git a/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java b/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java index 2a87a34aa..706fcf3a5 100644 --- a/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java +++ b/main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java @@ -18,7 +18,7 @@ public class OpenWorkspaceDirCommand extends Command { String serverName = request.getServerName(); if (!"127.0.0.1".equals(serverName) && !"localhost".equals(serverName)) { - respond(response, "{ \"code\" : \"error\", \"message\" : \"Workspace directory can only be opened on the local machine where Gridworks is run.\" }"); + respond(response, "{ \"code\" : \"error\", \"message\" : \"Workspace directory can only be opened on the local machine where Google Refine is run.\" }"); } else if (ProjectManager.singleton instanceof FileProjectManager) { File dir = ((FileProjectManager) ProjectManager.singleton).getWorkspaceDir(); diff --git a/main/src/com/google/refine/commands/auth/AuthorizeCommand.java b/main/src/com/google/refine/commands/auth/AuthorizeCommand.java index bb822f628..6fe5fdd23 100644 --- a/main/src/com/google/refine/commands/auth/AuthorizeCommand.java +++ b/main/src/com/google/refine/commands/auth/AuthorizeCommand.java @@ -126,7 +126,7 @@ public class AuthorizeCommand extends Command { throw new RuntimeException("referrer '" + referrer + "' can't be parsed as a URL"); } } else { - throw new RuntimeException("neither the 'host' nor 'referer' headers were present in the HTTP response, I can't determine what URL gridworks is listening to."); + throw new RuntimeException("neither the 'host' nor 'referer' headers were present in the HTTP response, I can't determine what URL Google Refine is listening to."); } } return "http://" + host + "/command/core/authorize/" + provider.getHost(); diff --git a/main/src/com/google/refine/commands/column/GetColumnsInfoCommand.java b/main/src/com/google/refine/commands/column/GetColumnsInfoCommand.java index 0188225dd..9e483c279 100644 --- a/main/src/com/google/refine/commands/column/GetColumnsInfoCommand.java +++ b/main/src/com/google/refine/commands/column/GetColumnsInfoCommand.java @@ -43,7 +43,7 @@ public class GetColumnsInfoCommand extends Command { } writer.endArray(); - //Gridworks.log("Obtained columns info in " + (System.currentTimeMillis() - start) + "ms"); + //Refine.log("Obtained columns info in " + (System.currentTimeMillis() - start) + "ms"); } catch (Exception e) { e.printStackTrace(); respondException(response, e); diff --git a/main/src/com/google/refine/expr/MetaParser.java b/main/src/com/google/refine/expr/MetaParser.java index 79b912ace..b23540c34 100644 --- a/main/src/com/google/refine/expr/MetaParser.java +++ b/main/src/com/google/refine/expr/MetaParser.java @@ -27,7 +27,7 @@ abstract public class MetaParser { static { s_languages = new HashMap(); - registerLanguageParser("gel", "Gridworks Expression Language (GEL)", new LanguageSpecificParser() { + registerLanguageParser("gel", "Google Refine Expression Language (GREL)", new LanguageSpecificParser() { @Override public Evaluable parse(String s) throws ParsingException { diff --git a/main/src/com/google/refine/importers/MarcImporter.java b/main/src/com/google/refine/importers/MarcImporter.java index 0dc860a38..10431f625 100644 --- a/main/src/com/google/refine/importers/MarcImporter.java +++ b/main/src/com/google/refine/importers/MarcImporter.java @@ -30,7 +30,7 @@ public class MarcImporter implements StreamImporter { File tempFile; try { - tempFile = File.createTempFile("gridworks-import-", ".marc.xml"); + tempFile = File.createTempFile("refine-import-", ".marc.xml"); } catch (IOException e) { throw new ImportException("Unexpected error creating temp file",e); } diff --git a/main/src/com/google/refine/model/recon/StandardReconConfig.java b/main/src/com/google/refine/model/recon/StandardReconConfig.java index 259115e38..771b921b8 100644 --- a/main/src/com/google/refine/model/recon/StandardReconConfig.java +++ b/main/src/com/google/refine/model/recon/StandardReconConfig.java @@ -31,7 +31,7 @@ import com.google.refine.protograph.FreebaseProperty; import com.google.refine.util.ParsingUtilities; public class StandardReconConfig extends ReconConfig { - final static Logger logger = LoggerFactory.getLogger("gridworks-standard-recon"); + final static Logger logger = LoggerFactory.getLogger("refine-standard-recon"); static public class ColumnDetail { final public String columnName; diff --git a/main/src/log4j.properties b/main/src/log4j.properties index c4d0abf88..de335de30 100644 --- a/main/src/log4j.properties +++ b/main/src/log4j.properties @@ -4,4 +4,4 @@ log4j.logger.org.apache.http.impl=WARN log4j.logger.org.apache.http.client=WARN log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=com.google.gridworks.logging.IndentingLayout +log4j.appender.console.layout=com.google.refine.logging.IndentingLayout diff --git a/main/tests/server/conf/tests.xml b/main/tests/server/conf/tests.xml index 81779560f..45ce758b5 100644 --- a/main/tests/server/conf/tests.xml +++ b/main/tests/server/conf/tests.xml @@ -1,9 +1,9 @@ - + - + diff --git a/main/tests/server/src/tests.log4j.properties b/main/tests/server/src/tests.log4j.properties index 50715313e..38e59be4c 100644 --- a/main/tests/server/src/tests.log4j.properties +++ b/main/tests/server/src/tests.log4j.properties @@ -1,4 +1,4 @@ log4j.rootLogger=ERROR, console log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=com.google.gridworks.logging.IndentingLayout +log4j.appender.console.layout=com.google.refine.logging.IndentingLayout diff --git a/main/webapp/WEB-INF/butterfly.properties b/main/webapp/WEB-INF/butterfly.properties index 5f07bf45d..ca73e3601 100644 --- a/main/webapp/WEB-INF/butterfly.properties +++ b/main/webapp/WEB-INF/butterfly.properties @@ -26,7 +26,7 @@ butterfly.default.mountpoint = /extension butterfly.modules.path = modules butterfly.modules.path = ../../extensions/ # Add more paths here if your extensions live elsewhere. - # Relative paths are relative to gridworks/main/webapp/ + # Relative paths are relative to refine/main/webapp/ butterfly.modules.wirings = WEB-INF/modules.properties diff --git a/main/webapp/WEB-INF/web.xml b/main/webapp/WEB-INF/web.xml index 9347c8de9..6750c16ab 100644 --- a/main/webapp/WEB-INF/web.xml +++ b/main/webapp/WEB-INF/web.xml @@ -19,12 +19,12 @@ - gridworks + refine com.google.refine.RefineServlet - gridworks + refine /* diff --git a/main/webapp/modules/core/MOD-INF/module.properties b/main/webapp/modules/core/MOD-INF/module.properties index 11a750eb0..63dfff601 100644 --- a/main/webapp/modules/core/MOD-INF/module.properties +++ b/main/webapp/modules/core/MOD-INF/module.properties @@ -1,4 +1,4 @@ -description = Gridworks Core Module +description = Google Refine Core Module implements = core templating.macros = macros.vm diff --git a/server/IDEs/eclipse/README.txt b/server/IDEs/eclipse/README.txt index 15ee509e5..8392a7b73 100644 --- a/server/IDEs/eclipse/README.txt +++ b/server/IDEs/eclipse/README.txt @@ -1,26 +1,26 @@ - Gridworks Helpers for Eclipse - ----------------------------- + Google Refine Helpers for Eclipse + --------------------------------- This file contains Eclipse-specific help files that can get simplify your life - developing Gridworks with Eclipse (http://www.eclipse.org/). + developing Google Refine with Eclipse (http://www.eclipse.org/). Launch Files (*.launch) ----------------------- - These are files that help you running Gridworks directly from eclipse without having to execute + These are files that help you running Google Refine directly from eclipse without having to execute the shell scripts. To run, right click on the files directly from Eclipse, then do "Run As -> ". - Code Style Format Configurations (Gridworks.style.xml) + Code Style Format Configurations (Refine.style.xml) ------------------------------------------------------ - This is the code formatting configurations that all Gridworks developers should follow. + This is the code formatting configurations that all Google Refine developers should follow. To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter" and click the "Import" button and load the file. @@ -33,6 +33,6 @@ Thank you for your interest. - The Freebase Gridworks Development Team - http://code.google.com/p/freebase-gridworks/ + The Google Refine Development Team + http://code.google.com/p/google-refine/ \ No newline at end of file diff --git a/server/IDEs/netbeans/nbbuild.xml b/server/IDEs/netbeans/nbbuild.xml index 0615b3be5..defa0432a 100644 --- a/server/IDEs/netbeans/nbbuild.xml +++ b/server/IDEs/netbeans/nbbuild.xml @@ -7,8 +7,8 @@ - - Builds, tests, and runs the project gridworks server. + + Builds, tests, and runs the project refine server. - + @@ -484,7 +484,7 @@ is divided into following sections: - + @@ -833,7 +833,7 @@ is divided into following sections: - + diff --git a/server/IDEs/netbeans/nbproject/project.properties b/server/IDEs/netbeans/nbproject/project.properties index 3f103abdc..e4eeeb2f2 100644 --- a/server/IDEs/netbeans/nbproject/project.properties +++ b/server/IDEs/netbeans/nbproject/project.properties @@ -2,7 +2,7 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=gridworks server +application.title=refine server application.vendor=dfhuynh build.classes.dir=${build.dir}/ build.classes.excludes=**/*.java,**/*.form @@ -23,7 +23,7 @@ debug.test.classpath=\ ${run.test.classpath} # This directory is removed when the project is cleaned: dist.dir=dist -dist.jar=${dist.dir}/gridworks server.jar +dist.jar=${dist.dir}/refine server.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= diff --git a/server/IDEs/netbeans/nbproject/project.xml b/server/IDEs/netbeans/nbproject/project.xml index e312e1de5..977ce6e70 100644 --- a/server/IDEs/netbeans/nbproject/project.xml +++ b/server/IDEs/netbeans/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.java.j2seproject - gridworks server + refine server diff --git a/server/src/com/google/refine/Refine.java b/server/src/com/google/refine/Refine.java index 2caefe818..101c85b1f 100644 --- a/server/src/com/google/refine/Refine.java +++ b/server/src/com/google/refine/Refine.java @@ -46,7 +46,7 @@ public class Refine { static private int port; static private String host; - final static Logger logger = LoggerFactory.getLogger("gridworks"); + final static Logger logger = LoggerFactory.getLogger("refine"); public static void main(String[] args) throws Exception { @@ -67,14 +67,14 @@ public class Refine { } // set the log verbosity level - org.apache.log4j.Logger.getRootLogger().setLevel(Level.toLevel(Configurations.get("gridworks.verbosity","info"))); + org.apache.log4j.Logger.getRootLogger().setLevel(Level.toLevel(Configurations.get("refine.verbosity","info"))); - port = Configurations.getInteger("gridworks.port",DEFAULT_PORT); - host = Configurations.get("gridworks.host",DEFAULT_HOST); + port = Configurations.getInteger("refine.port",DEFAULT_PORT); + host = Configurations.get("refine.host",DEFAULT_HOST); - Refine gridworks = new Refine(); + Refine refine = new Refine(); - gridworks.init(args); + refine.init(args); } public void init(String[] args) throws Exception { @@ -82,7 +82,7 @@ public class Refine { RefineServer server = new RefineServer(); server.init(host,port); - boolean headless = Configurations.getBoolean("gridworks.headless",false); + boolean headless = Configurations.getBoolean("refine.headless",false); if (!headless) { try { RefineClient client = new RefineClient(); @@ -105,19 +105,19 @@ public class Refine { class RefineServer extends Server { - final static Logger logger = LoggerFactory.getLogger("gridworks_server"); + final static Logger logger = LoggerFactory.getLogger("refine_server"); private ThreadPoolExecutor threadPool; public void init(String host, int port) throws Exception { logger.info("Starting Server bound to '" + host + ":" + port + "'"); - String memory = Configurations.get("gridworks.memory"); + String memory = Configurations.get("refine.memory"); if (memory != null) logger.info("Max memory size: " + memory); - int maxThreads = Configurations.getInteger("gridworks.queue.size", 30); - int maxQueue = Configurations.getInteger("gridworks.queue.max_size", 300); - long keepAliveTime = Configurations.getInteger("gridworks.queue.idle_time", 60); + int maxThreads = Configurations.getInteger("refine.queue.size", 30); + int maxQueue = Configurations.getInteger("refine.queue.max_size", 300); + long keepAliveTime = Configurations.getInteger("refine.queue.idle_time", 60); LinkedBlockingQueue queue = new LinkedBlockingQueue(maxQueue); @@ -128,11 +128,11 @@ class RefineServer extends Server { Connector connector = new SocketConnector(); connector.setPort(port); connector.setHost(host); - connector.setMaxIdleTime(Configurations.getInteger("gridworks.connection.max_idle_time",60000)); + connector.setMaxIdleTime(Configurations.getInteger("refine.connection.max_idle_time",60000)); connector.setStatsOn(false); this.addConnector(connector); - File webapp = new File(Configurations.get("gridworks.webapp","main/webapp")); + File webapp = new File(Configurations.get("refine.webapp","main/webapp")); if (!isWebapp(webapp)) { webapp = new File("main/webapp"); @@ -145,7 +145,7 @@ class RefineServer extends Server { } } - final String contextPath = Configurations.get("gridworks.context_path","/"); + final String contextPath = Configurations.get("refine.context_path","/"); logger.info("Initializing context: '" + contextPath + "' from '" + webapp.getAbsolutePath() + "'"); WebAppContext context = new WebAppContext(webapp.getAbsolutePath(), contextPath); @@ -156,7 +156,7 @@ class RefineServer extends Server { this.setSendServerVersion(true); // Enable context autoreloading - if (Configurations.getBoolean("gridworks.autoreload",false)) { + if (Configurations.getBoolean("refine.autoreload",false)) { scanForUpdates(webapp, context); } @@ -196,7 +196,7 @@ class RefineServer extends Server { logger.info("Starting autoreloading scanner... "); Scanner scanner = new Scanner(); - scanner.setScanInterval(Configurations.getInteger("gridworks.scanner.period",1)); + scanner.setScanInterval(Configurations.getInteger("refine.scanner.period",1)); scanner.setScanDirs(scanList); scanner.setReportExistingFilesOnStartup(false); @@ -236,18 +236,18 @@ class RefineServer extends Server { // NOTE: this is done *after* starting the server because jetty might override the init // parameters if we set them in the webapp context upon reading the web.xml file static private void configure(WebAppContext context) throws Exception { - ServletHolder servlet = context.getServletHandler().getServlet("gridworks"); + ServletHolder servlet = context.getServletHandler().getServlet("refine"); if (servlet != null) { - servlet.setInitParameter("gridworks.data", getDataDir()); + servlet.setInitParameter("refine.data", getDataDir()); servlet.setInitParameter("butterfly.modules.path", getDataDir() + "/extensions"); servlet.setInitOrder(1); servlet.doStart(); } - servlet = context.getServletHandler().getServlet("gridworks-broker"); + servlet = context.getServletHandler().getServlet("refine-broker"); if (servlet != null) { - servlet.setInitParameter("gridworks.data", getDataDir() + "/broker"); - servlet.setInitParameter("gridworks.development", Configurations.get("gridworks.development","false")); + servlet.setInitParameter("refine.data", getDataDir() + "/broker"); + servlet.setInitParameter("refine.development", Configurations.get("refine.development","false")); servlet.setInitOrder(1); servlet.doStart(); } @@ -255,7 +255,7 @@ class RefineServer extends Server { static private String getDataDir() { - String data_dir = Configurations.get("gridworks.data_dir"); + String data_dir = Configurations.get("refine.data_dir"); if (data_dir != null) { return data_dir; }