Author: rwesten
Date: Tue May 12 13:02:52 2015
New Revision: 1678929
URL: http://svn.apache.org/r1678929
Log:
STANBOL-1419: updated all common dependencies as well as maven plugins. This
also includes code changes required by this update (esp. because of
httpcomponents). In addition the JAX-RS components of the OntologyManager,
Reasoning, Rules and Topic modules where adapted to the new model (singelton
instance OSGI components) and removed from the now deprecated Webfragments.
This removes the WARNINGS during the startup but has no functional consiquences.
Added:
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicMenuItem.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerMenueItem.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersMenueItem.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesMenueItem.java
Removed:
stanbol/trunk/commons/web/base/src/main/java/org/apache/stanbol/commons/web/base/readers/
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/commons/frameworkfragment/pom.xml
stanbol/trunk/commons/jobs/api/pom.xml
stanbol/trunk/commons/marmotta/kiwi/pom.xml
stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml
stanbol/trunk/commons/namespaceprefix/service/pom.xml
stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/provider/stanbol/DefaultNamespaceMappingsProvider.java
stanbol/trunk/commons/security/core/pom.xml
stanbol/trunk/commons/security/felixwebconsole/pom.xml
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
stanbol/trunk/commons/testing/http/pom.xml
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/Request.java
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RequestExecutor.java
stanbol/trunk/commons/testing/jarexec/pom.xml
stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java
stanbol/trunk/commons/testing/stanbol/src/main/java/org/apache/stanbol/commons/testing/stanbol/StanbolTestBase.java
stanbol/trunk/commons/tikabundle/pom.xml
stanbol/trunk/commons/web/base/pom.xml
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
stanbol/trunk/enhancement-engines/ (props changed)
stanbol/trunk/enhancement-engines/celi/pom.xml
stanbol/trunk/enhancement-engines/entitylinking/engine/pom.xml
stanbol/trunk/enhancement-engines/pom.xml
stanbol/trunk/enhancement-engines/topic/engine/pom.xml
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
stanbol/trunk/enhancer/ (props changed)
stanbol/trunk/enhancer/generic/servicesapi/ (props changed)
stanbol/trunk/enhancer/jersey/pom.xml
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
stanbol/trunk/entityhub/ (props changed)
stanbol/trunk/entityhub/generic/core/ (props changed)
stanbol/trunk/integration-tests/pom.xml
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
stanbol/trunk/integration-tests/src/test/resources/apache-project-doap-files.zip
stanbol/trunk/integration-tests/src/test/resources/log4j.properties
stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/pom.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
stanbol/trunk/parent/pom.xml
stanbol/trunk/reasoners/jena/pom.xml
stanbol/trunk/reasoners/manager/pom.xml
stanbol/trunk/reasoners/owlapi/pom.xml
stanbol/trunk/reasoners/servicesapi/pom.xml
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java
stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java
stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java
stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java
stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java
stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java
stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java
stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java
stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -1 +1 @@
-/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973
+/stanbol/branches/release-0.12:1571146,1571150,1572559,1572583,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1581735,1581830,1587573,1587824,1587844,1587860,1588447,1588449,1589341,1590930,1593490,1593899,1594122,1594490,1595157-1595158,1596518,1597063,1597561,1597575,1597760,1598019,1599433,1599973,1604752,1608340,1608360,1609451,1617239,1624001,1626979,1633539,1635413,1638045,1674012,1675556
Modified: stanbol/trunk/commons/frameworkfragment/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/frameworkfragment/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/frameworkfragment/pom.xml (original)
+++ stanbol/trunk/commons/frameworkfragment/pom.xml Tue May 12 13:02:52 2015
@@ -91,198 +91,9 @@
-->
<!-- The packages com.sun.management.* are referenced by
zookeper -->
<Export-Package>
- com.sun.management,
- com.sun.management.jmx,
- com.sun.xml.bind.v2.model.runtime,
- com.sun.xml.bind.v2.model.core,
- com.sun.xml.bind.v2.runtime,
- com.sun.xml.bind.v2.runtime.property,
- com.sun.xml.bind.v2.runtime.unmarshaller,
- com.sun.xml.ws,
- com.sun.xml.ws.addressing,
- com.sun.xml.ws.addressing.model,
- com.sun.xml.ws.addressing.v200408,
- com.sun.xml.ws.api,
- com.sun.xml.ws.api.addressing,
- com.sun.xml.ws.api.client,
- com.sun.xml.ws.api.fastinfoset,
- com.sun.xml.ws.api.handler,
- com.sun.xml.ws.api.message,
- com.sun.xml.ws.api.message.stream,
- com.sun.xml.ws.api.model,
- com.sun.xml.ws.api.model.soap,
- com.sun.xml.ws.api.model.wsdl,
- com.sun.xml.ws.api.pipe,
- com.sun.xml.ws.api.pipe.helper,
- com.sun.xml.ws.api.server,
- com.sun.xml.ws.api.streaming,
- com.sun.xml.ws.api.wsdl.parser,
- com.sun.xml.ws.api.wsdl.writer,
- com.sun.xml.ws.binding,
- com.sun.xml.ws.client,
- com.sun.xml.ws.client.dispatch,
- com.sun.xml.ws.client.sei,
- com.sun.xml.ws.developer,
- com.sun.xml.ws.developer.servlet,
- com.sun.xml.ws.encoding,
- com.sun.xml.ws.encoding.fastinfoset,
- com.sun.xml.ws.encoding.soap,
- com.sun.xml.ws.encoding.soap.streaming,
- com.sun.xml.ws.encoding.xml,
- com.sun.xml.ws.fault,
- com.sun.xml.ws.handler,
- com.sun.xml.ws.message,
- com.sun.xml.ws.message.jaxb,
- com.sun.xml.ws.message.saaj,
- com.sun.xml.ws.message.source,
- com.sun.xml.ws.message.stream,
- com.sun.xml.ws.model,
- com.sun.xml.ws.model.soap,
- com.sun.xml.ws.model.wsdl,
- com.sun.xml.ws.org.objectweb.asm,
- com.sun.xml.ws.protocol.soap,
- com.sun.xml.ws.protocol.xml,
- com.sun.xml.ws.resources,
- com.sun.xml.ws.server,
- com.sun.xml.ws.server.provider,
- com.sun.xml.ws.server.sei,
- com.sun.xml.ws.server.servlet,
- com.sun.xml.ws.spi,
- com.sun.xml.ws.streaming,
- com.sun.xml.ws.transport,
- com.sun.xml.ws.transport.http,
- com.sun.xml.ws.transport.http.client,
- com.sun.xml.ws.transport.http.server,
- com.sun.xml.ws.transport.http.servlet,
- com.sun.xml.ws.util,
- com.sun.xml.ws.util.exception,
- com.sun.xml.ws.util.localization,
- com.sun.xml.ws.util.pipe,
- com.sun.xml.ws.util.xml,
- com.sun.xml.ws.wsdl.parser,
- com.sun.xml.ws.wsdl.writer,
- com.sun.xml.ws.wsdl.writer.document,
- com.sun.xml.ws.wsdl.writer.document.http,
- com.sun.xml.ws.wsdl.writer.document.soap,
- com.sun.xml.ws.wsdl.writer.document.soap12,
- com.sun.xml.ws.wsdl.writer.document.xsd,
- com.sun.xml.internal.bind,
- com.sun.xml.internal.ws,
- com.sun.xml.internal.ws.addressing,
- com.sun.xml.internal.ws.addressing.model,
- com.sun.xml.internal.ws.addressing.v200408,
- com.sun.xml.internal.ws.api,
- com.sun.xml.internal.ws.api.addressing,
- com.sun.xml.internal.ws.api.client,
- com.sun.xml.internal.ws.api.fastinfoset,
- com.sun.xml.internal.ws.api.handler,
- com.sun.xml.internal.ws.api.message,
- com.sun.xml.internal.ws.api.message.stream,
- com.sun.xml.internal.ws.api.model,
- com.sun.xml.internal.ws.api.model.soap,
- com.sun.xml.internal.ws.api.model.wsdl,
- com.sun.xml.internal.ws.api.pipe,
- com.sun.xml.internal.ws.api.pipe.helper,
- com.sun.xml.internal.ws.api.server,
- com.sun.xml.internal.ws.api.streaming,
- com.sun.xml.internal.ws.api.wsdl.parser,
- com.sun.xml.internal.ws.api.wsdl.writer,
- com.sun.xml.internal.ws.binding,
- com.sun.xml.internal.ws.client,
- com.sun.xml.internal.ws.client.dispatch,
- com.sun.xml.internal.ws.client.sei,
- com.sun.xml.internal.ws.developer,
- com.sun.xml.internal.ws.encoding,
- com.sun.xml.internal.ws.encoding.fastinfoset,
- com.sun.xml.internal.ws.encoding.soap,
- com.sun.xml.internal.ws.encoding.soap.streaming,
- com.sun.xml.internal.ws.encoding.xml,
- com.sun.xml.internal.ws.fault,
- com.sun.xml.internal.ws.handler,
- com.sun.xml.internal.ws.message,
- com.sun.xml.internal.ws.message.jaxb,
- com.sun.xml.internal.ws.message.saaj,
- com.sun.xml.internal.ws.message.source,
- com.sun.xml.internal.ws.message.stream,
- com.sun.xml.internal.ws.model,
- com.sun.xml.internal.ws.model.soap,
- com.sun.xml.internal.ws.model.wsdl,
- com.sun.xml.internal.ws.org.objectweb.asm,
- com.sun.xml.internal.ws.protocol.soap,
- com.sun.xml.internal.ws.protocol.xml,
- com.sun.xml.internal.ws.resources,
- com.sun.xml.internal.ws.server,
- com.sun.xml.internal.ws.server.provider,
- com.sun.xml.internal.ws.server.sei,
- com.sun.xml.internal.ws.spi,
- com.sun.xml.internal.ws.streaming,
- com.sun.xml.internal.ws.transport,
- com.sun.xml.internal.ws.transport.http,
- com.sun.xml.internal.ws.transport.http.client,
- com.sun.xml.internal.ws.transport.http.server,
- com.sun.xml.internal.ws.util,
- com.sun.xml.internal.ws.util.exception,
- com.sun.xml.internal.ws.util.localization,
- com.sun.xml.internal.ws.util.pipe,
- com.sun.xml.internal.ws.util.xml,
- com.sun.xml.internal.ws.wsdl.parser,
- com.sun.xml.internal.ws.wsdl.writer,
- com.sun.xml.internal.ws.wsdl.writer.document,
- com.sun.xml.internal.ws.wsdl.writer.document.http,
- com.sun.xml.internal.ws.wsdl.writer.document,
- com.sun.xml.internal.ws.wsdl.writer.document.soap,
- com.sun.xml.internal.ws.wsdl.writer.document.soap12,
- com.sun.xml.internal.ws.wsdl.writer.document.xsd,
- javax.activation,
- javax.jws,
- javax.jws.soap,
- javax.xml,
- javax.xml.bind,
- javax.xml.bind.annotation,
- javax.xml.bind.annotation.adapters,
- javax.xml.bind.attachment,
- javax.xml.bind.helpers,
- javax.xml.bind.util,
- javax.xml.crypto,
- javax.xml.crypto.dom,
- javax.xml.crypto.dsig,
- javax.xml.crypto.dsig.dom,
- javax.xml.crypto.dsig.keyinfo,
- javax.xml.crypto.dsig.spec,
- javax.xml.datatype; version=1.4.0,
- javax.xml.namespace; version=1.4.0,
- javax.xml.parsers,
- javax.xml.soap,
- javax.xml.transform; version=1.4.0,
- javax.xml.transform.dom; version=1.4.0,
- javax.xml.transform.sax; version=1.4.0,
- javax.xml.transform.stax; version=1.4.0,
- javax.xml.transform.stream; version=1.4.0,
- javax.xml.validation; version=1.4.0,
- javax.xml.ws,
- javax.xml.ws.handler,
- javax.xml.ws.handler.soap,
- javax.xml.ws.http,
- javax.xml.ws.soap,
- javax.xml.ws.spi,
- javax.xml.ws.wsaddressing,
- javax.xml.xpath; version=1.4.0,
- org.w3c.dom; version=1.4.0,
- org.w3c.dom.bootstrap; version=1.4.0,
- org.w3c.dom.css,
- org.w3c.dom.events; version=1.4.0,
- org.w3c.dom.html,
- org.w3c.dom.ls; version=1.4.0,
- org.w3c.dom.ranges; version=1.4.0,
- org.w3c.dom.stylesheets,
- org.w3c.dom.traversal,
- org.w3c.dom.views,
- org.w3c.dom.xpath,
- org.xml.sax; version=1.4.0,
- org.xml.sax.ext; version=1.4.0,
- org.xml.sax.helpers; version=1.4.0,
- sun.misc,
- sun.security.util
+ com.sun.management, com.sun.management.jmx,
com.sun.xml.bind.v2.model.runtime, com.sun.xml.bind.v2.model.core,
com.sun.xml.bind.v2.runtime, com.sun.xml.bind.v2.runtime.property,
com.sun.xml.bind.v2.runtime.unmarshaller, com.sun.xml.ws,
com.sun.xml.ws.addressing, com.sun.xml.ws.addressing.model,
com.sun.xml.ws.addressing.v200408, com.sun.xml.ws.api,
com.sun.xml.ws.api.addressing, com.sun.xml.ws.api.client,
com.sun.xml.ws.api.fastinfoset, com.sun.xml.ws.api.handler,
com.sun.xml.ws.api.message, com.sun.xml.ws.api.message.stream,
com.sun.xml.ws.api.model, com.sun.xml.ws.api.model.soap,
com.sun.xml.ws.api.model.wsdl, com.sun.xml.ws.api.pipe,
com.sun.xml.ws.api.pipe.helper, com.sun.xml.ws.api.server,
com.sun.xml.ws.api.streaming, com.sun.xml.ws.api.wsdl.parser,
com.sun.xml.ws.api.wsdl.writer, com.sun.xml.ws.binding, com.sun.xml.ws.client,
com.sun.xml.ws.client.dispatch, com.sun.xml.ws.client.sei,
com.sun.xml.ws.developer, com.sun.xml.ws.developer.servlet, com.sun.xml.ws.e
ncoding, com.sun.xml.ws.encoding.fastinfoset, com.sun.xml.ws.encoding.soap,
com.sun.xml.ws.encoding.soap.streaming, com.sun.xml.ws.encoding.xml,
com.sun.xml.ws.fault, com.sun.xml.ws.handler, com.sun.xml.ws.message,
com.sun.xml.ws.message.jaxb, com.sun.xml.ws.message.saaj,
com.sun.xml.ws.message.source, com.sun.xml.ws.message.stream,
com.sun.xml.ws.model, com.sun.xml.ws.model.soap, com.sun.xml.ws.model.wsdl,
com.sun.xml.ws.org.objectweb.asm, com.sun.xml.ws.protocol.soap,
com.sun.xml.ws.protocol.xml, com.sun.xml.ws.resources, com.sun.xml.ws.server,
com.sun.xml.ws.server.provider, com.sun.xml.ws.server.sei,
com.sun.xml.ws.server.servlet, com.sun.xml.ws.spi, com.sun.xml.ws.streaming,
com.sun.xml.ws.transport, com.sun.xml.ws.transport.http,
com.sun.xml.ws.transport.http.client, com.sun.xml.ws.transport.http.server,
com.sun.xml.ws.transport.http.servlet, com.sun.xml.ws.util,
com.sun.xml.ws.util.exception, com.sun.xml.ws.util.localization,
com.sun.xml.ws.util.pipe, com.sun.xml.ws.util.xml,
com.sun.xml.ws.wsdl.parser, com.sun.xml.ws.wsdl.writer,
com.sun.xml.ws.wsdl.writer.document, com.sun.xml.ws.wsdl.writer.document.http,
com.sun.xml.ws.wsdl.writer.document.soap,
com.sun.xml.ws.wsdl.writer.document.soap12,
com.sun.xml.ws.wsdl.writer.document.xsd, com.sun.xml.internal.bind,
com.sun.xml.internal.ws, com.sun.xml.internal.ws.addressing,
com.sun.xml.internal.ws.addressing.model,
com.sun.xml.internal.ws.addressing.v200408, com.sun.xml.internal.ws.api,
com.sun.xml.internal.ws.api.addressing, com.sun.xml.internal.ws.api.client,
com.sun.xml.internal.ws.api.fastinfoset, com.sun.xml.internal.ws.api.handler,
com.sun.xml.internal.ws.api.message,
com.sun.xml.internal.ws.api.message.stream, com.sun.xml.internal.ws.api.model,
com.sun.xml.internal.ws.api.model.soap, com.sun.xml.internal.ws.api.model.wsdl,
com.sun.xml.internal.ws.api.pipe, com.sun.xml.internal.ws.api.pipe.helper,
com.sun.xml.internal.ws.api.server, com.sun.xml.internal.ws.api.streaming,
com.sun.xml.internal.ws.api.wsd
l.parser, com.sun.xml.internal.ws.api.wsdl.writer,
com.sun.xml.internal.ws.binding, com.sun.xml.internal.ws.client,
com.sun.xml.internal.ws.client.dispatch, com.sun.xml.internal.ws.client.sei,
com.sun.xml.internal.ws.developer, com.sun.xml.internal.ws.encoding,
com.sun.xml.internal.ws.encoding.fastinfoset,
com.sun.xml.internal.ws.encoding.soap,
com.sun.xml.internal.ws.encoding.soap.streaming,
com.sun.xml.internal.ws.encoding.xml, com.sun.xml.internal.ws.fault,
com.sun.xml.internal.ws.handler, com.sun.xml.internal.ws.message,
com.sun.xml.internal.ws.message.jaxb, com.sun.xml.internal.ws.message.saaj,
com.sun.xml.internal.ws.message.source, com.sun.xml.internal.ws.message.stream,
com.sun.xml.internal.ws.model, com.sun.xml.internal.ws.model.soap,
com.sun.xml.internal.ws.model.wsdl, com.sun.xml.internal.ws.org.objectweb.asm,
com.sun.xml.internal.ws.protocol.soap,
+ com.sun.xml.internal.ws.protocol.xml,
com.sun.xml.internal.ws.resources, com.sun.xml.internal.ws.server,
com.sun.xml.internal.ws.server.provider, com.sun.xml.internal.ws.server.sei,
com.sun.xml.internal.ws.spi, com.sun.xml.internal.ws.streaming,
com.sun.xml.internal.ws.transport, com.sun.xml.internal.ws.transport.http,
com.sun.xml.internal.ws.transport.http.client,
com.sun.xml.internal.ws.transport.http.server, com.sun.xml.internal.ws.util,
com.sun.xml.internal.ws.util.exception,
com.sun.xml.internal.ws.util.localization, com.sun.xml.internal.ws.util.pipe,
com.sun.xml.internal.ws.util.xml, com.sun.xml.internal.ws.wsdl.parser,
com.sun.xml.internal.ws.wsdl.writer,
com.sun.xml.internal.ws.wsdl.writer.document,
com.sun.xml.internal.ws.wsdl.writer.document.http,
com.sun.xml.internal.ws.wsdl.writer.document,
com.sun.xml.internal.ws.wsdl.writer.document.soap,
com.sun.xml.internal.ws.wsdl.writer.document.soap12,
com.sun.xml.internal.ws.wsdl.writer.document.xsd, javax.activa
tion, javax.jws, javax.jws.soap, javax.xml, javax.xml.bind,
javax.xml.bind.annotation, javax.xml.bind.annotation.adapters,
javax.xml.bind.attachment, javax.xml.bind.helpers, javax.xml.bind.util,
javax.xml.crypto, javax.xml.crypto.dom, javax.xml.crypto.dsig,
javax.xml.crypto.dsig.dom, javax.xml.crypto.dsig.keyinfo,
javax.xml.crypto.dsig.spec, javax.xml.datatype; version=1.4.0,
javax.xml.namespace; version=1.4.0, javax.xml.parsers, javax.xml.soap,
javax.xml.transform; version=1.4.0, javax.xml.transform.dom; version=1.4.0,
javax.xml.transform.sax; version=1.4.0, javax.xml.transform.stax;
version=1.4.0, javax.xml.transform.stream; version=1.4.0, javax.xml.validation;
version=1.4.0, javax.xml.ws, javax.xml.ws.handler, javax.xml.ws.handler.soap,
javax.xml.ws.http, javax.xml.ws.soap, javax.xml.ws.spi,
javax.xml.ws.wsaddressing, javax.xml.xpath; version=1.4.0, org.w3c.dom;
version=1.4.0, org.w3c.dom.bootstrap; version=1.4.0, org.w3c.dom.css,
org.w3c.dom.events; version=1.4.0, org.w3c.dom.ht
ml,
+ org.w3c.dom.ls; version=1.4.0, org.w3c.dom.ranges;
version=1.4.0, org.w3c.dom.stylesheets, org.w3c.dom.traversal,
org.w3c.dom.views, org.w3c.dom.xpath, org.xml.sax; version=1.4.0,
org.xml.sax.ext; version=1.4.0, org.xml.sax.helpers; version=1.4.0, sun.misc,
sun.security.util
</Export-Package>
</manifestEntries>
</archive>
Modified: stanbol/trunk/commons/jobs/api/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/jobs/api/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/jobs/api/pom.xml (original)
+++ stanbol/trunk/commons/jobs/api/pom.xml Tue May 12 13:02:52 2015
@@ -68,12 +68,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
<!-- Dependencise for testing -->
Modified: stanbol/trunk/commons/marmotta/kiwi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/pom.xml (original)
+++ stanbol/trunk/commons/marmotta/kiwi/pom.xml Tue May 12 13:02:52 2015
@@ -64,6 +64,7 @@
marmotta-util-tripletable,
kiwi-caching-infinispan, kiwi-caching-hazelcast,
kiwi-caching-ehcache,
+ marmotta-model-vocabs,
tomcat-jdbc, tomcat-juli, postgresql
</Embed-Dependency>
<!-- DynamicImport-Package is needed for
@@ -129,6 +130,10 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-caching-hazelcast</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-model-vocabs</artifactId>
+ </dependency>
<dependency>
Modified: stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/prefixccprovider/pom.xml Tue May 12
13:02:52 2015
@@ -128,11 +128,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: stanbol/trunk/commons/namespaceprefix/service/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/service/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/service/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/service/pom.xml Tue May 12 13:02:52
2015
@@ -122,11 +122,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml (original)
+++ stanbol/trunk/commons/namespaceprefix/stanbolprovider/pom.xml Tue May 12
13:02:52 2015
@@ -122,10 +122,5 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified:
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/provider/stanbol/DefaultNamespaceMappingsProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/provider/stanbol/DefaultNamespaceMappingsProvider.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/provider/stanbol/DefaultNamespaceMappingsProvider.java
(original)
+++
stanbol/trunk/commons/namespaceprefix/stanbolprovider/src/main/java/org/apache/stanbol/commons/namespaceprefix/provider/stanbol/DefaultNamespaceMappingsProvider.java
Tue May 12 13:02:52 2015
@@ -28,7 +28,7 @@ import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@Component(immediate=true, metatype=true)
+@Component(immediate=true)
@Service
@Property(name=Constants.SERVICE_RANKING,value="1000000")
public class DefaultNamespaceMappingsProvider extends
NamespacePrefixProviderImpl implements NamespacePrefixProvider {
@@ -36,7 +36,7 @@ public class DefaultNamespaceMappingsPro
private static final Logger log =
LoggerFactory.getLogger(DefaultNamespaceMappingsProvider.class);
public DefaultNamespaceMappingsProvider(){
- super(Collections.EMPTY_MAP);
+ super(Collections.<String,String>emptyMap());
for(DefaultNamespaceMappingsEnum m :
DefaultNamespaceMappingsEnum.values()){
String current = addMapping(m.getPrefix(), m.getNamespace(), true);
if(current != null){
Modified: stanbol/trunk/commons/security/core/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/core/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/security/core/pom.xml (original)
+++ stanbol/trunk/commons/security/core/pom.xml Tue May 12 13:02:52 2015
@@ -114,7 +114,6 @@
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
- <version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -144,13 +143,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
</dependency>
- <!-- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>permissiondescriptions</artifactId>
- <version>0.1-incubating</version>
- </dependency> -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: stanbol/trunk/commons/security/felixwebconsole/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/felixwebconsole/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/security/felixwebconsole/pom.xml (original)
+++ stanbol/trunk/commons/security/felixwebconsole/pom.xml Tue May 12 13:02:52
2015
@@ -95,8 +95,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.0.0</version>
- <type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Tue May 12 13:02:52
2015
@@ -129,12 +129,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/utils/DataFileResourceLoader.java
Tue May 12 13:02:52 2015
@@ -41,7 +41,7 @@ import org.apache.stanbol.commons.stanbo
* @author Rupert Westenthaler
*
*/
-@Component(immediate=true,policy=ConfigurationPolicy.OPTIONAL,metatype=true)
+@Component(immediate=true,policy=ConfigurationPolicy.OPTIONAL)
@Service(value={ResourceLoader.class, DataFileResourceLoader.class})
public class DataFileResourceLoader implements ResourceLoader {
Modified: stanbol/trunk/commons/testing/http/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/http/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/testing/http/pom.xml (original)
+++ stanbol/trunk/commons/testing/http/pom.xml Tue May 12 13:02:52 2015
@@ -76,6 +76,11 @@
<artifactId>org.osgi.core</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified:
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/Request.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/Request.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/Request.java
(original)
+++
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/Request.java
Tue May 12 13:02:52 2015
@@ -21,7 +21,7 @@ import java.net.URLEncoder;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.entity.StringEntity;
/**
@@ -30,16 +30,17 @@ import org.apache.http.entity.StringEnti
*/
public class Request {
- private final HttpUriRequest request;
- private String username;
- private String password;
+ private final HttpRequestBase request;
+//configure on unit test level
+// private String username;
+// private String password;
private boolean redirects = true;
- Request(HttpUriRequest r) {
+ Request(HttpRequestBase r) {
request = r;
}
- public HttpUriRequest getRequest() {
+ public HttpRequestBase getRequest() {
return request;
}
@@ -48,12 +49,6 @@ public class Request {
return this;
}
- public Request withCredentials(String username, String password) {
- this.username = username;
- this.password = password;
- return this;
- }
-
public Request withRedirects(boolean followRedirectsAutomatically) {
redirects = followRedirectsAutomatically;
return this;
@@ -111,13 +106,13 @@ public class Request {
return this;
}
- public String getUsername() {
- return username;
- }
-
- public String getPassword() {
- return password;
- }
+// public String getUsername() {
+// return username;
+// }
+
+// public String getPassword() {
+// return password;
+// }
public boolean getRedirects() {
return redirects;
Modified:
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RequestExecutor.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RequestExecutor.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RequestExecutor.java
(original)
+++
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/RequestExecutor.java
Tue May 12 13:02:52 2015
@@ -18,47 +18,34 @@ package org.apache.stanbol.commons.testi
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.regex.Pattern;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.http.Header;
import org.apache.http.HttpEntity;
-import org.apache.http.HttpException;
-import org.apache.http.HttpHost;
-import org.apache.http.HttpRequest;
-import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponse;
import org.apache.http.ParseException;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.AuthState;
-import org.apache.http.auth.Credentials;
-import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.client.params.ClientPNames;
-import org.apache.http.client.protocol.ClientContext;
import org.apache.http.entity.ContentType;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.protocol.ExecutionContext;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.protocol.HTTP;
-import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
-import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Executes a Request and provides convenience methods
@@ -66,8 +53,10 @@ import org.junit.Assert;
*/
public class RequestExecutor {
- private final DefaultHttpClient httpClient;
- private HttpUriRequest request;
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private final CloseableHttpClient httpClient;
+ private HttpRequestBase request;
private HttpResponse response;
private HttpEntity entity;
private String contentString;
@@ -75,34 +64,37 @@ public class RequestExecutor {
private ContentType contentType;
private Charset charset;
- /**
- * HttpRequestInterceptor for preemptive authentication, based on
httpclient
- * 4.0 example
- */
- private static class PreemptiveAuthInterceptor implements
HttpRequestInterceptor {
-
- public void process(HttpRequest request, HttpContext context) throws
HttpException, IOException {
+// /**
+// * HttpRequestInterceptor for preemptive authentication, based on
httpclient
+// * 4.0 example
+// */
+// private static class PreemptiveAuthInterceptor implements
HttpRequestInterceptor {
+//
+// public void process(HttpRequest request, HttpContext context) throws
HttpException, IOException {
+//
+// AuthState authState = (AuthState)
context.getAttribute(HttpClientContext.TARGET_AUTH_STATE);
+// CredentialsProvider credsProvider = (CredentialsProvider)
context.getAttribute(HttpClientContext.CREDS_PROVIDER);
+// HttpHost targetHost = (HttpHost)
context.getAttribute(HttpClientContext.HTTP_TARGET_HOST);
+//
+// // If not auth scheme has been initialized yet
+// if (authState.getAuthScheme() == null) {
+// AuthScope authScope = new
AuthScope(targetHost.getHostName(), targetHost.getPort());
+//
+// // Obtain credentials matching the target host
+// Credentials creds = credsProvider.getCredentials(authScope);
+//
+// // If found, generate BasicScheme preemptively
+// if (creds != null) {
+// authState.update(new BasicScheme(), creds);
+// }
+// }
+// }
+// }
- AuthState authState = (AuthState)
context.getAttribute(ClientContext.TARGET_AUTH_STATE);
- CredentialsProvider credsProvider = (CredentialsProvider)
context.getAttribute(ClientContext.CREDS_PROVIDER);
- HttpHost targetHost = (HttpHost)
context.getAttribute(ExecutionContext.HTTP_TARGET_HOST);
-
- // If not auth scheme has been initialized yet
- if (authState.getAuthScheme() == null) {
- AuthScope authScope = new AuthScope(targetHost.getHostName(),
targetHost.getPort());
-
- // Obtain credentials matching the target host
- Credentials creds = credsProvider.getCredentials(authScope);
-
- // If found, generate BasicScheme preemptively
- if (creds != null) {
- authState.update(new BasicScheme(), creds);
- }
- }
- }
+ public RequestExecutor(CloseableHttpClient client) {
+ httpClient = client;
}
-
- public RequestExecutor(DefaultHttpClient client) {
+ public RequestExecutor(CloseableHttpClient client, String username, String
password) {
httpClient = client;
}
@@ -124,21 +116,12 @@ public class RequestExecutor {
clear();
request = r.getRequest();
- // Optionally setup for basic authentication
- if (r.getUsername() != null) {
- httpClient.getCredentialsProvider().setCredentials(AuthScope.ANY,
- new UsernamePasswordCredentials(r.getUsername(),
r.getPassword()));
-
- // And add request interceptor to have preemptive authentication
- httpClient.addRequestInterceptor(new PreemptiveAuthInterceptor(),
0);
- } else {
-
//httpClient.getCredentialsProvider().setCredentials(AuthScope.ANY, null);
-
httpClient.removeRequestInterceptorByClass(PreemptiveAuthInterceptor.class);
- }
-
- // Setup redirects
-
httpClient.getParams().setBooleanParameter(ClientPNames.HANDLE_REDIRECTS,
r.getRedirects());
-
+ RequestConfig rc = RequestConfig.custom()
+ //.setConnectionRequestTimeout(TODO)
+ //.setConnectTimeout(TODO)
+ .setRedirectsEnabled(r.getRedirects())
+ .setRelativeRedirectsAllowed(true).build();
+ request.setConfig(rc);
// Execute request
response = httpClient.execute(request);
entity = response.getEntity();
@@ -332,4 +315,13 @@ public class RequestExecutor {
public final Charset getCharset() {
return charset;
}
+
+ public void close() {
+ clear();
+ try {
+ httpClient.close();
+ } catch (IOException e) {
+ log.error("Error while closing Http Client", e);
+ }
+ }
}
Modified: stanbol/trunk/commons/testing/jarexec/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/jarexec/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/testing/jarexec/pom.xml (original)
+++ stanbol/trunk/commons/testing/jarexec/pom.xml Tue May 12 13:02:52 2015
@@ -52,6 +52,11 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>compile</scope>
Modified:
stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java
(original)
+++
stanbol/trunk/commons/testing/jarexec/src/main/java/org/apache/stanbol/commons/testing/jarexec/JarExecutor.java
Tue May 12 13:02:52 2015
@@ -16,6 +16,8 @@
*/
package org.apache.stanbol.commons.testing.jarexec;
+import static org.apache.commons.lang.StringUtils.isBlank;
+
import java.io.File;
import java.util.Arrays;
import java.util.Properties;
@@ -28,7 +30,7 @@ import org.apache.commons.exec.ExecuteRe
import org.apache.commons.exec.Executor;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.exec.ShutdownHookProcessDestroyer;
-import org.apache.commons.exec.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -88,16 +90,16 @@ public final class JarExecutor {
final boolean isWindows =
System.getProperty("os.name").toLowerCase().contains("windows");
String portStr = config.getProperty(PROP_SERVER_PORT);
- serverPort = portStr == null ? DEFAULT_PORT : Integer.valueOf(portStr);
+ serverPort = isBlank(portStr) ? DEFAULT_PORT :
Integer.valueOf(portStr);
javaExecutable = isWindows ? "java.exe" : "java";
String jarFolderPath = config.getProperty(PROP_JAR_FOLDER);
- jarFolderPath = jarFolderPath == null ? DEFAULT_JAR_FOLDER :
jarFolderPath;
+ jarFolderPath = isBlank(jarFolderPath) ? DEFAULT_JAR_FOLDER :
jarFolderPath;
final File jarFolder = new File(jarFolderPath);
String jarNameRegexp = config.getProperty(PROP_JAR_NAME_REGEXP);
- jarNameRegexp = jarNameRegexp == null ? DEFAULT_JAR_NAME_REGEXP :
jarNameRegexp;
+ jarNameRegexp = isBlank(jarNameRegexp) ? DEFAULT_JAR_NAME_REGEXP :
jarNameRegexp;
final Pattern jarPattern = Pattern.compile(jarNameRegexp);
// Find executable jar
Modified:
stanbol/trunk/commons/testing/stanbol/src/main/java/org/apache/stanbol/commons/testing/stanbol/StanbolTestBase.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/stanbol/src/main/java/org/apache/stanbol/commons/testing/stanbol/StanbolTestBase.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/testing/stanbol/src/main/java/org/apache/stanbol/commons/testing/stanbol/StanbolTestBase.java
(original)
+++
stanbol/trunk/commons/testing/stanbol/src/main/java/org/apache/stanbol/commons/testing/stanbol/StanbolTestBase.java
Tue May 12 13:02:52 2015
@@ -16,20 +16,28 @@
*/
package org.apache.stanbol.commons.testing.stanbol;
-import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.TreeSet;
import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.conn.HttpHostConnectException;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.apache.stanbol.commons.testing.http.RequestBuilder;
import org.apache.stanbol.commons.testing.http.RequestExecutor;
import org.apache.stanbol.commons.testing.jarexec.JarExecutor;
+import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.slf4j.Logger;
@@ -53,9 +61,18 @@ public class StanbolTestBase {
protected boolean serverReady = false;
protected RequestBuilder builder;
- protected DefaultHttpClient httpClient = new DefaultHttpClient();
- protected RequestExecutor executor = new RequestExecutor(httpClient);
-
+ protected CloseableHttpClient httpClient = null;
+ protected RequestExecutor executor;
+
+ /**
+ * Overwrite to enable authentication for requests
+ * @return the <code>username:password</code> or <code>null</code> to
deactivate
+ * authentication (default)
+ */
+ protected String getCredentials(){
+ return null;
+ }
+
@BeforeClass
public static synchronized void startRunnableJar() throws Exception {
if (serverBaseUrl != null) {
@@ -63,8 +80,14 @@ public class StanbolTestBase {
return;
}
final String configuredUrl = System.getProperty(TEST_SERVER_URL_PROP);
- if (configuredUrl != null) {
+ if (configuredUrl != null && !configuredUrl.trim().isEmpty()) {
serverBaseUrl = configuredUrl;
+ try {
+ new URL(configuredUrl);
+ }catch(MalformedURLException e){
+ log.error("Configured " + TEST_SERVER_URL_PROP+ " = " +
configuredUrl + "is not a valid URL!");
+ throw e;
+ }
log.info(TEST_SERVER_URL_PROP + " is set: not starting server jar
(" + serverBaseUrl + ")");
} else {
final JarExecutor j =
JarExecutor.getInstance(System.getProperties());
@@ -89,7 +112,19 @@ public class StanbolTestBase {
log.debug("> before
{}#waitForServerReady()",getClass().getSimpleName());
// initialize instance request builder and HTTP client
builder = new RequestBuilder(serverBaseUrl);
- httpClient = new DefaultHttpClient();
+ //TODO:user name and pwd
+ String credentials = getCredentials();
+ if(credentials != null && !credentials.isEmpty()){
+ CredentialsProvider credsProvider = new BasicCredentialsProvider();
+ credsProvider.setCredentials(
+ new AuthScope(HttpHost.create(serverBaseUrl)),
+ new UsernamePasswordCredentials(credentials));
+ httpClient = HttpClients.custom()
+ .setDefaultCredentialsProvider(credsProvider)
+ .build();
+ } else {
+ httpClient = HttpClients.createDefault();
+ }
executor = new RequestExecutor(httpClient);
if (serverReady) {
@@ -128,7 +163,6 @@ public class StanbolTestBase {
// we don't check that the content contains the substring
log.debug(" - check serverReady Paths");
for (String p : testPaths) {
- log.debug(" > path: {}", p);
final String[] s = p.split(":");
final String path = s[0];
final String substring = (s.length > 0 ? s[1] : null);
@@ -145,10 +179,11 @@ public class StanbolTestBase {
get.setHeader(s[i], s[i+1]);
}
}
+ CloseableHttpResponse response = null;
HttpEntity entity = null;
try {
log.debug(" > execute: {}", get);
- HttpResponse response = httpClient.execute(get);
+ response = httpClient.execute(get);
log.debug(" > response: {}", response);
entity = response.getEntity();
final int status =
response.getStatusLine().getStatusCode();
@@ -169,27 +204,30 @@ public class StanbolTestBase {
log.info("Returned content for {} does not
contain "
+ "{} - will retry", url, substring);
continue readyLoop;
- } else {
- log.debug("Returned content for {} contains {} -
ready",
- url, substring);
}
}
- } catch (ConnectException e) {
- log.info("Got {} at {} - will retry",
e.getClass().getSimpleName(), url);
+ } catch (HttpHostConnectException e) {
+ log.info("Got HttpHostConnectException at " + url + " -
will retry");
continue readyLoop;
} finally {
- if (entity != null) {
- entity.consumeContent();
+ EntityUtils.consumeQuietly(entity);
+ if(response != null){
+ response.close();
}
}
}
- log.info("Got expected content for all configured requests, server
is ready");
serverReady = true;
+ log.info("Got expected content for all configured requests, server
is ready");
}
if (!serverReady) {
throw new Exception("Server not ready after " + timeoutSec + "
seconds");
}
}
+
+ @After
+ public void closeExecutor(){
+ executor.close();
+ }
}
Modified: stanbol/trunk/commons/tikabundle/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/tikabundle/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/tikabundle/pom.xml (original)
+++ stanbol/trunk/commons/tikabundle/pom.xml Tue May 12 13:02:52 2015
@@ -89,7 +89,6 @@
org.apache.tika.parser.*; version=${tika-version}
</Export-Package>
<Import-Package>
- *,
com.adobe.xmp;resolution:=optional,
com.adobe.xmp.properties;resolution:=optional,
com.google.protobuf;resolution:=optional,
@@ -159,7 +158,8 @@
visad.data;resolution:=optional,
visad.data.vis5d;resolution:=optional,
visad.jmet;resolution:=optional,
- visad.util;resolution:=optional
+ visad.util;resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>
Modified: stanbol/trunk/commons/web/base/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/base/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/commons/web/base/pom.xml (original)
+++ stanbol/trunk/commons/web/base/pom.xml Tue May 12 13:02:52 2015
@@ -73,12 +73,7 @@
javax.ws.rs;version="[2,3)",
javax.ws.rs.ext;version="[2,3)",
javax.ws.rs.core;version="[2,3)",
- org.apache.stanbol.commons.web.base,
- org.apache.stanbol.commons.web.base.format,
- org.apache.stanbol.commons.web.base.readers,
- org.apache.stanbol.commons.web.base.resource,
- org.apache.stanbol.commons.web.base.utils,
- org.apache.stanbol.commons.web.base.writers,
+ org.apache.stanbol.commons.web.base*,
org.apache.stanbol.commons.jsonld;resolution:=optional,
org.codehaus.jettison.json;resolution:=optional,
com.hp.hpl.jena.rdf.model;resolution:=optional,
Modified:
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
(original)
+++
stanbol/trunk/commons/web/home/src/main/java/org/apache/stanbol/commons/web/home/HomeWebFragment.java
Tue May 12 13:02:52 2015
@@ -37,7 +37,7 @@ import org.osgi.service.component.Compon
* Statically define the list of available resources and providers to be
contributed to the the Stanbol JAX-RS
* Endpoint.
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service
public class HomeWebFragment implements WebFragment {
Modified:
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
(original)
+++
stanbol/trunk/commons/web/sparql/src/main/java/org/apache/stanbol/commons/web/sparql/SparqlMenuItem.java
Tue May 12 13:02:52 2015
@@ -27,9 +27,9 @@ import org.apache.stanbol.commons.web.ba
public class SparqlMenuItem extends NavigationLink {
private static final String htmlDescription = "This is the <strong>SPARQL
endpoint</strong> for the Stanbol store."+
- "<a
href=\"http://en.wikipedia.org/wiki/Sparql\";>SPARQL</a> is the"+
- "standard query language the most commonly used to
provide interactive"+
- "access to semantic knowledge bases.";
+ "<a href=\"http://en.wikipedia.org/wiki/Sparql\";>SPARQL</a> is
the"+
+ "standard query language the most commonly used to provide
interactive"+
+ "access to semantic knowledge bases.";
public SparqlMenuItem() {
super("sparql", "/sparql", htmlDescription , 50);
Propchange: stanbol/trunk/enhancement-engines/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -1,7 +1,7 @@
/incubator/stanbol/branches/dbpedia-spotlight-engines/engines:1374978-1386535
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/engines:1386989-1388016
/stanbol/branches/STANBOL-913:1443935-1448276
-/stanbol/branches/release-0.12/enhancement-engines:1571150,1572559,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1588447,1589341,1590930,1593490,1597063,1597575,1597760
+/stanbol/branches/release-0.12/enhancement-engines:1571150,1572559,1572586,1572588,1572944,1573918,1573936,1574911,1577150,1588447,1589341,1590930,1593490,1597063,1597575,1597760,1609451,1617239,1624001,1638045,1674012
/stanbol/branches/stanbol-nlp-processing/enhancer/engines:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancement-engines:1455112-1458685
/stanbol/trunk/enhancement-engines:1496360-1533530
Modified: stanbol/trunk/enhancement-engines/celi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/celi/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/celi/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/celi/pom.xml Tue May 12 13:02:52 2015
@@ -156,11 +156,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: stanbol/trunk/enhancement-engines/entitylinking/engine/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitylinking/engine/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entitylinking/engine/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/entitylinking/engine/pom.xml Tue May 12
13:02:52 2015
@@ -153,11 +153,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
Modified: stanbol/trunk/enhancement-engines/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/pom.xml Tue May 12 13:02:52 2015
@@ -115,6 +115,8 @@
<module>geonames</module> <!-- http://geonames.org -->
<module>opencalais</module> <!-- http://opencalais.com/ -->
<module>zemanta</module> <!-- htt://zemanta.com -->
+
+ <module>entitycoreference</module>
</modules>
<build>
Modified: stanbol/trunk/enhancement-engines/topic/engine/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/engine/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/topic/engine/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/engine/pom.xml Tue May 12 13:02:52
2015
@@ -234,11 +234,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.ibm.icu</artifactId>
<scope>test</scope>
Modified:
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
(original)
+++
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
Tue May 12 13:02:52 2015
@@ -16,9 +16,7 @@
*/
package org.apache.stanbol.enhancer.web.topic.fragment;
-import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -29,14 +27,11 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.commons.web.base.readers.GraphReader;
-import
org.apache.stanbol.enhancer.web.topic.resource.TopicClassifierRootResource;
-import org.apache.stanbol.enhancer.web.topic.resource.TopicModelResource;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service
public class TopicClassifierFragment implements WebFragment {
@@ -51,9 +46,7 @@ public class TopicClassifierFragment imp
@Override
public Set<Class<?>> getJaxrsResourceClasses() {
- Set<Class<?>> classes = new HashSet<Class<?>>();
- classes.add(GraphReader.class);
- return classes;
+ return Collections.emptySet();
}
@Override
@@ -73,9 +66,7 @@ public class TopicClassifierFragment imp
@Override
public List<NavigationLink> getNavigationLinks() {
- List<NavigationLink> navList = new ArrayList<NavigationLink>();
- navList.add(new NavigationLink("topic", "/topic", null, 15));
- return navList;
+ return Collections.emptyList();
}
@Activate
Added:
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicMenuItem.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicMenuItem.java?rev=1678929&view=auto
==============================================================================
---
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicMenuItem.java
(added)
+++
stanbol/trunk/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicMenuItem.java
Tue May 12 13:02:52 2015
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 The Apache Software Foundation.
+ *
+ * Licensed 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.enhancer.web.topic.fragment;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.web.base.NavigationLink;
+
+/**
+ *
+ */
+@Component(immediate=true)
+@Service(NavigationLink.class)
+public class TopicMenuItem extends NavigationLink {
+
+ private static final String htmlDescription = "<strong>Topic
Classification" +
+ "endpoint</strong> for Apache Stanbol. This allows to manage and
train " +
+ "topic classification models for the Topic classification engine of
the " +
+ "Stanbol Enhancer.";
+
+ public TopicMenuItem() {
+ super("topic", "/topic", htmlDescription , 15);
+ }
+
+}
\ No newline at end of file
Propchange: stanbol/trunk/enhancer/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -1,5 +1,5 @@
/incubator/stanbol/branches/dbpedia-spotlight-engines:1374978-1386535
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer:1386989-1388016
-/stanbol/branches/release-0.12/enhancer:1571146,1571150,1572586,1572588,1587573,1587860,1588449,1593490,1593899,1594490,1596518,1597575
+/stanbol/branches/release-0.12/enhancer:1571146,1571150,1572586,1572588,1587573,1587860,1588449,1593490,1593899,1594490,1596518,1597575,1604752,1608340,1608360,1624001,1626979,1633539,1638045,1675556
/stanbol/branches/stanbol-nlp-processing/enhancer:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancer:1455112-1458685
Propchange: stanbol/trunk/enhancer/generic/servicesapi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -3,6 +3,6 @@
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi:1386989-1388016
/incubator/stanbol/trunk/enhancer/generic/servicesapi:1339554,1339557-1339558
/stanbol/branches/disambiguation-engine/generic/servicesapi:1388017-1403900
-/stanbol/branches/release-0.12/enhancer/generic/servicesapi:1571146,1571150,1572586,1587860,1593490,1593899,1594490,1596518,1597575,1608360
+/stanbol/branches/release-0.12/enhancer/generic/servicesapi:1571146,1571150,1572586,1587860,1593490,1593899,1594490,1596518,1597575,1608360,1624001,1675556
/stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancer/generic/servicesapi:1455112-1458685
Modified: stanbol/trunk/enhancer/jersey/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ stanbol/trunk/enhancer/jersey/pom.xml Tue May 12 13:02:52 2015
@@ -214,7 +214,6 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
- <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
Tue May 12 13:02:52 2015
@@ -33,7 +33,7 @@ import org.apache.stanbol.commons.web.ba
* Statically define the list of available resources and providers to be
contributed to the the Stanbol JAX-RS
* Endpoint.
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true)
@Service
public class EnhancerWebFragment implements WebFragment {
Modified:
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/writers/ContentItemWriter.java
Tue May 12 13:02:52 2015
@@ -77,6 +77,7 @@ import org.apache.http.entity.mime.conte
import org.apache.http.entity.mime.content.ContentBody;
import org.apache.http.entity.mime.content.ContentDescriptor;
import org.apache.http.entity.mime.content.InputStreamBody;
+import org.apache.http.message.BasicNameValuePair;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.helper.ContentItemHelper;
@@ -452,23 +453,22 @@ public class ContentItemWriter implement
private String boundary;
public MultipartContentBody(Map<String,ContentBody> parts, String
boundary, ContentType contentType){
- super(contentType);
+ super(ContentType.create(contentType.getMimeType(), new
BasicNameValuePair("boundary",boundary)));
this.parts = parts;
this.boundary = boundary;
}
- @Override
- public String getCharset() {
- return null; //no charset for multipart parts
- }
- @Override
- public String getMimeType() {
- return new StringBuilder(super.getMimeType()).append("; boundary=")
- .append(boundary).toString();
- }
- @Override
- public ContentType getContentType() {
- return super.getContentType();
- }
+// @Override
+// public String getCharset() {
+// return null; //no charset for multipart parts
+// }
+// @Override
+// public String getMimeType() {
+// String mime = new StringBuilder(super.getMimeType()).append(";
boundary=")
+// .append(boundary).toString();
+// log.info("!!! {}",mime);
+// return mime;
+//
+// }
@Override
public String getTransferEncoding() {
return MIME.ENC_8BIT;
Modified:
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
(original)
+++
stanbol/trunk/enhancer/jersey/src/test/java/org/apache/stanbol/enhancer/jersey/ContentItemReaderWriterTest.java
Tue May 12 13:02:52 2015
@@ -58,8 +58,6 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
-import org.apache.clerezza.rdf.jena.parser.JenaParserProvider;
-import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.commons.web.base.writers.JsonLdSerializerProvider;
@@ -78,8 +76,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-//import com.sun.jersey.core.util.StringKeyIgnoreCaseMultivaluedMap;
-
public class ContentItemReaderWriterTest {
private static final Logger log =
LoggerFactory.getLogger(ContentItemReaderWriterTest.class);
@@ -140,7 +136,7 @@ public class ContentItemReaderWriterTest
* @throws IOException
*/
private MediaType serializeContentItem(ByteArrayOutputStream out) throws
IOException {
- MultivaluedMap<String,Object> headers = new MultivaluedHashMap<String,
Object>();//StringKeyIgnoreCaseMultivaluedMap<Object>();
+ MultivaluedMap<String,Object> headers = new MultivaluedHashMap<String,
Object>();
ciWriter.writeTo(contentItem, ContentItem.class, null, null,
MediaType.MULTIPART_FORM_DATA_TYPE,
headers , out);
//check the returned content type
@@ -169,7 +165,7 @@ public class ContentItemReaderWriterTest
"<rdf:type rdf:resource=\"urn:types:Document\"/>",
"--"+ContentItemWriter.CONTENT_ITEM_BOUNDARY,
"Content-Disposition: form-data; name=\"content\"",
- "Content-Type: multipart/alternate; boundary=contentParts",
+ "Content-Type: multipart/alternate;
boundary="+ContentItemWriter.CONTENT_PARTS_BOUNDERY,
"--"+ContentItemWriter.CONTENT_PARTS_BOUNDERY,
"Content-Disposition: form-data; name=\"urn:test_main\"",
"Content-Type: text/html; charset=UTF-8",
@@ -188,9 +184,11 @@ public class ContentItemReaderWriterTest
"<rdf:type
rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/executionplan#ExecutionNode\"/>",
"--"+ContentItemWriter.CONTENT_ITEM_BOUNDARY+"--"
};
+ log.debug("> Validate Multipart Mime:");
for(String test : tests){
int index = multipartMime.indexOf(test);
- assertTrue("content does not contain '" + test + "'!",index >=0);
+ assertTrue("Unable to find: '"+test+"' in multipart mime!",index
>=0);
+ log.debug(" - found '{}'",test);
multipartMime = multipartMime.substring(index);
}
}
@@ -210,8 +208,8 @@ public class ContentItemReaderWriterTest
assertTrue(copy.isEmpty());
//assert Blob
assertEquals(contentItem.getBlob().getMimeType(),
ci.getBlob().getMimeType());
- String content =
IOUtils.toString(contentItem.getBlob().getStream(),"UTF-8");
- String readContent = IOUtils.toString(ci.getBlob().getStream(),
"UTF-8");
+ String content = IOUtils.toString(contentItem.getStream(),"UTF-8");
+ String readContent = IOUtils.toString(ci.getStream(), "UTF-8");
assertEquals(content, readContent);
Iterator<Entry<UriRef,Blob>> contentItemBlobsIt =
ContentItemHelper.getContentParts(contentItem,
Blob.class).entrySet().iterator();
Iterator<Entry<UriRef,Blob>> ciBlobsIt =
ContentItemHelper.getContentParts(ci, Blob.class).entrySet().iterator();
Propchange: stanbol/trunk/entityhub/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -1,3 +1,3 @@
-/stanbol/branches/release-0.12/entityhub:1572588,1581735,1587824,1587844,1595157-1595158,1599973
+/stanbol/branches/release-0.12/entityhub:1572588,1581735,1587824,1587844,1595157-1595158,1599973,1626979,1635413
/stanbol/branches/stanbol-solr4/entityhub:1455112-1458685
/stanbol/trunk/entityhub:1494993-1533392
Propchange: stanbol/trunk/entityhub/generic/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 12 13:02:52 2015
@@ -1 +1,2 @@
+/stanbol/branches/release-0.12/entityhub/generic/core:1635413
/stanbol/trunk/entityhub/generic/core:1494993-1533478
Modified: stanbol/trunk/integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
--- stanbol/trunk/integration-tests/pom.xml (original)
+++ stanbol/trunk/integration-tests/pom.xml Tue May 12 13:02:52 2015
@@ -241,11 +241,6 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultiThreadedTestBase.java
Tue May 12 13:02:52 2015
@@ -58,9 +58,14 @@ import org.apache.commons.compress.compr
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.params.ClientPNames;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.CoreConnectionPNames;
import org.apache.http.params.CoreProtocolPNames;
@@ -137,9 +142,8 @@ public abstract class MultiThreadedTestB
public static final String DEFAULT_TEST_DATA_PROPERTY =
"http://dbpedia.org/ontology/abstract";;
private static final String[] ENABLE_EXECUTION_METADATA = new
String[]{"executionmetadata","true"};
protected static Parser rdfParser;
- protected DefaultHttpClient pooledHttpClient;
- private BasicHttpParams httpParams;
- private PoolingClientConnectionManager connectionManager;
+ protected CloseableHttpClient pooledHttpClient;
+ private PoolingHttpClientConnectionManager connectionManager;
private NamespacePrefixService nsPrefixService;
@@ -346,17 +350,22 @@ public abstract class MultiThreadedTestB
@Before
public void initialiseHttpClient() {
if(this.pooledHttpClient == null){ //init for the first test
- httpParams = new BasicHttpParams();
- httpParams.setParameter(CoreProtocolPNames.USER_AGENT, "Stanbol
Integration Test");
- httpParams.setBooleanParameter(ClientPNames.HANDLE_REDIRECTS,true);
- httpParams.setIntParameter(ClientPNames.MAX_REDIRECTS,3);
-
httpParams.setBooleanParameter(CoreConnectionPNames.SO_KEEPALIVE,true);
-
- connectionManager = new PoolingClientConnectionManager();
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setRedirectsEnabled(true)
+ .setMaxRedirects(3).build();
+ SocketConfig socketConfig = SocketConfig.custom()
+ .setSoKeepAlive(true).build();
+
+ connectionManager = new PoolingHttpClientConnectionManager();
+ connectionManager.setDefaultSocketConfig(socketConfig);
connectionManager.setMaxTotal(20);
connectionManager.setDefaultMaxPerRoute(20);
- pooledHttpClient = new
DefaultHttpClient(connectionManager,httpParams);
+ pooledHttpClient = HttpClientBuilder.create()
+ .setUserAgent("Stanbol Integration Test")
+ .setConnectionManager(connectionManager)
+ .setDefaultRequestConfig(requestConfig)
+ .build();
}
}
@@ -414,7 +423,11 @@ public abstract class MultiThreadedTestB
@After
public final void close() {
setEndpoint(null,ENABLE_EXECUTION_METADATA); //reset the endpoint to
the default
- httpParams = null;
+ try {
+ pooledHttpClient.close();
+ } catch (IOException e) {
+ log.info("Unable to close HttpClient",e);
+ }
pooledHttpClient = null;
connectionManager.shutdown();
connectionManager = null;
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Tue May 12 13:02:52 2015
@@ -39,18 +39,16 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
-import org.apache.clerezza.rdf.jena.serializer.JenaSerializerProvider;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.http.HttpEntity;
-import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.mime.MIME;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.entity.mime.content.AbstractContentBody;
-import org.apache.http.entity.mime.content.ByteArrayBody;
import org.apache.http.entity.mime.content.ContentBody;
import org.apache.http.entity.mime.content.ContentDescriptor;
import org.apache.http.entity.mime.content.StringBody;
+import org.apache.http.message.BasicNameValuePair;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
@@ -542,19 +540,11 @@ public class MultipartRequestTest extend
private String boundary;
public MultipartContentBody(Map<String,ContentBody> parts, String
boundary, ContentType contentType){
- super(contentType);
+ super(ContentType.create(contentType.getMimeType(), new
BasicNameValuePair("boundary",boundary)));
this.parts = parts;
this.boundary = boundary;
}
- @Override
- public String getCharset() {
- return UTF8.toString(); //no charset for multipart parts
- }
- @Override
- public String getMimeType() {
- return new StringBuilder(super.getMimeType()).append("; boundary=")
- .append(boundary).toString();
- }
+
@Override
public String getTransferEncoding() {
return MIME.ENC_8BIT;
@@ -584,4 +574,5 @@ public class MultipartRequestTest extend
}
}
+
}
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java
Tue May 12 13:02:52 2015
@@ -22,6 +22,11 @@ import org.junit.Test;
/** Verify that the example config of STANBOL-110 is present */
public class DefaultConfigTest extends StanbolTestBase {
+ @Override
+ protected String getCredentials() {
+ return "admin:admin";
+ }
+
@Test
public void testDefaultConfig() throws Exception {
// AFAIK there's no way to get the config in machine
@@ -30,7 +35,6 @@ public class DefaultConfigTest extends S
final String path =
"/system/console/config/configuration-status-20110304-1743+0100.txt";
executor.execute(
builder.buildGetRequest(path)
- .withCredentials("admin", "admin")
)
.assertStatus(200)
.assertContentRegexp(
Modified:
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
---
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
(original)
+++
stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java
Tue May 12 13:02:52 2015
@@ -22,6 +22,11 @@ import org.junit.Test;
/** Test access to the OSGi console */
public class OsgiConsoleTest extends StanbolTestBase {
+ @Override
+ protected String getCredentials() {
+ return "admin:admin";
+ }
+
@Test
public void testDefaultConsolePaths() throws Exception {
final String [] subpaths = {
@@ -45,7 +50,6 @@ public class OsgiConsoleTest extends Sta
final String path = "/system/console/" + subpath;
executor.execute(
builder.buildGetRequest(path)
- .withCredentials("admin", "admin")
).assertStatus(200);
}
}
Modified:
stanbol/trunk/integration-tests/src/test/resources/apache-project-doap-files.zip
URL:
http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/resources/apache-project-doap-files.zip?rev=1678929&r1=1678928&r2=1678929&view=diff
==============================================================================
Binary files - no diff available.
