You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/10/28 09:28:15 UTC
svn commit: r1402951 - in
/stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic: ./ pom.xml
src/license/THIRD-PARTY.properties src/main/resources/README
src/test/resources/README
Author: rwesten
Date: Sun Oct 28 08:28:15 2012
New Revision: 1402951
URL: http://svn.apache.org/viewvc?rev=1402951&view=rev
Log:
Merged Changes from trunk to the Topic Engine to solve test errors in branch (Minor because there are no local changes to this engine in this branch)
Added:
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/main/resources/README
- copied unchanged from r1402950, stanbol/trunk/enhancer/engines/topic/src/main/resources/README
Removed:
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/test/resources/README
Modified:
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/ (props changed)
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/license/THIRD-PARTY.properties
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Oct 28 08:28:15 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/topic:1374978-1386535
+/incubator/stanbol/trunk/enhancer/engines/topic:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/engines/topic:1388017-1402950
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml?rev=1402951&r1=1402950&r2=1402951&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/pom.xml Sun Oct 28 08:28:15 2012
@@ -41,12 +41,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/topic/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/topic/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/engines/topic/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/engines/topic/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -61,10 +61,18 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true,
+ org.apache.stanbol.enhancer.servicesapi.impl; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
- org.apache.stanbol.enhancer.topic.*;version=${project.version},
- org.apache.stanbol.enhancer.engine.topic.*;version=${project.version}
+ org.apache.stanbol.enhancer.topic;version=${project.version},
+ org.apache.stanbol.enhancer.topic.training;version=${project.version}
</Export-Package>
+ <Private-Package>
+ org.apache.stanbol.enhancer.engine.topic
+ </Private-Package>
<Install-Path>install-config</Install-Path>
<Data-Files>data-files</Data-Files>
<Data-Files-Priority>-100</Data-Files-Priority>
@@ -80,8 +88,9 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <!-- AL20 licensed files. See src/test/resources/README -->
- <exclude>src/test/resources/classifier/topics_abstracts_snippet.tsv</exclude>
+ <!-- AL20 licensed files. See src/main/resources/README -->
+ <exclude>src/main/resources/install-config/default-topic-model.solrindex.ref</exclude>
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
</excludes>
</configuration>
</plugin>
@@ -283,7 +292,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/license/THIRD-PARTY.properties?rev=1402951&r1=1402950&r2=1402951&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/engines/topic/src/license/THIRD-PARTY.properties Sun Oct 28 08:28:15 2012
@@ -1,36 +1,32 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - ALv2
-# - Apache 2
-# - Apache License
-# - Apache License Version 2
-# - Apache License Version 2.0
-# - Apache License, Version 2.0
-# - Apache Software License - Version 2.0
-# - Apache Software License, Version 1.1
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - Version 1.0
-# - GPL2 w/ CPE
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - BSD-style
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:06:16 CET 2012
+#Sun Oct 07 16:38:47 CEST 2012
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.portlet--portlet-api--2.0=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0