Author: rwesten
Date: Mon Oct 29 10:21:38 2012
New Revision: 1403234
URL: http://svn.apache.org/viewvc?rev=1403234&view=rev
Log:
Merged Changes from trunk (Minor becauase there are no local changes to this
engine)
Modified:
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/ (props
changed)
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/license/THIRD-PARTY.properties
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 29 10:21:38 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/generic/test:1374978-1386535
+/incubator/stanbol/trunk/enhancer/generic/test:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/generic/test:1388017-1402959
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml?rev=1403234&r1=1403233&r2=1403234&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml
(original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/pom.xml Mon
Oct 29 10:21:38 2012
@@ -40,12 +40,12 @@
<scm>
<connection>
-
scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/test/
+
scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/test/
</connection>
<developerConnection>
-
scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/generic/test/
+
scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/generic/test/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
Modified:
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/license/THIRD-PARTY.properties
URL:
http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/license/THIRD-PARTY.properties?rev=1403234&r1=1403233&r2=1403234&view=diff
==============================================================================
---
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/license/THIRD-PARTY.properties
(original)
+++
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/license/THIRD-PARTY.properties
Mon Oct 29 10:21:38 2012
@@ -18,7 +18,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Apr 09 10:44:04 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License
(CDDL), Version 1.0
+#Sun Oct 07 16:00:11 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License
(CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
Modified:
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java?rev=1403234&r1=1403233&r2=1403234&view=diff
==============================================================================
---
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
(original)
+++
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/EnhancementStructureHelper.java
Mon Oct 29 10:21:38 2012
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.enhancer.test.helper;
import static
org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses.DBPEDIA_ORGANISATION;
@@ -319,10 +335,16 @@ public class EnhancementStructureHelper
// check if the relation to the text annotation is set
assertTrue(relationToTextAnnotationIterator.hasNext());
while (relationToTextAnnotationIterator.hasNext()) {
- // test if the referred annotations are text annotations
+ // test if the referred annotations are text annotations or
+ // the referenced annotations is a fise:EntityAnnotation AND also a
+ // dc:requires link is defined (STANBOL-766)
UriRef referredTextAnnotation = (UriRef)
relationToTextAnnotationIterator.next().getObject();
- assertTrue(enhancements.filter(referredTextAnnotation, RDF_TYPE,
- ENHANCER_TEXTANNOTATION).hasNext());
+ assertTrue("fise:EntityAnnotations MUST BE dc:related to a
fise:TextAnnotation OR dc:requires and dc:related to the same
fise:EntityAnnotation",
+ enhancements.filter(referredTextAnnotation, RDF_TYPE,
+ ENHANCER_TEXTANNOTATION).hasNext() || (
+ enhancements.filter(referredTextAnnotation, RDF_TYPE,
+ ENHANCER_ENTITYANNOTATION).hasNext() &&
+ enhancements.filter(entityAnnotation,
Properties.DC_REQUIRES, referredTextAnnotation).hasNext()));
}
// test if an entity is referred
Modified:
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java?rev=1403234&r1=1403233&r2=1403234&view=diff
==============================================================================
---
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
(original)
+++
stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/src/main/java/org/apache/stanbol/enhancer/test/helper/RemoteServiceHelper.java
Mon Oct 29 10:21:38 2012
@@ -1,3 +1,19 @@
+/*
+* 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.
+*/
package org.apache.stanbol.enhancer.test.helper;
import java.io.IOException;
