Added: incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4930060046783088552tmp URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4930060046783088552tmp?rev=1089668&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4930060046783088552tmp (added) +++ incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire4930060046783088552tmp Wed Apr 6 23:19:09 2011 @@ -0,0 +1,92 @@ +#surefire +#Thu Apr 07 00:20:01 CEST 2011 +classPathUrl.61=/Users/alessandro/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar +classPathUrl.60=/Users/alessandro/.m2/repository/commons-discovery/commons-discovery/0.4/commons-discovery-0.4.jar +excludes0=**/*$* +useSystemClassLoader=true +classPathUrl.59=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-spi/1.2.0/pax-exam-spi-1.2.0.jar +classPathUrl.58=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-runtime/1.2.0/pax-exam-runtime-1.2.0.jar +enableAssertions=true +classPathUrl.57=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-junit/1.2.0/pax-exam-junit-1.2.0.jar +classPathUrl.56=/Users/alessandro/.m2/repository/org/ops4j/base/ops4j-base-monitors/1.2.1/ops4j-base-monitors-1.2.1.jar +classPathUrl.55=/Users/alessandro/.m2/repository/org/ops4j/base/ops4j-base-io/1.2.1/ops4j-base-io-1.2.1.jar +classPathUrl.54=/Users/alessandro/.m2/repository/org/ops4j/base/ops4j-base-store/1.2.1/ops4j-base-store-1.2.1.jar +classPathUrl.53=/Users/alessandro/.m2/repository/org/ops4j/base/ops4j-base-lang/1.2.1/ops4j-base-lang-1.2.1.jar +classPathUrl.52=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam/1.2.0/pax-exam-1.2.0.jar +classPathUrl.51=/Users/alessandro/.m2/repository/com/sun/jersey/jersey-client/1.1.5.1/jersey-client-1.1.5.1.jar +includes2=**/*TestCase.java +classPathUrl.50=/Users/alessandro/.m2/repository/org/mockito/mockito-all/1.6/mockito-all-1.6.jar +includes1=**/*Test.java +includes0=**/Test*.java +dirscanner.0.params=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/target/test-classes|[**/Test*.java, **/*Test.java, **/*TestCase.java]|[**/*$*] +dirscanner.0=directoryScannerOptions +classPathUrl.49=/Users/alessandro/.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar +classPathUrl.48=/Users/alessandro/.m2/repository/org/apache/stanbol/org.apache.stanbol.ontologymanager.store.api/0.9-SNAPSHOT/org.apache.stanbol.ontologymanager.store.api-0.9-SNAPSHOT.jar +classPathUrl.47=/Users/alessandro/.m2/repository/owlapi/owlapi/3.0.0/owlapi-3.0.0.jar +classPathUrl.46=/Users/alessandro/.m2/repository/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar +classPathUrl.45=/Users/alessandro/.m2/repository/org/apache/stanbol/org.apache.stanbol.owl/0.9-SNAPSHOT/org.apache.stanbol.owl-0.9-SNAPSHOT.jar +classPathUrl.44=/Users/alessandro/.m2/repository/org/apache/stanbol/org.apache.stanbol.ontologymanager.ontonet/0.9-SNAPSHOT/org.apache.stanbol.ontologymanager.ontonet-0.9-SNAPSHOT.jar +surefireClassPathUrl.1=/Users/alessandro/.m2/repository/org/apache/maven/surefire/surefire-api/2.7.1/surefire-api-2.7.1.jar +classPathUrl.43=/Users/alessandro/.m2/repository/org/apache/stanbol/org.apache.stanbol.commons.web.base/0.9-SNAPSHOT/org.apache.stanbol.commons.web.base-0.9-SNAPSHOT.jar +surefireClassPathUrl.0=/Users/alessandro/.m2/repository/org/apache/maven/surefire/surefire-junit4/2.7.1/surefire-junit4-2.7.1.jar +classPathUrl.42=/Users/alessandro/.m2/repository/commons-io/commons-io/1.4/commons-io-1.4.jar +classPathUrl.41=/Users/alessandro/.m2/repository/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar +classPathUrl.40=/Users/alessandro/.m2/repository/org/mortbay/jetty/jetty-util/6.1.22/jetty-util-6.1.22.jar +report.2=org.apache.maven.surefire.report.XMLReporter +report.1=org.apache.maven.surefire.report.BriefFileReporter +report.0=org.apache.maven.surefire.report.ForkingConsoleReporter +providerConfiguration=org.apache.maven.surefire.junit4.JUnit4Provider +classPathUrl.39=/Users/alessandro/.m2/repository/org/mortbay/jetty/jetty/6.1.22/jetty-6.1.22.jar +childDelegation=false +classPathUrl.38=/Users/alessandro/.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar +classPathUrl.37=/Users/alessandro/.m2/repository/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar +classPathUrl.36=/Users/alessandro/.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar +classPathUrl.35=/Users/alessandro/.m2/repository/org/codehaus/jackson/jackson-core-asl/1.1.1/jackson-core-asl-1.1.1.jar +classPathUrl.34=/Users/alessandro/.m2/repository/org/codehaus/jettison/jettison/1.2/jettison-1.2.jar +classPathUrl.33=/Users/alessandro/.m2/repository/com/sun/jersey/jersey-json/1.1.5.1/jersey-json-1.1.5.1.jar +classPathUrl.32=/Users/alessandro/.m2/repository/asm/asm/3.1/asm-3.1.jar +classPathUrl.31=/Users/alessandro/.m2/repository/com/sun/jersey/jersey-core/1.1.5.1/jersey-core-1.1.5.1.jar +classPathUrl.30=/Users/alessandro/.m2/repository/com/sun/jersey/jersey-server/1.1.5.1/jersey-server-1.1.5.1.jar +testSuiteDefinitionTestSourceDirectory=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/src/test/java +reportsDirectory=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/target/surefire-reports +classPathUrl.29=/Users/alessandro/.m2/repository/log4j/log4j/1.2.13/log4j-1.2.13.jar +classPathUrl.28=/Users/alessandro/.m2/repository/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar +classPathUrl.27=/Users/alessandro/.m2/repository/com/hp/hpl/jena/iri/0.7/iri-0.7.jar +classPathUrl.26=/Users/alessandro/.m2/repository/com/hp/hpl/jena/jena/2.6.2/jena-2.6.2.jar +classPathUrl.25=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.jena.commons/0.5-incubating-SNAPSHOT/org.apache.clerezza.rdf.jena.commons-0.5-incubating-SNAPSHOT.jar +classPathUrl.24=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.jena.facade/0.12-incubating-SNAPSHOT/org.apache.clerezza.rdf.jena.facade-0.12-incubating-SNAPSHOT.jar +classPathUrl.23=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.jena.serializer/0.9-incubating-SNAPSHOT/org.apache.clerezza.rdf.jena.serializer-0.9-incubating-SNAPSHOT.jar +classPathUrl.22=/Users/alessandro/.m2/repository/javax/ws/rs/jsr311-api/1.1.1/jsr311-api-1.1.1.jar +classPathUrl.21=/Users/alessandro/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar +classPathUrl.20=/Users/alessandro/.m2/repository/junit/junit/4.7/junit-4.7.jar +dirscanner.0.types=java.io.File|java.util.ArrayList|java.util.ArrayList +classPathUrl.9=/Users/alessandro/.m2/repository/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar +classPathUrl.8=/Users/alessandro/.m2/repository/org/wymiwyg/wymiwyg-commons-core/0.7.5/wymiwyg-commons-core-0.7.5.jar +classPathUrl.7=/Users/alessandro/.m2/repository/org/apache/httpcomponents/httpcore/4.0/httpcore-4.0.jar +classPathUrl.6=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.utils/0.1-incubating-SNAPSHOT/org.apache.clerezza.utils-0.1-incubating-SNAPSHOT.jar +classPathUrl.5=/Users/alessandro/.m2/repository/org/apache/felix/org.apache.felix.scr.annotations/1.2.0/org.apache.felix.scr.annotations-1.2.0.jar +classPathUrl.4=/Users/alessandro/.m2/repository/org/osgi/org.osgi.compendium/4.1.0/org.osgi.compendium-4.1.0.jar +classPathUrl.3=/Users/alessandro/.m2/repository/org/osgi/org.osgi.core/4.1.0/org.osgi.core-4.1.0.jar +classPathUrl.2=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.core/0.12-incubating-SNAPSHOT/org.apache.clerezza.rdf.core-0.12-incubating-SNAPSHOT.jar +classPathUrl.1=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/target/classes +classPathUrl.0=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/target/test-classes +isTrimStackTrace=true +classPathUrl.19=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.core.test/0.13-incubating-SNAPSHOT/org.apache.clerezza.rdf.core.test-0.13-incubating-SNAPSHOT.jar +classPathUrl.18=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.ontologies/0.11-incubating-SNAPSHOT/org.apache.clerezza.rdf.ontologies-0.11-incubating-SNAPSHOT.jar +classPathUrl.17=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.utils/0.13-incubating-SNAPSHOT/org.apache.clerezza.rdf.utils-0.13-incubating-SNAPSHOT.jar +classPathUrl.16=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.jaxrs.rdf.providers/0.13-incubating-SNAPSHOT/org.apache.clerezza.jaxrs.rdf.providers-0.13-incubating-SNAPSHOT.jar +classPathUrl.15=/Users/alessandro/.m2/repository/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.jar +classPathUrl.14=/Users/alessandro/.m2/repository/org/apache/clerezza/ext/org.json.simple/0.3-incubating-SNAPSHOT/org.json.simple-0.3-incubating-SNAPSHOT.jar +classPathUrl.13=/Users/alessandro/.m2/repository/org/apache/clerezza/org.apache.clerezza.rdf.rdfjson/0.3-incubating-SNAPSHOT/org.apache.clerezza.rdf.rdfjson-0.3-incubating-SNAPSHOT.jar +classPathUrl.12=/Users/alessandro/.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar +useManifestOnlyJar=true +classPathUrl.11=/Users/alessandro/.m2/repository/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar +classPathUrl.10=/Users/alessandro/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar +failIfNoTests=false +testClassesDirectory=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web/target/test-classes +classPathUrl.67=/Users/alessandro/.m2/repository/org/ops4j/pax/runner/pax-runner-no-jcl/1.3.0/pax-runner-no-jcl-1.3.0.jar +classPathUrl.66=/Users/alessandro/.m2/repository/org/ops4j/base/ops4j-base-net/1.2.1/ops4j-base-net-1.2.1.jar +classPathUrl.65=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-container-rbc/1.2.0/pax-exam-container-rbc-1.2.0.jar +classPathUrl.64=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-container-rbc-client/1.2.0/pax-exam-container-rbc-client-1.2.0.jar +classPathUrl.63=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-container-default/1.2.0/pax-exam-container-default-1.2.0.jar +classPathUrl.62=/Users/alessandro/.m2/repository/org/ops4j/pax/exam/pax-exam-junit-extender/1.2.0/pax-exam-junit-extender-1.2.0.jar
Added: incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire6075288695461613020tmp URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire6075288695461613020tmp?rev=1089668&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire6075288695461613020tmp (added) +++ incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire6075288695461613020tmp Wed Apr 6 23:19:09 2011 @@ -0,0 +1,5 @@ +#surefire +#Wed Apr 06 23:03:53 CEST 2011 +user.dir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web +localRepository=/Users/alessandro/.m2/repository +basedir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web Added: incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7226073098259083453tmp URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7226073098259083453tmp?rev=1089668&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7226073098259083453tmp (added) +++ incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7226073098259083453tmp Wed Apr 6 23:19:09 2011 @@ -0,0 +1,6 @@ +#surefire +#Thu Apr 07 00:25:18 CEST 2011 +sling.url=http\://localhost\:8080/system/console +user.dir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web +localRepository=/Users/alessandro/.m2/repository +basedir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web Added: incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7464876842838733373tmp URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7464876842838733373tmp?rev=1089668&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7464876842838733373tmp (added) +++ incubator/stanbol/trunk/ontologymanager/web/target/surefire/surefire7464876842838733373tmp Wed Apr 6 23:19:09 2011 @@ -0,0 +1,6 @@ +#surefire +#Thu Apr 07 00:10:38 CEST 2011 +sling.url=http\://localhost\:8080/system/console +user.dir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web +localRepository=/Users/alessandro/.m2/repository +basedir=/Users/alessandro/workspaces/IKS/stanbol/ontologymanager/web Added: incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/web/JettyServerTest.class URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/web/JettyServerTest.class?rev=1089668&view=auto ============================================================================== Binary file - no diff available. Propchange: incubator/stanbol/trunk/ontologymanager/web/target/test-classes/org/apache/stanbol/ontologymanager/web/JettyServerTest.class ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: incubator/stanbol/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/pom.xml (original) +++ incubator/stanbol/trunk/pom.xml Wed Apr 6 23:19:09 2011 @@ -58,7 +58,9 @@ </activation> <modules> <module>owl</module> + <!-- <module>kres/jersey</module> + --> <module>ontologymanager</module> <module>rules</module> <module>reengineer</module> Modified: incubator/stanbol/trunk/reasoners/web/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/pom.xml?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/pom.xml (original) +++ incubator/stanbol/trunk/reasoners/web/pom.xml Wed Apr 6 23:19:09 2011 @@ -206,7 +206,7 @@ <!-- Stanbol deps --> <dependency> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.kres.jersey</artifactId> + <artifactId>org.apache.stanbol.commons.web.base</artifactId> <version>${stanbol-version}</version> <scope>provided</scope> </dependency> Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java Wed Apr 6 23:19:09 2011 @@ -10,7 +10,6 @@ import javax.servlet.ServletException; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; import org.apache.stanbol.reasoners.base.api.ConsistentRefactorer; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; @@ -97,8 +96,8 @@ public class JerseyEndpoint { // Register templates servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY, staticUrlRoot); - servletContext - .setAttribute(ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, freemakerTemplates); +// servletContext +// .setAttribute(ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, freemakerTemplates); log.info("Jersey servlet registered at {}", alias); } Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java Wed Apr 6 23:19:09 2011 @@ -5,10 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; -import org.apache.stanbol.kres.jersey.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.ResultSetWriter; import org.apache.stanbol.owl.web.OWLOntologyWriter; -import org.apache.stanbol.kres.jersey.writers.ResultSetWriter; import org.apache.stanbol.reasoners.web.resources.Classify; import org.apache.stanbol.reasoners.web.resources.ConsistencyCheck; import org.apache.stanbol.reasoners.web.resources.ConsistentRefactoring; @@ -50,7 +49,7 @@ public class JerseyEndpointApplication e public Set<Object> getSingletons() { Set<Object> singletons = new HashSet<Object>(); // view processors - singletons.add(new ViewProcessorImpl()); +// singletons.add(new ViewProcessorImpl()); return singletons; } Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java Wed Apr 6 23:19:09 2011 @@ -64,7 +64,7 @@ import com.hp.hpl.jena.rdf.model.Model; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.Resource; -import org.apache.stanbol.kres.jersey.format.KRFormat; +import org.apache.stanbol.commons.web.base.format.KRFormat; /** * Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java Wed Apr 6 23:19:09 2011 @@ -16,7 +16,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.stanbol.kres.jersey.format.KRFormat; +import org.apache.stanbol.commons.web.base.format.KRFormat; import org.apache.stanbol.reasoners.base.api.ConsistentRefactorer; import org.apache.stanbol.reasoners.base.api.InconcistencyException; import org.apache.stanbol.rules.base.api.NoSuchRecipeException; Modified: incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java Wed Apr 6 23:19:09 2011 @@ -5,7 +5,6 @@ package org.apache.stanbol.reasoners.web; -import org.apache.stanbol.kres.jersey.JettyServer; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; Modified: incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java Wed Apr 6 23:19:09 2011 @@ -5,7 +5,6 @@ package org.apache.stanbol.reasoners.web; -import org.apache.stanbol.kres.jersey.JettyServer; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; Modified: incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java Wed Apr 6 23:19:09 2011 @@ -5,7 +5,6 @@ package org.apache.stanbol.reasoners.web; -import org.apache.stanbol.kres.jersey.JettyServer; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; Modified: incubator/stanbol/trunk/reengineer/web/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/pom.xml?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/web/pom.xml (original) +++ incubator/stanbol/trunk/reengineer/web/pom.xml Wed Apr 6 23:19:09 2011 @@ -205,7 +205,7 @@ <!-- Stanbol deps --> <dependency> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.kres.jersey</artifactId> + <artifactId>org.apache.stanbol.commons.web.base</artifactId> <version>${stanbol-version}</version> <scope>provided</scope> </dependency> Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java (original) +++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java Wed Apr 6 23:19:09 2011 @@ -10,8 +10,8 @@ import javax.servlet.ServletException; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; -import org.apache.stanbol.reengineer.base.api.ReengineerManager; import org.apache.stanbol.reengineer.base.api.Reengineer; +import org.apache.stanbol.reengineer.base.api.ReengineerManager; import org.osgi.framework.BundleContext; import org.osgi.service.component.ComponentContext; import org.osgi.service.http.HttpService; @@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory; import com.sun.jersey.spi.container.servlet.ServletContainer; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; /** * Jersey-based RESTful endpoint for KReS. @@ -115,9 +114,9 @@ public class JerseyEndpoint { servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY, staticUrlRoot); - servletContext.setAttribute( - ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, - freemakerTemplates); +// servletContext.setAttribute( +// ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, +// freemakerTemplates); log.info("Jersey servlet registered at {}", alias); } Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java (original) +++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java Wed Apr 6 23:19:09 2011 @@ -5,10 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; -import org.apache.stanbol.kres.jersey.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.ResultSetWriter; import org.apache.stanbol.owl.web.OWLOntologyWriter; -import org.apache.stanbol.kres.jersey.writers.ResultSetWriter; /** * Statically define the list of available resources and providers to be used by the KReS JAX-RS Endpoint. @@ -42,7 +41,7 @@ public class JerseyEndpointApplication e public Set<Object> getSingletons() { Set<Object> singletons = new HashSet<Object>(); // view processors - singletons.add(new ViewProcessorImpl()); +// singletons.add(new ViewProcessorImpl()); return singletons; } Modified: incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerResource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerResource.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerResource.java (original) +++ incubator/stanbol/trunk/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerResource.java Wed Apr 6 23:19:09 2011 @@ -23,11 +23,12 @@ import org.apache.clerezza.rdf.core.UriR import org.apache.clerezza.rdf.core.access.TcManager; import org.apache.clerezza.rdf.core.impl.SimpleMGraph; import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage; import org.apache.stanbol.reengineer.base.api.DataSource; -import org.apache.stanbol.reengineer.base.api.ReengineeringException; -import org.apache.stanbol.reengineer.base.api.ReengineerManager; import org.apache.stanbol.reengineer.base.api.Reengineer; +import org.apache.stanbol.reengineer.base.api.ReengineerManager; +import org.apache.stanbol.reengineer.base.api.ReengineeringException; import org.apache.stanbol.reengineer.base.api.datasources.DataSourceFactory; import org.apache.stanbol.reengineer.base.api.datasources.InvalidDataSourceForTypeSelectedException; import org.apache.stanbol.reengineer.base.api.datasources.NoSuchDataSourceExpection; @@ -42,12 +43,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.sun.jersey.api.view.ImplicitProduces; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; @Path("/reengineer") @ImplicitProduces("text/html") -public class ReengineerResource extends NavigationMixin { +public class ReengineerResource extends BaseStanbolResource { Modified: incubator/stanbol/trunk/rules/web/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/pom.xml?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/pom.xml (original) +++ incubator/stanbol/trunk/rules/web/pom.xml Wed Apr 6 23:19:09 2011 @@ -207,7 +207,7 @@ <!-- Stanbol deps --> <dependency> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.kres.jersey</artifactId> + <artifactId>org.apache.stanbol.commons.web.base</artifactId> <version>${stanbol-version}</version> <scope>provided</scope> </dependency> Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java Wed Apr 6 23:19:09 2011 @@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory; import com.sun.jersey.spi.container.servlet.ServletContainer; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; /** * Jersey-based RESTful endpoint for KReS. @@ -129,9 +128,9 @@ public class JerseyEndpoint { servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY, staticUrlRoot); - servletContext.setAttribute( - ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, - freemakerTemplates); +// servletContext.setAttribute( +// ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM, +// freemakerTemplates); //Rule manager servletContext.setAttribute(RuleStore.class.getName(), Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java Wed Apr 6 23:19:09 2011 @@ -5,10 +5,9 @@ import java.util.Set; import javax.ws.rs.core.Application; -import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl; -import org.apache.stanbol.kres.jersey.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.GraphWriter; +import org.apache.stanbol.commons.web.base.writers.ResultSetWriter; import org.apache.stanbol.owl.web.OWLOntologyWriter; -import org.apache.stanbol.kres.jersey.writers.ResultSetWriter; /** * Statically define the list of available resources and providers to be used by the KReS JAX-RS Endpoint. @@ -47,7 +46,7 @@ public class JerseyEndpointApplication e public Set<Object> getSingletons() { Set<Object> singletons = new HashSet<Object>(); // view processors - singletons.add(new ViewProcessorImpl()); +// singletons.add(new ViewProcessorImpl()); return singletons; } Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java Wed Apr 6 23:19:09 2011 @@ -15,8 +15,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.clerezza.rdf.core.access.TcManager; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.rules.base.api.NoSuchRecipeException; import org.apache.stanbol.rules.refactor.api.Refactorer; @@ -37,7 +37,7 @@ import com.sun.jersey.api.view.ImplicitP @Path("/refactorer") @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2") -public class RefactorerResource extends NavigationMixin { +public class RefactorerResource extends BaseStanbolResource { protected ONManager onManager; protected Refactorer semionRefactorer; Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java Wed Apr 6 23:19:09 2011 @@ -30,6 +30,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.clerezza.rdf.core.access.TcManager; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl; import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage; @@ -51,9 +53,6 @@ import org.semanticweb.owlapi.model.OWLO import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; - /** * * @author elvio @@ -61,7 +60,7 @@ import org.apache.stanbol.kres.jersey.re @Path("/recipe") // /{uri:.+}") // @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2") -public class RestRecipe extends NavigationMixin { +public class RestRecipe extends BaseStanbolResource { protected ONManager onm; Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java Wed Apr 6 23:19:09 2011 @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.clerezza.rdf.core.access.TcManager; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl; import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage; @@ -54,9 +56,6 @@ import org.semanticweb.owlapi.model.OWLO import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; - /** * * @author elvio @@ -64,7 +63,7 @@ import org.apache.stanbol.kres.jersey.re * */ @Path("/rule") -public class RestRule extends NavigationMixin{ +public class RestRule extends BaseStanbolResource{ protected ONManager onm; protected ClerezzaOntologyStorage storage; Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorerResource.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorerResource.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorerResource.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorerResource.java Wed Apr 6 23:19:09 2011 @@ -15,8 +15,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.clerezza.rdf.core.access.TcManager; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.rules.base.api.NoSuchRecipeException; import org.apache.stanbol.rules.refactor.api.Refactorer; @@ -37,7 +37,7 @@ import com.sun.jersey.api.view.ImplicitP @Path("/refactorer") @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2") -public class RefactorerResource extends NavigationMixin { +public class RefactorerResource extends BaseStanbolResource { protected ONManager onManager; protected Refactorer semionRefactorer; Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRecipe.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRecipe.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRecipe.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRecipe.java Wed Apr 6 23:19:09 2011 @@ -30,6 +30,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.clerezza.rdf.core.access.TcManager; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl; import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage; @@ -51,9 +53,6 @@ import org.semanticweb.owlapi.model.OWLO import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; - /** * * @author elvio @@ -61,7 +60,7 @@ import org.apache.stanbol.kres.jersey.re @Path("/recipe") // /{uri:.+}") // @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2") -public class RestRecipe extends NavigationMixin { +public class RestRecipe extends BaseStanbolResource { protected ONManager onm; Modified: incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRule.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRule.java?rev=1089668&r1=1089667&r2=1089668&view=diff ============================================================================== --- incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRule.java (original) +++ incubator/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RestRule.java Wed Apr 6 23:19:09 2011 @@ -32,6 +32,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import org.apache.clerezza.rdf.core.access.TcManager; +import org.apache.stanbol.commons.web.base.format.KRFormat; +import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl; import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage; @@ -54,9 +56,6 @@ import org.semanticweb.owlapi.model.OWLO import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.stanbol.kres.jersey.format.KRFormat; -import org.apache.stanbol.kres.jersey.resource.NavigationMixin; - /** * * @author elvio @@ -64,7 +63,7 @@ import org.apache.stanbol.kres.jersey.re * */ @Path("/rule") -public class RestRule extends NavigationMixin{ +public class RestRule extends BaseStanbolResource{ protected ONManager onm; protected ClerezzaOntologyStorage storage;
