You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/10/05 19:24:57 UTC
svn commit: r1394667 - in /stanbol/trunk:
commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/
contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/
ontologymanager/generic/servicesapi/
ontologymanager/generic/servicesapi/src...
Author: alexdma
Date: Fri Oct 5 17:24:55 2012
New Revision: 1394667
URL: http://svn.apache.org/viewvc?rev=1394667&view=rev
Log:
* Removed second export of deprecated ontonet package that caused service references to go unsatisfied. I could then safely move deprecated interfaces back to their original package (STANBOL-672)
* Also removed metatype annotations for some Web Fragments that are not configurable (a simplification for STANBOL-103)
Added:
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/NamedArtifact.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ONManager.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/OfflineConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/Vocabulary.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/Lockable.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/Lockable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollector.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollector.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListenable.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListenable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListener.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListener.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSource.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSourceHandler.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSourceHandler.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/Origin.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/Origin.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/SetInputSource.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/SetInputSource.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLExportable.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OWLExportable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyProvider.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OntologyProvider.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CoreOntologySpace.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CustomOntologySpace.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScope.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologyScope.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologySpace.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologySpace.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListenable.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListenable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListener.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListener.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeRegistry.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeRegistry.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/Session.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListenable.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListener.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
- copied, changed from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionManager.java
Removed:
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/NamedArtifact.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ONManager.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/OfflineConfiguration.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/Vocabulary.java
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/
Modified:
stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
stanbol/trunk/ontologymanager/generic/servicesapi/pom.xml
stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/AbstractGenericInputSource.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java
stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/OntologyManagerWebFragment.java
stanbol/trunk/reasoners/web/pom.xml
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/RulesFragment.java
Modified: stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java (original)
+++ stanbol/trunk/commons/owl/src/main/java/org/apache/stanbol/commons/owl/web/OWLFragment.java Fri Oct 5 17:24:55 2012
@@ -42,7 +42,7 @@ import freemarker.cache.TemplateLoader;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true, metatype = false)
@Service(WebFragment.class)
public class OWLFragment implements WebFragment {
Modified: stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java (original)
+++ stanbol/trunk/contrib/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/ReengineerFragment.java Fri Oct 5 17:24:55 2012
@@ -48,7 +48,7 @@ import freemarker.cache.TemplateLoader;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true, metatype = false)
@Service(WebFragment.class)
public class ReengineerFragment implements WebFragment{
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/pom.xml?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/pom.xml Fri Oct 5 17:24:55 2012
@@ -51,8 +51,7 @@
<Bundle-ClassPath>.</Bundle-ClassPath>
<Bundle-Activator/>
<Export-Package>
- org.apache.stanbol.ontologymanager.obsolete.*;version=${project.version},
- org.apache.stanbol.ontologymanager.ontonet.*;version=${project.version},
+ org.apache.stanbol.ontologymanager.ontonet.api.*;version=${project.version}, <!-- DEPRECATED -->
org.apache.stanbol.ontologymanager.servicesapi.*;version=${project.version}
</Export-Package>
<Import-Package>
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/NamedArtifact.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/NamedArtifact.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/NamedArtifact.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/NamedArtifact.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api;
+package org.apache.stanbol.ontologymanager.ontonet.api;
@Deprecated
public interface NamedArtifact extends org.apache.stanbol.ontologymanager.servicesapi.NamedArtifact {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ONManager.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ONManager.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ONManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java Fri Oct 5 17:24:55 2012
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api;
+package org.apache.stanbol.ontologymanager.ontonet.api;
-import org.apache.stanbol.ontologymanager.obsolete.api.scope.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.api.scope.ScopeRegistry;
@Deprecated
public interface ONManager extends org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager,
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/OfflineConfiguration.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/OfflineConfiguration.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/OfflineConfiguration.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/OfflineConfiguration.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api;
+package org.apache.stanbol.ontologymanager.ontonet.api;
@Deprecated
public interface OfflineConfiguration extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/Vocabulary.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/Vocabulary.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/Vocabulary.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/Vocabulary.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api;
+package org.apache.stanbol.ontologymanager.ontonet.api;
@Deprecated
public class Vocabulary extends org.apache.stanbol.ontologymanager.servicesapi.Vocabulary {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/Lockable.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/Lockable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/Lockable.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/Lockable.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/Lockable.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/Lockable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/Lockable.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.collector;
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
@Deprecated
public interface Lockable extends org.apache.stanbol.ontologymanager.servicesapi.collector.Lockable {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollector.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollector.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollector.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollector.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollector.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollector.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollector.java Fri Oct 5 17:24:55 2012
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.collector;
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
-import org.apache.stanbol.ontologymanager.obsolete.api.NamedArtifact;
-import org.apache.stanbol.ontologymanager.obsolete.api.io.OntologyInputSourceHandler;
+import org.apache.stanbol.ontologymanager.ontonet.api.NamedArtifact;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSourceHandler;
@Deprecated
public interface OntologyCollector extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListenable.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListenable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListenable.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListenable.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListenable.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListenable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListenable.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.collector;
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
@Deprecated
public interface OntologyCollectorListenable extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListener.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListener.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListener.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListener.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListener.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/collector/OntologyCollectorListener.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/OntologyCollectorListener.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.collector;
+package org.apache.stanbol.ontologymanager.ontonet.api.collector;
@Deprecated
public interface OntologyCollectorListener extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSource.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSource.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSource.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSource.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.io;
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
@Deprecated
public interface OntologyInputSource<O> extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSourceHandler.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSourceHandler.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSourceHandler.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSourceHandler.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSourceHandler.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/OntologyInputSourceHandler.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/OntologyInputSourceHandler.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.io;
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
@Deprecated
public interface OntologyInputSourceHandler extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/Origin.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/Origin.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/Origin.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/Origin.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/Origin.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/Origin.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/Origin.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.io;
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
@Deprecated
public class Origin<R> extends org.apache.stanbol.ontologymanager.servicesapi.io.Origin<R> {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/SetInputSource.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/SetInputSource.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/SetInputSource.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/SetInputSource.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/SetInputSource.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/io/SetInputSource.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/SetInputSource.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.io;
+package org.apache.stanbol.ontologymanager.ontonet.api.io;
@Deprecated
public interface SetInputSource<O> extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLExportable.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OWLExportable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLExportable.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLExportable.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OWLExportable.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OWLExportable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OWLExportable.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.ontology;
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
@Deprecated
public interface OWLExportable extends org.apache.stanbol.ontologymanager.servicesapi.ontology.OWLExportable {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyProvider.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OntologyProvider.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyProvider.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyProvider.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OntologyProvider.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/ontology/OntologyProvider.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ontology/OntologyProvider.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.ontology;
+package org.apache.stanbol.ontologymanager.ontonet.api.ontology;
@Deprecated
public interface OntologyProvider<S> extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CoreOntologySpace.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CoreOntologySpace.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CoreOntologySpace.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CoreOntologySpace.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface CoreOntologySpace extends OntologySpace {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CustomOntologySpace.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CustomOntologySpace.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/CustomOntologySpace.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/CustomOntologySpace.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface CustomOntologySpace extends OntologySpace {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScope.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologyScope.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScope.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScope.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologyScope.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologyScope.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologyScope.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologySpace.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologySpace.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologySpace.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologySpace.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologySpace.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/OntologySpace.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/OntologySpace.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface OntologySpace extends org.apache.stanbol.ontologymanager.servicesapi.scope.OntologySpace {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListenable.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListenable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListenable.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListenable.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListenable.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListenable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListenable.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface ScopeEventListenable extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListener.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListener.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListener.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListener.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListener.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeEventListener.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeEventListener.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface ScopeEventListener extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeRegistry.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeRegistry.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeRegistry.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeRegistry.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeRegistry.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/scope/ScopeRegistry.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/scope/ScopeRegistry.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.scope;
+package org.apache.stanbol.ontologymanager.ontonet.api.scope;
@Deprecated
public interface ScopeRegistry extends org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeRegistry {
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/Session.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/Session.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/Session.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/Session.java Fri Oct 5 17:24:55 2012
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.session;
+package org.apache.stanbol.ontologymanager.ontonet.api.session;
-import org.apache.stanbol.ontologymanager.obsolete.api.collector.Lockable;
-import org.apache.stanbol.ontologymanager.obsolete.api.collector.OntologyCollector;
-import org.apache.stanbol.ontologymanager.obsolete.api.ontology.OWLExportable;
+import org.apache.stanbol.ontologymanager.ontonet.api.collector.Lockable;
+import org.apache.stanbol.ontologymanager.ontonet.api.collector.OntologyCollector;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OWLExportable;
@Deprecated
public interface Session extends org.apache.stanbol.ontologymanager.servicesapi.session.Session,
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListenable.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListenable.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListenable.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListenable.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.session;
+package org.apache.stanbol.ontologymanager.ontonet.api.session;
@Deprecated
public interface SessionListenable extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListener.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListener.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionListener.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionListener.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.session;
+package org.apache.stanbol.ontologymanager.ontonet.api.session;
@Deprecated
public interface SessionListener extends
Copied: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java (from r1394600, stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionManager.java)
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java?p2=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java&p1=stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionManager.java&r1=1394600&r2=1394667&rev=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/obsolete/api/session/SessionManager.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java Fri Oct 5 17:24:55 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.stanbol.ontologymanager.obsolete.api.session;
+package org.apache.stanbol.ontologymanager.ontonet.api.session;
@Deprecated
public interface SessionManager extends org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager {
Modified: stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/AbstractGenericInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/AbstractGenericInputSource.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/AbstractGenericInputSource.java (original)
+++ stanbol/trunk/ontologymanager/generic/servicesapi/src/main/java/org/apache/stanbol/ontologymanager/servicesapi/io/AbstractGenericInputSource.java Fri Oct 5 17:24:55 2012
@@ -26,7 +26,7 @@ package org.apache.stanbol.ontologymanag
* the ontology returned by this input source.
*/
public abstract class AbstractGenericInputSource<O> implements
- org.apache.stanbol.ontologymanager.obsolete.api.io.OntologyInputSource<O> {
+ org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource<O> {
/**
* Where the ontology object was retrieved from.
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/pom.xml Fri Oct 5 17:24:55 2012
@@ -53,7 +53,6 @@
</Bundle-ClassPath>
<Bundle-Activator/>
<Export-Package>
- org.apache.stanbol.ontologymanager.ontonet.*, <!-- DEPRECATED -->
org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector;version=${project.version},
org.apache.stanbol.ontologymanager.multiplexer.clerezza.ontology;version=${project.version},
org.apache.stanbol.ontologymanager.multiplexer.clerezza.session;version=${project.version}
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/ontology/ClerezzaOntologyProvider.java Fri Oct 5 17:24:55 2012
@@ -127,9 +127,9 @@ import org.slf4j.LoggerFactory;
*/
@Component(immediate = true, metatype = true)
@Service({OntologyProvider.class,
- org.apache.stanbol.ontologymanager.obsolete.api.ontology.OntologyProvider.class})
+ org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider.class})
public class ClerezzaOntologyProvider implements
- org.apache.stanbol.ontologymanager.obsolete.api.ontology.OntologyProvider<TcProvider> {
+ org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider<TcProvider> {
/**
* Internally, the Clerezza ontology provider uses a reserved graph to store the associations between
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/main/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/session/SessionManagerImpl.java Fri Oct 5 17:24:55 2012
@@ -72,9 +72,9 @@ import org.slf4j.LoggerFactory;
*
*/
@Component(immediate = true, metatype = true)
-@Service({SessionManager.class, org.apache.stanbol.ontologymanager.obsolete.api.session.SessionManager.class})
+@Service({SessionManager.class, org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager.class})
public class SessionManagerImpl implements
- org.apache.stanbol.ontologymanager.obsolete.api.session.SessionManager, ScopeEventListener {
+ org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager, ScopeEventListener {
public static final String _CONNECTIVITY_POLICY_DEFAULT = "TIGHT";
public static final String _ID_DEFAULT = "session";
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=1394667&r1=1394666&r2=1394667&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 Fri Oct 5 17:24:55 2012
@@ -31,7 +31,7 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+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;
Modified: stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/pom.xml?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/pom.xml (original)
+++ stanbol/trunk/reasoners/web/pom.xml Fri Oct 5 17:24:55 2012
@@ -1,253 +1,247 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
- -->
+<!-- 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. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>stanbol-parent</artifactId>
- <version>2-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.web</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol Reasoners Web</name>
- <description>Set of rest services to deal with reasoners</description>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- javax.servlet.*,
- javax.ws.rs.*; version="[0,2)",
- org.slf4j.*,
- org.osgi.framework.*,
- org.osgi.service.*,
- freemarker.cache.*,
- com.sun.jersey.api.*,
- com.sun.jersey.multipart.*,
- org.apache.clerezza.rdf.core.*,
- com.hp.hpl.jena.*,
- org.semanticweb.owlapi.*,
- org.coode.owlapi.*,
- uk.ac.manchester.cs.owl.owlapi.*,
- org.apache.commons.io.*,
- org.apache.stanbol.commons.web.base.*,
- org.apache.stanbol.commons.jobs.api.*,
- org.apache.stanbol.commons.jobs.impl.*,
- org.apache.stanbol.commons.owl.*,
- org.apache.stanbol.rules.base.api.*,
- org.apache.stanbol.ontologymanager.ontonet.api.*,
- org.apache.stanbol.ontologymanager.obsolete.api.*,
- org.apache.stanbol.ontologymanager.servicesapi.*,
- org.apache.stanbol.reasoners.servicesapi.*,
- org.apache.stanbol.reasoners.jena.*,
- org.apache.stanbol.reasoners.owlapi.*
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- AL20 License -->
- <exclude>src/license/THIRD-PARTY.properties</exclude>
-
- <!-- MIT License -->
- <exclude>src/main/resources/org/apache/stanbol/reasoners/web/static/jquery/jquery-1.6.1</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- Stanbol deps -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.10.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.9.0-incubating</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.rdfjson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>jaxrs.rdf.providers</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.serializer</artifactId>
- </dependency>
-
- <!-- specific deps for this project -->
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <exclusions>
- <!-- jaxb is now part of java 6 -->
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- </dependency>
- <!-- indirect dependency for freemarker -->
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- </dependency>
-
- <!-- servlet container, most useful for the tests -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </dependency>
-
- <!-- generic tax -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </dependency>
-
- <!-- OSGi tax -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <scope>provided</scope>
- </dependency>
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.web</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Reasoners Web</name>
+ <description>Set of rest services to deal with reasoners</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ javax.servlet.*,
+ javax.ws.rs.*; version="[0,2)",
+ org.slf4j.*,
+ org.osgi.framework.*,
+ org.osgi.service.*,
+ freemarker.cache.*,
+ com.sun.jersey.api.*,
+ com.sun.jersey.multipart.*,
+ org.apache.clerezza.rdf.core.*,
+ com.hp.hpl.jena.*,
+ org.semanticweb.owlapi.*,
+ org.coode.owlapi.*,
+ uk.ac.manchester.cs.owl.owlapi.*,
+ org.apache.commons.io.*,
+ org.apache.stanbol.commons.web.base.*,
+ org.apache.stanbol.commons.jobs.api.*,
+ org.apache.stanbol.commons.jobs.impl.*,
+ org.apache.stanbol.commons.owl.*,
+ org.apache.stanbol.rules.base.api.*,
+ org.apache.stanbol.ontologymanager.ontonet.api.*,
+ org.apache.stanbol.ontologymanager.servicesapi.*,
+ org.apache.stanbol.reasoners.servicesapi.*,
+ org.apache.stanbol.reasoners.jena.*,
+ org.apache.stanbol.reasoners.owlapi.*
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 License -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- MIT License -->
+ <exclude>src/main/resources/org/apache/stanbol/reasoners/web/static/jquery/jquery-1.6.1</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.base</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.manager</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.rules.refactor</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <version>0.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.rdfjson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>jaxrs.rdf.providers</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.serializer</artifactId>
+ </dependency>
+
+ <!-- specific deps for this project -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <exclusions>
+ <!-- jaxb is now part of java 6 -->
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ </dependency>
+ <!-- indirect dependency for freemarker -->
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </dependency>
+
+ <!-- servlet container, most useful for the tests -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
+
+ <!-- generic tax -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <!-- OSGi tax -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Testing deps -->
<dependency>
@@ -255,6 +249,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- </dependencies>
+ </dependencies>
</project>
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=1394667&r1=1394666&r2=1394667&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 Fri Oct 5 17:24:55 2012
@@ -30,9 +30,8 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.NavigationLink;
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
-import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
-import org.apache.stanbol.ontologymanager.obsolete.api.ontology.OntologyProvider;
-import org.apache.stanbol.ontologymanager.obsolete.api.session.SessionManager;
+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;
@@ -51,7 +50,7 @@ import freemarker.cache.TemplateLoader;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true, metatype = false)
@Service(WebFragment.class)
public class ReasonersFragment implements WebFragment {
@@ -65,9 +64,6 @@ public class ReasonersFragment implement
ONManager onm;
@Reference
- OntologyProvider onProvider;
-
- @Reference
SessionManager sessionManager;
@Reference
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java Fri Oct 5 17:24:55 2012
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputFactory;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputManager;
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java Fri Oct 5 17:24:55 2012
@@ -22,7 +22,7 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert;
-import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1394667&r1=1394666&r2=1394667&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java Fri Oct 5 17:24:55 2012
@@ -52,7 +52,7 @@ import org.apache.stanbol.commons.jobs.a
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.obsolete.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.jena.JenaReasoningService;
import org.apache.stanbol.reasoners.owlapi.OWLApiReasoningService;
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=1394667&r1=1394666&r2=1394667&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 Fri Oct 5 17:24:55 2012
@@ -50,7 +50,7 @@ import freemarker.cache.TemplateLoader;
*
*/
-@Component(immediate = true, metatype = true)
+@Component(immediate = true, metatype = false)
@Service(WebFragment.class)
public class RulesFragment implements WebFragment {