Modified: stanbol/trunk/integration-tests/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/stanbol/trunk/integration-tests/src/test/resources/log4j.properties?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/integration-tests/src/test/resources/log4j.properties (original) +++ stanbol/trunk/integration-tests/src/test/resources/log4j.properties Tue May 12 13:02:52 2015 @@ -21,4 +21,5 @@ log4j.appender.stdout=org.apache.log4j.C log4j.appender.stdout.Target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n +# log4j.logger.org.apache.stanbol.commons.testing=DEBUG # log4j.logger.org.apache.stanbol=DEBUG \ No newline at end of file
Modified: stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml (original) +++ stanbol/trunk/launchers/bundlelists/enhancer/src/main/bundles/list.xml Tue May 12 13:02:52 2015 @@ -321,6 +321,11 @@ <version>1.0.0-SNAPSHOT</version> </bundle> --> + <bundle> <!-- finds co-mentions of Entities earlier mentioned on the Text (STANBOL-1070)--> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.engines.entitycoreference</artifactId> + <version>1.0.0-SNAPSHOT</version> + </bundle> <!-- External Service Integration --> Modified: stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml (original) +++ stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml Tue May 12 13:02:52 2015 @@ -41,7 +41,7 @@ <bundle> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.3.1</version> + <version>${jackson2-version}</version> </bundle> </startLevel> @@ -50,7 +50,7 @@ <bundle> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime-osgi</artifactId> - <version>2.7.11</version> + <version>${sesame-version}</version> </bundle> </startLevel> Modified: stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml (original) +++ stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml Tue May 12 13:02:52 2015 @@ -17,19 +17,19 @@ --> <bundles> <!-- logback logging is used by Sesame and Marmotta --> - <!-- commented as this is already provided by the Entityhub Sesame bundlelist + <!-- NOTE: Also defined by the Entityhub Sesame bundlelist --> <startLevel level="10"> <bundle> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>0.9.30</version> - sesame expects version < 1.0.0 - + <version>0.9.30</version> <!-- sesame expects version < 1.0.0 --> </bundle> <bundle> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>0.9.30</version> - sesame expects version < 1.0.0 - + <version>0.9.30</version> <!-- sesame expects version < 1.0.0 --> </bundle> - </startLevel> --> + </startLevel> <startLevel level="21"> <bundle> @@ -40,7 +40,12 @@ <bundle> <groupId>commons-validator</groupId> <artifactId>commons-validator</artifactId> - <version>1.4.0</version> + <version>1.4.1</version> + </bundle> + <bundle> <!-- hazelcast 3.3 dependency --> + <groupId>com.eclipsesource.minimal-json</groupId> + <artifactId>minimal-json</artifactId> + <version>0.9.1</version> </bundle> <!-- <bundle> Infinispan Hotrod dependency <groupId>org.apache.avro</groupId> @@ -60,18 +65,18 @@ <bundle> <groupId>com.fasterxml.uuid</groupId> <artifactId>java-uuid-generator</artifactId> - <version>3.1.3</version> + <version>3.1.4</version> </bundle> - <!-- sesame dependency provided by the Entityhub Sesame bundlelist + <!-- sesame dependency NOTE: also provided by the Entityhub Sesame bundlelist --> <bundle> <groupId>org.ow2.bundles</groupId> <artifactId>ow2-bundles-externals-opencsv</artifactId> <version>1.0.36</version> - </bundle> --> + </bundle> <bundle> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> - <version>2.3.1</version> + <version>${jackson2-version}</version> </bundle> </startLevel> @@ -85,16 +90,16 @@ <!-- Marmotta Bundles --> <startLevel level="21"> - <!-- Sesame is provided by the Entityhub Sesame Bundlelist + <!-- Sesame is also provided by the Entityhub Sesame Bundlelist --> <bundle> <groupId>org.openrdf.sesame</groupId> <artifactId>sesame-runtime-osgi</artifactId> - <version>2.7.11</version> - </bundle> --> + <version>${sesame-version}</version> + </bundle> <bundle> <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-commons</artifactId> - <version>3.2.0</version> + <version>${marmotta-version}</version> </bundle> </startLevel> @@ -112,7 +117,7 @@ <bundle> <groupId>com.hazelcast</groupId> <artifactId>hazelcast</artifactId> - <version>3.1.6</version> + <version>${hazelcast.version}</version> </bundle> <!-- EHCache Caching @@ -199,24 +204,4 @@ </bundle> </startLevel> - <!-- The Sesame Entityhub support --> - <!-- Use the Entityhub Sesame Bundlelist to provide those - <startLevel level="30"> - <bundle> - <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.entityhub.model.sesame</artifactId> - <version>1.0.0-SNAPSHOT</version> - </bundle> - <bundle> - <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.entityhub.yard.sesame</artifactId> - <version>1.0.0-SNAPSHOT</version> - </bundle> - <bundle> - <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.entityhub.query.sesame</artifactId> - <version>1.0.0-SNAPSHOT</version> - </bundle> - </startLevel> --> - </bundles> Modified: stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original) +++ stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Tue May 12 13:02:52 2015 @@ -42,22 +42,22 @@ <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.metatype</artifactId> - <version>1.0.10</version> + <version>1.0.12</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.eventadmin</artifactId> - <version>1.3.2</version> + <version>1.4.2</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.dependencymanager</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.dependencymanager.runtime</artifactId> - <version>3.1.0</version> + <version>3.2.0</version> </bundle> <!-- bundle> <groupId>org.apache.felix</groupId> @@ -84,30 +84,30 @@ <!-- Logging Dependencies --> <startLevel level="2"> - <bundle> <!-- STANNBOL-1025 upgraded to Sling logging 3.0.0 --> + <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.log</artifactId> - <version>3.0.0</version> + <version>4.0.2</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.commons.logservice</artifactId> - <version>1.0.2</version> + <version>1.0.4</version> </bundle> - <bundle> <!-- Can not use 1.7 because of o.a.sling.commons.log --> + <bundle> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.6</version> + <version>${slf4j-version}</version> </bundle> <bundle> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.6.6</version> + <version>${slf4j-version}</version> </bundle> <bundle> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> - <version>1.6.6</version> + <version>${slf4j-version}</version> </bundle> </startLevel> @@ -121,7 +121,7 @@ <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.whiteboard</artifactId> - <version>2.3.0</version> + <version>2.3.2</version> </bundle> </startLevel> @@ -135,12 +135,12 @@ <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole</artifactId> - <version>4.2.2</version> + <version>4.2.8</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.bundlerepository</artifactId> - <version>1.6.6</version> + <version>2.0.4</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> @@ -160,17 +160,17 @@ <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole.plugins.obr</artifactId> - <version>1.0.0</version> + <version>1.0.2</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole.plugins.event</artifactId> - <version>1.1.0</version> + <version>1.1.2</version> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.webconsole.plugins.memoryusage</artifactId> - <version>1.0.4</version> + <version>1.0.6</version> </bundle> </startLevel> <startLevel level="20"> Modified: stanbol/trunk/launchers/bundlelists/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/pom.xml (original) +++ stanbol/trunk/launchers/bundlelists/pom.xml Tue May 12 13:02:52 2015 @@ -84,7 +84,8 @@ <!-- Specific features --> <module>security</module> - <module>zzshell</module> + <!-- replaced by Clerezza Provisioning shell --> + <!-- module>zzshell</module --> <!-- language specific extensions --> <module>language-extras/smartcn</module> Modified: stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original) +++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Tue May 12 13:02:52 2015 @@ -16,7 +16,7 @@ limitations under the License. --> <bundles> - <startLevel level="5"> + <startLevel level="1"> <!-- JDK Package Exporter --> <bundle> <groupId>org.apache.stanbol</groupId> @@ -50,12 +50,12 @@ <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.installer.core</artifactId> - <version>3.5.4</version> + <version>3.6.4</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.installer.factory.configuration</artifactId> - <version>1.0.14</version> + <version>1.1.2</version> </bundle> <bundle> <groupId>org.apache.stanbol</groupId> @@ -65,7 +65,7 @@ <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.installer.provider.file</artifactId> - <version>1.0.4</version> + <version>1.1.0</version> </bundle> <bundle> <!-- The Apache Sling Installer WebConsole plugin --> <groupId>org.apache.sling</groupId> @@ -84,12 +84,12 @@ <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.settings</artifactId> - <version>1.3.0</version> + <version>1.3.6</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.installer</artifactId> - <version>1.2.0</version> + <version>1.2.2</version> </bundle> </startLevel> @@ -111,7 +111,7 @@ <bundle> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.2</version> + <version>3.4</version> </bundle> <bundle> <groupId>commons-collections</groupId> @@ -121,7 +121,7 @@ <bundle> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.8</version> + <version>1.9</version> </bundle> <bundle> <groupId>org.tukaani</groupId> @@ -131,7 +131,7 @@ <bundle> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.9</version> + <version>1.10</version> </bundle> <bundle> <!-- commons-beanutils as bundle provided by servicemix.apache.org --> <groupId>org.apache.servicemix.bundles</groupId> @@ -162,12 +162,12 @@ <bundle> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> - <version>4.3</version> + <version>${httpcomponents-version}</version> </bundle> <bundle> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>4.3.1</version> + <version>${httpcomponents-version}</version> </bundle> <bundle> <!-- jarkata regexp as bundle provided by servicemix.apache.org --> <groupId>org.apache.servicemix.bundles</groupId> @@ -177,7 +177,7 @@ <bundle> <!-- only used by the Entityhub --> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.3</version> + <version>2.7</version> </bundle> <!-- Stax support --> <!-- as the JVM only gives Stax 1.0 but we want Stax 2.0 (see STANBOL-1395)--> @@ -201,7 +201,7 @@ <bundle> <!-- used for simple JSON parsing/writing in Stanbol --> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> - <version>1.3.5</version> + <version>1.3.7</version> </bundle> <bundle> <!-- used for stream parsing/serialization --> <groupId>org.codehaus.jackson</groupId> @@ -307,36 +307,36 @@ <groupId>org.glassfish.hk2.external</groupId> <artifactId>javax.inject</artifactId> <version>2.2.0</version> -</bundle> -<bundle> + </bundle> + <bundle> <groupId>org.glassfish.hk2.external</groupId> <artifactId>asm-all-repackaged</artifactId> <version>2.2.0</version> -</bundle> -<bundle> + </bundle> + <bundle> <groupId>org.glassfish.hk2.external</groupId> <artifactId>cglib</artifactId> <version>2.2.0-b23</version> -</bundle> -<bundle> - <groupId>org.glassfish.hk2.external</groupId> - <artifactId>aopalliance-repackaged</artifactId> - <version>2.2.0</version> -</bundle> -<bundle> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.18.0-GA</version> -</bundle> -<bundle> - <groupId>org.glassfish.jersey.bundles.repackaged</groupId> - <artifactId>jersey-guava</artifactId> - <version>2.7</version> -</bundle> -<bundle> + </bundle> + <bundle> + <groupId>org.glassfish.hk2.external</groupId> + <artifactId>aopalliance-repackaged</artifactId> + <version>2.2.0</version> + </bundle> + <bundle> + <groupId>org.javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.18.0-GA</version> + </bundle> + <bundle> + <groupId>org.glassfish.jersey.bundles.repackaged</groupId> + <artifactId>jersey-guava</artifactId> + <version>2.7</version> + </bundle> + <bundle> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <version>2.0.1</version> </bundle> </startLevel> @@ -547,17 +547,17 @@ <bundle> <!-- LD Path --> <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-api</artifactId> - <version>3.2.0</version> + <version>${ldpath-version}</version> </bundle> <bundle> <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-core-bundle</artifactId> - <version>3.2.0</version> + <version>${ldpath-version}</version> </bundle> <bundle> <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-template</artifactId> - <version>3.2.0</version> + <version>${ldpath-version}</version> </bundle> <bundle> <groupId>org.apache.stanbol</groupId> Modified: stanbol/trunk/launchers/full/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/full/pom.xml (original) +++ stanbol/trunk/launchers/full/pom.xml Tue May 12 13:02:52 2015 @@ -83,21 +83,21 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-jetty-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-http-api-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.servlet-api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>1.0.0</version> + <version>${felix-sevlet-api-version}</version> <startLevel>3</startLevel> </bundle> </bundles> @@ -227,11 +227,11 @@ <scope>provided</scope> </dependency> - <!-- zz> Shell Bundle List --> + <!-- Clerezza zz> Shell Bundle List --> <dependency> - <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.launchers.bundlelists.zzshell</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.apache.clerezza.provisioning</groupId> + <artifactId>shell</artifactId> + <version>0.1</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> Modified: stanbol/trunk/launchers/mini/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/mini/pom.xml (original) +++ stanbol/trunk/launchers/mini/pom.xml Tue May 12 13:02:52 2015 @@ -85,21 +85,21 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-jetty-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-http-api-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.servlet-api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>1.0.0</version> + <version>${felix-sevlet-api-version}</version> <startLevel>3</startLevel> </bundle> </bundles> Modified: stanbol/trunk/launchers/stable/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/launchers/stable/pom.xml (original) +++ stanbol/trunk/launchers/stable/pom.xml Tue May 12 13:02:52 2015 @@ -83,21 +83,21 @@ <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-jetty-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>2.3.0</version> + <version>${felix-http-api-version}</version> <startLevel>3</startLevel> </bundle> <bundle> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.servlet-api</artifactId> <!-- explicit version is required (STANBOL-1402) --> - <version>1.0.0</version> + <version>${felix-sevlet-api-version}</version> <startLevel>3</startLevel> </bundle> </bundles> Added: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerMenueItem.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerMenueItem.java?rev=1678929&view=auto ============================================================================== --- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerMenueItem.java (added) +++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerMenueItem.java Tue May 12 13:02:52 2015 @@ -0,0 +1,24 @@ +package org.apache.stanbol.ontologymanager.web; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Service; +import org.apache.stanbol.commons.web.base.NavigationLink; + +/** + * The menue item for the Stanbol OntologyManager component + */ +@Component +@Service(value=NavigationLink.class) +public class OntologyManagerMenueItem extends NavigationLink { + + private static final String NAME = "ontonet"; + + private static final String htmlDescription = + "A <strong>controlled environment</strong> for managing Web ontologies, "+ + "<strong>ontology networks</strong> and user sessions that put them to use."; + + public OntologyManagerMenueItem() { + super(NAME, "/"+NAME, htmlDescription, 50); + } + +} Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java (original) +++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java Tue May 12 13:02:52 2015 @@ -18,31 +18,15 @@ package org.apache.stanbol.ontologymanag import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.clerezza.rdf.core.access.TcManager; -import org.apache.felix.scr.annotations.Activate; + import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.commons.web.base.LinkResource; 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.ontologymanager.ontonet.api.ONManager; -import org.apache.stanbol.ontologymanager.registry.api.RegistryManager; -import org.apache.stanbol.ontologymanager.servicesapi.OfflineConfiguration; -import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyProvider; -import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager; -import org.apache.stanbol.ontologymanager.web.resources.OntoNetRootResource; -import org.apache.stanbol.ontologymanager.web.resources.RegistryManagerResource; -import org.apache.stanbol.ontologymanager.web.resources.ScopeManagerResource; -import org.apache.stanbol.ontologymanager.web.resources.ScopeResource; -import org.apache.stanbol.ontologymanager.web.resources.SessionManagerResource; -import org.apache.stanbol.ontologymanager.web.resources.SessionResource; -import org.osgi.framework.BundleContext; -import org.osgi.service.component.ComponentContext; /** @@ -58,54 +42,30 @@ public class OntologyManagerWebFragment private static final String NAME = "ontonet"; - private static final String htmlDescription = - "A <strong>controlled environment</strong> for managing Web ontologies, "+ - "<strong>ontology networks</strong> and user sessions that put them to use."; - - private BundleContext bundleContext; - - @Reference - OfflineConfiguration offline; - - @Reference - OntologyProvider<?> ontologyProvider; - - @Reference - RegistryManager regMgr; - - @Reference - ONManager scopeMgr; - - @Reference - SessionManager sessionMgr; - - @Reference - TcManager tcManager; - - @Activate - protected void activate(ComponentContext ctx) { - this.bundleContext = ctx.getBundleContext(); - } + private static final String htmlDescription = + "A <strong>controlled environment</strong> for managing Web ontologies, "+ + "<strong>ontology networks</strong> and user sessions that put them to use."; @Override public Set<Class<?>> getJaxrsResourceClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); + //Set<Class<?>> classes = new HashSet<Class<?>>(); // Core resources - classes.add(OntoNetRootResource.class); + //classes.add(OntoNetRootResource.class); // Registry resources - classes.add(RegistryManagerResource.class); + //classes.add(RegistryManagerResource.class); // Scope resources - classes.add(ScopeManagerResource.class); - classes.add(ScopeResource.class); + //classes.add(ScopeManagerResource.class); + //classes.add(ScopeResource.class); // Session resources - classes.add(SessionManagerResource.class); - classes.add(SessionResource.class); + //classes.add(SessionManagerResource.class); + //classes.add(SessionResource.class); - return classes; + //return classes; + return Collections.emptySet(); } @Override @@ -127,9 +87,7 @@ public class OntologyManagerWebFragment @Override public List<NavigationLink> getNavigationLinks() { - List<NavigationLink> links = new ArrayList<NavigationLink>(); - links.add(new NavigationLink(NAME, "/" + NAME, htmlDescription, 50)); - return links; + return Collections.emptyList(); } @Override Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original) +++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Tue May 12 13:02:52 2015 @@ -16,11 +16,6 @@ */ package org.apache.stanbol.ontologymanager.web.resources; -//import static javax.ws.rs.HttpMethod.DELETE; -//import static javax.ws.rs.HttpMethod.GET; -//import static javax.ws.rs.HttpMethod.OPTIONS; -//import static javax.ws.rs.HttpMethod.POST; -//import static javax.ws.rs.HttpMethod.PUT; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; import static javax.ws.rs.core.MediaType.TEXT_HTML; @@ -90,7 +85,6 @@ import org.apache.felix.scr.annotations. import org.apache.stanbol.commons.owl.util.OWLUtils; import org.apache.stanbol.commons.owl.util.URIUtils; import org.apache.stanbol.commons.web.viewable.Viewable; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope; import org.apache.stanbol.ontologymanager.registry.api.RegistryManager; import org.apache.stanbol.ontologymanager.registry.api.model.Library; import org.apache.stanbol.ontologymanager.registry.io.LibrarySource; @@ -119,9 +113,6 @@ import org.semanticweb.owlapi.model.OWLO import org.semanticweb.owlapi.model.OWLOntologyStorageException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin; -//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS; -//import org.apache.stanbol.commons.web.base.ContextHelper; /** * The REST resource of an OntoNet {@link OntologyScope} whose identifier is known. Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original) +++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Tue May 12 13:02:52 2015 @@ -16,11 +16,6 @@ */ package org.apache.stanbol.ontologymanager.web.resources; -//import static javax.ws.rs.HttpMethod.DELETE; -//import static javax.ws.rs.HttpMethod.GET; -//import static javax.ws.rs.HttpMethod.OPTIONS; -//import static javax.ws.rs.HttpMethod.POST; -//import static javax.ws.rs.HttpMethod.PUT; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; import static javax.ws.rs.core.MediaType.TEXT_HTML; @@ -44,8 +39,6 @@ import static org.apache.stanbol.commons import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -56,7 +49,6 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import javax.servlet.ServletContext; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; @@ -75,7 +67,6 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; import org.apache.clerezza.jaxrs.utils.form.FormFile; import org.apache.clerezza.jaxrs.utils.form.MultiPartBody; @@ -117,13 +108,6 @@ import org.semanticweb.owlapi.model.OWLO import org.semanticweb.owlapi.model.OWLOntologyStorageException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// -//import com.sun.jersey.multipart.BodyPart; -//import com.sun.jersey.multipart.FormDataBodyPart; -//import com.sun.jersey.multipart.FormDataMultiPart; -//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin; -//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS; -//import org.apache.stanbol.commons.web.base.ContextHelper; /** * The REST resource of an OntoNet {@link Session} whose identifier is known. Modified: stanbol/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/parent/pom.xml (original) +++ stanbol/trunk/parent/pom.xml Tue May 12 13:02:52 2015 @@ -57,14 +57,37 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + + <!-- Library versions defined in the parent pom as constant --> + <!-- commons lib versions --> + <httpcomponents-version>4.4.1</httpcomponents-version> + <jackson-version>1.9.13</jackson-version> + <jackson2-version>2.5.3</jackson2-version> <owlapi-version>3.3</owlapi-version> - <solr-version>4.4.0</solr-version> - <pax-exam-version>2.3.0.M1</pax-exam-version> - <sesame-version>2.7.7</sesame-version> - <marmotta-version>3.2.0</marmotta-version> + + <!-- sesame and marmotta versions --> + <sesame-version>2.7.13</sesame-version> + <marmotta-version>3.3.0</marmotta-version> <ldpath-version>${marmotta-version}</ldpath-version> + <hazelcast.version>3.3.1</hazelcast.version> + <tika-version>1.5</tika-version> - <sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor> + <solr-version>4.4.0</solr-version> + + <!-- jersey and hk2 version --> + <jersey-version>2.17</jersey-version> + <hk2-version>2.3.0</hk2-version> + + <!-- OSGi http service versions for jar launchers (see also STANBOL-1402) --> + <felix-http-api-version>2.3.2</felix-http-api-version> + <felix-jetty-version>3.0.2</felix-jetty-version> + <felix-sevlet-api-version>1.1.0</felix-sevlet-api-version> + + <!-- logging and test dep. versions --> + <slf4j-version>1.7.12</slf4j-version> + <pax-exam-version>2.3.0.M1</pax-exam-version> + + <sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor> </properties> <prerequisites> @@ -140,32 +163,32 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> + <version>3.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> - <version>2.3</version> + <version>2.10</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.1.1</version> + <version>2.6</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.20</version> + <version>6.1.26</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.5</version> + <version>1.9.1</version> </plugin> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>2.3.7</version> + <version>2.5.4</version> <inherited>true</inherited> <configuration> <instructions> @@ -185,14 +208,14 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-scr-plugin</artifactId> - <version>1.16.0</version> + <version>1.21.0</version> <!-- slf4j impl is needed when QDox inspects/loads classes that use a static field for the logger, so that those classes can be loaded. --> <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> </dependencies> <executions> @@ -212,7 +235,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <version>2.3.2</version> + <version>2.5.2</version> <configuration> <tagBase> https://svn.apache.org/repos/asf/stanbol/tags/ @@ -222,47 +245,47 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.0.1</version> + <version>1.4</version> </plugin> <plugin> <groupId>org.apache.sling</groupId> <artifactId>maven-sling-plugin</artifactId> - <version>2.0.6</version> + <version>2.1.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <version>2.6.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> - <version>2.7</version> + <version>2.8.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> + <version>2.5.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> + <version>3.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> - <version>2.1.2</version> + <version>2.4</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> - <version>2.5</version> + <version>2.7</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.16</version> + <version>2.18.1</version> <configuration> <argLine>-Xmx1G</argLine> </configuration> @@ -270,12 +293,12 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>2.3.2</version> + <version>2.6</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> - <version>2.1</version> + <version>2.3</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -292,7 +315,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-assembly-plugin</artifactId> - <version>2.2.1</version> + <version>2.5.4</version> </plugin> <plugin> <groupId>org.apache.sling</groupId> @@ -305,7 +328,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.0</version> + <version>1.2</version> <executions> <execution> <id>generate-depends-file</id> @@ -429,7 +452,7 @@ <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> - <version>0.8</version> + <version>0.11</version> <executions> <execution> <configuration> @@ -441,7 +464,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.0</version> + <version>1.8</version> <executions> <execution> <configuration> @@ -509,7 +532,7 @@ <dependencies> <!-- CMIS --> - <dependency> + <!-- dependency> <groupId>org.apache.chemistry.opencmis</groupId> <artifactId>chemistry-opencmis-client-api</artifactId> <version>0.4.0</version> @@ -518,10 +541,10 @@ <groupId>org.apache.chemistry.opencmis</groupId> <artifactId>chemistry-opencmis-client-impl</artifactId> <version>0.4.0</version> - </dependency> + </dependency --> <!-- JCR --> - <dependency> + <!-- dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> <version>2.0</version> @@ -541,7 +564,7 @@ <groupId>org.apache.jackrabbit</groupId> <artifactId>jackrabbit-jcr-commons</artifactId> <version>2.2.5</version> - </dependency> + </dependency --> <!-- OSGi --> <dependency> @@ -552,7 +575,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.compendium</artifactId> - <!-- with older versions the scr plugin complains --> + <!-- with older versions the scr plugin complains (see FELIX-4450) --> <version>4.3.1</version> </dependency> @@ -560,17 +583,17 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr</artifactId> - <version>1.6.2</version> + <version>1.8.2</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.scr.annotations</artifactId> - <version>1.9.8</version> + <version>1.9.12</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.configadmin</artifactId> - <version>1.2.8</version> + <version>1.8.4</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -580,22 +603,27 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.jetty</artifactId> - <version>2.3.0</version> + <version>${felix-jetty-version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.api</artifactId> - <version>2.3.0</version> + <version>${felix-http-api-version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.servlet-api</artifactId> - <version>1.0.0</version> + <version>${felix-sevlet-api-version}</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.http.whiteboard</artifactId> - <version>2.3.0</version> + <version>2.3.2</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.webconsole</artifactId> + <version>4.2.8</version> </dependency> @@ -692,6 +720,11 @@ </dependency> <dependency> <groupId>org.apache.clerezza</groupId> + <artifactId>platform.config</artifactId> + <version>0.4</version> + </dependency> + <dependency> + <groupId>org.apache.clerezza</groupId> <artifactId>rdf.core.test</artifactId> <version>0.15</version> <scope>test</scope> @@ -811,6 +844,12 @@ <artifactId>kiwi-caching-hazelcast</artifactId> <version>${marmotta-version}</version> </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>marmotta-model-vocabs</artifactId> + <version>${marmotta-version}</version> + </dependency> + <!-- Commons --> <dependency> @@ -848,7 +887,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> - <version>1.8</version> + <version>1.9</version> </dependency> <dependency> <!-- dependency of commons-compress 1.4+ --> <groupId>org.tukaani</groupId> @@ -863,27 +902,37 @@ <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - <version>1.8</version> + <version>1.10</version> </dependency> <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.3</version> + <version>1.3.1</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${httpcomponents-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId> - <version>4.3.1</version> + <version>${httpcomponents-version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${httpcomponents-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore-osgi</artifactId> - <version>4.3</version> + <version>${httpcomponents-version}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.3.1</version> + <version>${httpcomponents-version}</version> </dependency> <dependency> <!-- instead of commons-csv --> <groupId>org.apache.servicemix.bundles</groupId> @@ -895,14 +944,14 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>14.0.1</version> + <version>18.0</version> </dependency> <!-- Joda Time --> <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.0</version> + <version>2.7</version> </dependency> <!-- Javax Mail --> @@ -916,7 +965,7 @@ <dependency> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.7.2</version> + <version>1.8.2</version> </dependency> <!-- Velocity --> @@ -935,33 +984,33 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>log4j-over-slf4j</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> - <dependency> <!-- when using log4j for the logging --> + <dependency> <!-- used for log4j logging (for unit tests and tools) --> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> - <dependency> + <!-- dependency> - use slf4j-log4j12 instead !! <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.16</version> - </dependency> + </dependency> --> <!-- Servlet API --> <dependency> @@ -975,7 +1024,7 @@ <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> - <version>2.0</version> + <version>2.0.1</version> </dependency> <!-- Freemarker --> @@ -990,18 +1039,18 @@ <dependency> <groupId>org.codehaus.jettison</groupId> <artifactId>jettison</artifactId> - <version>1.3</version> + <version>1.3.7</version> </dependency> <!-- Jackson --> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> - <version>1.9.11</version> + <version>${jackson-version}</version> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-mapper-asl</artifactId> - <version>1.9.11</version> + <version>${jackson-version}</version> </dependency> <!-- Jena (and Clerezza Jena Modules)--> @@ -1055,58 +1104,10 @@ <version>1.0.1_1</version> </dependency> - <!-- old Jena Dependencies --> - <!-- dependency> - <groupId>com.hp.hpl.jena</groupId> - <artifactId>jena</artifactId> - <version>2.6.3</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.hp.hpl.jena</groupId> - <artifactId>arq</artifactId> - <version>2.8.5</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.hp.hpl.jena</groupId> - <artifactId>tdb</artifactId> - <version>0.8.7</version> - <type>jar</type> - <exclusions> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency> --> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb-j5</artifactId> - <version>2.0.0</version> + <version>2.2.4</version> <type>jar</type> </dependency> @@ -1330,7 +1331,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> <exclusions> <exclusion> <groupId>jaxen</groupId> @@ -1344,9 +1345,7 @@ <dependency> <groupId>net.sourceforge.htmlcleaner</groupId> <artifactId>htmlcleaner</artifactId> - <version>2.2</version> - <type>jar</type> - <scope>compile</scope> + <version>2.10</version> <exclusions> <exclusion> <groupId>jaxen</groupId> @@ -1359,18 +1358,6 @@ </exclusions> </dependency> - <!-- OpenNLP --> - <dependency> - <groupId>org.clojars.zaxtax</groupId> - <artifactId>opennlp-tools</artifactId> - <version>1.5.0</version> - </dependency> - <dependency> - <groupId>org.clojars.zaxtax</groupId> - <artifactId>maxent</artifactId> - <version>3.0.0</version> - </dependency> - <!-- see also lucene-xercesImpl --> <dependency> <groupId>xerces</groupId> @@ -1535,31 +1522,25 @@ </exclusion> </exclusions> </dependency> - - <dependency> - <groupId>net.sourceforge</groupId> - <artifactId>htmlcleaner</artifactId> - <version>2_1p</version> - </dependency> - + <!-- Sling --> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.base</artifactId> - <version>2.5.0</version> + <version>4.6.1-2.5.8</version> <classifier>app</classifier> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.base</artifactId> - <version>2.5.0</version> + <version>4.6.1-2.5.8</version> <classifier>webapp</classifier> <type>war</type> </dependency> <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.installer</artifactId> - <version>1.2.0</version> + <version>1.2.2</version> </dependency> <dependency> <groupId>org.apache.sling</groupId> @@ -1574,71 +1555,78 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.installer.core</artifactId> - <version>3.4.4</version> + <version>3.6.2</version> </dependency> - <!-- Apache James --> - <!-- do we need this? - <dependency> - <groupId>org.apache.james</groupId> - <artifactId>apache-mime4j</artifactId> - <version>0.6</version> - </dependency> --> - <!-- Testing Deps --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-nop</artifactId> - <version>1.6.1</version> + <version>${slf4j-version}</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.11</version> + <version>4.12</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jmock</groupId> <artifactId>jmock-junit4</artifactId> - <version>2.5.1</version> + <version>2.8.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> - <version>1.6</version> + <version>1.10.19</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + <version>3.3.1</version> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.22</version> + <version>6.1.26</version> <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> - <version>2.2</version> + <version>${jersey-version}</version> <scope>test</scope> </dependency> - + + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-common</artifactId> + <version>${jersey-version}</version> + </dependency> + + <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-locator</artifactId> - <version>2.2.0-b15</version> + <version>${hk2-version}</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-utils</artifactId> - <version>2.2.0-b15</version> + <version>${hk2-version}</version> </dependency> <dependency> <groupId>org.glassfish.hk2</groupId> @@ -1705,7 +1693,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.junit.core</artifactId> - <version>1.0.6</version> + <version>1.0.10</version> <scope>test</scope> </dependency> </dependencies> @@ -1810,7 +1798,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>source-assembly</artifactId> - <version>1.0.0</version> + <version>1.0.1</version> </dependency> </dependencies> </plugin> Modified: stanbol/trunk/reasoners/jena/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/jena/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/jena/pom.xml (original) +++ stanbol/trunk/reasoners/jena/pom.xml Tue May 12 13:02:52 2015 @@ -94,17 +94,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>provided</scope> </dependency> <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/reasoners/manager/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/manager/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/manager/pom.xml (original) +++ stanbol/trunk/reasoners/manager/pom.xml Tue May 12 13:02:52 2015 @@ -72,17 +72,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>provided</scope> </dependency> <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/reasoners/owlapi/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/owlapi/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/owlapi/pom.xml (original) +++ stanbol/trunk/reasoners/owlapi/pom.xml Tue May 12 13:02:52 2015 @@ -81,17 +81,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>provided</scope> </dependency> <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/reasoners/servicesapi/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/servicesapi/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/servicesapi/pom.xml (original) +++ stanbol/trunk/reasoners/servicesapi/pom.xml Tue May 12 13:02:52 2015 @@ -65,17 +65,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <scope>provided</scope> </dependency> <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/reasoners/web/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/web/pom.xml (original) +++ stanbol/trunk/reasoners/web/pom.xml Tue May 12 13:02:52 2015 @@ -198,18 +198,6 @@ <artifactId>org.apache.felix.scr.annotations</artifactId> </dependency> - <!-- dependency> - <groupId>org.apache.jena</groupId> - <artifactId>jena-core</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <artifactId>slf4j-log4j12</artifactId> - <groupId>org.slf4j</groupId> - </exclusion> - </exclusions> - </dependency --> - <!-- Testing deps --> <dependency> <groupId>junit</groupId> Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java (original) +++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java Tue May 12 13:02:52 2015 @@ -18,26 +18,15 @@ package org.apache.stanbol.reasoners.web import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.felix.scr.annotations.Activate; + import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.commons.web.base.LinkResource; 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.ontologymanager.ontonet.api.ONManager; -import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager; -import org.apache.stanbol.reasoners.web.resources.JobsResource; -import org.apache.stanbol.reasoners.web.resources.ReasoningServiceTaskResource; -import org.apache.stanbol.reasoners.web.resources.ReasoningServicesResource; -import org.apache.stanbol.reasoners.web.writers.JenaModelWriter; -import org.apache.stanbol.rules.base.api.RuleStore; -import org.osgi.framework.BundleContext; -import org.osgi.service.component.ComponentContext; /** @@ -53,34 +42,24 @@ public class ReasonersFragment implement private static final String NAME = "reasoners"; - private static final String htmlDescription = - "The entry point to multiple <strong>reasoning services</strong> that are used for"+ - "obtaining unexpressed additional knowledge from the explicit axioms in an ontology."+ - "Multiple reasoning profiles are available, each with its expressive power and computational cost."; - - @Reference - ONManager onm; - - @Reference - SessionManager sessionManager; - - @Reference - RuleStore kresRuleStore; - - private BundleContext bundleContext; + private static final String htmlDescription = + "The entry point to multiple <strong>reasoning services</strong> that are used for"+ + "obtaining unexpressed additional knowledge from the explicit axioms in an ontology."+ + "Multiple reasoning profiles are available, each with its expressive power and computational cost."; @Override public Set<Class<?>> getJaxrsResourceClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); + //Set<Class<?>> classes = new HashSet<Class<?>>(); // Reasoner // classes.add(ReasonersResource.class); - classes.add(ReasoningServicesResource.class); - classes.add(ReasoningServiceTaskResource.class); - classes.add(JobsResource.class); + //classes.add(ReasoningServicesResource.class); + //classes.add(ReasoningServiceTaskResource.class); + //classes.add(JobsResource.class); // Writer - classes.add(JenaModelWriter.class); - return classes; + //classes.add(JenaModelWriter.class); + //return classes; + return Collections.emptySet(); } @Override @@ -102,9 +81,7 @@ public class ReasonersFragment implement @Override public List<NavigationLink> getNavigationLinks() { - List<NavigationLink> links = new ArrayList<NavigationLink>(); - links.add(new NavigationLink("reasoners", "/reasoners", htmlDescription, 50)); - return links; + return Collections.emptyList(); } @Override @@ -112,9 +89,4 @@ public class ReasonersFragment implement return Collections.emptyList(); } - @Activate - protected void activate(ComponentContext ctx) { - this.bundleContext = ctx.getBundleContext(); - } - } Added: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersMenueItem.java URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersMenueItem.java?rev=1678929&view=auto ============================================================================== --- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersMenueItem.java (added) +++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersMenueItem.java Tue May 12 13:02:52 2015 @@ -0,0 +1,25 @@ +package org.apache.stanbol.reasoners.web; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Service; +import org.apache.stanbol.commons.web.base.NavigationLink; + +/** + * The menue item for the Stanbol Reasoners component + */ +@Component +@Service(value=NavigationLink.class) +public class ReasonersMenueItem extends NavigationLink { + + private static final String NAME = "reasoners"; + + private static final String htmlDescription = + "The entry point to multiple <strong>reasoning services</strong> that are used for"+ + "obtaining unexpressed additional knowledge from the explicit axioms in an ontology."+ + "Multiple reasoning profiles are available, each with its expressive power and computational cost."; + + public ReasonersMenueItem() { + super(NAME, "/"+NAME, htmlDescription, 50); + } + +} Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java (original) +++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java Tue May 12 13:02:52 2015 @@ -39,7 +39,6 @@ import org.apache.felix.scr.annotations. import org.apache.stanbol.commons.jobs.api.JobManager; import org.apache.stanbol.commons.web.viewable.Viewable; import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; -import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource.ResultData; import org.apache.stanbol.reasoners.web.utils.ReasoningServiceResult; import org.apache.stanbol.reasoners.web.utils.ResponseTaskBuilder; import org.slf4j.Logger; Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java (original) +++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java Tue May 12 13:02:52 2015 @@ -29,6 +29,9 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +44,9 @@ import com.hp.hpl.jena.rdf.model.RDFWrit * @author enridaga * */ +@Component +@Service(Object.class) +@Property(name="javax.ws.rs", boolValue=true) @Provider @Produces({"application/rdf+xml", "text/turtle", "text/n3", "text/plain", "application/turtle"}) public class JenaModelWriter implements MessageBodyWriter<Model> { Modified: stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java (original) +++ stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java Tue May 12 13:02:52 2015 @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; * @author anuzzolese * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdaptersFactory.class) public class RuleAdaptersFactoryImpl implements RuleAdaptersFactory, ServiceListener { Modified: stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java (original) +++ stanbol/trunk/rules/adapters/abstract/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java Tue May 12 13:02:52 2015 @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapterManager.class) public class RuleAdaptersManagerImpl implements RuleAdapterManager { Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java (original) +++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java Tue May 12 13:02:52 2015 @@ -77,7 +77,7 @@ import com.hp.hpl.jena.util.FileManager; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapter.class) public class ClerezzaAdapter extends AbstractRuleAdapter { Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java (original) +++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersFactoryImpl.java Tue May 12 13:02:52 2015 @@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory; * @author anuzzolese * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdaptersFactory.class) public class RuleAdaptersFactoryImpl implements RuleAdaptersFactory, ServiceListener { Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java (original) +++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/impl/RuleAdaptersManagerImpl.java Tue May 12 13:02:52 2015 @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapterManager.class) public class RuleAdaptersManagerImpl implements RuleAdapterManager { Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java (original) +++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java Tue May 12 13:02:52 2015 @@ -91,7 +91,7 @@ import com.ibm.icu.util.Output; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapter.class) public class JenaAdapter extends AbstractRuleAdapter { Modified: stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java (original) +++ stanbol/trunk/rules/adapters/sparql/src/main/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdapter.java Tue May 12 13:02:52 2015 @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapter.class) public class SPARQLAdapter extends AbstractRuleAdapter { Modified: stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java (original) +++ stanbol/trunk/rules/adapters/swrl/src/main/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdapter.java Tue May 12 13:02:52 2015 @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(RuleAdapter.class) public class SWRLAdapter extends AbstractRuleAdapter { Modified: stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original) +++ stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Tue May 12 13:02:52 2015 @@ -62,7 +62,7 @@ import com.hp.hpl.jena.sparql.pfunction. * */ -@Component(immediate = true, metatype = true) +@Component(immediate = true) @Service(Refactorer.class) public class RefactorerImpl implements Refactorer { Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java Tue May 12 13:02:52 2015 @@ -18,24 +18,15 @@ package org.apache.stanbol.rules.web; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Set; + import org.apache.felix.scr.annotations.Component; -import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.commons.web.base.LinkResource; 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.rules.base.api.RuleStore; -import org.apache.stanbol.rules.refactor.api.Refactorer; - -import org.apache.stanbol.rules.web.resources.RefactorResource; -import org.apache.stanbol.rules.web.resources.RulesResource; -import org.apache.stanbol.rules.web.writers.RecipeListWriter; -import org.apache.stanbol.rules.web.writers.RecipeWriter; -import org.apache.stanbol.rules.web.writers.RuleListWriter; /** @@ -51,16 +42,9 @@ public class RulesFragment implements We private static final String NAME = "rules"; - private static final String htmlDescription = - "This is the implementation of Stanbol Rules which can be used both "+ - "for <strong>reasoning</strong> and <strong>refactoring</strong>"; - - - @Reference - Refactorer refactorer; - - @Reference - RuleStore ruleStore; + private static final String htmlDescription = + "This is the implementation of Stanbol Rules which can be used both "+ + "for <strong>reasoning</strong> and <strong>refactoring</strong>"; @Override public String getName() { @@ -69,16 +53,17 @@ public class RulesFragment implements We @Override public Set<Class<?>> getJaxrsResourceClasses() { - Set<Class<?>> classes = new HashSet<Class<?>>(); + //Set<Class<?>> classes = new HashSet<Class<?>>(); // resources - classes.add(RefactorResource.class); - classes.add(RulesResource.class); + //classes.add(RefactorResource.class); + //classes.add(RulesResource.class); // writers - classes.add(RecipeWriter.class); - classes.add(RecipeListWriter.class); - classes.add(RuleListWriter.class); - return classes; + //classes.add(RecipeWriter.class); + //classes.add(RecipeListWriter.class); + //classes.add(RuleListWriter.class); + //return classes; + return Collections.emptySet(); } @Override @@ -103,9 +88,7 @@ public class RulesFragment implements We @Override public List<NavigationLink> getNavigationLinks() { - List<NavigationLink> links = new ArrayList<NavigationLink>(); - links.add(new NavigationLink("rules", "/rules", htmlDescription, 50)); - return links; + return Collections.emptyList(); } } Added: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesMenueItem.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesMenueItem.java?rev=1678929&view=auto ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesMenueItem.java (added) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesMenueItem.java Tue May 12 13:02:52 2015 @@ -0,0 +1,24 @@ +package org.apache.stanbol.rules.web; + +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Service; +import org.apache.stanbol.commons.web.base.NavigationLink; + +/** + * The menue item for the Stanbol Rules component + */ +@Component +@Service(value=NavigationLink.class) +public class RulesMenueItem extends NavigationLink { + + private static final String NAME = "rules"; + + private static final String htmlDescription = + "This is the implementation of Stanbol Rules which can be used both "+ + "for <strong>reasoning</strong> and <strong>refactoring</strong>"; + + public RulesMenueItem() { + super(NAME, "/"+NAME, htmlDescription, 50); + } + +} Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java Tue May 12 13:02:52 2015 @@ -21,6 +21,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + //import javax.servlet.ServletContext; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; @@ -34,7 +35,10 @@ import org.apache.clerezza.rdf.core.Trip import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter; import org.apache.stanbol.commons.web.base.format.KRFormat; import org.apache.stanbol.rules.base.api.Recipe; @@ -66,6 +70,9 @@ import org.slf4j.LoggerFactory; * */ +@Component(immediate=true) +@Service(Object.class) +@Property(name = "javax.ws.rs", boolValue = true) @Provider @Produces({KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL, KRFormat.FUNCTIONAL_OWL, KRFormat.TURTLE, KRFormat.RDF_JSON}) Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java?rev=1678929&r1=1678928&r2=1678929&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java Tue May 12 13:02:52 2015 @@ -21,6 +21,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; + //import javax.servlet.ServletContext; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; @@ -35,7 +36,10 @@ import org.apache.clerezza.rdf.core.UriR import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.Service; import org.apache.stanbol.commons.owl.transformation.OWLAPIToClerezzaConverter; import org.apache.stanbol.commons.web.base.format.KRFormat; import org.apache.stanbol.rules.base.api.Recipe; @@ -67,7 +71,9 @@ import org.slf4j.LoggerFactory; * @author anuzzolese * */ - +@Component(immediate=true) +@Service(Object.class) +@Property(name = "javax.ws.rs", boolValue = true) @Provider @Produces({KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL, KRFormat.FUNCTIONAL_OWL, KRFormat.TURTLE, KRFormat.RDF_JSON, MediaType.TEXT_PLAIN})
