Author: fchrist
Date: Tue Jan 22 13:51:47 2013
New Revision: 1436928
URL: http://svn.apache.org/viewvc?rev=1436928&view=rev
Log:
STANBOL-904 Moving the topic-web module to the topic engine, STANBOL-780 added
NLP license infos
Added:
stanbol/trunk/enhancement-engines/topic/engine/
stanbol/trunk/enhancement-engines/topic/engine/build-archives.xml
- copied unchanged from r1436814,
stanbol/trunk/enhancement-engines/topic/build-archives.xml
stanbol/trunk/enhancement-engines/topic/engine/pom.xml
- copied, changed from r1436814,
stanbol/trunk/enhancement-engines/topic/pom.xml
stanbol/trunk/enhancement-engines/topic/engine/sling/
- copied from r1436814, stanbol/trunk/enhancement-engines/topic/sling/
stanbol/trunk/enhancement-engines/topic/engine/src/
- copied from r1436814, stanbol/trunk/enhancement-engines/topic/src/
stanbol/trunk/enhancement-engines/topic/web/
- copied from r1436894, stanbol/trunk/enhancer/topic-web/
stanbol/trunk/enhancement-engines/topic/web/pom.xml
- copied, changed from r1436896, stanbol/trunk/enhancer/topic-web/pom.xml
stanbol/trunk/enhancement-engines/topic/web/tools/README.md
- copied unchanged from r1436896,
stanbol/trunk/enhancer/topic-web/tools/README.md
stanbol/trunk/enhancer/generic/nlp-json/src/main/resources/README
stanbol/trunk/enhancer/generic/nlp/src/license/
stanbol/trunk/enhancer/generic/nlp/src/license/THIRD-PARTY.properties
Removed:
stanbol/trunk/enhancement-engines/topic/build-archives.xml
stanbol/trunk/enhancement-engines/topic/pom.xml
stanbol/trunk/enhancement-engines/topic/sling/
stanbol/trunk/enhancement-engines/topic/src/
Modified:
stanbol/trunk/enhancement-engines/pom.xml
stanbol/trunk/pom.xml
Modified: stanbol/trunk/enhancement-engines/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/pom.xml?rev=1436928&r1=1436927&r2=1436928&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/pom.xml Tue Jan 22 13:51:47 2013
@@ -79,7 +79,8 @@
<module>keywordextraction</module>
<!-- Categorization -->
- <module>topic</module>
+ <module>topic/engine</module>
+ <module>topic/web</module>
<!-- Sentiment -->
<module>sentiment-wordclassifier</module>
Copied: stanbol/trunk/enhancement-engines/topic/engine/pom.xml (from r1436814,
stanbol/trunk/enhancement-engines/topic/pom.xml)
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/engine/pom.xml?p2=stanbol/trunk/enhancement-engines/topic/engine/pom.xml&p1=stanbol/trunk/enhancement-engines/topic/pom.xml&r1=1436814&r2=1436928&rev=1436928&view=diff
==============================================================================
--- stanbol/trunk/enhancement-engines/topic/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/engine/pom.xml Tue Jan 22 13:51:47
2013
@@ -18,7 +18,7 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../../enhancer/parent</relativePath>
+ <relativePath>../../../enhancer/parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
@@ -41,10 +41,10 @@
<scm>
<connection>
-
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engines/topic/
+
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engines/topic/engine/
</connection>
<developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engines/topic/
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engines/topic/engine/
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
Copied: stanbol/trunk/enhancement-engines/topic/web/pom.xml (from r1436896,
stanbol/trunk/enhancer/topic-web/pom.xml)
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/topic/web/pom.xml?p2=stanbol/trunk/enhancement-engines/topic/web/pom.xml&p1=stanbol/trunk/enhancer/topic-web/pom.xml&r1=1436896&r2=1436928&rev=1436928&view=diff
==============================================================================
--- stanbol/trunk/enhancer/topic-web/pom.xml (original)
+++ stanbol/trunk/enhancement-engines/topic/web/pom.xml Tue Jan 22 13:51:47 2013
@@ -24,11 +24,11 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.parent</artifactId>
<version>0.10.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../../../enhancer/parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.web.topic</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.engine.topic.web</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -42,15 +42,30 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
+
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engine/topic/web/
</connection>
<developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancement-engine/topic/web/
</developerConnection>
<url>http://stanbol.apache.org/</url>
</scm>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <instructions>
+ <Bundle-Category>Stanbol Enhancer</Bundle-Category>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
Added: stanbol/trunk/enhancer/generic/nlp-json/src/main/resources/README
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp-json/src/main/resources/README?rev=1436928&view=auto
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp-json/src/main/resources/README (added)
+++ stanbol/trunk/enhancer/generic/nlp-json/src/main/resources/README Tue Jan
22 13:51:47 2013
@@ -0,0 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+The following files are released under the Apache License, 2.0
+
+META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeSerializer
+META-INF/services/org.apache.stanbol.enhancer.nlp.json.valuetype.ValueTypeParser
Added: stanbol/trunk/enhancer/generic/nlp/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancer/generic/nlp/src/license/THIRD-PARTY.properties?rev=1436928&view=auto
==============================================================================
--- stanbol/trunk/enhancer/generic/nlp/src/license/THIRD-PARTY.properties
(added)
+++ stanbol/trunk/enhancer/generic/nlp/src/license/THIRD-PARTY.properties Tue
Jan 22 13:51:47 2013
@@ -0,0 +1,24 @@
+# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
+#-------------------------------------------------------------------------------
+# Already used licenses in project :
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - 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
+# - New BSD License
+# - Public Domain License
+#-------------------------------------------------------------------------------
+# Please fill the missing licenses for dependencies :
+#
+#
+#Tue Jan 22 13:39:30 CET 2013
+org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
+org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: stanbol/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/pom.xml?rev=1436928&r1=1436927&r2=1436928&view=diff
==============================================================================
--- stanbol/trunk/pom.xml (original)
+++ stanbol/trunk/pom.xml Tue Jan 22 13:51:47 2013
@@ -73,7 +73,6 @@
<module>contenthub</module>
<module>enhancement-engines</module>
- <module>enhancer/topic-web</module>
<module>cmsadapter</module>
