Author: cihan
Date: Mon Jun 20 07:53:06 2011
New Revision: 1137535
URL: http://svn.apache.org/viewvc?rev=1137535&view=rev
Log:
Changed jersey version and updated launcher bundles, added missing activate
function at MappingEngine implementation.
Modified:
incubator/stanbol/trunk/cmsadapter/core/src/main/java/org/apache/stanbol/cmsadapter/core/mapping/MappingEngineImpl.java
incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
incubator/stanbol/trunk/cmsadapter/parent/pom.xml
Modified:
incubator/stanbol/trunk/cmsadapter/core/src/main/java/org/apache/stanbol/cmsadapter/core/mapping/MappingEngineImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/core/src/main/java/org/apache/stanbol/cmsadapter/core/mapping/MappingEngineImpl.java?rev=1137535&r1=1137534&r2=1137535&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/core/src/main/java/org/apache/stanbol/cmsadapter/core/mapping/MappingEngineImpl.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/core/src/main/java/org/apache/stanbol/cmsadapter/core/mapping/MappingEngineImpl.java
Mon Jun 20 07:53:06 2011
@@ -6,9 +6,11 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.jcr.RepositoryException;
+import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
@@ -64,6 +66,12 @@ public class MappingEngineImpl implement
private DObjectAdapter adapter;
private NamingStrategy namingStrategy;
+ @Activate
+ protected void activate(final Map<?,?> properties){
+ //TODO need to do something here?
+ }
+
+
private void runProcessors(List<Object> cmsObjects, String mode) {
Iterator<Processor> processorIterator;
synchronized (processors) {
Modified:
incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml?rev=1137535&r1=1137534&r2=1137535&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
Mon Jun 20 07:53:06 2011
@@ -110,6 +110,11 @@
<artifactId>joda-time</artifactId>
<version>1.6.2</version>
</bundle>
+ <bundle>
+ <groupId>eu.medsea.mimeutil</groupId>
+ <artifactId>mime-util</artifactId>
+ <version>2.1.3</version>
+ </bundle>
</startLevel>
@@ -210,30 +215,35 @@
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
</startLevel>
<startLevel level="15">
<bundle>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>1.1.1</version>
- </bundle>
- <bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
</bundle>
<bundle>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
+ </bundle>
+ <bundle>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>1.7</version>
+ </bundle>
+ <bundle>
+ <groupId>org.jvnet</groupId>
+ <artifactId>mimepull</artifactId>
+ <version>1.4</version>
</bundle>
<bundle>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
</bundle>
<bundle>
<groupId>org.codehaus.jackson</groupId>
@@ -293,11 +303,10 @@
<!-- Generic -->
<bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.jsonld
- </artifactId>
- <version>0.9-SNAPSHOT</version>
- </bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.defaultdata</artifactId>
Modified: incubator/stanbol/trunk/cmsadapter/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/parent/pom.xml?rev=1137535&r1=1137534&r2=1137535&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/parent/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/parent/pom.xml Mon Jun 20 07:53:06 2011
@@ -303,13 +303,13 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>1.2</version>
+ <version>1.7</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -363,13 +363,13 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
+ <version>1.6.1</version>
<scope>provided</scope>
</dependency>
