You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/10/18 19:58:28 UTC
svn commit: r1533571 [1/7] - in /stanbol/branches/commons-ng: ./
commons/solr/ commons/solr/core/ commons/solr/core/src/license/
commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/
commons/solr/core/src/main/java/org/apache/stanbol/commons...
Author: reto
Date: Fri Oct 18 17:58:24 2013
New Revision: 1533571
URL: http://svn.apache.org/r1533571
Log:
STANBOL-1094: merged down from trunk various components and added inetgration tests
Added:
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/RegisteredSolrAnalyzerFactory.java
- copied unchanged from r1533448, stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/RegisteredSolrAnalyzerFactory.java
stanbol/branches/commons-ng/commons/solr/extras/icu/src/license/
- copied from r1533448, stanbol/trunk/commons/solr/extras/icu/src/license/
stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/license/
- copied from r1533448, stanbol/trunk/commons/solr/extras/kuromoji/src/license/
stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/license/
- copied from r1533448, stanbol/trunk/commons/solr/extras/smartcn/src/license/
stanbol/branches/commons-ng/commons/solr/extras/stempel/src/license/
- copied from r1533448, stanbol/trunk/commons/solr/extras/stempel/src/license/
stanbol/branches/commons-ng/enhancement-engines/disambiguation-mlt/src/license/
- copied from r1533530, stanbol/trunk/enhancement-engines/disambiguation-mlt/src/license/
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/ChunkData.java
- copied unchanged from r1533530, stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/ChunkData.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/SectionData.java
- copied unchanged from r1533530, stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/SectionData.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/TokenData.java
- copied unchanged from r1533530, stanbol/trunk/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/TokenData.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/license/
- copied from r1533530, stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-kuromoji/src/license/
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/src/license/
- copied from r1533530, stanbol/trunk/enhancement-engines/kuromoji-nlp/src/license/
stanbol/branches/commons-ng/enhancement-engines/lucenefstlinking/ (props changed)
- copied from r1533530, stanbol/trunk/enhancement-engines/lucenefstlinking/
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/
- copied from r1533530, stanbol/trunk/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/util/
stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/license/
- copied from r1533530, stanbol/trunk/enhancement-engines/textannotationnewmodel/src/license/
stanbol/branches/commons-ng/enhancement-engines/topic/api/ (props changed)
- copied from r1533530, stanbol/trunk/enhancement-engines/topic/api/
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/fst.config
- copied unchanged from r1533392, stanbol/trunk/entityhub/indexing/dbpedia/src/main/resources/indexing/config/fst.config
stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/fst/
- copied from r1533392, stanbol/trunk/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/fst/
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/license/
- copied from r1533392, stanbol/trunk/entityhub/indexing/freebase/src/license/
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/fst.config
- copied unchanged from r1533392, stanbol/trunk/entityhub/indexing/freebase/src/main/resources/indexing/config/fst.config
stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/main/resources/indexing/config/fst.config
- copied unchanged from r1533392, stanbol/trunk/entityhub/indexing/genericrdf/src/main/resources/indexing/config/fst.config
stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/fst.config
- copied unchanged from r1533392, stanbol/trunk/entityhub/indexing/geonames/src/main/resources/indexing/config/fst.config
stanbol/branches/commons-ng/entityhub/model/sesame/ (props changed)
- copied from r1533392, stanbol/trunk/entityhub/model/sesame/
stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/ClerezzaQueryUtils.java
- copied unchanged from r1533392, stanbol/trunk/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/ClerezzaQueryUtils.java
stanbol/branches/commons-ng/entityhub/query/sparql/ (props changed)
- copied from r1533392, stanbol/trunk/entityhub/query/sparql/
stanbol/branches/commons-ng/entityhub/yard/sesame/ (props changed)
- copied from r1533392, stanbol/trunk/entityhub/yard/sesame/
stanbol/branches/commons-ng/integration-tests/ (props changed)
- copied from r1533373, stanbol/trunk/integration-tests/
Removed:
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/Batch.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/BatchProcessor.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/ClassificationReport.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/ClassifierException.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/TopicClassifier.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/TopicSuggestion.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/Example.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/TrainingSet.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/TrainingSetException.java
stanbol/branches/commons-ng/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtilsTest.java
Modified:
stanbol/branches/commons-ng/commons/solr/ (props changed)
stanbol/branches/commons-ng/commons/solr/core/pom.xml
stanbol/branches/commons-ng/commons/solr/core/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiSolrResourceLoader.java
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java
stanbol/branches/commons-ng/commons/solr/extras/icu/src/main/java/org/apache/stanbol/commons/solr/extras/icu/impl/IcuAnalyzerFactoryActivator.java
stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/main/java/org/apache/stanbol/commons/solr/extras/kuromoji/impl/KuromojiAnalyzerFactoryActivator.java
stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/main/java/org/apache/stanbol/commons/solr/extras/smartcn/impl/SmartcnAnalyzerFactoryActivator.java
stanbol/branches/commons-ng/commons/solr/extras/stempel/src/main/java/org/apache/stanbol/commons/solr/extras/stempel/impl/StempelAnalyzerFoctoryActivator.java
stanbol/branches/commons-ng/commons/solr/install/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/commons/solr/managed/pom.xml
stanbol/branches/commons-ng/commons/solr/managed/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java
stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java
stanbol/branches/commons-ng/commons/solr/web/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java
stanbol/branches/commons-ng/enhancement-engines/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/Annotation.java
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/CandidateResource.java
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/model/SurfaceForm.java
stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/utils/SpotlightEngineUtils.java
stanbol/branches/commons-ng/enhancement-engines/disambiguation-mlt/README.md
stanbol/branches/commons-ng/enhancement-engines/disambiguation-mlt/pom.xml
stanbol/branches/commons-ng/enhancement-engines/disambiguation-mlt/src/main/java/org/apache/stanbol/enhancer/engine/disambiguation/mlt/DisambiguationData.java
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/CoMentionConstants.java
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/EntityCoMentionEngine.java
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/impl/ContentItemMentionBuilder.java
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/main/java/org/apache/stanbol/enhancer/engines/entitycomention/impl/EntityMention.java
stanbol/branches/commons-ng/enhancement-engines/entitycomention/src/main/resources/OSGI-INF/metatype/metatype.properties
stanbol/branches/commons-ng/enhancement-engines/entityhublinking/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/EntityLinker.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/LinkingStateAware.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/ProcessingState.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/engine/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/impl/Statistic.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/labeltokenizer-lucene/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitylinking/labeltokenizer-lucene/src/main/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/LuceneLabelTokenizer.java
stanbol/branches/commons-ng/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitylinking/labeltokenizer-smartcn/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitytagging/pom.xml
stanbol/branches/commons-ng/enhancement-engines/entitytagging/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntity.java
stanbol/branches/commons-ng/enhancement-engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/MockEntityhub.java
stanbol/branches/commons-ng/enhancement-engines/entitytagging/src/test/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/TestEntityLinkingEnhancementEngine.java
stanbol/branches/commons-ng/enhancement-engines/keywordextraction/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/pom.xml
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/Constants.java
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/KuromojiNlpEngine.java
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/src/main/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/NerData.java
stanbol/branches/commons-ng/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/TestKuromojiNlpEngine.java
stanbol/branches/commons-ng/enhancement-engines/lucenefstlinking/pom.xml
stanbol/branches/commons-ng/enhancement-engines/metaxa/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/nlp2rdf/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-chunker/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-chunker/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-ner/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-ner/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-pos/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-pos/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-sentence/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-sentence/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-token/ (props changed)
stanbol/branches/commons-ng/enhancement-engines/opennlp/opennlp-token/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/pom.xml
stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/Sentiment.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentPhrase.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-summarization/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/summarize/SentimentSummarizationEngine.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/pom.xml
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/api/LexicalCategoryClassifier.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/api/SentimentClassifier.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/classifiers/SentiWSComponent.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/classifiers/SentiWordNet.java
stanbol/branches/commons-ng/enhancement-engines/sentiment-wordclassifier/src/main/java/org/apache/stanbol/enhancer/engines/sentiment/services/SentimentEngine.java
stanbol/branches/commons-ng/enhancement-engines/smartcn-token/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/pom.xml
stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/TextAnnotationNewModelEngineTest.java
stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test.html
stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test2.html
stanbol/branches/commons-ng/enhancement-engines/topic/api/pom.xml
stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/EmbeddedSolrHelper.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TopicEngineTest.java
stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TrainingSetTest.java
stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml
stanbol/branches/commons-ng/enhancement-engines/topic/web/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
stanbol/branches/commons-ng/entityhub/ (props changed)
stanbol/branches/commons-ng/entityhub/generic/core/ (props changed)
stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java
stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/ValueFactoryTest.java
stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/yard/YardTest.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/Urify.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/IndexerFactory.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConstants.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/FinishedEntityDaemon.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerConstants.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerImpl.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilter.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathPostProcessor.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/EntityIneratorToScoreProviderAdapter.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/ResourceLoader.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ConfigTest.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/IndexerTest.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ResourceLoaderTest.java
stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilterTest.java
stanbol/branches/commons-ng/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/indexing/dblp/src/main/resources/log4j.properties
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/pom.xml
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-bottom.html
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-top.html
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/update-script.js
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/indexing.properties
stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/log4j.properties
stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/pom.xml
stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestination.java
stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
stanbol/branches/commons-ng/entityhub/indexing/freebase/pom.xml
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseAbbrevationProcessor.java
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseImageProcessor.java
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseKeyProcessor.java
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-bottom.html
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-top.html
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/update-script.js
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexing.properties
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexingsource.properties
stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/log4j.properties
stanbol/branches/commons-ng/entityhub/indexing/genericrdf/README.md
stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/main/resources/indexing/config/indexing.properties
stanbol/branches/commons-ng/entityhub/indexing/geonames/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeonamesEntityScoreProvider.java
stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/indexing.properties
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/pom.xml
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/DestinationTripleGraph.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LiteralLanguageFilter.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilter.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfImportFilter.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LanguageLiteralFilterTest.java
stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilterTest.java
stanbol/branches/commons-ng/entityhub/ldpath/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java
stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java
stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/impl/LDPathTestBase.java
stanbol/branches/commons-ng/entityhub/model/sesame/pom.xml
stanbol/branches/commons-ng/entityhub/pom.xml
stanbol/branches/commons-ng/entityhub/query/clerezza/pom.xml
stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/RdfQueryResultList.java
stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQuery.java
stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlFieldQueryFactory.java
stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/SparqlQueryUtils.java
stanbol/branches/commons-ng/entityhub/query/sparql/pom.xml
stanbol/branches/commons-ng/entityhub/site/linkeddata/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/yard/clerezza/ (props changed)
stanbol/branches/commons-ng/entityhub/yard/clerezza/pom.xml
stanbol/branches/commons-ng/entityhub/yard/sesame/pom.xml
stanbol/branches/commons-ng/entityhub/yard/solr/src/license/THIRD-PARTY.properties
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/defaults/QueryConst.java
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/java/org/apache/stanbol/entityhub/yard/solr/impl/SolrYardComponent.java
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/resources/solr/core/allextras.solrindex.zip
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/resources/solr/core/default.solrindex.zip
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/resources/solr/core/entityhub.solrindex.zip
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/resources/solr/core/kuromoji.solrindex.zip
stanbol/branches/commons-ng/entityhub/yard/solr/src/main/resources/solr/core/smartcn.solrindex.zip
stanbol/branches/commons-ng/integration-tests/pom.xml
stanbol/branches/commons-ng/launchers/bundlelists/pom.xml
stanbol/branches/commons-ng/launchers/full/pom.xml
stanbol/branches/commons-ng/parent/ (props changed)
stanbol/branches/commons-ng/parent/pom.xml
stanbol/branches/commons-ng/pom.xml
Propchange: stanbol/branches/commons-ng/commons/solr/
------------------------------------------------------------------------------
svn:mergeinfo = /stanbol/trunk/commons/solr:1487448-1533448
Modified: stanbol/branches/commons-ng/commons/solr/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/solr/core/pom.xml Fri Oct 18 17:58:24 2013
@@ -88,6 +88,7 @@
org.tartarus.snowball;resolution:=optional,
org.restlet;resolution:=optional,
org.restlet.*;resolution:=optional,
+ org.apache.hadoop.*;resolution:=optional,
*
</Import-Package>
<DynamicImport-Package>*</DynamicImport-Package>
@@ -98,7 +99,7 @@
lucene-spatial, lucene-spellchecker, lucene-misc, lucene-queries,
lucene-memory, lucene-phonetic, lucene-grouping, lucene-codecs,
lucene-queryparser, lucene-sandbox, lucene-suggest,
- zookeeper
+ zookeeper, noggit
</Embed-Dependency>
<Private-Package>
org.apache.stanbol.commons.solr.impl;version=${project.version}
@@ -258,6 +259,11 @@
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
</dependency>
+ <dependency> <!-- used by Lucene for JSON serialization -->
+ <groupId>org.noggit</groupId>
+ <artifactId>noggit</artifactId>
+ </dependency>
+
<!--
Restlet is used starting with Solr 4.2. For now commented as this in only
Modified: stanbol/branches/commons-ng/commons/solr/core/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,18 +15,23 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Dec 13 14:20:12 CET 2012
+#Tue Sep 24 20:37:20 CEST 2013
antlr--antlr--2.7.2=Public Domain
commons-beanutils--commons-beanutils--1.7.0=Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrConstants.java Fri Oct 18 17:58:24 2013
@@ -20,6 +20,9 @@ import java.io.File;
import java.util.Locale;
import org.apache.lucene.analysis.util.AbstractAnalysisFactory;
+import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.Version;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
@@ -152,6 +155,17 @@ public final class SolrConstants {
* to find anayzer factory instances.
*/
public static final String PROPERTY_ANALYZER_FACTORY_NAME = "org.apache.lucene.analysis.factory.name";
+ /**
+ * The full qualified name of the {@link AbstractAnalysisFactory} implementation
+ * registered with the {@link #PROPERTY_ANALYZER_FACTORY_NAME name}.
+ */
+ public static final String PROPERTY_ANALYZER_FACTORY_IMPL = "org.apache.lucene.analysis.factory.impl";
+ /**
+ * The full qualified name of the {@link AbstractAnalysisFactory} interface
+ * implemented by the class. One of {@link CharFilterFactory},
+ * {@link TokenizerFactory}or {@link TokenFilterFactory}.
+ */
+ public static final String PROPERTY_ANALYZER_FACTORY_TYPE = "org.apache.lucene.analysis.factory.type";
public static final String PROPERTY_LUCENE_MATCH_VERSION = Version.class.getName().toLowerCase(Locale.ROOT);
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java Fri Oct 18 17:58:24 2013
@@ -57,12 +57,14 @@ import org.apache.commons.io.FilenameUti
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.core.CloseHook;
+import org.apache.solr.core.ConfigSolr;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.stanbol.commons.solr.impl.OsgiSolrResourceLoader;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -228,16 +230,17 @@ public class SolrServerAdapter {
//create a clone so that only we control who changes to the properties
serverProperties = parsedServerProperties.clone();
+ File solrCof = new File(solrDir,parsedServerProperties.getSolrXml());
ClassLoader classLoader = updateContextClassLoader();
CoreContainer container;
try {
+ log.info(" ... create OSGI enabled SolrCore (conf: {}",solrCof);
SolrResourceLoader loader = new OsgiSolrResourceLoader(context, solrDir.getAbsolutePath(),
SolrServerAdapter.class.getClassLoader());
- container = new OsgiCoreContainer(loader, context);
+ container = new OsgiCoreContainer(loader, context,solrCof);
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
}
- File solrCof = new File(solrDir,parsedServerProperties.getSolrXml());
this.server = container;
this.registrations = Collections.synchronizedMap(
new HashMap<String,CoreRegistration>());
@@ -249,8 +252,7 @@ public class SolrServerAdapter {
//now load the cores
classLoader = updateContextClassLoader();
try {
- log.info(" ... load SolrConfig {}",solrCof);
- container.load(solrDir.getAbsolutePath(), solrCof);
+ container.load();
log.info(" - loaded SolrConfig {}",solrCof);
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
@@ -406,10 +408,6 @@ public class SolrServerAdapter {
if(coreDir == null){
coreDir = new File(serverProperties.getServerDir(),coreName);
}
- if(!coreDir.isDirectory()){
- throw new IllegalArgumentException("The Core Directory '"+
- coreDir+" for the Core '"+coreName+"' does not exist or is not an directory");
- }
SolrCore old = null;
ClassLoader classLoader = updateContextClassLoader();
SolrCore core;
@@ -418,7 +416,7 @@ public class SolrServerAdapter {
// CoreContainer is overridden by the SolrServerAdapter
// to use the OSGI specific SolrResourceLoader!
core = server.create(new CoreDescriptor(server,
- coreName, coreDir.getAbsolutePath()));
+ coreName, coreDir.getPath()));
//CloseHook is now appied by the overridden registerCore(..) method
//of the wrapped CoreContainer!
//core.addCloseHook(closeHook);
@@ -427,18 +425,26 @@ public class SolrServerAdapter {
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
}
- //update the OSGI service for the new Core
- ServiceReference coreRef = registerCoreService(coreName,core);
- if(old != null){
- //cleanup the old core
- cleanupSolrCore(old);
+ //NOTE: core registration is now done as part of the registration of the
+ // SolrCore to the CoreContainer
+// ServiceReference coreRef = registerCoreService(coreName,core);
+// if(old != null){
+// //cleanup the old core
+// cleanupSolrCore(old);
+// }
+// // persist the new core to have it available on the next start
+// //server.persist();
+// //update the OSGI service is now done by the overridden CoreContainer#create(..)
+// //method
+// updateServerRegistration();
+ //so just get the ServiceReference for the ServiceRegistration
+ CoreRegistration reg = registrations.get(coreName);
+ if (reg == null){
+ throw new IllegalStateException("No OSGI ServiceRegistration present after "
+ + "adding SolrCore '"+coreName+"' to SolrCore!");
+ } else {
+ return reg.getServiceReference();
}
- // persist the new core to have it available on the next start
- //server.persist();
- //update the OSGI service is now done by the overridden CoreContainer#create(..)
- //method
- //updateServerRegistration();
- return coreRef;
}
/**
@@ -609,8 +615,8 @@ public class SolrServerAdapter {
private final class OsgiCoreContainer extends CoreContainer {
private final BundleContext context;
- private OsgiCoreContainer(SolrResourceLoader loader, BundleContext context) {
- super(loader);
+ private OsgiCoreContainer(SolrResourceLoader loader, BundleContext context, File solrConf) {
+ super(loader,ConfigSolr.fromFile(loader, solrConf));
this.context = context;
}
@@ -618,6 +624,9 @@ public class SolrServerAdapter {
//to create SolrCores
@Override
public SolrCore create(CoreDescriptor dcore) {
+ if (isShutDown()) {
+ throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "Solr has shutdown.");
+ }
log.info(" .... createCore {}:{}",serverProperties.getServerName(),dcore.getName());
if (getZkController() != null) {
//TODO: add support for ZooKeeper managed cores
@@ -625,17 +634,43 @@ public class SolrServerAdapter {
} else {
File idir = new File(dcore.getInstanceDir());
String instanceDir = idir.getPath();
- //TODO: we can not use the indexSchemaCache because it is
- // a private variable
SolrResourceLoader loader = new OsgiSolrResourceLoader(context, instanceDir,
CoreContainer.class.getClassLoader());
SolrConfig config;
try {
config = new SolrConfig(loader, dcore.getConfigName(), null);
} catch (Exception e) {
+ log.error("Failed to load file {}", new File(instanceDir, dcore.getConfigName()).getAbsolutePath());
throw new SolrException(ErrorCode.SERVER_ERROR, "Could not load config for " + dcore.getConfigName(), e);
}
- IndexSchema schema = new IndexSchema(config,dcore.getSchemaName(),null);
+ IndexSchema schema = null;
+ //indexSchemaCache is now protected (Solr 4.4)
+ if (indexSchemaCache != null) {
+ final String resourceNameToBeUsed = IndexSchemaFactory.getResourceNameToBeUsed(dcore.getSchemaName(), config);
+ File schemaFile = new File(resourceNameToBeUsed);
+ if (!schemaFile.isAbsolute()) {
+ schemaFile = new File(loader.getConfigDir(), schemaFile.getPath());
+ }
+ if (schemaFile.exists()) {
+ String key = schemaFile.getAbsolutePath()
+ + ":"
+ + new SimpleDateFormat("yyyyMMddHHmmss", Locale.ROOT).format(new Date(
+ schemaFile.lastModified()));
+ schema = indexSchemaCache.get(key);
+ if (schema == null) {
+ log.info("creating new schema object for core: " + dcore.getProperty(CoreDescriptor.CORE_NAME));
+ schema = IndexSchemaFactory.buildIndexSchema(dcore.getSchemaName(), config);
+ indexSchemaCache.put(key, schema);
+ } else {
+ log.info("re-using schema object for core: " + dcore.getProperty(CoreDescriptor.CORE_NAME));
+ }
+ }
+ }
+
+ if (schema == null) {
+ schema = IndexSchemaFactory.buildIndexSchema(dcore.getSchemaName(), config);
+ }
+
SolrCore core = new SolrCore(dcore.getName(), null, config, schema, dcore);
if (core.getUpdateHandler().getUpdateLog() != null) {
// always kick off recovery if we are in standalone mode.
@@ -647,10 +682,9 @@ public class SolrServerAdapter {
//this ensures that a closeHook is added to registered cores
@Override
- protected SolrCore registerCore(Map<String,SolrCore> whichCores, String name, SolrCore core,
- boolean returnPrevNotClosed) {
+ protected SolrCore registerCore(boolean isTransientCore, String name, SolrCore core, boolean returnPrevNotClosed) {
log.info(" .... registerCore {}:{}",serverProperties.getServerName(),name);
- SolrCore old = super.registerCore(whichCores, name, core, returnPrevNotClosed);
+ SolrCore old = super.registerCore(isTransientCore, name, core, returnPrevNotClosed);
//NOTE: we can not register the services here, as this can trigger
// a deadlock!!
//Reason: OSGI ensures that activation is done by a single thread.
@@ -1040,11 +1074,8 @@ public class SolrServerAdapter {
public void setCoreDir(File directory){
if(directory == null){
coreProperties.remove(PROPERTY_CORE_DIR);
- } else if(directory.isDirectory()){
- coreProperties.put(PROPERTY_CORE_DIR, directory);
} else {
- throw new IllegalArgumentException("The parsed File '"+
- directory+"' MUST represent a Directory!");
+ coreProperties.put(PROPERTY_CORE_DIR, directory);
}
}
public String getCoreName(){
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiSolrResourceLoader.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiSolrResourceLoader.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/impl/OsgiSolrResourceLoader.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.impl;
import static org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_ANALYZER_FACTORY_NAME;
@@ -15,6 +31,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.stanbol.commons.solr.SolrServerAdapter;
import org.apache.stanbol.commons.solr.utils.AbstractAnalyzerFactoryActivator;
+import org.apache.stanbol.commons.solr.utils.RegisteredSolrAnalyzerFactory;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -82,16 +99,18 @@ public class OsgiSolrResourceLoader exte
String filter;
try {
filter = String.format("(%s=%s)", PROPERTY_ANALYZER_FACTORY_NAME, name.toLowerCase(Locale.ROOT));
- referenced = bc.getServiceReferences(expectedType.getName(), filter);
+ referenced = bc.getServiceReferences(RegisteredSolrAnalyzerFactory.class.getName(), filter);
} catch (InvalidSyntaxException e) {
throw new IllegalStateException("Unable to create Filter for Service with name '" + name
+ "'!", e);
}
if (referenced != null && referenced.length > 0) {
Object service = bc.getService(referenced[0]);
- if (service != null) {
- clazz = (Class<? extends T>) service.getClass();
- bc.ungetService(referenced[0]); //we return the class and do not use the service
+ if (service instanceof RegisteredSolrAnalyzerFactory) {
+ //TODO: we could check the type here
+ clazz = ((RegisteredSolrAnalyzerFactory)service).getFactoryClass();
+ //we do not use a service so immediately unget it
+ bc.ungetService(referenced[0]);
return clazz;
}
} else {
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/AbstractAnalyzerFactoryActivator.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.utils;
import java.util.ArrayList;
@@ -130,28 +146,33 @@ public abstract class AbstractAnalyzerFa
throw new ServiceConfigurationError("The class name " + service.getName() +
" has wrong suffix, allowed are: " + Arrays.toString(suffixes));
}
- AbstractAnalysisFactory factory;
- try {
- factory = service.newInstance();
- } catch (Exception e) {
- throw new IllegalArgumentException("SPI class of type "+ type.getName()
- + " with name '"+name+"' cannot be instantiated. This is likely "
- + "due to a misconfiguration of the java class '"
- + service.getName() + "': ", e);
- }
+ //as if Solr 4.4. we can no longer create an instance of the Factories
+ //as constructors not take the Map<String,String> with the configuration
+ //(we do not have any configuration).
+ //because of that we register the new RegisteredSolrAnalyzerFactory class
+ //instead
+// AbstractAnalysisFactory factory;
+// try {
+// factory = service.newInstance();
+// } catch (Exception e) {
+// throw new IllegalArgumentException("SPI class of type "+ type.getName()
+// + " with name '"+name+"' cannot be instantiated. This is likely "
+// + "due to a misconfiguration of the java class '"
+// + service.getName() + "': ", e);
+// }
Dictionary<String,Object> prop = new Hashtable<String,Object>();
- prop.put(SolrConstants.PROPERTY_ANALYZER_FACTORY_NAME,name);
- Version version = factory.getLuceneMatchVersion();
- if(version != null){
- prop.put(SolrConstants.PROPERTY_LUCENE_MATCH_VERSION, version.name());
- }
+ prop.put(SolrConstants.PROPERTY_ANALYZER_FACTORY_NAME, name);
+ prop.put(SolrConstants.PROPERTY_ANALYZER_FACTORY_IMPL, service.getName());
+ prop.put(SolrConstants.PROPERTY_ANALYZER_FACTORY_TYPE, type.getName());
//use 0 - bundle id as service ranking. This ensures that if two
//factories do use the same name the one provided by the bundle with the
//lower id is used by default
int serviceRanking = 0 - (int)bc.getBundle().getBundleId();
prop.put(Constants.SERVICE_RANKING, serviceRanking);
log.debug(" ... {} (name={})",service.getName(),name);
- registrations.add(bc.registerService(type.getName(), factory, prop));
+ //register the AnalyzerFactory
+ registrations.add(bc.registerService(RegisteredSolrAnalyzerFactory.class.getName(),
+ new RegisteredSolrAnalyzerFactory<S>(name, type, service), prop));
}
return registrations;
}
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java Fri Oct 18 17:58:24 2013
@@ -93,4 +93,9 @@ public class DataFileResourceLoader impl
throw new UnsupportedOperationException("Loading of ClassFiles is not supported");
}
+ @Override
+ public <T> Class<? extends T> findClass(String cname, Class<T> expectedType) {
+ throw new UnsupportedOperationException("Loading of ClassFiles is not supported");
+ }
+
}
Modified: stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java (original)
+++ stanbol/branches/commons-ng/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/StanbolResourceLoader.java Fri Oct 18 17:58:24 2013
@@ -24,8 +24,11 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.solr.common.SolrException;
+import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrResourceLoader;
+import org.apache.solr.util.plugin.SolrCoreAware;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,38 +116,39 @@ public class StanbolResourceLoader imple
}
return lines;
}
-
@Override
- public <T> T newInstance(String cname, Class<T> expectedType) {
+ public <T> Class<? extends T> findClass(String cname, Class<T> expectedType) {
String parentMessage = null;
+ Class<? extends T> clazz = null;
if(parent != null){
try {
- return parent.newInstance(cname, expectedType);
+ clazz = parent.findClass(cname, expectedType);
} catch (SecurityException e) { //do not catch security related exceptions
throw e;
} catch (RuntimeException e) {
parentMessage = e.getMessage();
}
}
- Class<T> clazz = null;
- // first try cname == full name
- try {
- clazz = (Class<T>) classloader.loadClass(cname);
- } catch (Exception e) {
- String newName = cname;
- if (newName.startsWith(project)) {
- newName = cname.substring(project.length() + 1);
- }
- for (String subpackage : packages) {
- try {
- String name = base + '.' + subpackage + newName;
- log.trace("Trying class name " + name);
- clazz = (Class<T>) classloader.loadClass(name);
- break;
- } catch (Exception e1) {
- // ignore... assume first exception is best.
+ if(clazz == null){
+ try {
+ clazz = (Class<T>) classloader.loadClass(cname);
+ } catch (Exception e) {
+ String newName = cname;
+ if (newName.startsWith(project)) {
+ newName = cname.substring(project.length() + 1);
+ }
+ for (String subpackage : packages) {
+ try {
+ String name = base + '.' + subpackage + newName;
+ log.trace("Trying class name " + name);
+ clazz = (Class<T>) classloader.loadClass(name);
+ break;
+ } catch (Exception e1) {
+ // ignore... assume first exception is best.
+ }
}
}
+
}
if(clazz == null){
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
@@ -153,12 +157,19 @@ public class StanbolResourceLoader imple
+ "via Classloader "+classloader);
}
+ return clazz;
+ }
+
+ @Override
+ public <T> T newInstance(String cname, Class<T> expectedType) {
+ Class<? extends T> clazz = findClass(cname, expectedType);
try {
return clazz.newInstance();
} catch (Exception e) {
- throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
- "Error instantiating class: '" + clazz.getName()+"'", e);
+ throw new SolrException( SolrException.ErrorCode.SERVER_ERROR,
+ "Error instantiating class: '" + clazz.getName()+"'", e);
}
+
}
}
Modified: stanbol/branches/commons-ng/commons/solr/extras/icu/src/main/java/org/apache/stanbol/commons/solr/extras/icu/impl/IcuAnalyzerFactoryActivator.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/extras/icu/src/main/java/org/apache/stanbol/commons/solr/extras/icu/impl/IcuAnalyzerFactoryActivator.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/extras/icu/src/main/java/org/apache/stanbol/commons/solr/extras/icu/impl/IcuAnalyzerFactoryActivator.java (original)
+++ stanbol/branches/commons-ng/commons/solr/extras/icu/src/main/java/org/apache/stanbol/commons/solr/extras/icu/impl/IcuAnalyzerFactoryActivator.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.extras.icu.impl;
import org.apache.stanbol.commons.solr.utils.AbstractAnalyzerFactoryActivator;
Modified: stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/main/java/org/apache/stanbol/commons/solr/extras/kuromoji/impl/KuromojiAnalyzerFactoryActivator.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/main/java/org/apache/stanbol/commons/solr/extras/kuromoji/impl/KuromojiAnalyzerFactoryActivator.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/main/java/org/apache/stanbol/commons/solr/extras/kuromoji/impl/KuromojiAnalyzerFactoryActivator.java (original)
+++ stanbol/branches/commons-ng/commons/solr/extras/kuromoji/src/main/java/org/apache/stanbol/commons/solr/extras/kuromoji/impl/KuromojiAnalyzerFactoryActivator.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.extras.kuromoji.impl;
import org.apache.stanbol.commons.solr.utils.AbstractAnalyzerFactoryActivator;
Modified: stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/main/java/org/apache/stanbol/commons/solr/extras/smartcn/impl/SmartcnAnalyzerFactoryActivator.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/main/java/org/apache/stanbol/commons/solr/extras/smartcn/impl/SmartcnAnalyzerFactoryActivator.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/main/java/org/apache/stanbol/commons/solr/extras/smartcn/impl/SmartcnAnalyzerFactoryActivator.java (original)
+++ stanbol/branches/commons-ng/commons/solr/extras/smartcn/src/main/java/org/apache/stanbol/commons/solr/extras/smartcn/impl/SmartcnAnalyzerFactoryActivator.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.extras.smartcn.impl;
import org.apache.stanbol.commons.solr.utils.AbstractAnalyzerFactoryActivator;
Modified: stanbol/branches/commons-ng/commons/solr/extras/stempel/src/main/java/org/apache/stanbol/commons/solr/extras/stempel/impl/StempelAnalyzerFoctoryActivator.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/extras/stempel/src/main/java/org/apache/stanbol/commons/solr/extras/stempel/impl/StempelAnalyzerFoctoryActivator.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/extras/stempel/src/main/java/org/apache/stanbol/commons/solr/extras/stempel/impl/StempelAnalyzerFoctoryActivator.java (original)
+++ stanbol/branches/commons-ng/commons/solr/extras/stempel/src/main/java/org/apache/stanbol/commons/solr/extras/stempel/impl/StempelAnalyzerFoctoryActivator.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.commons.solr.extras.stempel.impl;
import org.apache.stanbol.commons.solr.utils.AbstractAnalyzerFactoryActivator;
Modified: stanbol/branches/commons-ng/commons/solr/install/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/install/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/install/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/commons/solr/install/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,12 +15,13 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Dec 13 14:22:22 CET 2012
+#Tue Sep 24 20:52:17 CEST 2013
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=Apache Software License, Version 2.0
@@ -28,8 +29,12 @@ dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/commons/solr/managed/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/managed/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/managed/pom.xml (original)
+++ stanbol/branches/commons-ng/commons/solr/managed/pom.xml Fri Oct 18 17:58:24 2013
@@ -94,11 +94,6 @@
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <!-- dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.web</artifactId>
- <version>0.9.0-incubating</version>
- </dependency -->
<!-- OSGI dependencies -->
<dependency>
Modified: stanbol/branches/commons-ng/commons/solr/managed/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/managed/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/managed/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/commons/solr/managed/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,21 +15,23 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Dec 13 14:22:11 CET 2012
+#Tue Sep 24 20:51:59 CEST 2013
antlr--antlr--2.7.2=Public Domain
-asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
-org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
-xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java (original)
+++ stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneEmbeddedSolrServerProvider.java Fri Oct 18 17:58:24 2013
@@ -76,7 +76,7 @@ public class StandaloneEmbeddedSolrServe
* by using the configName on the ManagedSolrServer referenced by
* {@link IndexReference#getServer()}
*/
- public SolrServer getSolrServer(IndexReference indexRef, String configName){
+ public EmbeddedSolrServer getSolrServer(IndexReference indexRef, String configName){
if(indexRef == null){
throw new IllegalArgumentException("The parsed InexReference MUST NOT be NULL!");
}
Modified: stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java (original)
+++ stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/standalone/StandaloneManagedSolrServer.java Fri Oct 18 17:58:24 2013
@@ -216,9 +216,8 @@ public class StandaloneManagedSolrServer
}
}
server = new CoreContainer(managedSolrDir.getAbsolutePath());
- File solrXml = new File(managedSolrDir,"solr.xml");
- server.load(managedSolrDir.getAbsolutePath(), solrXml);
- server.setPersistent(true);
+ //File solrXml = new File(managedSolrDir,"solr.xml");
+ server.load();
}
private void shutdown() {
server.shutdown();
Modified: stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java (original)
+++ stanbol/branches/commons-ng/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/util/ManagementUtils.java Fri Oct 18 17:58:24 2013
@@ -23,6 +23,10 @@ import java.io.InputStream;
import org.apache.commons.compress.archivers.ArchiveException;
import org.apache.commons.compress.archivers.ArchiveInputStream;
import org.apache.commons.compress.archivers.ArchiveStreamFactory;
+import org.apache.commons.compress.compressors.CompressorException;
+import org.apache.commons.compress.compressors.CompressorStreamFactory;
+import org.apache.commons.compress.compressors.FileNameUtil;
+import org.apache.commons.io.FilenameUtils;
import org.apache.solr.core.SolrCore;
import org.apache.stanbol.commons.solr.SolrConstants;
import org.apache.stanbol.commons.solr.managed.IndexMetadata;
@@ -90,6 +94,10 @@ public class ManagementUtils {
*/
public static final ArchiveStreamFactory archiveStreamFactory = new ArchiveStreamFactory();
/**
+ * An instance of the compressor stream factory
+ */
+ public static final CompressorStreamFactory compressorStreamFactory = new CompressorStreamFactory();
+ /**
* Tries to create an {@link ArchiveInputStream} based on the parsed {@link InputStream}.
* First the provided resource name is used to detect the type of the archive.
* if that does not work, or the parsed resource name is <code>null</code> the
@@ -104,14 +112,38 @@ public class ManagementUtils {
if(is == null){
return null;
}
- if(resourceName != null){
+ String extension = resourceName == null ? null :
+ FilenameUtils.getExtension(resourceName);
+ if(!is.markSupported()){
+ is = new BufferedInputStream(is);
+ }
+ InputStream as;
+ if(!"zip".equalsIgnoreCase(extension)){ //if not a zip file (the default)
+ //we need to first check if this is a compressed stream
+ try {
+ as = compressorStreamFactory.createCompressorInputStream(extension,is);
+ extension = "tar"; // assume tar archives
+ } catch (CompressorException e) {
+ try {
+ as = compressorStreamFactory.createCompressorInputStream(is);
+ extension = "tar"; // assume tar archives
+ } catch (CompressorException e1) {
+ //not a compression stream?
+ as = is;
+ }
+ }
+ } else { //zip ... this is already an archive stream
+ as = is;
+ }
+ if(extension != null){
try {
- return archiveStreamFactory.createArchiveInputStream(resourceName, is);
+ return archiveStreamFactory.createArchiveInputStream(extension, as);
} catch (ArchiveException e) {
//ignore
}
}
- return archiveStreamFactory.createArchiveInputStream(new BufferedInputStream(is));
+ //try to detect
+ return archiveStreamFactory.createArchiveInputStream(is);
}
/**
* Getter for the name of the index within the current
Modified: stanbol/branches/commons-ng/commons/solr/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/web/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/web/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/commons/solr/web/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,13 +15,14 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Dec 13 14:22:18 CET 2012
+#Tue Sep 24 20:52:11 CEST 2013
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=Apache Software License, Version 2.0
@@ -29,8 +30,12 @@ dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java (original)
+++ stanbol/branches/commons-ng/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/DelegatingSolrDispatchFilter.java Fri Oct 18 17:58:24 2013
@@ -16,18 +16,14 @@
*/
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.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.xml.sax.SAXException;
/**
* A {@link SolrDispatchFilter} that does not create a new {@link CoreContainer}
@@ -50,27 +46,6 @@ public abstract class DelegatingSolrDisp
* multiple calls to init)
*/
private CoreContainer delegate = null;
- /**
- * {@link Initializer} implementation that calls the abstract
- * {@link #getCoreContainerReference()} method to lookup the {@link ServiceReference}
- * to the {@link CoreContainer} used for this dispatch filter
- *
- */
- private Initializer initialiser = new Initializer() {
- @Override
- public CoreContainer initialize() {
- //support multiple calls
- if(delegate != null){
- ungetCoreContainer(); //cleanup current
- }
- delegate = getCoreContainer();
- if(delegate != null){
- return delegate;
- } else {
- throw new IllegalStateException("CoreContainer currently not available");
- }
- }
- };
/**
@@ -79,16 +54,16 @@ public abstract class DelegatingSolrDisp
public DelegatingSolrDispatchFilter(){
super();
}
-
@Override
- protected Initializer createInitializer() {
- //we do not need to initialise a new CoreContaine. Just get the service
- //via the OSGI environment
- return initialiser;
+ protected final CoreContainer createCoreContainer() {
+ if(delegate == null){
+ delegate = getCoreContainer();
+ }
+ return delegate;
}
@Override
- public void destroy() {
+ public final void destroy() {
//we need NOT do shutdown the CoreContainer! Just release the
//OSGI service!
try {
Propchange: stanbol/branches/commons-ng/enhancement-engines/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancement-engines:r1496360-1533530
Propchange: stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancement-engines/dbpedia-spotlight:r1496360-1533530
Modified: stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementEngine.java Fri Oct 18 17:58:24 2013
@@ -39,6 +39,7 @@ import java.net.URLEncoder;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
+import java.util.HashMap;
import java.util.Map;
import org.apache.clerezza.rdf.core.Language;
@@ -53,6 +54,7 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.commons.stanboltools.offline.OfflineMode;
import org.apache.stanbol.commons.stanboltools.offline.OnlineMode;
import org.apache.stanbol.enhancer.engines.dbpspotlight.model.Annotation;
+import org.apache.stanbol.enhancer.engines.dbpspotlight.model.SurfaceForm;
import org.apache.stanbol.enhancer.engines.dbpspotlight.utils.SpotlightEngineUtils;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
@@ -193,12 +195,13 @@ public class DBPSpotlightAnnotateEnhance
String text = SpotlightEngineUtils.getPlainContent(ci);
Collection<Annotation> dbpslGraph = doPostRequest(text,ci.getUri());
+ Map<SurfaceForm,UriRef> surfaceForm2TextAnnotation = new HashMap<SurfaceForm,UriRef>();
if (dbpslGraph != null) {
// Acquire a write lock on the ContentItem when adding the
// enhancements
ci.getLock().writeLock().lock();
try {
- createEnhancements(dbpslGraph, ci, text, language);
+ createEnhancements(dbpslGraph, ci, text, language, surfaceForm2TextAnnotation);
if (log.isDebugEnabled()) {
Serializer serializer = Serializer.getInstance();
ByteArrayOutputStream debugStream = new ByteArrayOutputStream();
@@ -231,22 +234,18 @@ public class DBPSpotlightAnnotateEnhance
* the content item
*/
protected void createEnhancements(Collection<Annotation> occs,
- ContentItem ci, String text, Language language) {
- //we need to create multiple EntityAnnotations even for the same
- //suggested Entity, as the scores will be different
- //HashMap<Resource, UriRef> entityAnnotationMap = new HashMap<Resource, UriRef>();
+ ContentItem ci, String text, Language language,
+ Map<SurfaceForm,UriRef> surfaceForm2TextAnnotation) {
for (Annotation occ : occs) {
- UriRef textAnnotation = SpotlightEngineUtils.createTextEnhancement(
- occ.surfaceForm, this, ci, text, language);
-
-// if (entityAnnotationMap.containsKey(occ.uri)) {
-// model.add(new TripleImpl(entityAnnotationMap.get(occ.uri),
-// DC_RELATION, textAnnotation));
-// } else {
- SpotlightEngineUtils.createEntityAnnotation(occ, this, ci, textAnnotation, language);
-// entityAnnotationMap.put(occ.uri, entityAnnotation);
+ UriRef textAnnotation = surfaceForm2TextAnnotation.get(occ.surfaceForm);
+ if(textAnnotation == null){ //not yet written ... create a new
+ textAnnotation = SpotlightEngineUtils.createTextEnhancement(
+ occ.surfaceForm, this, ci, text, language);
+ surfaceForm2TextAnnotation.put(occ.surfaceForm,textAnnotation);
}
+ SpotlightEngineUtils.createEntityAnnotation(occ, this, ci, textAnnotation, language);
}
+ }
/**
Modified: stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/dbpedia-spotlight/src/main/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementEngine.java Fri Oct 18 17:58:24 2013
@@ -247,7 +247,7 @@ public class DBPSpotlightCandidatesEnhan
CandidateResource resource = resources.next();
UriRef entityAnnotation = SpotlightEngineUtils.createEntityAnnotation(
resource, this, ci, textAnnotation);
- entityAnnotationMap.put(resource.uri, entityAnnotation);
+ entityAnnotationMap.put(resource.localName, entityAnnotation);
}
if (entityAnnotationMap.containsKey(occ.name)) {
model.add(new TripleImpl(entityAnnotationMap.get(occ.name),