s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More renaming, except for: client-side code, build scripts, anything to do with data loading and QA, workspace path. Refine can still run, and undo/redo on existing projects is working.

Browse Source 
git-svn-id: http://google-refine.googlecode.com/svn/trunk@1290 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
David Huynh 2010-09-22 18:36:33 +00:00
parent e6bc603a11
commit 1367ce301e
43 changed files with 133 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
broker/appengine/.settings/com.google.appengine.eclipse.core.prefs
View File

@ -1,3 +1,3 @@
#Tue Aug 03 15:54:32 PDT 2010 #Tue Aug 03 15:54:32 PDT 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
validationExclusions=src/com/google/gridworks/appengine/*ClientConnection*.java validationExclusions=src/com/google/refine/appengine/*ClientConnection*.java

2
broker/appengine/src/com/google/refine/broker/AppEngineRefineBrokerImpl.java
View File

@ -31,7 +31,7 @@ import com.google.refine.broker.RefineBroker;
public class AppEngineRefineBrokerImpl extends 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; PersistenceManagerFactory pmfInstance;

8
broker/core/IDEs/eclipse/GridworksBrokerTests.launch
View File

@ -2,15 +2,15 @@
<launchConfiguration type="org.testng.eclipse.launchconfig"> <launchConfiguration type="org.testng.eclipse.launchconfig">
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="false"/> <booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="false"/>
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS"> <listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
<listEntry value="/gridworks-broker/module/MOD-INF/classes"/> <listEntry value="/grefine-broker/module/MOD-INF/classes"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gridworks-broker"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="grefine-broker"/>
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"> <mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS">
<mapEntry key="com.google.gridworks.broker.tests.RefineBrokerTests" value=""/> <mapEntry key="com.google.refine.broker.tests.RefineBrokerTests" value=""/>
</mapAttribute> </mapAttribute>
<listAttribute key="org.testng.eclipse.CLASS_TEST_LIST"> <listAttribute key="org.testng.eclipse.CLASS_TEST_LIST">
<listEntry value="com.google.gridworks.broker.tests.RefineBrokerTests"/> <listEntry value="com.google.refine.broker.tests.RefineBrokerTests"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/> <stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/>
<listAttribute key="org.testng.eclipse.GROUP_LIST"/> <listAttribute key="org.testng.eclipse.GROUP_LIST"/>

16
broker/core/IDEs/eclipse/README.txt
View File

@ -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 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) 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. the shell scripts.
To run, right click on the files directly from Eclipse, then do "Run As -> <name>". To run, right click on the files directly from Eclipse, then do "Run As -> <name>".
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" To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter"
and click the "Import" button and load the file. and click the "Import" button and load the file.
@ -33,6 +33,6 @@
Thank you for your interest. Thank you for your interest.
The Freebase Gridworks Development Team The Google Refine Development Team
http://code.google.com/p/freebase-gridworks/ http://code.google.com/p/google-refine/

4
broker/core/WEB-INF/web.xml
View File

@ -7,12 +7,12 @@
<web-app> <web-app>
<servlet> <servlet>
<servlet-name>gridworks-broker</servlet-name> <servlet-name>refine-broker</servlet-name>
<servlet-class>edu.mit.simile.butterfly.Butterfly</servlet-class> <servlet-class>edu.mit.simile.butterfly.Butterfly</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>gridworks-broker</servlet-name> <servlet-name>refine-broker</servlet-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</servlet-mapping> </servlet-mapping>

10
broker/core/src/com/google/refine/broker/RefineBroker.java
View File

@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
import edu.mit.simile.butterfly.ButterflyModuleImpl; 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. * development over the same project.
* *
* Broker implementations differ in how they store their state but all of them are required * 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 COL = 1;
static final public int CELL = 2; 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 USER_INFO_URL = "http://www.freebase.com/api/service/user_info";
static final protected String DELEGATED_OAUTH_HEADER = "X-Freebase-Credentials"; 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 { public void init(ServletConfig config) throws Exception {
super.init(config); super.init(config);
httpclient = getHttpClient(); httpclient = getHttpClient();
developmentMode = Boolean.parseBoolean(config.getInitParameter("gridworks.development")); developmentMode = Boolean.parseBoolean(config.getInitParameter("refine.development"));
if (developmentMode) logger.warn("Running in development mode"); 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); HttpPost httpRequest = new HttpPost(USER_INFO_URL);
httpRequest.setHeader(OAUTH_HEADER, oauth); 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); httpRequest.setEntity(entity);
ResponseHandler<String> responseHandler = new BasicResponseHandler(); ResponseHandler<String> responseHandler = new BasicResponseHandler();

4
broker/core/src/com/google/refine/broker/RefineBrokerImpl.java
View File

@ -34,7 +34,7 @@ import com.sleepycat.persist.model.SecondaryKey;
public class RefineBrokerImpl extends RefineBroker { 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; Environment env;
@ -59,7 +59,7 @@ public class RefineBrokerImpl extends RefineBroker {
expirer = new Expirer(); expirer = new Expirer();
timer.schedule(expirer, 0, LOCK_EXPIRATION_CHECK_DELAY); 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"; if (dataDir == null) dataDir = "data";
File dataPath = new File(dataDir); File dataPath = new File(dataDir);
if (!dataPath.exists()) dataPath.mkdirs(); if (!dataPath.exists()) dataPath.mkdirs();

4
broker/core/tests/conf/tests.xml
View File

@ -1,9 +1,9 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="Gridworks Broker Unit Tests"> <suite name="Google Refine Broker Unit Tests">
<test name="tests"> <test name="tests">
<packages> <packages>
<package name="com.google.gridworks.broker.tests.*"/> <package name="com.google.refine.broker.tests.*"/>
</packages> </packages>
<groups> <groups>
<run> <run>

4
broker/core/tests/src/com/google/refine/broker/tests/RefineBrokerTests.java
View File

@ -58,8 +58,8 @@ public class RefineBrokerTests {
@BeforeTest public void test_init() throws Exception { @BeforeTest public void test_init() throws Exception {
logger = LoggerFactory.getLogger(this.getClass()); logger = LoggerFactory.getLogger(this.getClass());
config = mock(ServletConfig.class); config = mock(ServletConfig.class);
when(config.getInitParameter("gridworks.data")).thenReturn(data.getAbsolutePath()); when(config.getInitParameter("refine.data")).thenReturn(data.getAbsolutePath());
when(config.getInitParameter("gridworks.development")).thenReturn("true"); when(config.getInitParameter("refine.development")).thenReturn("true");
broker = new RefineBrokerImpl(); broker = new RefineBrokerImpl();
broker.init(config); broker.init(config);

18
extensions/jython/build.xml
View File

@ -2,11 +2,11 @@
<!--+ <!--+
| |
| Gridworks Extension Jython Build File | Google Refine Extension Jython Build File
| |
+--> +-->
<project name="gridworks-jython" default="build" basedir="."> <project name="refine-jython" default="build" basedir=".">
<property environment="env"/> <property environment="env"/>
@ -28,11 +28,11 @@
<property name="fullname" value="${name}-${version}-${revision}" /> <property name="fullname" value="${name}-${version}-${revision}" />
<property name="gridworks.dir" value="${basedir}/../../main" /> <property name="refine.dir" value="${basedir}/../../main" />
<property name="gridworks.webinf.dir" value="${gridworks.dir}/webapp/WEB-INF" /> <property name="refine.webinf.dir" value="${refine.dir}/webapp/WEB-INF" />
<property name="gridworks.modinf.dir" value="${gridworks.dir}/webapp/modules/core/MOD-INF" /> <property name="refine.modinf.dir" value="${refine.dir}/webapp/modules/core/MOD-INF" />
<property name="gridworks.classes.dir" value="${gridworks.webinf.dir}/classes" /> <property name="refine.classes.dir" value="${refine.webinf.dir}/classes" />
<property name="gridworks.lib.dir" value="${gridworks.webinf.dir}/lib" /> <property name="refine.lib.dir" value="${refine.webinf.dir}/lib" />
<property name="src.dir" value="${basedir}/src" /> <property name="src.dir" value="${basedir}/src" />
<property name="module.dir" value="${basedir}/module" /> <property name="module.dir" value="${basedir}/module" />
@ -44,10 +44,10 @@
<fileset dir="${lib.dir}"> <fileset dir="${lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<fileset dir="${gridworks.lib.dir}"> <fileset dir="${refine.lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<pathelement path="${gridworks.classes.dir}"/> <pathelement path="${refine.classes.dir}"/>
</path> </path>
<target name="build_java"> <target name="build_java">

2
extensions/jython/module/MOD-INF/module.properties
View File

@ -1,4 +1,4 @@
name = jython-extension name = jython-extension
description = Gridworks Jython Extension description = Google Refine Jython Extension
templating = false templating = false
requires = core requires = core

2
extensions/jython/src/com/google/refine/jython/JythonEvaluable.java
View File

@ -36,7 +36,7 @@ public class JythonEvaluable implements Evaluable {
private static PythonInterpreter _engine; private static PythonInterpreter _engine;
// FIXME(SM): this initialization logic depends on the fact that the JVM's // 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 // or the development checkouts. While this works in practice, it would
// be preferable to have a more reliable address space, but since we // 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 // don't have access to the servlet context from this class this is

18
extensions/sample-extension/build.xml
View File

@ -2,11 +2,11 @@
<!--+ <!--+
| |
| Gridworks Extension Sample Extension Build File | Google Refine Extension Sample Extension Build File
| |
+--> +-->
<project name="gridworks-sample-extension" default="build" basedir="."> <project name="refine-sample-extension" default="build" basedir=".">
<property environment="env"/> <property environment="env"/>
@ -28,11 +28,11 @@
<property name="fullname" value="${name}-${version}-${revision}" /> <property name="fullname" value="${name}-${version}-${revision}" />
<property name="gridworks.dir" value="${basedir}/../../main" /> <property name="refine.dir" value="${basedir}/../../main" />
<property name="gridworks.webinf.dir" value="${gridworks.dir}/webapp/WEB-INF" /> <property name="refine.webinf.dir" value="${refine.dir}/webapp/WEB-INF" />
<property name="gridworks.modinf.dir" value="${gridworks.dir}/webapp/modules/core/MOD-INF" /> <property name="refine.modinf.dir" value="${refine.dir}/webapp/modules/core/MOD-INF" />
<property name="gridworks.classes.dir" value="${gridworks.webinf.dir}/classes" /> <property name="refine.classes.dir" value="${refine.webinf.dir}/classes" />
<property name="gridworks.lib.dir" value="${gridworks.webinf.dir}/lib" /> <property name="refine.lib.dir" value="${refine.webinf.dir}/lib" />
<property name="src.dir" value="${basedir}/src" /> <property name="src.dir" value="${basedir}/src" />
<property name="module.dir" value="${basedir}/module" /> <property name="module.dir" value="${basedir}/module" />
@ -44,10 +44,10 @@
<fileset dir="${lib.dir}"> <fileset dir="${lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<fileset dir="${gridworks.lib.dir}"> <fileset dir="${refine.lib.dir}">
<include name="**/*.jar" /> <include name="**/*.jar" />
</fileset> </fileset>
<pathelement path="${gridworks.classes.dir}"/> <pathelement path="${refine.classes.dir}"/>
</path> </path>
<target name="build_java"> <target name="build_java">

2
extensions/sample-extension/module/MOD-INF/module.properties
View File

@ -1,4 +1,4 @@
name = sample-extension name = sample-extension
description = Gridworks Sample Extension description = Google Refine Sample Extension
templating.macros = macros.vm templating.macros = macros.vm
requires = core requires = core

4
main/IDEs/eclipse/GridworksTests.launch
View File

@ -2,10 +2,10 @@
<launchConfiguration type="org.testng.eclipse.launchconfig"> <launchConfiguration type="org.testng.eclipse.launchconfig">
<booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="false"/> <booleanAttribute key="com.mountainminds.eclemma.core.INPLACE_INSTRUMENTATION" value="false"/>
<listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS"> <listAttribute key="com.mountainminds.eclemma.core.INSTRUMENTATION_PATHS">
<listEntry value="/gridworks/src/main/webapp/WEB-INF/classes"/> <listEntry value="/refine/src/main/webapp/WEB-INF/classes"/>
</listAttribute> </listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gridworks"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="refine"/>
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/> <mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/>
<listAttribute key="org.testng.eclipse.CLASS_TEST_LIST"/> <listAttribute key="org.testng.eclipse.CLASS_TEST_LIST"/>
<stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/> <stringAttribute key="org.testng.eclipse.COMPLIANCE_LEVEL" value="JDK"/>

16
main/IDEs/eclipse/README.txt
View File

@ -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 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) 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. the shell scripts.
To run, right click on the files directly from Eclipse, then do "Run As -> <name>". To run, right click on the files directly from Eclipse, then do "Run As -> <name>".
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" To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter"
and click the "Import" button and load the file. and click the "Import" button and load the file.
@ -33,6 +33,6 @@
Thank you for your interest. Thank you for your interest.
The Freebase Gridworks Development Team The Google Refine Development Team
http://code.google.com/p/freebase-gridworks/ http://code.google.com/p/google-refine/

6
main/IDEs/netbeans/build.xml
View File

@ -7,8 +7,8 @@
<!-- the Compile on Save feature is turned off for the project. --> <!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.--> <!-- in the project's Project Properties dialog box.-->
<project name="gridworks_main" default="default" basedir="."> <project name="refine_main" default="default" basedir=".">
<description>Builds, tests, and runs the project gridworks main.</description> <description>Builds, tests, and runs the project refine main.</description>
<import file="nbproject/build-impl.xml"/> <import file="nbproject/build-impl.xml"/>
<!-- <!--
@ -59,7 +59,7 @@
An example of overriding the target for project execution could look like this: An example of overriding the target for project execution could look like this:
<target name="run" depends="gridworks_main-impl.jar"> <target name="run" depends="refine_main-impl.jar">
<exec dir="bin" executable="launcher.exe"> <exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/> <arg file="${dist.jar}"/>
</exec> </exec>

6
main/IDEs/netbeans/nbproject/build-impl.xml
View File

@ -19,7 +19,7 @@ is divided into following sections:
- cleanup - cleanup
--> -->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="gridworks_main-impl"> <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="refine_main-impl">
<fail message="Please build using Ant 1.7.1 or higher."> <fail message="Please build using Ant 1.7.1 or higher.">
<condition> <condition>
<not> <not>
@ -484,7 +484,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/> <delete file="${built-jar.properties}" quiet="true"/>
</target> </target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: gridworks main was already built"/> <echo level="warn" message="Cycle detected: refine main was already built"/>
</target> </target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>
@ -833,7 +833,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/> <delete file="${built-clean.properties}" quiet="true"/>
</target> </target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: gridworks main was already built"/> <echo level="warn" message="Cycle detected: refine main was already built"/>
</target> </target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>

4
main/IDEs/netbeans/nbproject/project.properties
View File

@ -2,7 +2,7 @@ annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=gridworks main application.title=refine main
application.vendor=dfhuynh application.vendor=dfhuynh
build.classes.dir=${build.dir}/ build.classes.dir=${build.dir}/
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
@ -22,7 +22,7 @@ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/gridworks main.jar dist.jar=${dist.dir}/refine main.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=

2
main/IDEs/netbeans/nbproject/project.xml
View File

@ -3,7 +3,7 @@
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>gridworks main</name> <name>refine main</name>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>

2
main/src/com/google/refine/ClientSideResourceManager.java
View File

@ -15,7 +15,7 @@ import edu.mit.simile.butterfly.MountPoint;
public class ClientSideResourceManager { public class ClientSideResourceManager {
final static Logger logger = LoggerFactory.getLogger("gridworks_clientSideResourceManager"); final static Logger logger = LoggerFactory.getLogger("refine_clientSideResourceManager");
static public class QualifiedPath { static public class QualifiedPath {
public ButterflyModule module; public ButterflyModule module;

6
main/src/com/google/refine/ProjectManager.java
View File

@ -102,9 +102,9 @@ public abstract class ProjectManager {
*/ */
protected abstract Project loadProject(long id); 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 projectID
* @param inputStream * @param inputStream
* @param gziped * @param gziped
@ -113,7 +113,7 @@ public abstract class ProjectManager {
public abstract void importProject(long projectID, InputStream inputStream, boolean gziped) throws IOException; 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 projectId
* @param tos * @param tos
* @throws IOException * @throws IOException

9
main/src/com/google/refine/RefineServlet.java
View File

@ -37,7 +37,7 @@ public class RefineServlet extends Butterfly {
// timer for periodically saving projects // timer for periodically saving projects
static private Timer _timer; static private Timer _timer;
final static Logger logger = LoggerFactory.getLogger("gridworks"); final static Logger logger = LoggerFactory.getLogger("refine");
public static String getVersion() { public static String getVersion() {
return VERSION; return VERSION;
@ -67,10 +67,10 @@ public class RefineServlet extends Butterfly {
logger.trace("> initialize"); logger.trace("> initialize");
String data = getInitParameter("gridworks.data"); String data = getInitParameter("refine.data");
if (data == null) { 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); s_dataDir = new File(data);
@ -225,6 +225,9 @@ public class RefineServlet extends Butterfly {
if (className.startsWith("com.metaweb.")) { if (className.startsWith("com.metaweb.")) {
className = "com.google." + className.substring("com.metaweb.".length()); 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); return Class.forName(className);
} }
} }

2
main/src/com/google/refine/clustering/binning/BinningClusterer.java
View File

@ -61,7 +61,7 @@ public class BinningClusterer extends Clusterer {
_params = new Object[1]; _params = new Object[1];
_params[0] = size; _params[0] = size;
} catch (JSONException e) { } catch (JSONException e) {
//Gridworks.warn("No params specified, using default"); //Refine.warn("No params specified, using default");
} }
} }
} }

2
main/src/com/google/refine/clustering/knn/kNNClusterer.java
View File

@ -76,7 +76,7 @@ public class kNNClusterer extends Clusterer {
JSONObject params = o.getJSONObject("params"); JSONObject params = o.getJSONObject("params");
_radius = params.getDouble("radius"); _radius = params.getDouble("radius");
} catch (JSONException e) { } catch (JSONException e) {
//Gridworks.warn("No parameters found, using defaults"); //Refine.warn("No parameters found, using defaults");
} }
} }

2
main/src/com/google/refine/commands/OpenWorkspaceDirCommand.java
View File

@ -18,7 +18,7 @@ public class OpenWorkspaceDirCommand extends Command {
String serverName = request.getServerName(); String serverName = request.getServerName();
if (!"127.0.0.1".equals(serverName) && !"localhost".equals(serverName)) { 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) { } else if (ProjectManager.singleton instanceof FileProjectManager) {
File dir = ((FileProjectManager) ProjectManager.singleton).getWorkspaceDir(); File dir = ((FileProjectManager) ProjectManager.singleton).getWorkspaceDir();

2
main/src/com/google/refine/commands/auth/AuthorizeCommand.java
View File

@ -126,7 +126,7 @@ public class AuthorizeCommand extends Command {
throw new RuntimeException("referrer '" + referrer + "' can't be parsed as a URL"); throw new RuntimeException("referrer '" + referrer + "' can't be parsed as a URL");
} }
} else { } 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(); return "http://" + host + "/command/core/authorize/" + provider.getHost();

2
main/src/com/google/refine/commands/column/GetColumnsInfoCommand.java
View File

@ -43,7 +43,7 @@ public class GetColumnsInfoCommand extends Command {
} }
writer.endArray(); 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) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
respondException(response, e); respondException(response, e);

2
main/src/com/google/refine/expr/MetaParser.java
View File

@ -27,7 +27,7 @@ abstract public class MetaParser {
static { static {
s_languages = new HashMap<String, LanguageInfo>(); s_languages = new HashMap<String, LanguageInfo>();
registerLanguageParser("gel", "Gridworks Expression Language (GEL)", new LanguageSpecificParser() { registerLanguageParser("gel", "Google Refine Expression Language (GREL)", new LanguageSpecificParser() {
@Override @Override
public Evaluable parse(String s) throws ParsingException { public Evaluable parse(String s) throws ParsingException {

2
main/src/com/google/refine/importers/MarcImporter.java
View File

@ -30,7 +30,7 @@ public class MarcImporter implements StreamImporter {
File tempFile; File tempFile;
try { try {
tempFile = File.createTempFile("gridworks-import-", ".marc.xml"); tempFile = File.createTempFile("refine-import-", ".marc.xml");
} catch (IOException e) { } catch (IOException e) {
throw new ImportException("Unexpected error creating temp file",e); throw new ImportException("Unexpected error creating temp file",e);
} }

2
main/src/com/google/refine/model/recon/StandardReconConfig.java
View File

@ -31,7 +31,7 @@ import com.google.refine.protograph.FreebaseProperty;
import com.google.refine.util.ParsingUtilities; import com.google.refine.util.ParsingUtilities;
public class StandardReconConfig extends ReconConfig { 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 { static public class ColumnDetail {
final public String columnName; final public String columnName;

2
main/src/log4j.properties
View File

@ -4,4 +4,4 @@ log4j.logger.org.apache.http.impl=WARN
log4j.logger.org.apache.http.client=WARN log4j.logger.org.apache.http.client=WARN
log4j.appender.console=org.apache.log4j.ConsoleAppender 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

4
main/tests/server/conf/tests.xml
View File

@ -1,9 +1,9 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="Gridworks Unit Tests"> <suite name="Refine Unit Tests">
<test name="tests"> <test name="tests">
<packages> <packages>
<package name="com.google.gridworks.tests.*"/> <package name="com.google.refine.tests.*"/>
</packages> </packages>
<groups> <groups>
<run> <run>

2
main/tests/server/src/tests.log4j.properties
View File

@ -1,4 +1,4 @@
log4j.rootLogger=ERROR, console log4j.rootLogger=ERROR, console
log4j.appender.console=org.apache.log4j.ConsoleAppender 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

2
main/webapp/WEB-INF/butterfly.properties
View File

@ -26,7 +26,7 @@ butterfly.default.mountpoint = /extension
butterfly.modules.path = modules butterfly.modules.path = modules
butterfly.modules.path = ../../extensions/ butterfly.modules.path = ../../extensions/
# Add more paths here if your extensions live elsewhere. # 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 butterfly.modules.wirings = WEB-INF/modules.properties

4
main/webapp/WEB-INF/web.xml
View File

@ -19,12 +19,12 @@
</context-param> </context-param>
<servlet> <servlet>
<servlet-name>gridworks</servlet-name> <servlet-name>refine</servlet-name>
<servlet-class>com.google.refine.RefineServlet</servlet-class> <servlet-class>com.google.refine.RefineServlet</servlet-class>
</servlet> </servlet>
<servlet-mapping> <servlet-mapping>
<servlet-name>gridworks</servlet-name> <servlet-name>refine</servlet-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</servlet-mapping> </servlet-mapping>

2
main/webapp/modules/core/MOD-INF/module.properties
View File

@ -1,4 +1,4 @@
description = Gridworks Core Module description = Google Refine Core Module
implements = core implements = core
templating.macros = macros.vm templating.macros = macros.vm

16
server/IDEs/eclipse/README.txt
View File

@ -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 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) 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. the shell scripts.
To run, right click on the files directly from Eclipse, then do "Run As -> <name>". To run, right click on the files directly from Eclipse, then do "Run As -> <name>".
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" To import, open the Eclipse preferences, then follow to "Java > Code Style > Formatter"
and click the "Import" button and load the file. and click the "Import" button and load the file.
@ -33,6 +33,6 @@
Thank you for your interest. Thank you for your interest.
The Freebase Gridworks Development Team The Google Refine Development Team
http://code.google.com/p/freebase-gridworks/ http://code.google.com/p/google-refine/

6
server/IDEs/netbeans/nbbuild.xml
View File

@ -7,8 +7,8 @@
<!-- the Compile on Save feature is turned off for the project. --> <!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> <!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.--> <!-- in the project's Project Properties dialog box.-->
<project name="gridworks_server" default="default" basedir="."> <project name="refine_server" default="default" basedir=".">
<description>Builds, tests, and runs the project gridworks server.</description> <description>Builds, tests, and runs the project refine server.</description>
<import file="nbproject/build-impl.xml"/> <import file="nbproject/build-impl.xml"/>
<!-- <!--
@ -59,7 +59,7 @@
An example of overriding the target for project execution could look like this: An example of overriding the target for project execution could look like this:
<target name="run" depends="gridworks_server-impl.jar"> <target name="run" depends="refine_server-impl.jar">
<exec dir="bin" executable="launcher.exe"> <exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/> <arg file="${dist.jar}"/>
</exec> </exec>

6
server/IDEs/netbeans/nbproject/build-impl.xml
View File

@ -19,7 +19,7 @@ is divided into following sections:
- cleanup - cleanup
--> -->
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="gridworks_server-impl"> <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="refine_server-impl">
<fail message="Please build using Ant 1.7.1 or higher."> <fail message="Please build using Ant 1.7.1 or higher.">
<condition> <condition>
<not> <not>
@ -484,7 +484,7 @@ is divided into following sections:
<delete file="${built-jar.properties}" quiet="true"/> <delete file="${built-jar.properties}" quiet="true"/>
</target> </target>
<target if="already.built.jar.${basedir}" name="-warn-already-built-jar"> <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
<echo level="warn" message="Cycle detected: gridworks server was already built"/> <echo level="warn" message="Cycle detected: refine server was already built"/>
</target> </target>
<target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps"> <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>
@ -833,7 +833,7 @@ is divided into following sections:
<delete file="${built-clean.properties}" quiet="true"/> <delete file="${built-clean.properties}" quiet="true"/>
</target> </target>
<target if="already.built.clean.${basedir}" name="-warn-already-built-clean"> <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
<echo level="warn" message="Cycle detected: gridworks server was already built"/> <echo level="warn" message="Cycle detected: refine server was already built"/>
</target> </target>
<target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps"> <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
<mkdir dir="${build.dir}"/> <mkdir dir="${build.dir}"/>

4
server/IDEs/netbeans/nbproject/project.properties
View File

@ -2,7 +2,7 @@ annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=gridworks server application.title=refine server
application.vendor=dfhuynh application.vendor=dfhuynh
build.classes.dir=${build.dir}/ build.classes.dir=${build.dir}/
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
@ -23,7 +23,7 @@ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/gridworks server.jar dist.jar=${dist.dir}/refine server.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=

2
server/IDEs/netbeans/nbproject/project.xml
View File

@ -3,7 +3,7 @@
<type>org.netbeans.modules.java.j2seproject</type> <type>org.netbeans.modules.java.j2seproject</type>
<configuration> <configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3"> <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>gridworks server</name> <name>refine server</name>
<source-roots> <source-roots>
<root id="src.dir"/> <root id="src.dir"/>
</source-roots> </source-roots>

46
server/src/com/google/refine/Refine.java
View File

@ -46,7 +46,7 @@ public class Refine {
static private int port; static private int port;
static private String host; 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 { public static void main(String[] args) throws Exception {
@ -67,14 +67,14 @@ public class Refine {
} }
// set the log verbosity level // 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); port = Configurations.getInteger("refine.port",DEFAULT_PORT);
host = Configurations.get("gridworks.host",DEFAULT_HOST); 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 { public void init(String[] args) throws Exception {
@ -82,7 +82,7 @@ public class Refine {
RefineServer server = new RefineServer(); RefineServer server = new RefineServer();
server.init(host,port); server.init(host,port);
boolean headless = Configurations.getBoolean("gridworks.headless",false); boolean headless = Configurations.getBoolean("refine.headless",false);
if (!headless) { if (!headless) {
try { try {
RefineClient client = new RefineClient(); RefineClient client = new RefineClient();
@ -105,19 +105,19 @@ public class Refine {
class RefineServer extends Server { class RefineServer extends Server {
final static Logger logger = LoggerFactory.getLogger("gridworks_server"); final static Logger logger = LoggerFactory.getLogger("refine_server");
private ThreadPoolExecutor threadPool; private ThreadPoolExecutor threadPool;
public void init(String host, int port) throws Exception { public void init(String host, int port) throws Exception {
logger.info("Starting Server bound to '" + host + ":" + port + "'"); 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); if (memory != null) logger.info("Max memory size: " + memory);
int maxThreads = Configurations.getInteger("gridworks.queue.size", 30); int maxThreads = Configurations.getInteger("refine.queue.size", 30);
int maxQueue = Configurations.getInteger("gridworks.queue.max_size", 300); int maxQueue = Configurations.getInteger("refine.queue.max_size", 300);
long keepAliveTime = Configurations.getInteger("gridworks.queue.idle_time", 60); long keepAliveTime = Configurations.getInteger("refine.queue.idle_time", 60);
LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>(maxQueue); LinkedBlockingQueue<Runnable> queue = new LinkedBlockingQueue<Runnable>(maxQueue);
@ -128,11 +128,11 @@ class RefineServer extends Server {
Connector connector = new SocketConnector(); Connector connector = new SocketConnector();
connector.setPort(port); connector.setPort(port);
connector.setHost(host); 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); connector.setStatsOn(false);
this.addConnector(connector); 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)) { if (!isWebapp(webapp)) {
webapp = new File("main/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() + "'"); logger.info("Initializing context: '" + contextPath + "' from '" + webapp.getAbsolutePath() + "'");
WebAppContext context = new WebAppContext(webapp.getAbsolutePath(), contextPath); WebAppContext context = new WebAppContext(webapp.getAbsolutePath(), contextPath);
@ -156,7 +156,7 @@ class RefineServer extends Server {
this.setSendServerVersion(true); this.setSendServerVersion(true);
// Enable context autoreloading // Enable context autoreloading
if (Configurations.getBoolean("gridworks.autoreload",false)) { if (Configurations.getBoolean("refine.autoreload",false)) {
scanForUpdates(webapp, context); scanForUpdates(webapp, context);
} }
@ -196,7 +196,7 @@ class RefineServer extends Server {
logger.info("Starting autoreloading scanner... "); logger.info("Starting autoreloading scanner... ");
Scanner scanner = new 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.setScanDirs(scanList);
scanner.setReportExistingFilesOnStartup(false); 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 // 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 // parameters if we set them in the webapp context upon reading the web.xml file
static private void configure(WebAppContext context) throws Exception { static private void configure(WebAppContext context) throws Exception {
ServletHolder servlet = context.getServletHandler().getServlet("gridworks"); ServletHolder servlet = context.getServletHandler().getServlet("refine");
if (servlet != null) { if (servlet != null) {
servlet.setInitParameter("gridworks.data", getDataDir()); servlet.setInitParameter("refine.data", getDataDir());
servlet.setInitParameter("butterfly.modules.path", getDataDir() + "/extensions"); servlet.setInitParameter("butterfly.modules.path", getDataDir() + "/extensions");
servlet.setInitOrder(1); servlet.setInitOrder(1);
servlet.doStart(); servlet.doStart();
} }
servlet = context.getServletHandler().getServlet("gridworks-broker"); servlet = context.getServletHandler().getServlet("refine-broker");
if (servlet != null) { if (servlet != null) {
servlet.setInitParameter("gridworks.data", getDataDir() + "/broker"); servlet.setInitParameter("refine.data", getDataDir() + "/broker");
servlet.setInitParameter("gridworks.development", Configurations.get("gridworks.development","false")); servlet.setInitParameter("refine.development", Configurations.get("refine.development","false"));
servlet.setInitOrder(1); servlet.setInitOrder(1);
servlet.doStart(); servlet.doStart();
} }
@ -255,7 +255,7 @@ class RefineServer extends Server {
static private String getDataDir() { static private String getDataDir() {
String data_dir = Configurations.get("gridworks.data_dir"); String data_dir = Configurations.get("refine.data_dir");
if (data_dir != null) { if (data_dir != null) {
return data_dir; return data_dir;
} }