You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2014/07/11 17:58:53 UTC
svn commit: r1609731 - in /stanbol/trunk:
commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/
commons/security/core/ commons/security/usermanagement/
commons/solr/web/src/main/java/org/apache/stanbo...
Author: reto
Date: Fri Jul 11 15:58:52 2014
New Revision: 1609731
URL: http://svn.apache.org/r1609731
Log:
STANBOL-1363: updated clerezza dependencies
Modified:
stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java
stanbol/trunk/commons/security/core/pom.xml
stanbol/trunk/commons/security/usermanagement/pom.xml
stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java
stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/DataBundleInstaller.java
stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/BundleContextMock.java
stanbol/trunk/enhancement-engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java
stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/MockComponentContext.java
stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/opennlp/MockComponentContext.java
stanbol/trunk/enhancement-engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/impl/MockComponentContext.java
stanbol/trunk/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java
stanbol/trunk/enhancement-engines/nbactions.xml
stanbol/trunk/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/MockComponentContext.java
stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/MockComponentContext.java
stanbol/trunk/enhancement-engines/uima/uimalocal-template/pom.xml
stanbol/trunk/enhancement-engines/uima/uimaremote/pom.xml
stanbol/trunk/enhancement-engines/uima/uimatotriples/pom.xml
stanbol/trunk/enhancer/generic/servicesapi/pom.xml
stanbol/trunk/launchers/bundlelists/security/src/main/bundles/list.xml
stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
stanbol/trunk/launchers/full-war/pom.xml
stanbol/trunk/launchers/full/pom.xml
stanbol/trunk/launchers/mini/pom.xml
stanbol/trunk/launchers/stable/pom.xml
stanbol/trunk/parent/pom.xml
Modified: stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java (original)
+++ stanbol/trunk/commons/installer/bundleprovider/src/main/java/org/apache/stanbol/commons/installer/provider/bundle/impl/BundleInstaller.java Fri Jul 11 15:58:52 2014
@@ -201,7 +201,7 @@ public class BundleInstaller implements
}
}
log.debug(" ... registering");
- Dictionary<String, Object> headers = (Dictionary<String, Object>) bundle.getHeaders();
+ Dictionary<String, String> headers = (Dictionary<String, String>) bundle.getHeaders();
// log.info("With Headers:");
// for(Enumeration<String> keys = headers.keys();keys.hasMoreElements();){
// String key = keys.nextElement();
Modified: stanbol/trunk/commons/security/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/core/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/security/core/pom.xml (original)
+++ stanbol/trunk/commons/security/core/pom.xml Fri Jul 11 15:58:52 2014
@@ -144,7 +144,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.clerezza</groupId>
Modified: stanbol/trunk/commons/security/usermanagement/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/security/usermanagement/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/security/usermanagement/pom.xml (original)
+++ stanbol/trunk/commons/security/usermanagement/pom.xml Fri Jul 11 15:58:52 2014
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java (original)
+++ stanbol/trunk/commons/solr/web/src/main/java/org/apache/stanbol/commons/solr/web/dispatch/SolrServiceDispatchFilter.java Fri Jul 11 15:58:52 2014
@@ -123,7 +123,7 @@ public class SolrServiceDispatchFilter e
try {
references = filter == null ?
context.getServiceReferences(CoreContainer.class.getName(), null) :
- context.getServiceReferences(null, filter.toString());
+ context.getServiceReferences((String)null, filter.toString());
} catch (InvalidSyntaxException e) {
references = null;
//can not be happen, because we created the filter already in the
Modified: stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/DataBundleInstaller.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/DataBundleInstaller.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/DataBundleInstaller.java (original)
+++ stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/DataBundleInstaller.java Fri Jul 11 15:58:52 2014
@@ -116,7 +116,7 @@ public class DataBundleInstaller impleme
activated.put(bundle, null);
}
log.debug("Register Bundle {} with DataBundleInstaller",bundle.getSymbolicName());
- Dictionary<String, Object> headers = (Dictionary<String, Object>) bundle.getHeaders();
+ Dictionary<String, String> headers = (Dictionary<String, String>) bundle.getHeaders();
// log.info("With Headers:");
// for(Enumeration<String> keys = headers.keys();keys.hasMoreElements();){
// String key = keys.nextElement();
Modified: stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/BundleContextMock.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/BundleContextMock.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/BundleContextMock.java (original)
+++ stanbol/trunk/commons/testing/http/src/main/java/org/apache/stanbol/commons/testing/http/BundleContextMock.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.commons.testi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
@@ -86,6 +87,11 @@ public class BundleContextMock implement
// TODO Auto-generated method stub
return null;
}
+
+ public Bundle getBundle(String id) {
+ // TODO Auto-generated method stub
+ return null;
+ }
public Bundle[] getBundles() {
// TODO Auto-generated method stub
@@ -153,10 +159,23 @@ public class BundleContextMock implement
return this.serviceReferenceMap.get(clazz);
}
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
// TODO Auto-generated method stub
return null;
}
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
public Bundle installBundle(String location) throws BundleException {
// TODO Auto-generated method stub
@@ -198,4 +217,9 @@ public class BundleContextMock implement
return false;
}
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
}
Modified: stanbol/trunk/enhancement-engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/celi/src/test/java/org/apache/stanbol/enhancer/engines/celi/testutils/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -201,5 +202,24 @@ public class MockComponentContext implem
throw new UnsupportedOperationException("Mock implementation");
}
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ return null;
+ }
}
}
Modified: stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-lucene/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/lucene/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -165,6 +166,26 @@ public class MockComponentContext implem
@Override
public void addBundleListener(BundleListener listener) {
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
};
}
Modified: stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/opennlp/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/opennlp/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/opennlp/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/entitylinking/labeltokenizer-opennlp/src/test/java/org/apache/stanbol/enhancer/engines/entitylinking/labeltokenizer/opennlp/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -165,6 +166,26 @@ public class MockComponentContext implem
@Override
public void addBundleListener(BundleListener listener) {
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ return null;
+ }
};
}
Modified: stanbol/trunk/enhancement-engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/impl/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/impl/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/impl/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/keywordextraction/src/test/java/org/apache/stanbol/enhancer/engines/keywordextraction/impl/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -165,6 +166,26 @@ public class MockComponentContext implem
@Override
public void addBundleListener(BundleListener listener) {
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
};
}
Modified: stanbol/trunk/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/kuromoji-nlp/src/test/java/org/apache/stanbol/enhancer/engines/kuromoji/impl/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -200,6 +201,26 @@ public class MockComponentContext implem
public Filter createFilter(String filter) throws InvalidSyntaxException {
throw new UnsupportedOperationException("Mock implementation");
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+ }
}
}
Modified: stanbol/trunk/enhancement-engines/nbactions.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/nbactions.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/nbactions.xml (original)
+++ stanbol/trunk/enhancement-engines/nbactions.xml Fri Jul 11 15:58:52 2014
@@ -1,13 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
<action>
- <actionName>CUSTOM-newVersion</actionName>
- <displayName>newVersion</displayName>
+ <actionName>CUSTOM-update-parents</actionName>
+ <displayName>update-parents</displayName>
<goals>
- <goal>versions:set</goal>
+ <goal>versions:update-parent</goal>
</goals>
<properties>
- <newVersion>1.0.0-SNAPSHOT</newVersion>
+ <allowSnapshots>true</allowSnapshots>
+ </properties>
+ </action>
+ <action>
+ <actionName>build</actionName>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <Env.MAVEN_OPTS>-Xmx2g -XX:MaxPermSize=512M</Env.MAVEN_OPTS>
+ </properties>
+ </action>
+ <action>
+ <actionName>rebuild</actionName>
+ <goals>
+ <goal>clean</goal>
+ <goal>install</goal>
+ </goals>
+ <properties>
+ <Env.MAVEN_OPTS>-Xmx2g -XX:MaxPermSize=512M</Env.MAVEN_OPTS>
+ </properties>
+ </action>
+ <action>
+ <actionName>CUSTOM-use-latests-versions</actionName>
+ <displayName>use-latests-versions</displayName>
+ <goals>
+ <goal>versions:use-latest-versions</goal>
+ </goals>
+ <properties>
+ <includes>org.apache.stanbol</includes>
+ <allowSnapshots>true</allowSnapshots>
</properties>
</action>
</actions>
Modified: stanbol/trunk/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -200,6 +201,26 @@ public class MockComponentContext implem
public Filter createFilter(String filter) throws InvalidSyntaxException {
throw new UnsupportedOperationException("Mock implementation");
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ return null;
+ }
}
}
Modified: stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/MockComponentContext.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/MockComponentContext.java?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/MockComponentContext.java (original)
+++ stanbol/trunk/enhancement-engines/tika/src/test/java/org/apache/stanbol/enhancer/engines/tika/MockComponentContext.java Fri Jul 11 15:58:52 2014
@@ -18,6 +18,7 @@ package org.apache.stanbol.enhancer.engi
import java.io.File;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -165,6 +166,26 @@ public class MockComponentContext implem
@Override
public void addBundleListener(BundleListener listener) {
}
+
+ @Override
+ public <S> ServiceRegistration<S> registerService(Class<S> clazz, S service, Dictionary<String, ?> properties) {
+ return null;
+ }
+
+ @Override
+ public <S> ServiceReference<S> getServiceReference(Class<S> clazz) {
+ return null;
+ }
+
+ @Override
+ public <S> Collection<ServiceReference<S>> getServiceReferences(Class<S> clazz, String filter) throws InvalidSyntaxException {
+ return null;
+ }
+
+ @Override
+ public Bundle getBundle(String location) {
+ return null;
+ }
};
}
Modified: stanbol/trunk/enhancement-engines/uima/uimalocal-template/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/uima/uimalocal-template/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/uima/uimalocal-template/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/uima/uimalocal-template/pom.xml Fri Jul 11 15:58:52 2014
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.12-incubating</version>
+ <version>0.14</version>
<type>jar</type>
</dependency>
<dependency>
Modified: stanbol/trunk/enhancement-engines/uima/uimaremote/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/uima/uimaremote/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/uima/uimaremote/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/uima/uimaremote/pom.xml Fri Jul 11 15:58:52 2014
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.12-incubating</version>
+ <version>0.14</version>
<type>bundle</type>
</dependency>
<dependency>
Modified: stanbol/trunk/enhancement-engines/uima/uimatotriples/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/uima/uimatotriples/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/uima/uimatotriples/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/uima/uimatotriples/pom.xml Fri Jul 11 15:58:52 2014
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.12-incubating</version>
+ <version>0.14</version>
<type>jar</type>
</dependency>
<dependency>
Modified: stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ stanbol/trunk/enhancer/generic/servicesapi/pom.xml Fri Jul 11 15:58:52 2014
@@ -118,6 +118,10 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/launchers/bundlelists/security/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/security/src/main/bundles/list.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/security/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/security/src/main/bundles/list.xml Fri Jul 11 15:58:52 2014
@@ -21,22 +21,22 @@
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.file.storage</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
</bundle>
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4-SNAPSHOT</version>
+ <version>0.4</version>
</bundle>
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>permissiondescriptions</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</bundle>
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -71,7 +71,7 @@
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.6-incubating</version>
+ <version>0.7</version>
</bundle>
</startLevel>
</bundles>
Modified: stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Fri Jul 11 15:58:52 2014
@@ -332,7 +332,7 @@
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.utils</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</bundle>
<!-- dependency of jersey-multipart -->
@@ -345,7 +345,7 @@
<bundle>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.13-incubating</version>
+ <version>0.15</version>
</bundle>
</startLevel>
Modified: stanbol/trunk/launchers/full-war/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full-war/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/full-war/pom.xml (original)
+++ stanbol/trunk/launchers/full-war/pom.xml Fri Jul 11 15:58:52 2014
@@ -153,7 +153,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Fri Jul 11 15:58:52 2014
@@ -189,7 +189,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/mini/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/mini/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/mini/pom.xml (original)
+++ stanbol/trunk/launchers/mini/pom.xml Fri Jul 11 15:58:52 2014
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
@@ -215,7 +215,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/launchers/stable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/stable/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/launchers/stable/pom.xml (original)
+++ stanbol/trunk/launchers/stable/pom.xml Fri Jul 11 15:58:52 2014
@@ -186,7 +186,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1609731&r1=1609730&r2=1609731&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Fri Jul 11 15:58:52 2014
@@ -547,12 +547,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
+ <version>4.3.1</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.1.0</version>
+ <!-- with older versions the scr plugin complains -->
+ <version>4.3.1</version>
</dependency>
<!-- Apache Felix -->
@@ -612,87 +613,87 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>utils</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.13</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.13-incubating</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.utils</artifactId>
- <version>0.8</version>
+ <version>0.9</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.metadata</artifactId>
- <version>0.1-incubating</version>
+ <version>0.2</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.11-incubating</version>
+ <version>0.12</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>0.10</version>
+ <version>0.11</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
- <version>0.11</version>
+ <version>0.12</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.sparql</artifactId>
- <version>0.6</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.content</artifactId>
- <version>0.13-incubating</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.6-incubating</version>
+ <version>0.7</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- <version>0.3-incubating</version>
+ <version>0.4</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.14</version>
+ <version>0.15</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.simple.storage</artifactId>
- <version>0.7-incubating</version>
+ <version>0.8</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.facade</artifactId>
- <version>0.13</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core.test</artifactId>
- <version>0.13-incubating</version>
+ <version>0.15</version>
<scope>test</scope>
</dependency>