Author: ssmiweve
Date: 2007-08-09 15:39:09 +0200 (Thu, 09 Aug 2007)
New Revision: 5600
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/QueryTransformerFactory.java
trunk/result-handler-control-spi/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandlerFactory.java
Log:
SEARCH-1744
sorry magnus, had to take the comment away as it seems the separate
classloader for the constructor's parameter wasn't required.
Modified:
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/QueryTransformerFactory.java
===================================================================
---
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/QueryTransformerFactory.java
2007-08-09 10:39:26 UTC (rev 5599)
+++
trunk/query-transform-control-spi/src/main/java/no/schibstedsok/searchportal/query/transform/QueryTransformerFactory.java
2007-08-09 13:39:09 UTC (rev 5600)
@@ -68,33 +68,14 @@
}
};
- final SiteClassLoaderFactory.Context cfgCxt = new
SiteClassLoaderFactory.Context() {
- public BytecodeLoader newBytecodeLoader(final SiteContext
site, final String name, final String jar) {
- return context.newBytecodeLoader(site, name, jar);
- }
- public Site getSite() {
- return context.getSite();
- }
- public Spi getSpi() {
- return Spi.QUERY_TRANSFORM_CONFIG;
- }
- };
-
final ClassLoader ctrlClassLoader =
SiteClassLoaderFactory.valueOf(ctrlCxt).getClassLoader();
- final ClassLoader cfgClassLoader =
SiteClassLoaderFactory.valueOf(cfgCxt).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends QueryTransformer> cls
= (Class<? extends
QueryTransformer>)ctrlClassLoader.loadClass(controllerName);
- // tricky tricky. took me some time to see this!
- // one classLoader for the constructor, another for it's
paramaeter! nice one magnus.
- @SuppressWarnings("unchecked")
- final Class<QueryTransformerConfig> cfgClass =
(Class<QueryTransformerConfig>)
-
cfgClassLoader.loadClass(QueryTransformerConfig.class.getName());
+ final Constructor<? extends QueryTransformer> constructor =
cls.getConstructor(QueryTransformerConfig.class);
- final Constructor<? extends QueryTransformer> constructor =
cls.getConstructor(cfgClass);
-
return constructor.newInstance(config);
} catch (ClassNotFoundException ex) {
Modified:
trunk/result-handler-control-spi/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandlerFactory.java
===================================================================
---
trunk/result-handler-control-spi/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandlerFactory.java
2007-08-09 10:39:26 UTC (rev 5599)
+++
trunk/result-handler-control-spi/src/main/java/no/schibstedsok/searchportal/result/handler/ResultHandlerFactory.java
2007-08-09 13:39:09 UTC (rev 5600)
@@ -71,29 +71,13 @@
context
);
- final SiteClassLoaderFactory.Context cfgContext =
ContextWrapper.wrap(
- SiteClassLoaderFactory.Context.class,
- new BaseContext() {
- public Spi getSpi() {
- return Spi.RESULT_HANDLER_CONFIG;
- }
- },
- context
- );
-
final ClassLoader ctlLoader =
SiteClassLoaderFactory.valueOf(ctlContext).getClassLoader();
- final ClassLoader cfgLoader =
SiteClassLoaderFactory.valueOf(cfgContext).getClassLoader();
@SuppressWarnings("unchecked")
final Class<? extends ResultHandler> cls = (Class<? extends
ResultHandler>)ctlLoader.loadClass(name);
- // one classLoader for the constructor, another for it's
paramaeter!
- @SuppressWarnings("unchecked")
- final Class<ResultHandlerConfig> cfgClass =
(Class<ResultHandlerConfig>)
- cfgLoader.loadClass(ResultHandlerConfig.class.getName());
+ final Constructor<? extends ResultHandler> constructor =
cls.getConstructor(ResultHandlerConfig.class);
- final Constructor<? extends ResultHandler> constructor =
cls.getConstructor(cfgClass);
-
return constructor.newInstance(config);
} catch (ClassNotFoundException ex) {
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
