You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/12/21 12:57:00 UTC
svn commit: r1424884 - in /stanbol/trunk/commons/solr/core: pom.xml
src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
Author: rwesten
Date: Fri Dec 21 11:57:00 2012
New Revision: 1424884
URL: http://svn.apache.org/viewvc?rev=1424884&view=rev
Log:
STANBOL-852: added DynamicImport-Package; all excluded imports of org.apache.solr|lucene are now optional instead. Changes the SolrServerAdapter are only currently commented code
Modified:
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1424884&r1=1424883&r2=1424884&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Fri Dec 21 11:57:00 2012
@@ -68,7 +68,8 @@
org.apache.stanbol.commons.solr;version=${project.version},
org.apache.stanbol.commons.solr.utils;version=${project.version}
</Export-Package>
- <_exportcontents> <!-- used instead of Export-Package to preserve the owlapi jar -->
+ <!-- used instead of Export-Package to preserve the jars -->
+ <_exportcontents>
org.apache.solr.client.solrj;version=${solr-version},
org.apache.solr.client.solrj.beans;version=${solr-version},
org.apache.solr.client.solrj.impl;version=${solr-version},
@@ -116,12 +117,12 @@
!antlr.*,
!com.werken.*,
!org.apache.oro.*,
- !org.apache.lucene.analysis.cn.smart.*,
- !org.apache.lucene.analysis.pl.*,
- !org.apache.lucene.analysis.ja.*,
- !org.apache.lucene.analysis.stempel.*,
- !org.apache.lucene.search.grouping.*,
- !org.egothor.stemmer.*,
+ org.apache.lucene.analysis.cn.smart.*;resolution:=optional,
+ org.apache.lucene.analysis.pl.*;resolution:=optional,
+ org.apache.lucene.analysis.ja.*;resolution:=optional,
+ org.apache.lucene.analysis.stempel.*;resolution:=optional,
+ org.apache.lucene.search.grouping.*;resolution:=optional,
+ org.egothor.stemmer.*;resolution:=optional,
javax.servlet.*; version="[2.5.0,4.0.0)",
org.apache.stanbol.commons.solr,
org.apache.stanbol.commons.solr.utils,
@@ -149,6 +150,7 @@
org.apache.lucene.*,
*
</Import-Package>
+ <DynamicImport-Package>*</DynamicImport-Package>
<Embed-Dependency>
solr-solrj, solr-core, solr-dataimporthandler,
solr-analysis-extras, commons-httpclient,
Modified: stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1424884&r1=1424883&r2=1424884&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java (original)
+++ stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java Fri Dec 21 11:57:00 2012
@@ -181,6 +181,9 @@ public class SolrServerAdapter {
this.context = context;
//create a clone so that only we control who changes to the properties
serverProperties = parsedServerProperties.clone();
+// SolrResourceLoader loader = new OsgiResourceLoader(solrDir.getAbsolutePath(),
+// SolrServerAdapter.class.getClassLoader());
+// CoreContainer container = new CoreContainer(loader);
CoreContainer container = new CoreContainer(solrDir.getAbsolutePath());
File solrCof = new File(solrDir,parsedServerProperties.getSolrXml());
ClassLoader classLoader = updateContextClassLoader();
@@ -352,8 +355,14 @@ public class SolrServerAdapter {
ClassLoader classLoader = updateContextClassLoader();
SolrCore core;
try {
+// SolrResourceLoader loader = new OsgiResourceLoader(coreDir.getAbsolutePath(),
+// SolrServerAdapter.class.getClassLoader());
+// SolrConfig config = new OsgiEnabledSolrConfig(loader, "solrconfig.xml", null);
+// IndexSchema schema = new IndexSchema(config,"schema.xml",null);
CoreDescriptor coreDescriptor = new CoreDescriptor(server,
coreName, coreDir.getAbsolutePath());
+// core = new SolrCore(coreName, coreDir.getAbsolutePath(), config, schema,coreDescriptor);
+// server.register(coreName, core, false);
core = server.create(coreDescriptor);
//add the CloseHook
core.addCloseHook(closeHook);