Author: fchrist
Date: Tue Apr 17 18:08:11 2012
New Revision: 1327206
URL: http://svn.apache.org/viewvc?rev=1327206&view=rev
Log:
STANBOL-585 STANBOL-586 merged changes in #1326932 for removing JAWS to
0.9.0-incubating branch
Removed:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/wordnet/
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/resources/
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/appended-resources/
(props changed)
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
Propchange:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 17 18:08:11 2012
@@ -0,0 +1 @@
+/incubator/stanbol/trunk/contenthub/search/related:1301064-1303319,1303391-1303402,1303405-1304408,1326932
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml?rev=1327206&r1=1327205&r2=1327206&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/pom.xml
Tue Apr 17 18:08:11 2012
@@ -35,12 +35,6 @@ Finds related keywords from various type
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>jaws</Embed-Dependency>
- <Export-Package>edu.smu.tspell.*</Export-Package>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -86,12 +80,6 @@ Finds related keywords from various type
<groupId>com.hp.hpl.jena</groupId>
<artifactId>arq</artifactId>
</dependency>
-
- <!-- Jaws Wordnet client -->
- <dependency>
- <groupId>edu.smu.tspell</groupId>
- <artifactId>jaws</artifactId>
- </dependency>
</dependencies>
<repositories>
Propchange:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/appended-resources/
------------------------------------------------------------------------------
Merged
/incubator/stanbol/trunk/contenthub/search/related/src/main/appended-resources:r1326932
Modified:
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java?rev=1327206&r1=1327205&r2=1327206&view=diff
==============================================================================
---
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
(original)
+++
incubator/stanbol/branches/0.9.0-incubating/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/RelatedKeywordSearchManagerImpl.java
Tue Apr 17 18:08:11 2012
@@ -29,7 +29,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
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;
@@ -83,11 +82,6 @@ public class RelatedKeywordSearchManager
relatedKeywordsMap.put(keyword, relatedKeywords);
return new RelatedKeywordSearchResult(relatedKeywordsMap);
}
-
- @Override
- public SearchResult getRelatedKeywordsFromWordnet(String keyword) throws
SearchException {
- return getRelatedKeywordsFrom(keyword, WordnetSearch.class);
- }
@Override
public SearchResult getRelatedKeywordsFromOntology(String keyword, String
ontologyURI) throws SearchException {
