Author: ssmaeklu
Date: 2007-08-13 15:49:34 +0200 (Mon, 13 Aug 2007)
New Revision: 5605
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/Spi.java
trunk/skinresourcefeed/src/main/java/no/schibstedsok/commons/resourcefeed/ResourceServlet.java
Log:
FastSearchResult now loaded by the correct class loader.
Modified:
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/Spi.java
===================================================================
---
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/Spi.java
2007-08-13 13:47:55 UTC (rev 5604)
+++
trunk/site-spi/src/main/java/no/schibstedsok/searchportal/site/config/Spi.java
2007-08-13 13:49:34 UTC (rev 5605)
@@ -19,11 +19,11 @@
/** */
RESULT_HANDLER_CONTROL("result-handler-control", RESULT_HANDLER_CONFIG),
/** */
- SEARCH_COMMAND_CONFIG("command-config", RESULT),
+ SEARCH_COMMAND_CONFIG("search-command-config", RESULT),
/** */
- SEARCH_COMMAND_CONTROL("command-control", SEARCH_COMMAND_CONFIG),
+ SEARCH_COMMAND_CONTROL("search-command-control", SEARCH_COMMAND_CONFIG),
/** */
- VIEW_CONFIG("view-config"),
+ VIEW_CONFIG("view-config", RESULT),
/** */
VIEW_CONTROL("view-control", VIEW_CONFIG),
/** */
Modified:
trunk/skinresourcefeed/src/main/java/no/schibstedsok/commons/resourcefeed/ResourceServlet.java
===================================================================
---
trunk/skinresourcefeed/src/main/java/no/schibstedsok/commons/resourcefeed/ResourceServlet.java
2007-08-13 13:47:55 UTC (rev 5604)
+++
trunk/skinresourcefeed/src/main/java/no/schibstedsok/commons/resourcefeed/ResourceServlet.java
2007-08-13 13:49:34 UTC (rev 5605)
@@ -280,9 +280,10 @@
final String path = (String) iterator.next();
- // Req. for jars can be done without the version suffix. A
request for query-transform.jar might
- // return the file query-transform-2.11-SNAPSHOT.jar.
- if (path.contains(baseName)) {
+ // Remove path, site name and version suffix.
+ final String jarName = path.substring(path.lastIndexOf('/') +
1).replaceAll("-(\\d+\\.?)+(-SNAPSHOT)?.jar$",
"").replaceAll("^([\\p{Alnum}]+\\.?)+-", "");
+
+ if (jarName.equals(baseName)) {
final URL url =
servletConfig.getServletContext().getResource(path);
return url.openConnection().getInputStream();
}
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
