Added: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/index.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/index.ftl?rev=1309382&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/index.ftl (added) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/index.ftl Wed Apr 4 13:48:12 2012 @@ -0,0 +1,112 @@ +<#-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<#import "/imports/common.ftl" as common> + +<#escape x as x?html> + <@common.page title="${it.scope.ID} : Apache Stanbol OntoNet scope" hasrestapi=false> + + <div class="panel" id="webview"> + + <h3>Load ontologies</h3> + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>From a local file</legend> + <p><b>File:</b> <input type="file" name="file"/> + Input format: + <select name="format"> + <option value="auto">Auto</option> + <option value="application/rdf+xml">RDF/XML</option> + <option value="application/rdf+json">RDF/JSON</option> + <option value="text/turtle">Turtle</option> + <option value="text/rdf+nt">N-TRIPLE</option> + <option value="text/rdf+n3">N3</option> + <!-- + <option value="application/owl+xml">OWL/XML</option> + <option value="text/owl-manchester">Manchester OWL</option> + <option value="text/owl-functional">OWL Functional</option> + --> + </select> + <input type="submit" value="Send"/> + </p> + </fieldset> + </form> + + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>From a URL</legend> + <p> + <b>URL:</b> <input type="text" name="url" size="80" value="http://"/> + <input type="submit" value="Fetch"/> + </p> + </fieldset> + </form> + + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>From a whole ontology library</legend> + <p><b>Library ID:</b> + <select name="library"> + <option value="null"><please select a library></option> + <#list it.libraries as lib> + <option value="${lib.IRI}">${lib.name}</option> + </#list> + </select> + <input type="submit" value="Load"/> + </p> + </fieldset> + </form> + + Note: OWL import targets will be included. Ontology loading is set to fail on missing imports. + + <h3>Stored ontologies</h3> + <h4>Custom</h4> + <#assign ontologies = it.customOntologies> + <div class="storeContents"> + <table id="customOnt"> + <div> + <tr> + <th>Name</th> + </tr> + <#list ontologies as ontology> + <tr> + <td><a href="/ontonet/ontology/${it.scope.ID}/${ontology}">${ontology}</a></td> + </tr> + </#list> + </div> + </table> <!-- allOntologies --> + </div> + <h4>Core</h4> + <#assign ontologies2 = it.coreOntologies> + <div class="storeContents"> + <table id="coreOnt"> + <div> + <tr> + <th>Name</th> + </tr> + <#list ontologies2 as ontology2> + <tr> + <td><a href="/ontonet/ontology/${it.scope.ID}/${ontology2}">${ontology2}</a></td> + </tr> + </#list> + </div> + </table> <!-- allOntologies --> + </div> + + </div> <!-- web view --> + + </@common.page> +</#escape> \ No newline at end of file
Added: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/ontology.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/ontology.ftl?rev=1309382&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/ontology.ftl (added) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ScopeResource/ontology.ftl Wed Apr 4 13:48:12 2012 @@ -0,0 +1,26 @@ +<#-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<#import "/imports/common.ftl" as common> +<#escape x as x?html> +<@common.page title="Ontology Manager : Ontology Detail" hasrestapi=false> + <div class="panel"> +<pre> +${it.result} +</pre> + </div> + </@common.page> +</#escape> \ No newline at end of file Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl (original) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl Wed Apr 4 13:48:12 2012 @@ -18,7 +18,7 @@ <#import "/imports/ontonetDescription.ftl" as ontonetDescription> <#escape x as x?html> - <@common.page title="Apache Stanbol OntoNet session manager" hasrestapi=false> + <@common.page title="Apache Stanbol OntoNet session manager" hasrestapi=true> <div class="panel" id="webview"> <#assign sessions = it.sessions> @@ -37,22 +37,26 @@ <#list sessions as session> <tr> <td> + <#-- <img src="${it.staticRootUrl}/contenthub/images/edit_icon_16.png" title="(not available yet) Edit this item" /> <img src="${it.staticRootUrl}/contenthub/images/delete_icon_16.png" title="(not available yet) Delete this item" /> + --> </td> <td><a href="${session.namespace}${session.ID}" title="${session.ID}">${session.ID}</a></td> <td>${session.locked?string("locked", "modifiable")}</td> <td></td> - <td>${session.ontologyCount}</td> + <td>${session.listManagedOntologies()?size}</td> </tr> </#list> </div> </table> <!-- allSessions --> </div> - </div> <!-- web view --> + </div> <!-- webview --> - <hr> - <#include "/imports/inc_sessionmgr.ftl"> + <div class="panel" id="restapi" style="display: none;"> + <h3>Service Endpoints</h3> + <#include "/imports/inc_sessionmgr.ftl"> + </div> <!-- restapi --> </@common.page> </#escape> \ No newline at end of file Added: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl?rev=1309382&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl (added) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl Wed Apr 4 13:48:12 2012 @@ -0,0 +1,111 @@ +<#-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<#import "/imports/common.ftl" as common> + +<#escape x as x?html> + <@common.page title="${it.session.ID} : an Apache Stanbol OntoNet session" hasrestapi=false> + + <div class="panel" id="webview"> + + <h3>Load an ontology</h3> + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>From a local file</legend> + <p><b>File:</b> <input type="file" name="file"/> + Input format: + <select name="format"> + <option value="auto">Auto</option> + <option value="application/rdf+xml">RDF/XML</option> + <option value="application/rdf+json">RDF/JSON</option> + <option value="text/turtle">Turtle</option> + <option value="text/rdf+nt">N-TRIPLE</option> + <option value="text/rdf+n3">N3</option> + <!-- + <option value="application/owl+xml">OWL/XML</option> + <option value="text/owl-manchester">Manchester OWL</option> + <option value="text/owl-functional">OWL Functional</option> + --> + </select> + <input type="submit" value="Send"/> + </p> + </fieldset> + </form> + + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>From a URL</legend> + <p> + <b>URL:</b> <input type="text" name="url" size="80" value="http://"/> + <input type="submit" value="Fetch"/> + </p> + </fieldset> + </form> + + <form method="POST" enctype="multipart/form-data" accept-charset="utf-8"> + <fieldset> + <legend>Append a scope</legend> + <p><b>Scope ID:</b> + <select name="scope"> + <option value="null"><please select a scope></option> + <#list it.appendableScopes as scope> + <option value="${scope.ID}">${scope.ID}</option> + </#list> + </select> + <input type="submit" value="Append"/> + </p> + </fieldset> + </form> + + Note: OWL import targets will be included. Ontology loading is set to fail on missing imports. + + <h3>Stored ontologies</h3> + <#assign ontologies = it.ontologies> + <div class="storeContents"> + <table id="onts"> + <div> + <tr> + <th>Name</th> + </tr> + <#list ontologies as ontology> + <tr> + <td><a href="/ontonet/session/${it.session.ID}/${ontology}">${ontology}</a></td> + </tr> + </#list> + </div> + </table> <!-- allOntologies --> + </div> + + <h3>Appended Scopes</h3> + <div class="storeContents"> + <table id="appSc"> + <div> + <tr> + <th>Name</th> + </tr> + <#list it.appendedScopes as appended> + <tr> + <td><a href="/ontonet/ontology/${appended.ID}">${appended.ID}</a></td> + </tr> + </#list> + </div> + </table> <!-- appSc --> + </div> + + </div> <!-- web view --> + + </@common.page> +</#escape> \ No newline at end of file Added: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/ontology.ftl URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/ontology.ftl?rev=1309382&view=auto ============================================================================== --- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/ontology.ftl (added) +++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/ontology.ftl Wed Apr 4 13:48:12 2012 @@ -0,0 +1,26 @@ +<#-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<#import "/imports/common.ftl" as common> +<#escape x as x?html> +<@common.page title="Ontology Manager : Ontology Detail" hasrestapi=false> + <div class="panel"> +<pre> +${it.result} +</pre> + </div> + </@common.page> +</#escape> \ No newline at end of file Modified: incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java (original) +++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntonetInputProvider.java Wed Apr 4 13:48:12 2012 @@ -150,7 +150,7 @@ public class OntonetInputProvider implem try { OntologyScope scope = null; synchronized (onManager) { - scope = onManager.getScopeRegistry().getScope(this.scopeId); + scope = onManager.getScope(this.scopeId); } if (scope == null) { log.error("Scope {} cannot be retrieved", this.scopeId); @@ -160,15 +160,10 @@ public class OntonetInputProvider implem if (sessionManager != null) synchronized (sessionManager) { session = sessionManager.getSession(sessionId); } - if (session == null) { - log.warn("Session {} cannot be retrieved. Ignoring.", this.sessionId); - } + if (session == null) log.warn("Session {} cannot be retrieved. Ignoring.", this.sessionId); final Set<OWLOntology> set = new HashSet<OWLOntology>(); set.add(scope.export(OWLOntology.class, true)); - if (session != null) { - set.add(session.export(OWLOntology.class, true)); - } - + if (session != null) set.add(session.export(OWLOntology.class, true)); if (set.size() == 1) return set.iterator().next(); OWLOntologyMerger merger = new OWLOntologyMerger(new OWLOntologySetProvider() { @Override @@ -190,8 +185,7 @@ public class OntonetInputProvider implem // We isolate here the creation of the temporary manager // TODO How to behave when resolving owl:imports? // We should set the manager to use a service to lookup for ontologies, - // instead of trying on the web - // directly + // instead of trying on the web directly OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); // FIXME Which is the other way of doing this? Modified: incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java (original) +++ incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java Wed Apr 4 13:48:12 2012 @@ -7,7 +7,6 @@ import java.util.Hashtable; import java.util.Set; import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert; -import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.reengineer.base.api.ReengineeringException; import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator; import org.apache.stanbol.reengineer.db.connection.DatabaseConnection; @@ -38,12 +37,10 @@ import com.hp.hpl.jena.rdf.model.Resourc public class DBDataTransformer extends ReengineerUriRefGenerator { - private ONManager onManager; private OWLOntology schemaOntology; private DatabaseConnection databaseConnection; - public DBDataTransformer(ONManager onManager, OWLOntology schemaOntology) { - this.onManager = onManager; + public DBDataTransformer(OWLOntology schemaOntology) { this.schemaOntology = schemaOntology; this.databaseConnection = new DatabaseConnection(schemaOntology); } @@ -54,7 +51,7 @@ public class DBDataTransformer extends R if (schemaOntology != null) { - OWLOntologyManager manager = onManager.getOwlCacheManager(); + OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); OWLDataFactory factory = OWLManager.getOWLDataFactory(); graphNS = graphNS.replace("#", ""); Modified: incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java (original) +++ incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java Wed Apr 4 13:48:12 2012 @@ -16,9 +16,6 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException; import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource; import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScopeFactory; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpaceFactory; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.ScopeRegistry; import org.apache.stanbol.reengineer.base.api.DataSource; import org.apache.stanbol.reengineer.base.api.Reengineer; import org.apache.stanbol.reengineer.base.api.ReengineerManager; @@ -192,17 +189,6 @@ public class DBExtractor implements Reen reengineeringManager.bindReengineer(this); - // SessionManager kReSSessionManager = onManager.getSessionManager(); - // Session kReSSession = kReSSessionManager.createSession(); - - // kReSSessionID = kReSSession.getID(); - - OntologyScopeFactory ontologyScopeFactory = onManager.getOntologyScopeFactory(); - - ScopeRegistry scopeRegistry = onManager.getScopeRegistry(); - - OntologySpaceFactory ontologySpaceFactory = onManager.getOntologySpaceFactory(); - scope = null; try { log.info("Created scope with IRI " + REENGINEERING_SCOPE); @@ -211,33 +197,21 @@ public class DBExtractor implements Reen OWLOntology owlOntology = ontologyManager.createOntology(iri); log.info("Ontology {} created.", iri); - scope = ontologyScopeFactory.createOntologyScope(reengineeringScopeID, new RootOntologyIRISource( - IRI.create(DBS_L1.URI))); + scope = onManager.createOntologyScope(reengineeringScopeID, + new RootOntologyIRISource(IRI.create(DBS_L1.URI))); // scope.setUp(); - scopeRegistry.registerScope(scope); - } catch (DuplicateIDException e) { log.info("Semion DBExtractor : already existing scope for IRI " + REENGINEERING_SCOPE); - scope = scopeRegistry.getScope(reengineeringScopeID); + scope = onManager.getScope(reengineeringScopeID); } catch (OWLOntologyCreationException e) { log.error("Failed to creare ontology " + DBS_L1.URI, e); } catch (Exception e) { log.error("Semion DBExtractor : No OntologyInputSource for ONManager."); } - if (scope != null) { - // try { - // scope.addSessionSpace(ontologySpaceFactory.createSessionOntologySpace(this.reengineeringScopeID), - // kReSSession.getID()); - scopeRegistry.setScopeActive(reengineeringScopeID, true); - // } catch (UnmodifiableOntologySpaceException ex) { - // log.error("Cannot add session space for scope " + reengineeringScopeID + - // " to unmodifiable scope " - // + scope, ex); - // } - } + if (scope != null) onManager.setScopeActive(reengineeringScopeID, true); log.info("Activated KReS Semion RDB Reengineer"); } @@ -277,7 +251,7 @@ public class DBExtractor implements Reen DataSource dataSource, OWLOntology schemaOntology) throws ReengineeringException { - DBDataTransformer semionDBDataTransformer = new DBDataTransformer(onManager, schemaOntology); + DBDataTransformer semionDBDataTransformer = new DBDataTransformer(schemaOntology); return semionDBDataTransformer.transformData(graphNS, outputIRI); } @@ -294,15 +268,8 @@ public class DBExtractor implements Reen } private OntologyScope getScope() { - OntologyScope ontologyScope = null; - - ScopeRegistry scopeRegistry = onManager.getScopeRegistry(); - - if (scopeRegistry.isScopeActive(reengineeringScopeID)) { - ontologyScope = scopeRegistry.getScope(reengineeringScopeID); - } - - return ontologyScope; + if (onManager.isScopeActive(reengineeringScopeID)) return onManager.getScope(reengineeringScopeID); + return null; } @Override Modified: incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java (original) +++ incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java Wed Apr 4 13:48:12 2012 @@ -4,12 +4,20 @@ import java.util.Dictionary; import java.util.Hashtable; import org.apache.clerezza.rdf.core.access.TcManager; +import org.apache.clerezza.rdf.core.access.TcProvider; import org.apache.clerezza.rdf.core.access.WeightedTcProvider; +import org.apache.clerezza.rdf.core.serializedform.Parser; import org.apache.clerezza.rdf.core.sparql.QueryEngine; import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine; import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider; import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; +import org.apache.stanbol.ontologymanager.ontonet.api.OfflineConfiguration; +import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider; +import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpaceFactory; import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl; +import org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl; +import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider; +import org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.OntologySpaceFactoryImpl; import org.apache.stanbol.reengineer.base.impl.ReengineerManagerImpl; import org.junit.Before; import org.junit.BeforeClass; @@ -18,14 +26,14 @@ import org.semanticweb.owlapi.model.IRI; public class DBExtractorTest { - static DBExtractor dbExtractor; - static String graphNS; - static ONManager onManager; - static IRI outputIRI; - - @BeforeClass - public static void setupClass() { - Dictionary<String, Object> emptyConf = new Hashtable<String, Object>(); + static DBExtractor dbExtractor; + static String graphNS; + static ONManager onManager; + static IRI outputIRI; + + @BeforeClass + public static void setupClass() { + Dictionary<String,Object> emptyConf = new Hashtable<String,Object>(); class SpecialTcManager extends TcManager { public SpecialTcManager(QueryEngine qe, WeightedTcProvider wtcp) { super(); @@ -38,53 +46,57 @@ public class DBExtractorTest { WeightedTcProvider wtcp = new SimpleTcProvider(); TcManager tcm = new SpecialTcManager(qe, wtcp); - // Two different ontology storagez, the same sparql engine and tcprovider - - onManager = new ONManagerImpl(tcm, wtcp,emptyConf); - dbExtractor = new DBExtractor(new ReengineerManagerImpl(new Hashtable<String,Object>()), - onManager, tcm, wtcp, emptyConf); - graphNS = "http://kres.iks-project.eu/reengineering/test";; - outputIRI = IRI.create(graphNS); - } - - @Before - public void setup() { - - } - - @Before - public void tearDown() { - - } - - @Test - public void testDataReengineering(){ -// graphNS = "http://kres.iks-project.eu/reengineering/test";; -// outputIRI = IRI.create(graphNS); -// try { -// OWLOntology ontology = dbExtractor.dataReengineering(graphNS, -// outputIRI, null, dbExtractor.schemaReengineering(graphNS, -// outputIRI, null)); -// } catch (ReengineeringException e) { -// fail("Some errors occur with dataReengineering of DBExtractor."); -// } - } - - @Test - public void testReengineering(){ -// graphNS = "http://kres.iks-project.eu/reengineering/test";; -// outputIRI = IRI.create(graphNS); -// try { -// OWLOntology ontology = dbExtractor.reengineering(graphNS, -// outputIRI, null); -// } catch (ReengineeringException e) { -// fail("Some errors occur with reengineering of DBExtractor."); -// } - } - - @Test - public void testSchemaReengineering() { -// OWLOntology ontology = dbExtractor.schemaReengineering(graphNS, -// outputIRI, null); - } + OfflineConfiguration offline = new OfflineConfigurationImpl(emptyConf); + OntologyProvider<TcProvider> ontologyProvider = new ClerezzaOntologyProvider(tcm, offline, + Parser.getInstance()); + + // Two different ontology storages, the same sparql engine and tcprovider + OntologySpaceFactory sf = new OntologySpaceFactoryImpl(ontologyProvider, emptyConf); + + onManager = new ONManagerImpl(ontologyProvider, offline, sf, emptyConf); + dbExtractor = new DBExtractor(new ReengineerManagerImpl(emptyConf), onManager, tcm, wtcp, emptyConf); + graphNS = "http://kres.iks-project.eu/reengineering/test";; + outputIRI = IRI.create(graphNS); + } + + @Before + public void setup() { + + } + + @Before + public void tearDown() { + + } + + @Test + public void testDataReengineering() { + // graphNS = "http://kres.iks-project.eu/reengineering/test";; + // outputIRI = IRI.create(graphNS); + // try { + // OWLOntology ontology = dbExtractor.dataReengineering(graphNS, + // outputIRI, null, dbExtractor.schemaReengineering(graphNS, + // outputIRI, null)); + // } catch (ReengineeringException e) { + // fail("Some errors occur with dataReengineering of DBExtractor."); + // } + } + + @Test + public void testReengineering() { + // graphNS = "http://kres.iks-project.eu/reengineering/test";; + // outputIRI = IRI.create(graphNS); + // try { + // OWLOntology ontology = dbExtractor.reengineering(graphNS, + // outputIRI, null); + // } catch (ReengineeringException e) { + // fail("Some errors occur with reengineering of DBExtractor."); + // } + } + + @Test + public void testSchemaReengineering() { + // OWLOntology ontology = dbExtractor.schemaReengineering(graphNS, + // outputIRI, null); + } } Modified: incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (original) +++ incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Wed Apr 4 13:48:12 2012 @@ -43,9 +43,6 @@ import org.apache.stanbol.ontologymanage import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource; import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource; import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScopeFactory; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpaceFactory; -import org.apache.stanbol.ontologymanager.ontonet.api.scope.ScopeRegistry; import org.apache.stanbol.reengineer.base.api.DataSource; import org.apache.stanbol.reengineer.base.api.Reengineer; import org.apache.stanbol.reengineer.base.api.ReengineerManager; @@ -113,9 +110,6 @@ public class XMLExtractor extends Reengi @Reference ONManager onManager; - // - // @Reference - // SessionManager sessionManager; @Reference ReengineerManager reengineeringManager; @@ -123,8 +117,6 @@ public class XMLExtractor extends Reengi private OntologyScope scope; private String scopeID; - // private IRI spaceIRI; - /** * This default constructor is <b>only</b> intended to be used by the OSGI environment with Service * Component Runtime support. @@ -133,9 +125,7 @@ public class XMLExtractor extends Reengi * TO USE {@link #XMLExtractor(ONManager)} or its overloads, to parse the configuration and then * initialise the rule store if running outside a OSGI environment. */ - public XMLExtractor() { - - } + public XMLExtractor() {} public XMLExtractor(ReengineerManager reengineeringManager, ONManager onManager, @@ -169,22 +159,8 @@ public class XMLExtractor extends Reengi if (hostPort == null) hostPort = _HOST_NAME_AND_PORT_DEFAULT; // TODO: Manage the other properties - // spaceIRI = IRI.create(XML_REENGINEERING_SESSION_SPACE); - // scopeID = IRI.create("http://"; + hostPort + "/kres/ontology/" + scopeID); - reengineeringManager.bindReengineer(this); - // SessionManager kReSSessionManager = onManager.getSessionManager(); - // Session kReSSession = sessionManager.createSession(); - - // sessionId = kReSSession.getID(); - - OntologyScopeFactory ontologyScopeFactory = onManager.getOntologyScopeFactory(); - - ScopeRegistry scopeRegistry = onManager.getScopeRegistry(); - - OntologySpaceFactory ontologySpaceFactory = onManager.getOntologySpaceFactory(); - scope = null; try { // // A che cacchio serviva 'sta robba? @@ -199,29 +175,20 @@ public class XMLExtractor extends Reengi OntologyInputSource xmlowlSrc = new RootOntologyIRISource(IRI.create(XML_OWL.URI), OWLOntologyManagerFactory.createOWLOntologyManager(locations)); - scope = ontologyScopeFactory.createOntologyScope(scopeID, xmlowlSrc + scope = onManager.createOntologyScope(scopeID, xmlowlSrc /* new OntologyInputSourceOXML() */); // scope.setUp(); - scopeRegistry.registerScope(scope); + onManager.registerScope(scope); } catch (DuplicateIDException e) { log.info("Will perform XML reengineering in already existing scope {}", scopeID); - scope = onManager.getScopeRegistry().getScope(scopeID); + scope = onManager.getScope(scopeID); } catch (OWLOntologyCreationException e) { throw new IllegalStateException("No valid schema was found in ontology " + XML_OWL.URI + "for reengineer" + XMLExtractor.class, e); } - if (scope != null) { - // try { - // scope.addSessionSpace(ontologySpaceFactory.createSessionOntologySpace(scopeID), - // kReSSession.getID()); - - scopeRegistry.setScopeActive(scopeID, true); - // } catch (UnmodifiableOntologySpaceException ex) { - // log.error("Cannot add session space for " + scopeID + " to unmodifiable scope " + scope, ex); - // } - } + if (scope != null) onManager.setScopeActive(scopeID, true); log.info("Stanbol XML Reengineer active."); } @@ -370,11 +337,9 @@ public class XMLExtractor extends Reengi OWLOntology ontology = null; log.info("Starting XML Reengineering"); - OWLOntologyManager ontologyManager = onManager.getOwlCacheManager(); + OWLOntologyManager ontologyManager = OWLManager.createOWLOntologyManager(); OWLDataFactory factory = OWLManager.getOWLDataFactory(); - IRI schemaOntologyIRI = schemaOntology.getOntologyID().getOntologyIRI(); - OWLOntology localDataOntology = null; log.debug("XML output IRI: {}", outputIRI); @@ -463,7 +428,7 @@ public class XMLExtractor extends Reengi Document dom, OWLOntology schemaOntology) throws ReengineeringException { - OWLOntologyManager ontologyManager = onManager.getOwlCacheManager(); + OWLOntologyManager ontologyManager = OWLManager.createOWLOntologyManager(); OWLDataFactory factory = OWLManager.getOWLDataFactory(); IRI schemaOntologyIRI = schemaOntology.getOntologyID().getOntologyIRI(); @@ -532,18 +497,6 @@ public class XMLExtractor extends Reengi return ReengineerType.XML; } - private OntologyScope getScope() { - OntologyScope ontologyScope = null; - - ScopeRegistry scopeRegistry = onManager.getScopeRegistry(); - - if (scopeRegistry.isScopeActive(scopeID)) { - ontologyScope = scopeRegistry.getScope(scopeID); - } - - return ontologyScope; - } - private void iterateChildren(String dataNS, String schemaNS, IRI parentResource, @@ -714,7 +667,7 @@ public class XMLExtractor extends Reengi @Override public OWLOntology schemaReengineering(String graphNS, IRI outputIRI, DataSource dataSource) throws ReengineeringException { - XSDExtractor xsdExtractor = new XSDExtractor(onManager); + XSDExtractor xsdExtractor = new XSDExtractor(); return xsdExtractor.getOntologySchema(graphNS, outputIRI, dataSource); } Modified: incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java?rev=1309382&r1=1309381&r2=1309382&view=diff ============================================================================== --- incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java (original) +++ incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java Wed Apr 4 13:48:12 2012 @@ -23,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.stanbol.ontologymanager.ontonet.api.ONManager; import org.apache.stanbol.reengineer.base.api.DataSource; import org.apache.stanbol.reengineer.base.api.ReengineeringException; import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator; @@ -80,13 +79,9 @@ import org.xml.sax.SAXException; public class XSDExtractor extends ReengineerUriRefGenerator { - private ONManager onManager; - public final Logger log = LoggerFactory.getLogger(getClass()); - public XSDExtractor(ONManager onManager) { - this.onManager = onManager; - } + public XSDExtractor() {} private void addComplexType(String schemaNS, OWLOntologyManager manager, @@ -553,7 +548,7 @@ public class XSDExtractor extends Reengi PSVIDocumentImpl psviDocumentImpl = new PSVIDocumentImpl(); XSSimpleTypeDecl m; - OWLOntologyManager ontologyManager = onManager.getOwlCacheManager(); + OWLOntologyManager ontologyManager = OWLManager.createOWLOntologyManager(); OWLDataFactory factory = OWLManager.getOWLDataFactory(); log.debug("XSD output IRI : " + outputIRI);
