Author: suat
Date: Wed Mar 28 08:51:56 2012
New Revision: 1306216
URL: http://svn.apache.org/viewvc?rev=1306216&view=rev
Log:
STANBOL-498, STANBOL499:
-Renamed classes
-Created module for second layer indexing
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/
(with props)
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/SemanticIndexManagerImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/DocumentResultImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FacetResultImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchResult.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/util/SolrContentItemConverter.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/ClosureHelper.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/OntologyResourceSearch.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/referencedsite/ReferencedSiteSearch.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetClient.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetSearch.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/SolrSearchImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/util/SolrQueryUtil.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/RelatedKeywordResource.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/util/JSONUtils.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/LDProgramCollectionWriter.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/SearchResultWriter.java
Propchange:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 28 08:51:56 2012
@@ -0,0 +1,4 @@
+target
+.project
+.settings
+.classpath
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml?rev=1306216&view=auto
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
(added)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
Wed Mar 28 08:51:56 2012
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.contenthub.parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+
+ <artifactId>org.apache.stanbol.contenthub.index</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Contenthub Second Layer Indexing Module</name>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ </dependencies>
+</project>
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
Wed Mar 28 08:51:56 2012
@@ -43,7 +43,7 @@ import org.apache.commons.compress.archi
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
+import org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathException;
import org.apache.stanbol.entityhub.ldpath.backend.SiteManagerBackend;
import org.apache.stanbol.entityhub.servicesapi.site.ReferencedSiteManager;
import org.osgi.framework.Bundle;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/SemanticIndexManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/SemanticIndexManagerImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/SemanticIndexManagerImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/SemanticIndexManagerImpl.java
Wed Mar 28 08:51:56 2012
@@ -34,9 +34,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramCollection;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathException;
+import
org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathProgramCollection;
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.store.solr.manager.SolrCoreManager;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
@@ -234,8 +234,8 @@ public class SemanticIndexManagerImpl im
}
@Override
- public LDProgramCollection retrieveAllPrograms() {
- return new LDProgramCollection(nameProgramMap);
+ public LDPathProgramCollection retrieveAllPrograms() {
+ return new LDPathProgramCollection(nameProgramMap);
}
@Override
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
Wed Mar 28 08:51:56 2012
@@ -39,6 +39,7 @@
<module>parent</module>
<module>servicesapi</module>
<module>store</module>
+ <module>index</module>
<module>search</module>
<module>web</module>
<module>bundlelist</module>
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/DocumentResultImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/DocumentResultImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/DocumentResultImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/DocumentResultImpl.java
Wed Mar 28 08:51:56 2012
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.contenthub.search.featured;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
import org.apache.stanbol.contenthub.store.solr.util.ContentItemIDOrganizer;
public class DocumentResultImpl implements DocumentResult {
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FacetResultImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FacetResultImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FacetResultImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FacetResultImpl.java
Wed Mar 28 08:51:56 2012
@@ -20,7 +20,7 @@ import static org.apache.stanbol.content
import static
org.apache.stanbol.contenthub.servicesapi.store.vocabulary.SolrVocabulary.STANBOLRESERVED_PREFIX;
import org.apache.solr.client.solrj.response.FacetField;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
public class FacetResultImpl implements FacetResult {
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchImpl.java
Wed Mar 28 08:51:56 2012
@@ -47,14 +47,14 @@ import org.apache.stanbol.commons.solr.m
import
org.apache.stanbol.contenthub.search.featured.util.SolrContentItemConverter;
import org.apache.stanbol.contenthub.search.solr.util.SolrQueryUtil;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.FeaturedSearch;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearchManager;
-import org.apache.stanbol.contenthub.servicesapi.search.solr.SolrSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FeaturedSearch;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearchManager;
+import org.apache.stanbol.contenthub.servicesapi.index.search.solr.SolrSearch;
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.store.solr.manager.SolrCoreManager;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchResult.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchResult.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchResult.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/FeaturedSearchResult.java
Wed Mar 28 08:51:56 2012
@@ -19,10 +19,10 @@ package org.apache.stanbol.contenthub.se
import java.util.List;
import java.util.Map;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
public class FeaturedSearchResult implements SearchResult {
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/util/SolrContentItemConverter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/util/SolrContentItemConverter.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/util/SolrContentItemConverter.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/featured/src/main/java/org/apache/stanbol/contenthub/search/featured/util/SolrContentItemConverter.java
Wed Mar 28 08:51:56 2012
@@ -18,7 +18,7 @@ package org.apache.stanbol.contenthub.se
import org.apache.solr.common.SolrDocument;
import org.apache.stanbol.contenthub.search.featured.DocumentResultImpl;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
import
org.apache.stanbol.contenthub.servicesapi.store.vocabulary.SolrVocabulary.SolrFieldName;
public class SolrContentItemConverter {
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordImpl.java
Wed Mar 28 08:51:56 2012
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.contenthub.search.related;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
public class RelatedKeywordImpl implements RelatedKeyword {
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
Wed Mar 28 08:51:56 2012
@@ -30,11 +30,11 @@ import org.apache.felix.scr.annotations.
import
org.apache.stanbol.contenthub.search.related.ontologyresource.OntologyResourceSearch;
import
org.apache.stanbol.contenthub.search.related.referencedsite.ReferencedSiteSearch;
import org.apache.stanbol.contenthub.search.related.wordnet.WordnetSearch;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearch;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearchManager;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearch;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearchManager;
@Component
@Service
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchResult.java
Wed Mar 28 08:51:56 2012
@@ -20,10 +20,10 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.lang.NotImplementedException;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/ClosureHelper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/ClosureHelper.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/ClosureHelper.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/ClosureHelper.java
Wed Mar 28 08:51:56 2012
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.commons.io.FilenameUtils;
import org.apache.stanbol.contenthub.search.related.RelatedKeywordImpl;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/OntologyResourceSearch.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/OntologyResourceSearch.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/OntologyResourceSearch.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/OntologyResourceSearch.java
Wed Mar 28 08:51:56 2012
@@ -30,9 +30,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.contenthub.search.related.RelatedKeywordImpl;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/referencedsite/ReferencedSiteSearch.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/referencedsite/ReferencedSiteSearch.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/referencedsite/ReferencedSiteSearch.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/referencedsite/ReferencedSiteSearch.java
Wed Mar 28 08:51:56 2012
@@ -32,9 +32,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.contenthub.search.related.RelatedKeywordImpl;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearch;
import org.apache.stanbol.entityhub.core.query.DefaultQueryFactory;
import org.apache.stanbol.entityhub.servicesapi.Entityhub;
import org.apache.stanbol.entityhub.servicesapi.EntityhubException;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetClient.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetClient.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetClient.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetClient.java
Wed Mar 28 08:51:56 2012
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.stanbol.contenthub.search.related.RelatedKeywordImpl;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
import edu.smu.tspell.wordnet.NounSynset;
import edu.smu.tspell.wordnet.Synset;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetSearch.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetSearch.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetSearch.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/WordnetSearch.java
Wed Mar 28 08:51:56 2012
@@ -28,9 +28,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.PropertyOption;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearch;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/SolrSearchImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/SolrSearchImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/SolrSearchImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/SolrSearchImpl.java
Wed Mar 28 08:51:56 2012
@@ -29,8 +29,8 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.common.params.SolrParams;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
import org.apache.stanbol.contenthub.search.solr.util.SolrQueryUtil;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.solr.SolrSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import org.apache.stanbol.contenthub.servicesapi.index.search.solr.SolrSearch;
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.store.solr.manager.SolrCoreManager;
import org.osgi.framework.BundleContext;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/util/SolrQueryUtil.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/util/SolrQueryUtil.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/util/SolrQueryUtil.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/search/solr/src/main/java/org/apache/stanbol/contenthub/search/solr/util/SolrQueryUtil.java
Wed Mar 28 08:51:56 2012
@@ -31,7 +31,7 @@ import org.apache.solr.client.solrj.util
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
import
org.apache.stanbol.contenthub.servicesapi.store.vocabulary.SolrVocabulary;
import
org.apache.stanbol.contenthub.servicesapi.store.vocabulary.SolrVocabulary.SolrFieldName;
import org.slf4j.Logger;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/store/solr/src/main/java/org/apache/stanbol/contenthub/store/solr/SolrStoreImpl.java
Wed Mar 28 08:51:56 2012
@@ -61,8 +61,8 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrInputDocument;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathException;
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrContentItem;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrStore;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/FeaturedSearchResource.java
Wed Mar 28 08:51:56 2012
@@ -50,12 +50,12 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.contenthub.search.solr.util.SolrQueryUtil;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.SemanticIndexManager;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.FacetResult;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.FeaturedSearch;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearchManager;
+import org.apache.stanbol.contenthub.servicesapi.index.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FacetResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.FeaturedSearch;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearchManager;
import
org.apache.stanbol.contenthub.servicesapi.store.vocabulary.SolrVocabulary;
import org.apache.stanbol.contenthub.web.util.JSONUtils;
import org.apache.stanbol.contenthub.web.util.RestUtil;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/RelatedKeywordResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/RelatedKeywordResource.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/RelatedKeywordResource.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/RelatedKeywordResource.java
Wed Mar 28 08:51:56 2012
@@ -40,9 +40,9 @@ import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.ontologies.RDFS;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import
org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeywordSearchManager;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeywordSearchManager;
import org.apache.stanbol.contenthub.web.util.RestUtil;
import org.apache.stanbol.contenthub.web.writers.SearchResultWriter;
import org.apache.stanbol.entityhub.core.query.DefaultQueryFactory;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/SemanticIndexManagerResource.java
Wed Mar 28 08:51:56 2012
@@ -43,10 +43,10 @@ import javax.ws.rs.core.Response.Status;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgram;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramCollection;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathException;
+import org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathProgram;
+import
org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathProgramCollection;
import org.apache.stanbol.contenthub.web.util.RestUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,7 +115,7 @@ public class SemanticIndexManagerResourc
if (acceptedHeader.isCompatible(MediaType.TEXT_HTML_TYPE)) {
return Response.ok(new Viewable("index", this),
MediaType.TEXT_HTML).build();
} else{
- LDProgramCollection ldProgramCollection =
programManager.retrieveAllPrograms();
+ LDPathProgramCollection ldProgramCollection =
programManager.retrieveAllPrograms();
ResponseBuilder rb = Response.ok(ldProgramCollection,
MediaType.APPLICATION_JSON);
addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -217,7 +217,7 @@ public class SemanticIndexManagerResourc
}
// Helper methods for HTML view
- public List<LDProgram> getLdPrograms() {
+ public List<LDPathProgram> getLdPrograms() {
return programManager.retrieveAllPrograms().asList();
}
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/resources/StoreResource.java
Wed Mar 28 08:51:56 2012
@@ -84,10 +84,10 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import
org.apache.stanbol.contenthub.search.featured.util.SolrContentItemConverter;
import org.apache.stanbol.contenthub.search.solr.SolrSearchImpl;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.SemanticIndexManager;
-import org.apache.stanbol.contenthub.servicesapi.search.SearchException;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
-import org.apache.stanbol.contenthub.servicesapi.search.solr.SolrSearch;
+import org.apache.stanbol.contenthub.servicesapi.index.SemanticIndexManager;
+import org.apache.stanbol.contenthub.servicesapi.index.search.SearchException;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
+import org.apache.stanbol.contenthub.servicesapi.index.search.solr.SolrSearch;
import org.apache.stanbol.contenthub.servicesapi.store.StoreException;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrContentItem;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrStore;
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/util/JSONUtils.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/util/JSONUtils.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/util/JSONUtils.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/util/JSONUtils.java
Wed Mar 28 08:51:56 2012
@@ -28,10 +28,10 @@ import java.util.Map.Entry;
import org.apache.commons.io.IOUtils;
import org.apache.solr.client.solrj.response.FacetField;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramCollection;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
-import
org.apache.stanbol.contenthub.servicesapi.search.featured.DocumentResult;
-import org.apache.stanbol.contenthub.servicesapi.search.related.RelatedKeyword;
+import
org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathProgramCollection;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.DocumentResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.related.RelatedKeyword;
import org.apache.stanbol.contenthub.servicesapi.store.solr.SolrContentItem;
import org.apache.stanbol.contenthub.store.solr.util.ContentItemIDOrganizer;
import org.codehaus.jettison.json.JSONArray;
@@ -217,7 +217,7 @@ public class JSONUtils {
return jObj.toString(4);
}
- public static String createJSONString(LDProgramCollection ldpc) throws
JSONException {
+ public static String createJSONString(LDPathProgramCollection ldpc) throws
JSONException {
JSONObject jObj = new JSONObject();
for (Map.Entry<String,String> entry : ldpc.asMap().entrySet()) {
jObj.put(entry.getKey(), entry.getValue());
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/LDProgramCollectionWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/LDProgramCollectionWriter.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/LDProgramCollectionWriter.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/LDProgramCollectionWriter.java
Wed Mar 28 08:51:56 2012
@@ -32,7 +32,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramCollection;
+import
org.apache.stanbol.contenthub.servicesapi.index.ldpath.LDPathProgramCollection;
import org.apache.stanbol.contenthub.web.util.JSONUtils;
import org.apache.stanbol.contenthub.web.util.RestUtil;
import org.codehaus.jettison.json.JSONException;
@@ -43,17 +43,17 @@ import org.codehaus.jettison.json.JSONEx
*
*/
@Provider
-public class LDProgramCollectionWriter implements
MessageBodyWriter<LDProgramCollection> {
+public class LDProgramCollectionWriter implements
MessageBodyWriter<LDPathProgramCollection> {
@Override
public boolean isWriteable(Class<?> type, Type genericType, Annotation[]
annotations, MediaType mediaType) {
String mediaTypeString = mediaType.getType() + '/' +
mediaType.getSubtype();
- return LDProgramCollection.class.isAssignableFrom(type)
+ return LDPathProgramCollection.class.isAssignableFrom(type)
&& RestUtil.supportedMediaTypes.contains(mediaTypeString);
}
@Override
- public long getSize(LDProgramCollection t,
+ public long getSize(LDPathProgramCollection t,
Class<?> type,
Type genericType,
Annotation[] annotations,
@@ -62,7 +62,7 @@ public class LDProgramCollectionWriter i
}
@Override
- public void writeTo(LDProgramCollection t,
+ public void writeTo(LDPathProgramCollection t,
Class<?> type,
Type genericType,
Annotation[] annotations,
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/SearchResultWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/SearchResultWriter.java?rev=1306216&r1=1306215&r2=1306216&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/SearchResultWriter.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/web/src/main/java/org/apache/stanbol/contenthub/web/writers/SearchResultWriter.java
Wed Mar 28 08:51:56 2012
@@ -32,7 +32,7 @@ import javax.ws.rs.ext.Provider;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.contenthub.servicesapi.Constants;
-import org.apache.stanbol.contenthub.servicesapi.search.featured.SearchResult;
+import
org.apache.stanbol.contenthub.servicesapi.index.search.featured.SearchResult;
import org.apache.stanbol.contenthub.web.util.JSONUtils;
import org.apache.stanbol.contenthub.web.util.RestUtil;
import org.codehaus.jettison.json.JSONException;
