You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by si...@apache.org on 2012/03/06 10:53:56 UTC
svn commit: r1297400 - in /incubator/stanbol/trunk: contenthub/bundlelist/
contenthub/ldpath/ contenthub/search/related/
contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/
contenthub/search/solr/ cont...
Author: sinaci
Date: Tue Mar 6 09:53:56 2012
New Revision: 1297400
URL: http://svn.apache.org/viewvc?rev=1297400&view=rev
Log:
Refactoring Contenthub pom's. Removed unnecessary dependencies.
Removed:
incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/enhancements/
Modified:
incubator/stanbol/trunk/contenthub/bundlelist/pom.xml
incubator/stanbol/trunk/contenthub/ldpath/pom.xml
incubator/stanbol/trunk/contenthub/search/related/pom.xml
incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/IndexingHelper.java
incubator/stanbol/trunk/contenthub/search/solr/pom.xml
incubator/stanbol/trunk/contenthub/servicesapi/pom.xml
incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/Constants.java
incubator/stanbol/trunk/contenthub/store/solr/pom.xml
incubator/stanbol/trunk/contenthub/web/pom.xml
incubator/stanbol/trunk/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
incubator/stanbol/trunk/demos/crawler/pom.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Modified: incubator/stanbol/trunk/contenthub/bundlelist/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/bundlelist/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/bundlelist/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/bundlelist/pom.xml Tue Mar 6 09:53:56 2012
@@ -21,7 +21,6 @@
<relativePath>../parent</relativePath>
</parent>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.contenthub.bundlelist</artifactId>
<packaging>partialbundlelist</packaging>
Modified: incubator/stanbol/trunk/contenthub/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/pom.xml Tue Mar 6 09:53:56 2012
@@ -44,7 +44,6 @@
nu.xom.*
</Export-Package>
<Import-Package>
- at.newmedialab.ldpath.*; version="[0.9.4, 1)",
!org.apache.xerces.*,
!com.sun.org.apache.xerces.internal.*,
!junit.framework.*,
@@ -72,12 +71,6 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
@@ -88,10 +81,6 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.ldpath</artifactId>
</dependency>
@@ -103,19 +92,6 @@
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-core-bundle</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.parser</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -136,11 +112,9 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
- <!-- DOM parser for Solr schema -->
<dependency>
<groupId>xom</groupId>
<artifactId>xom</artifactId>
- <version>1.2.5</version>
</dependency>
</dependencies>
Modified: incubator/stanbol/trunk/contenthub/search/related/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/search/related/pom.xml Tue Mar 6 09:53:56 2012
@@ -58,10 +58,6 @@ Finds related keywords from various type
<artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.cmsadapter.servicesapi</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
Modified: incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/IndexingHelper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/IndexingHelper.java?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/IndexingHelper.java (original)
+++ incubator/stanbol/trunk/contenthub/search/related/src/main/java/org/apache/stanbol/contenthub/search/related/ontologyresource/IndexingHelper.java Tue Mar 6 09:53:56 2012
@@ -18,7 +18,6 @@ package org.apache.stanbol.contenthub.se
import java.util.List;
-import org.apache.stanbol.cmsadapter.servicesapi.helper.CMSAdapterVocabulary;
import org.apache.stanbol.contenthub.servicesapi.Constants;
import com.hp.hpl.jena.ontology.OntClass;
@@ -59,7 +58,7 @@ public class IndexingHelper {
}
// Add CMS objects
- Resource cmsObject = ResourceFactory.createResource(CMSAdapterVocabulary.CMS_OBJECT
+ Resource cmsObject = ResourceFactory.createResource(Constants.CMS_OBJECT
.getUnicodeString());
List<Statement> cmsOBjects = model.listStatements(null, RDF.type, cmsObject).toList();
for (Statement stmt : cmsOBjects) {
@@ -79,7 +78,7 @@ public class IndexingHelper {
public static String getCMSObjectName(Resource subject) {
String name = "";
- Property cmsNameProp = ResourceFactory.createProperty(CMSAdapterVocabulary.CMS_OBJECT_NAME
+ Property cmsNameProp = ResourceFactory.createProperty(Constants.CMS_OBJECT_NAME
.getUnicodeString());
if (subject.hasProperty(cmsNameProp)) {
name = subject.getProperty(cmsNameProp).getString();
Modified: incubator/stanbol/trunk/contenthub/search/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/search/solr/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/search/solr/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/search/solr/pom.xml Tue Mar 6 09:53:56 2012
@@ -54,10 +54,6 @@
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
@@ -70,14 +66,6 @@
<artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>arq</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified: incubator/stanbol/trunk/contenthub/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/servicesapi/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/servicesapi/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/servicesapi/pom.xml Tue Mar 6 09:53:56 2012
@@ -32,19 +32,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>jaxb-impl</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <Import-Package>
- <!-- JAXB Impl -->
- !org.jvnet.*,
- !com.sun.xml.fastinfoset.*,
- !javax.xml.stream.*,
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/Constants.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/Constants.java?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/Constants.java (original)
+++ incubator/stanbol/trunk/contenthub/servicesapi/src/main/java/org/apache/stanbol/contenthub/servicesapi/Constants.java Tue Mar 6 09:53:56 2012
@@ -16,6 +16,8 @@
*/
package org.apache.stanbol.contenthub.servicesapi;
+import org.apache.clerezza.rdf.core.UriRef;
+
/**
* Class keeping the constants that are used in various places of Contenthub.
*
@@ -50,4 +52,14 @@ public class Constants {
}
public static final String SEARCH_URI = "http://stanbol.apache.org/contenthub/search/";
+
+ /**
+ * Represent the RDF type of CMS Object in the content management system
+ */
+ public static final UriRef CMS_OBJECT = new UriRef("http://www.apache.org/stanbol/cms#CMSObject");
+
+ /**
+ * Represents a reference to name of a CMS Object
+ */
+ public static final UriRef CMS_OBJECT_NAME = new UriRef("http://www.apache.org/stanbol/cms#name");
}
Modified: incubator/stanbol/trunk/contenthub/store/solr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/store/solr/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/store/solr/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/store/solr/pom.xml Tue Mar 6 09:53:56 2012
@@ -59,12 +59,12 @@
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.jena.facade</artifactId>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
</dependency>
<!-- Solr/Lucene dependencies (needed for using embedded Solr servers) -->
@@ -73,14 +73,6 @@
<artifactId>solr-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
Modified: incubator/stanbol/trunk/contenthub/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/web/pom.xml Tue Mar 6 09:53:56 2012
@@ -49,14 +49,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- javax.ws.rs.*; version="[0,2)",
- *
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -105,17 +97,6 @@
<artifactId>org.apache.stanbol.enhancer.jersey</artifactId>
</dependency>
- <!-- Clerezza dependencies -->
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- </dependency>
-
<!-- dependencies on other Stanbol modules -->
<!-- TODO : added to get DefaultQueryFactory at SearchResource, find
a solution not to get this dependency -->
@@ -160,11 +141,6 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
- <dependency>
- <groupId>eu.medsea.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- </dependency>
-
<!-- OSGi tax -->
<dependency>
Modified: incubator/stanbol/trunk/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl (original)
+++ incubator/stanbol/trunk/contenthub/web/src/main/resources/org/apache/stanbol/contenthub/web/templates/org/apache/stanbol/contenthub/web/resources/StoreResource/index.ftl Tue Mar 6 09:53:56 2012
@@ -33,7 +33,6 @@
<tr><input type="text" id="searchKeywords" name="searchKeywords" onkeydown="if (event.keyCode == 13) document.getElementById('searchButton').click()" /><input id="searchButton" type="button" value="Search" onClick="javascript:performSearch();" /></tr>
<tr><div><a href="${it.publicBaseUri}contenthub/${it.indexName}/search/featured" />Search Page</a></div></tr>
<br/>
- <tr><div><a href="${it.publicBaseUri}contenthub/${it.indexName}/import/cnn">Import News</a></div></tr>
<tr><div><a href="${it.publicBaseUri}contenthub/ldpath">Submit Index</a></div></tr>
</td></table>
</div>
Modified: incubator/stanbol/trunk/demos/crawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/crawler/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/crawler/pom.xml (original)
+++ incubator/stanbol/trunk/demos/crawler/pom.xml Tue Mar 6 09:53:56 2012
@@ -53,9 +53,30 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- MIT License -->
+ <exclude>src/main/resources/org/apache/stanbol/demos/crawler/web/static/style/jquery-ui-1.8.11.custom.css</exclude>
+ <exclude>src/main/resources/org/apache/stanbol/demos/crawler/web/static/scripts/jquery-ui-1.8.11.custom.min.js</exclude>
+ <exclude>src/main/resources/org/apache/stanbol/demos/crawler/web/static/scripts/jquery-1.5.1.min.js</exclude>
+
+ <!-- BSD License -->
+ <exclude>src/main/resources/org/apache/stanbol/demos/crawler/web/static/scripts/jit.js</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
@@ -73,14 +94,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.contenthub.servicesapi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- </dependency>
- <dependency>
<groupId>net.sourceforge.htmlcleaner</groupId>
<artifactId>htmlcleaner</artifactId>
</dependency>
@@ -88,7 +101,7 @@
<groupId>jtidy</groupId>
<artifactId>jtidy</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Tue Mar 6 09:53:56 2012
@@ -26,11 +26,11 @@
********************************************************************* -->
<!-- General-purpose libraries -->
<startLevel level="10">
- <bundle> <!-- only used by the Contenthub -->
- <groupId>eu.medsea.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- <version>2.1.3</version>
- </bundle>
+<!-- <bundle> only used by the Contenthub -->
+<!-- <groupId>eu.medsea.mimeutil</groupId> -->
+<!-- <artifactId>mime-util</artifactId> -->
+<!-- <version>2.1.3</version> -->
+<!-- </bundle> -->
<bundle> <!-- used by langid -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1297400&r1=1297399&r2=1297400&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Tue Mar 6 09:53:56 2012
@@ -1155,13 +1155,6 @@
<version>1.6.2</version>
</dependency>
- <!-- MimeUtil -->
- <dependency>
- <groupId>eu.medsea.mimeutil</groupId>
- <artifactId>mime-util</artifactId>
- <version>2.1.3</version>
- </dependency>
-
<!-- SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -1529,6 +1522,13 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- DOM parser for Solr schema -->
+ <dependency>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ <version>1.2.5</version>
+ </dependency>
<!-- HTML cleaner -->
<!-- we need to exclude jaxen and we do not need ant -->