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/10/17 15:23:30 UTC
svn commit: r1399228 - in /stanbol/trunk/commons/solr: core/ install/
install/src/main/java/org/apache/stanbol/commons/solr/
install/src/main/java/org/apache/stanbol/commons/solr/install/
install/src/main/java/org/apache/stanbol/commons/solr/install/im...
Author: rwesten
Date: Wed Oct 17 13:23:29 2012
New Revision: 1399228
URL: http://svn.apache.org/viewvc?rev=1399228&view=rev
Log:
STANBOL-774: Changes for the commons.solr packages. Some classes needed to be moved (to avoid exporting of pakckes that would otherwise have broken the XML handling for the Solr core. ManagementUtils was moved to allow the impl. package to be private.
Added:
stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java (contents, props changed)
- copied, changed from r1397809, stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/IndexInstallerConstants.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java (contents, props changed)
- copied, changed from r1397809, stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagementUtils.java
Removed:
stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/IndexInstallerConstants.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagementUtils.java
Modified:
stanbol/trunk/commons/solr/core/pom.xml
stanbol/trunk/commons/solr/install/pom.xml
stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/IndexInstallTask.java
stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/SolrIndexInstaller.java
stanbol/trunk/commons/solr/managed/pom.xml
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
stanbol/trunk/commons/solr/web/pom.xml
stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/ReferencedSolrDispatchFilter.java
stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java
stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/impl/SolrServerPublishingComponent.java
Modified: stanbol/trunk/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/pom.xml?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/core/pom.xml (original)
+++ stanbol/trunk/commons/solr/core/pom.xml Wed Oct 17 13:23:29 2012
@@ -66,30 +66,32 @@
<instructions>
<Export-Package>
org.apache.stanbol.commons.solr;version=${project.version},
- org.apache.stanbol.commons.solr.utils;version=${project.version},
- org.apache.solr.client.solrj,
- org.apache.solr.client.solrj.beans,
- org.apache.solr.client.solrj.impl,
- org.apache.solr.client.solrj.request,
- org.apache.solr.client.solrj.response,
- org.apache.solr.client.solrj.util,
- org.apache.solr.client.solrj.embedded,
- org.apache.solr.common,
- org.apache.solr.common.luke,
- org.apache.solr.common.params,
- org.apache.solr.common.util,
- org.apache.solr.servlet,
- org.apache.solr.core,
- org.apache.solr.handler.*,
- org.apache.solr.request,
- org.apache.solr.response,
- org.apache.solr.schema,
- org.apache.solr.search.*,
- org.apache.solr.update .*,
- org.apache.solr.util.*,
- org.apache.solr.analysis,
- org.apache.lucene.*,
+ org.apache.stanbol.commons.solr.utils;version=${project.version}
</Export-Package>
+ <_exportcontents> <!-- used instead of Export-Package to preserve the owlapi jar -->
+ 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},
+ org.apache.solr.client.solrj.request;version=${solr-version},
+ org.apache.solr.client.solrj.response;version=${solr-version},
+ org.apache.solr.client.solrj.util;version=${solr-version},
+ org.apache.solr.client.solrj.embedded;version=${solr-version},
+ org.apache.solr.common;version=${solr-version},
+ org.apache.solr.common.luke;version=${solr-version},
+ org.apache.solr.common.params;version=${solr-version},
+ org.apache.solr.common.util;version=${solr-version},
+ org.apache.solr.servlet;version=${solr-version},
+ org.apache.solr.core;version=${solr-version},
+ org.apache.solr.handler.*;version=${solr-version},
+ org.apache.solr.request;version=${solr-version},
+ org.apache.solr.response;version=${solr-version},
+ org.apache.solr.schema;version=${solr-version},
+ org.apache.solr.search.*;version=${solr-version},
+ org.apache.solr.update.*;version=${solr-version},
+ org.apache.solr.util.*;version=${solr-version},
+ org.apache.solr.analysis;version=${solr-version},
+ org.apache.lucene.*;version=${solr-version}
+ </_exportcontents>
<!-- NOTE:
* The exclusion of javax.xml.stream assumes that only serialised
java objects are used as serialisation to and from the SolrServer
@@ -118,12 +120,35 @@
!org.apache.lucene.analysis.pl.*,
!org.apache.lucene.analysis.stempel.*,
!org.egothor.stemmer.*,
+ !org.w3c.dom.html,
+ !org.w3c.dom.*,
+ !org.xml.sax.*,
+ org.apache.stanbol.commons.solr,
+ org.apache.stanbol.commons.solr.utils,
+ org.apache.solr.client.solrj,
+ org.apache.solr.client.solrj.beans,
+ org.apache.solr.client.solrj.impl,
+ org.apache.solr.client.solrj.request,
+ org.apache.solr.client.solrj.response,
+ org.apache.solr.client.solrj.util,
+ org.apache.solr.client.solrj.embedded,
+ org.apache.solr.common,
+ org.apache.solr.common.luke,
+ org.apache.solr.common.params,
+ org.apache.solr.common.util,
+ org.apache.solr.servlet,
+ org.apache.solr.core,
+ org.apache.solr.handler.*,
+ org.apache.solr.request,
+ org.apache.solr.response,
+ org.apache.solr.schema,
+ org.apache.solr.search.*,
+ org.apache.solr.update.*,
+ org.apache.solr.util.*,
+ org.apache.solr.analysis,
+ org.apache.lucene.*,
*
</Import-Package>
- <Private-Package>
- org.apache.stanbol.commons.solr.impl;version=${project.version},
- org.apache.stanbol.commons.solr.impl.install;version=${project.version}
- </Private-Package>
<Embed-Dependency>
solr-solrj, solr-core, solr-noggit, solr-dataimporthandler,
solr-analysis-extras,
Modified: stanbol/trunk/commons/solr/install/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/pom.xml?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/pom.xml (original)
+++ stanbol/trunk/commons/solr/install/pom.xml Wed Oct 17 13:23:29 2012
@@ -66,11 +66,8 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.commons.solr.install;version=${project.version}
+ org.apache.stanbol.commons.solr.install;version=${project.version}; provide:=true
</Export-Package>
- <Import-Package>
- *
- </Import-Package>
<Private-Package>
org.apache.stanbol.commons.solr.install.impl;version=${project.version}
</Private-Package>
@@ -90,13 +87,8 @@
<!-- Stanbol Commomns dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.0-SNAPSHOT</version>
</dependency>
<!-- for the Solr Index Installer -->
<dependency>
Copied: stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java (from r1397809, stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/IndexInstallerConstants.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java?p2=stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java&p1=stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/IndexInstallerConstants.java&r1=1397809&r2=1399228&rev=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/IndexInstallerConstants.java (original)
+++ stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java Wed Oct 17 13:23:29 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.solr;
+package org.apache.stanbol.commons.solr.install;
import org.apache.stanbol.commons.solr.install.impl.SolrIndexInstaller;
Propchange: stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/IndexInstallerConstants.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/IndexInstallTask.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/IndexInstallTask.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/IndexInstallTask.java (original)
+++ stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/IndexInstallTask.java Wed Oct 17 13:23:29 2012
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.commons.solr.install.impl;
-import static org.apache.stanbol.commons.solr.IndexInstallerConstants.PROPERTY_ARCHIVE_FORMAT;
+import static org.apache.stanbol.commons.solr.install.IndexInstallerConstants.PROPERTY_ARCHIVE_FORMAT;
import static org.apache.stanbol.commons.solr.managed.ManagedIndexConstants.INDEX_ARCHIVES;
import static org.apache.stanbol.commons.solr.managed.ManagedIndexConstants.INDEX_NAME;
Modified: stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/SolrIndexInstaller.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/SolrIndexInstaller.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/SolrIndexInstaller.java (original)
+++ stanbol/trunk/commons/solr/install/src/main/java/org/apache/stanbol/commons/solr/install/impl/SolrIndexInstaller.java Wed Oct 17 13:23:29 2012
@@ -16,8 +16,8 @@
*/
package org.apache.stanbol.commons.solr.install.impl;
-import static org.apache.stanbol.commons.solr.IndexInstallerConstants.PROPERTY_ARCHIVE_FORMAT;
-import static org.apache.stanbol.commons.solr.IndexInstallerConstants.SOLR_INDEX_ARCHIVE_RESOURCE_TYPE;
+import static org.apache.stanbol.commons.solr.install.IndexInstallerConstants.PROPERTY_ARCHIVE_FORMAT;
+import static org.apache.stanbol.commons.solr.install.IndexInstallerConstants.SOLR_INDEX_ARCHIVE_RESOURCE_TYPE;
import static org.apache.stanbol.commons.solr.managed.ManagedIndexConstants.INDEX_NAME;
import static org.apache.stanbol.commons.solr.utils.ConfigUtils.SOLR_INDEX_ARCHIVE_EXTENSION;
import static org.apache.stanbol.commons.solr.utils.ConfigUtils.SUPPORTED_SOLR_ARCHIVE_FORMAT;
@@ -43,7 +43,7 @@ import org.apache.sling.installer.api.ta
import org.apache.sling.installer.api.tasks.TaskResource;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
import org.apache.sling.installer.api.tasks.TransformationResult;
-import org.apache.stanbol.commons.solr.IndexInstallerConstants;
+import org.apache.stanbol.commons.solr.install.IndexInstallerConstants;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
import org.apache.stanbol.commons.solr.utils.ServiceReferenceRankingComparator;
import org.osgi.framework.Constants;
Modified: stanbol/trunk/commons/solr/managed/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/pom.xml?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/pom.xml (original)
+++ stanbol/trunk/commons/solr/managed/pom.xml Wed Oct 17 13:23:29 2012
@@ -59,12 +59,10 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.stanbol.commons.solr.managed;version=${project.version},
+ org.apache.stanbol.commons.solr.managed;version=${project.version}; provide:=true,
+ org.apache.stanbol.commons.solr.managed.util;version=${project.version},
org.apache.stanbol.commons.solr.managed.standalone;version=${project.version}
</Export-Package>
- <Import-Package>
- *
- </Import-Package>
<Private-Package>
org.apache.stanbol.commons.solr.managed.impl;version=${project.version}
</Private-Package>
@@ -89,13 +87,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.web</artifactId>
<version>0.9.0-incubating</version>
- </dependency>
+ </dependency -->
<!-- OSGI dependencies -->
<dependency>
@@ -141,191 +139,6 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-solrj</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-dataimporthandler</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-dataimporthandler-extras</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-noggit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-commons-csv</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-highlighter</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-memory</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-misc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spellchecker</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-spatial</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-icu</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-analysis-extras</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jakarta-regexp</groupId>
- <artifactId>jakarta-regexp</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>test</scope>
- </dependency>
- <!--
- already used <dependency> <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId> <scope>test</scope> </dependency>
- -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- <version>2.7.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xalan</groupId>
- <artifactId>serializer</artifactId>
- <version>2.7.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-tools</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java (original)
+++ stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/IndexMetadata.java Wed Oct 17 13:23:29 2012
@@ -38,7 +38,6 @@ import java.util.InvalidPropertiesFormat
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.commons.solr.IndexReference;
Modified: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java (original)
+++ stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java Wed Oct 17 13:23:29 2012
@@ -24,8 +24,8 @@ import static org.apache.stanbol.commons
import static org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_RANKING;
import static org.apache.stanbol.commons.solr.managed.ManagedIndexConstants.INDEX_NAME;
import static org.apache.stanbol.commons.solr.managed.ManagedSolrServer.MANAGED_SOLR_DIR_PROPERTY;
-import static org.apache.stanbol.commons.solr.managed.impl.ManagementUtils.getArchiveCoreName;
-import static org.apache.stanbol.commons.solr.managed.impl.ManagementUtils.substituteProperty;
+import static org.apache.stanbol.commons.solr.managed.util.ManagementUtils.getArchiveCoreName;
+import static org.apache.stanbol.commons.solr.managed.util.ManagementUtils.substituteProperty;
import java.io.File;
import java.io.IOException;
@@ -67,6 +67,7 @@ import org.apache.stanbol.commons.solr.m
import org.apache.stanbol.commons.solr.managed.ManagedIndexState;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
import org.apache.stanbol.commons.solr.managed.standalone.ClassPathDataFileProvider;
+import org.apache.stanbol.commons.solr.managed.util.ManagementUtils;
import org.apache.stanbol.commons.solr.utils.ConfigUtils;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileListener;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
Modified: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java (original)
+++ stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java Wed Oct 17 13:23:29 2012
@@ -16,8 +16,6 @@
*/
package org.apache.stanbol.commons.solr.managed.standalone;
-import java.util.ServiceLoader;
-
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.core.CoreContainer;
Modified: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java (original)
+++ stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java Wed Oct 17 13:23:29 2012
@@ -16,9 +16,9 @@
*/
package org.apache.stanbol.commons.solr.managed.standalone;
-import static org.apache.stanbol.commons.solr.managed.impl.ManagementUtils.getArchiveCoreName;
-import static org.apache.stanbol.commons.solr.managed.impl.ManagementUtils.getMetadata;
-import static org.apache.stanbol.commons.solr.managed.impl.ManagementUtils.substituteProperty;
+import static org.apache.stanbol.commons.solr.managed.util.ManagementUtils.getArchiveCoreName;
+import static org.apache.stanbol.commons.solr.managed.util.ManagementUtils.getMetadata;
+import static org.apache.stanbol.commons.solr.managed.util.ManagementUtils.substituteProperty;
import java.io.File;
import java.io.IOException;
@@ -47,7 +47,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.stanbol.commons.solr.managed.IndexMetadata;
import org.apache.stanbol.commons.solr.managed.ManagedIndexState;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
-import org.apache.stanbol.commons.solr.managed.impl.ManagementUtils;
+import org.apache.stanbol.commons.solr.managed.util.ManagementUtils;
import org.apache.stanbol.commons.solr.utils.ConfigUtils;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
import org.slf4j.Logger;
Copied: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java (from r1397809, stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagementUtils.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java?p2=stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java&p1=stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagementUtils.java&r1=1397809&r2=1399228&rev=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagementUtils.java (original)
+++ stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java Wed Oct 17 13:23:29 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.commons.solr.managed.impl;
+package org.apache.stanbol.commons.solr.managed.util;
import java.io.BufferedInputStream;
import java.io.File;
Propchange: stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: stanbol/trunk/commons/solr/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/pom.xml?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/pom.xml (original)
+++ stanbol/trunk/commons/solr/web/pom.xml Wed Oct 17 13:23:29 2012
@@ -57,13 +57,13 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>
- org.apache.stanbol.commons.solr.web;version=${project.version},
- org.apache.stanbol.commons.solr.web.dispatch;version=${project.version}
- </Export-Package>
<Import-Package>
+ org.apache.stanbol.commons.solr.web.dispatch,
*
</Import-Package>
+ <Export-Package>
+ org.apache.stanbol.commons.solr.web.dispatch;version=${project.version}
+ </Export-Package>
<Private-Package>
org.apache.stanbol.commons.solr.web.impl;version=${project.version},
org.apache.stanbol.commons.solr.web.utils;version=${project.version}
@@ -85,13 +85,13 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<!-- OSGI framework dependencies -->
Modified: stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/ReferencedSolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/ReferencedSolrDispatchFilter.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/ReferencedSolrDispatchFilter.java (original)
+++ stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/ReferencedSolrDispatchFilter.java Wed Oct 17 13:23:29 2012
@@ -16,19 +16,15 @@
*/
package org.apache.stanbol.commons.solr.web.dispatch;
-import java.io.IOException;
import javax.servlet.Filter;
-import javax.xml.parsers.ParserConfigurationException;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.CoreContainer.Initializer;
import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.stanbol.commons.solr.SolrServerAdapter;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.http.HttpService;
-import org.xml.sax.SAXException;
/**
* Special version of the {@link SolrDispatchFilter} (implemented based on the
Modified: stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java (original)
+++ stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java Wed Oct 17 13:23:29 2012
@@ -19,8 +19,6 @@ package org.apache.stanbol.commons.solr.
import java.util.Arrays;
import java.util.Comparator;
-import javax.naming.Context;
-
import org.apache.solr.core.CoreContainer;
import org.apache.stanbol.commons.solr.SolrConstants;
import org.apache.stanbol.commons.solr.utils.ServiceReferenceRankingComparator;
Modified: stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/impl/SolrServerPublishingComponent.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/impl/SolrServerPublishingComponent.java?rev=1399228&r1=1399227&r2=1399228&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/impl/SolrServerPublishingComponent.java (original)
+++ stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/impl/SolrServerPublishingComponent.java Wed Oct 17 13:23:29 2012
@@ -302,7 +302,7 @@ public class SolrServerPublishingCompone
server = (CoreContainer)tracker.getService(ref);
}
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(SolrServerPublishingComponent.class.getClassLoader());
+ Thread.currentThread().setContextClassLoader(CoreContainer.class.getClassLoader());
try {
filter = new SolrFilter(server);
}finally {