Author: hossman
Date: Mon May 31 22:53:26 2010
New Revision: 949884
URL: http://svn.apache.org/viewvc?rev=949884&view=rev
Log:
merging r882838 from solr/branches/branch-1.5-dev for SOLR-1522
Modified:
lucene/solr/branches/branch-1.4/ (props changed)
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
(props changed)
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
(props changed)
Propchange: lucene/solr/branches/branch-1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 22:53:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk:881642,881906,883566,891596,891889,903271,911245,919871,925898
+/lucene/solr/trunk:881642,881906,882838,883566,891596,891889,903271,911245,919871,925898
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=949884&r1=949883&r2=949884&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Mon May 31 22:53:26 2010
@@ -82,6 +82,9 @@ Bug Fixes
* SOLR-1798: Small memory leak (~100 bytes) in fastLRUCache for every
commit. (yonik)
+* SOLR-1522: Show proper message if <script> tag is missing for DIH
+ ScriptTransformer (noble)
+
================== Release 1.4.0 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Modified:
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java?rev=949884&r1=949883&r2=949884&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
(original)
+++
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ContextImpl.java
Mon May 31 22:53:26 2010
@@ -89,6 +89,7 @@ public class ContextImpl extends Context
public DataSource getDataSource() {
if (ds != null) return ds;
+ if(entity == null) return null;
if (entity.dataSrc == null) {
entity.dataSrc = dataImporter.getDataSourceInstance(entity,
entity.dataSource, this);
}
Modified:
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
URL:
http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java?rev=949884&r1=949883&r2=949884&view=diff
==============================================================================
---
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
(original)
+++
lucene/solr/branches/branch-1.4/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ScriptTransformer.java
Mon May 31 22:53:26 2010
@@ -16,6 +16,9 @@
*/
package org.apache.solr.handler.dataimport;
+import static
org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow;
+import static
org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
@@ -55,24 +58,27 @@ public class ScriptTransformer extends T
} catch (DataImportHandlerException e) {
throw e;
} catch (InvocationTargetException e) {
- throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
+ wrapAndThrow(SEVERE,e,
"Could not invoke method :"
+ functionName
+ "\n <script>\n"
- + context.getVariableResolver().resolve(
- DataConfig.IMPORTER_NS + "." + DataConfig.SCRIPT)
- + "</script>", e);
+ + context.getScript()
+ + "</script>");
} catch (Exception e) {
- throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
- "Error invoking script for entity "
- + context.getEntityAttribute("name"), e);
+ wrapAndThrow(SEVERE,e, "Error invoking script for entity " +
context.getEntityAttribute("name"));
}
+ //will not reach here
+ return null;
}
private void initEngine(Context context) {
try {
String scriptText = context.getScript();
String scriptLang = context.getScriptLanguage();
+ if(scriptText == null ){
+ throw new DataImportHandlerException(SEVERE,
+ "<script> tag is not present under <dataConfig>");
+ }
Object scriptEngineMgr = Class
.forName("javax.script.ScriptEngineManager").newInstance();
// create a Script engine
@@ -84,8 +90,7 @@ public class ScriptTransformer extends T
String.class, Object[].class);
evalMethod.invoke(engine, scriptText);
} catch (Exception e) {
- throw new DataImportHandlerException(DataImportHandlerException.SEVERE,
- "<script> can be used only in java 6 or above", e);
+ wrapAndThrow(SEVERE,e, "<script> can be used only in java 6 or above");
}
}
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 22:53:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,883566,891596,891889,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java:881642,881906,882838,883566,891596,891889,903271,906553,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/DumpRequestHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 22:53:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,883566,891596,891889,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/DumpRequestHandler.java:881642,881906,882838,883566,891596,891889,903271,906553,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 22:53:26 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,883566,891596,891889,903271,906553,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/handler/MoreLikeThisHandler.java:881642,881906,882838,883566,891596,891889,903271,906553,911245,919871,925898
Propchange:
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/request/RawResponseWriter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 31 22:53:26 2010
@@ -1,2 +1,2 @@
-/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,883566,891596,891889,903271,911245,919871,925898
+/lucene/solr/trunk/src/java/org/apache/solr/request/RawResponseWriter.java:881642,881906,882838,883566,891596,891889,903271,911245,919871,925898
/lucene/solr/trunk/src/java/org/apache/solr/response/RawResponseWriter.java:906553
