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 2013/06/26 22:23:00 UTC
svn commit: r1497076 [2/2] - in /stanbol/branches/commons-ng: ./ entityhub/
entityhub/jersey/
entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/fragment/
entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/
entit...
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/ReferencedSiteReconcileResource.java Wed Jun 26 20:23:00 2013
@@ -23,8 +23,11 @@ import javax.ws.rs.WebApplicationExcepti
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
import org.apache.stanbol.entityhub.servicesapi.query.QueryResultList;
@@ -34,34 +37,22 @@ import org.apache.stanbol.entityhub.serv
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Component
+@Service(Object.class)
+@Property(name="javax.ws.rs", boolValue=true)
@Path("/entityhub/site/{site}/reconcile")
public class ReferencedSiteReconcileResource extends BaseGoogleRefineReconcileResource {
private final Logger log = LoggerFactory.getLogger(ReferencedSiteReconcileResource.class);
- private SiteManager _siteManager;
- private final String siteId;
- public ReferencedSiteReconcileResource(@Context ServletContext context,
- @PathParam(value = "site") String siteId) {
- super(context);
- if (siteId == null || siteId.isEmpty()) {
- log.error("Missing path parameter site={}", siteId);
- throw new WebApplicationException(Response.Status.NOT_FOUND);
- }
- this.siteId = siteId;
- }
- private Site getSite() throws WebApplicationException {
- if(_siteManager == null){
- _siteManager = ContextHelper.getServiceFromContext(
- SiteManager.class, servletContext);
- if(_siteManager == null){
- throw new IllegalStateException("Unable to lookup ReferencedSite '"
- +siteId+"' because ReferencedSiteManager service is unavailable!");
- }
- }
+ @Reference
+ private SiteManager _siteManager;
+
+ private Site getSite(String siteId) throws WebApplicationException {
+
Site site = _siteManager.getSite(siteId);
if (site == null) {
- String message = String.format("ReferencedSite '%s' not acitve!",siteId);
+ String message = String.format("ReferencedSite '%s' not active!",siteId);
log.error(message);
throw new WebApplicationException(
Response.status(Status.NOT_FOUND).entity(message).build());
@@ -73,16 +64,16 @@ public class ReferencedSiteReconcileReso
* @return
* @throws SiteException
*/
- protected QueryResultList<Representation> performQuery(FieldQuery query) throws SiteException {
- return getSite().find(query);
+ protected QueryResultList<Representation> performQuery(@PathParam(value = "site") String siteId, FieldQuery query) throws SiteException {
+ return getSite(siteId).find(query);
}
@Override
- protected String getSiteName() {
- return getSite().getId() + "Referenced Site";
+ protected String getSiteName(@PathParam(value = "site") String siteId) {
+ return getSite(siteId).getId() + "Referenced Site";
}
@Override
- protected FieldQuery createFieldQuery() {
- return getSite().getQueryFactory().createFieldQuery();
+ protected FieldQuery createFieldQuery(@PathParam(value = "site") String siteId) {
+ return getSite(siteId).getQueryFactory().createFieldQuery();
}
}
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/reconcile/SiteManagerReconcileResource.java Wed Jun 26 20:23:00 2013
@@ -16,11 +16,12 @@
*/
package org.apache.stanbol.entityhub.jersey.resource.reconcile;
-import javax.servlet.ServletContext;
import javax.ws.rs.Path;
-import javax.ws.rs.core.Context;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.entityhub.core.query.DefaultQueryFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
@@ -28,37 +29,31 @@ import org.apache.stanbol.entityhub.serv
import org.apache.stanbol.entityhub.servicesapi.site.SiteException;
import org.apache.stanbol.entityhub.servicesapi.site.SiteManager;
+@Component
+@Service(Object.class)
+@Property(name="javax.ws.rs", boolValue=true)
@Path("/entityhub/sites/reconcile")
public class SiteManagerReconcileResource extends BaseGoogleRefineReconcileResource {
+ @Reference
SiteManager _siteManager;
- public SiteManagerReconcileResource(@Context ServletContext context) {
- super(context);
- }
private SiteManager getSiteManager(){
- if(_siteManager == null){
- _siteManager = ContextHelper.getServiceFromContext(
- SiteManager.class, servletContext);
- if(_siteManager == null){
- throw new IllegalStateException("ReferencedSiteManager service is unavailable!");
- }
- }
return _siteManager;
}
@Override
- protected QueryResultList<Representation> performQuery(FieldQuery query) throws SiteException {
+ protected QueryResultList<Representation> performQuery(String siteId, FieldQuery query) throws SiteException {
return getSiteManager().find(query);
}
@Override
- protected String getSiteName() {
+ protected String getSiteName(String siteId) {
return "Referenced Site Manager (all sites)";
}
@Override
- protected FieldQuery createFieldQuery() {
+ protected FieldQuery createFieldQuery(String siteId) {
return DefaultQueryFactory.getInstance().createFieldQuery();
}
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java Wed Jun 26 20:23:00 2013
@@ -18,7 +18,6 @@ package org.apache.stanbol.entityhub.jer
import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static javax.ws.rs.core.MediaType.TEXT_HTML_TYPE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.getAcceptableMediaType;
import static org.apache.stanbol.entityhub.ldpath.LDPathUtils.getReader;
@@ -145,8 +144,7 @@ public class LDPathHelper {
RDFBackend<Object> backend,
String ldpath,
Set<String> contexts,
- HttpHeaders headers,
- ServletContext servletContext) {
+ HttpHeaders headers) {
Collection<String> supported = new HashSet<String>(JerseyUtils.ENTITY_SUPPORTED_MEDIA_TYPES);
supported.add(TEXT_HTML);
final MediaType acceptedMediaType = getAcceptableMediaType(headers,
@@ -176,7 +174,7 @@ public class LDPathHelper {
if(printDocu){ //a missing parameter and the content type is compatible to HTML
ResponseBuilder rb = Response.ok(new Viewable("ldpath", resource));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML+"; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
} else if(acceptedMediaType.equals(TEXT_HTML_TYPE)){
//HTML is only supported for documentation
@@ -196,7 +194,7 @@ public class LDPathHelper {
}
ResponseBuilder rb = Response.ok(data);
rb.header(HttpHeaders.CONTENT_TYPE, acceptedMediaType+"; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultListWriter.java Wed Jun 26 20:23:00 2013
@@ -45,8 +45,11 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.commons.io.IOUtils;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService;
-import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.entityhub.servicesapi.query.FieldQuery;
import org.apache.stanbol.entityhub.servicesapi.query.QueryResultList;
import org.codehaus.jettison.json.JSONException;
@@ -58,6 +61,9 @@ import org.slf4j.LoggerFactory;
/**
* TODO: Replace with Serializer infrastructure similar to {@link Serializer}
*/
+@Component
+@Service(Object.class)
+@Property(name="javax.ws.rs", boolValue=true)
@Provider
//@Produces({APPLICATION_JSON, N3, N_TRIPLE, RDF_XML, TURTLE, X_TURTLE, RDF_JSON})
public class QueryResultListWriter implements MessageBodyWriter<QueryResultList<?>> {
@@ -81,13 +87,11 @@ public class QueryResultListWriter imple
@Context
protected ServletContext servletContext;
- protected Serializer getSerializer() {
- return ContextHelper.getServiceFromContext(Serializer.class, servletContext);
- }
-
- private NamespacePrefixService getNsPrefixService(){
- return ContextHelper.getServiceFromContext(NamespacePrefixService.class, servletContext);
- }
+ @Reference
+ private Serializer serializer;
+
+ @Reference
+ private NamespacePrefixService namespacePrefixService;
@Override
public long getSize(QueryResultList<?> result, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType) {
@@ -113,15 +117,15 @@ public class QueryResultListWriter imple
}
if (APPLICATION_JSON.equals(mediaTypeString)) {
try {
- IOUtils.write(QueryResultsToJSON.toJSON(resultList,getNsPrefixService())
+ IOUtils.write(QueryResultsToJSON.toJSON(resultList,namespacePrefixService)
.toString(4), entityStream,encoding);
} catch (JSONException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
} else { //RDF
MGraph resultGraph = QueryResultsToRDF.toRDF(resultList);
- addFieldQuery(resultList.getQuery(),resultGraph, getNsPrefixService());
- getSerializer().serialize(entityStream, resultGraph, mediaTypeString);
+ addFieldQuery(resultList.getQuery(),resultGraph, namespacePrefixService);
+ serializer.serialize(entityStream, resultGraph, mediaTypeString);
}
}
private void addFieldQuery(FieldQuery query, MGraph resultGraph, NamespacePrefixService nsPrefixService) {
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/RepresentationWriter.java Wed Jun 26 20:23:00 2013
@@ -36,16 +36,26 @@ import javax.ws.rs.ext.Provider;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.commons.io.IOUtils;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.codehaus.jettison.json.JSONException;
+
+@Component
+@Service(Object.class)
+@Property(name="javax.ws.rs", boolValue=true)
@Provider
//@Produces( {MediaType.APPLICATION_JSON, SupportedFormat.N3, SupportedFormat.N_TRIPLE,
// SupportedFormat.RDF_XML, SupportedFormat.TURTLE, SupportedFormat.X_TURTLE,
// SupportedFormat.RDF_JSON})
public class RepresentationWriter implements MessageBodyWriter<Representation> {
+ @Reference
+ private Serializer ser;
+
public static final Set<String> supportedMediaTypes;
static {
Set<String> types = new HashSet<String>();
@@ -97,7 +107,6 @@ public class RepresentationWriter implem
throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
}
} else { // RDF
- Serializer ser = ContextHelper.getServiceFromContext(Serializer.class, servletContext);
ser.serialize(entityStream, EntityToRDF.toRDF(rep), mediaTypeString);
}
Modified: stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java (original)
+++ stanbol/branches/commons-ng/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/SignWriter.java Wed Jun 26 20:23:00 2013
@@ -36,7 +36,10 @@ import javax.ws.rs.ext.Provider;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.commons.io.IOUtils;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.codehaus.jettison.json.JSONException;
@@ -47,6 +50,9 @@ import org.codehaus.jettison.json.JSONEx
* @author Rupert Westenthaler
*
*/
+@Component
+@Service(Object.class)
+@Property(name="javax.ws.rs", boolValue=true)
@Provider
//@Produces( {MediaType.APPLICATION_JSON, SupportedFormat.N3, SupportedFormat.N_TRIPLE,
// SupportedFormat.RDF_XML, SupportedFormat.TURTLE, SupportedFormat.X_TURTLE,
@@ -66,13 +72,9 @@ public class SignWriter implements Messa
supportedMediaTypes = Collections.unmodifiableSet(types);
}
public static final String DEFAULT_ENCODING = "UTF-8";
-
- @Context
- protected ServletContext servletContext;
-
- protected Serializer getSerializer() {
- return ContextHelper.getServiceFromContext(Serializer.class, servletContext);
- }
+
+ @Reference
+ Serializer serializer;
@Override
public long getSize(Entity sign,
@@ -109,7 +111,7 @@ public class SignWriter implements Messa
throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
}
} else { // RDF
- getSerializer().serialize(entityStream, EntityToRDF.toRDF(sign), mediaTypeString);
+ serializer.serialize(entityStream, EntityToRDF.toRDF(sign), mediaTypeString);
}
}
Modified: stanbol/branches/commons-ng/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/pom.xml Wed Jun 26 20:23:00 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-entityhub</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Entityhub</name>
Modified: stanbol/branches/commons-ng/entityhub/site/linkeddata/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/site/linkeddata/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/site/linkeddata/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/site/linkeddata/pom.xml Wed Jun 26 20:23:00 2013
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-entityhub</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
@@ -121,8 +121,8 @@
<scope>provided</scope>
</dependency -->
<dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/launchers/bundlelists/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/entityhub/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/bundlelists/entityhub/pom.xml (original)
+++ stanbol/branches/commons-ng/launchers/bundlelists/entityhub/pom.xml Wed Jun 26 20:23:00 2013
@@ -21,7 +21,7 @@
</parent>
<artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>partialbundlelist</packaging>
<name>Apache Stanbol Bundlelist for Entityhub</name>
Modified: stanbol/branches/commons-ng/launchers/bundlelists/entityhub/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/entityhub/src/main/bundles/list.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/bundlelists/entityhub/src/main/bundles/list.xml (original)
+++ stanbol/branches/commons-ng/launchers/bundlelists/entityhub/src/main/bundles/list.xml Wed Jun 26 20:23:00 2013
@@ -42,7 +42,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.site.linkeddata</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -71,7 +71,7 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.jersey</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</bundle>
</startLevel>
<!-- Default configuration for the Entityhub -->
Modified: stanbol/branches/commons-ng/launchers/bundlelists/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/bundlelists/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/bundlelists/pom.xml (original)
+++ stanbol/branches/commons-ng/launchers/bundlelists/pom.xml Wed Jun 26 20:23:00 2013
@@ -67,9 +67,9 @@
<module>sentimentdata</module> -->
<!-- Components -->
- <!-- <module>enhancer</module>
+ <!-- <module>enhancer</module> -->
<module>entityhub</module>
- <module>cmsadapter</module>
+ <!-- <module>cmsadapter</module>
<module>contenthub</module>
<module>ontologymanager</module>
<module>reasoners</module>
Modified: stanbol/branches/commons-ng/launchers/mini/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/mini/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/mini/pom.xml (original)
+++ stanbol/branches/commons-ng/launchers/mini/pom.xml Wed Jun 26 20:23:00 2013
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
Modified: stanbol/branches/commons-ng/launchers/stable/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/launchers/stable/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/launchers/stable/pom.xml (original)
+++ stanbol/branches/commons-ng/launchers/stable/pom.xml Wed Jun 26 20:23:00 2013
@@ -21,13 +21,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.stable</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Stanbol Launchers Stable Launcher</name>
@@ -129,6 +129,20 @@
<excludes></excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.7</version>
+ <configuration>
+ <target>
+ <property name="vm.args" value=""/>
+ <java fork="true" jar="${project.build.directory}/${project.build.finalName}.jar"
+ dir="${project.build.directory}">
+ <jvmarg line="-Xmx1024m -XX:MaxPermSize=256M ${vm.args}"/>
+ </java>
+ </target>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -159,34 +173,34 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
<!-- Stanbol Enhancer Bundle List -->
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId>
<version>0.11.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<!-- Stanbol Data Bundle List -->
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId>
<version>1.1.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<!-- Stanbol Entityhub Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: stanbol/branches/commons-ng/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/pom.xml?rev=1497076&r1=1497075&r2=1497076&view=diff
==============================================================================
--- stanbol/branches/commons-ng/pom.xml (original)
+++ stanbol/branches/commons-ng/pom.xml Wed Jun 26 20:23:00 2013
@@ -66,8 +66,8 @@
<!-- <module>data</module> -->
<module>commons</module>
- <!-- <module>entityhub</module>
- <module>ontologymanager</module>
+ <module>entityhub</module>
+ <!-- <module>ontologymanager</module>
<module>rules</module>
<module>enhancer</module>
<module>contenthub</module>
@@ -82,10 +82,10 @@
<module>launchers/bundlelists</module>
<module>launchers/mini</module>
-<!-- <module>launchers/full</module>
+<!-- <module>launchers/full</module> -->
<module>launchers/stable</module>
- <module>launchers/full-war</module>
+ <!-- <module>launchers/full-war</module>
<module>development/archetypes/statefull-webmodule</module>
<module>development/archetypes/stateless-webmodule</module>