Updated classpath for LODRefine

.classpath

@@ -18,7 +18,7 @@
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/ant-tools-1.8.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/arithcode-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/butterfly-trunk.jar" sourcepath="main/webapp/WEB-INF/lib-src/butterfly-trunk-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/clojure-1.1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/clojure-1.4.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-codec-1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-collections-3.2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/commons-fileupload-1.2.1.jar"/>
@@ -33,7 +33,7 @@
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/lessen-trunk-r8.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/log4j-1.2.15.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/marc4j-2.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/opencsv-2.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/opencsv-2.4-SNAPSHOT.jar" sourcepath="main/webapp/WEB-INF/lib-src/opencsv-2.4-SNAPSHOT-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/poi-3.8-20120326.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-3.8-20120326.jar"/>
 	<classpathentry exported="true" kind="lib" path="main/webapp/WEB-INF/lib/poi-ooxml-schemas-3.8-20120326.jar"/>
@@ -52,7 +52,7 @@
 	<classpathentry exported="true" kind="lib" path="server/lib/slf4j-api-1.5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="server/lib/slf4j-log4j12-1.5.6.jar"/>
 	<classpathentry exported="true" kind="lib" path="broker/appengine/WEB-INF/lib/slf4j-jdk14-1.5.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="extensions/jython/module/MOD-INF/lib/jython-2.5.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="extensions/jython/module/MOD-INF/lib/jython-2.5.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="broker/core/module/MOD-INF/lib/bdb-je-4.0.103.jar"/>
 	<classpathentry exported="true" kind="lib" path="extensions/gdata/module/MOD-INF/lib/gdata-core-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="extensions/gdata/module/MOD-INF/lib/gdata-spreadsheet-3.0.jar"/>

.gitignore

@@ -20,3 +20,4 @@ broker/core/module/MOD-INF/classes/
 broker/core/WEB-INF/lib/
 broker/core/data/
 broker/core/test-output/
+/test-output

extensions/freebase/module/scripts/dialogs/extend-data-preview-dialog.js

@@ -1,6 +1,6 @@
 /*
 
-Copyright 2010, Google Inc.
+Copyright 2010,2012 Google Inc. and other contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -139,20 +139,19 @@ ExtendDataPreviewDialog.prototype._show = function(properties) {
   }
 
   var suggestConfig = {
-      filter: '(all type:/type/property)'
+      type: '/type/property', // NOTE: requires patched Suggest to pass this through
+      // Default returns id, lang, mid, name, notable {id,name}, score
+      mql_output : JSON.stringify({'name':null,'id':null,'mid':null, '/type/property/expected_type':{'name':null,'id':null}}),
   };
   if ((this._column.reconConfig) && (this._column.reconConfig.type)) {
-    suggestConfig.filter = '(all type:/type/property (any namespace:/type/object namespace:' + this._column.reconConfig.type.id + '))';
+    suggestConfig.filter = '(should (any namespace:/type/object namespace:/common/topic namespace:' + this._column.reconConfig.type.id + '))';
   }
 
   this._elmts.addPropertyInput.suggestP(suggestConfig).bind("fb-select", function(evt, data) {
     self._addProperty({
       id : data.id,
       name: data.name,
-      expected: {
-        id: "/type/object",
-        name: "Object"
-      }
+      expected: data["/type/property/expected_type"]
     });
   });
 };

extensions/freebase/module/scripts/dialogs/schema-alignment/ui-link.js

@@ -308,7 +308,7 @@ SchemaAlignmentDialog.UILink.prototype._showPropertySuggestPopup = function(elmt
   };
   var sourceTypeID = this._parentUINode.getExpectedType();
   if (sourceTypeID !== null) {
-    suggestOptions.filter = '(all type:/type/property (any namespace:/type/object namespace:' + sourceTypeID + '))'
+    suggestOptions.filter = '(all type:/type/property (should namespace:' + sourceTypeID + '))'
 
   }
   input.suggestP(suggestOptions).bind("fb-select", function(e, data) { commitProperty(data); });

extensions/freebase/src/com/google/refine/freebase/protograph/transpose/SchemaHelper.java

@@ -13,7 +13,7 @@
 import com.google.refine.util.ParsingUtilities;
 
 public class SchemaHelper {
-    static private final String helperURL = "http://2.refine-helper.stefanomazzocchi.user.dev.freebaseapps.com/";
+    static private final String helperURL = "http://openrefine-helper.freebaseapps.com/";
 
     static private class PropertyInfo {
         String fromTypeID;