Release 3.0

README.md

@@ -1,29 +1,21 @@
 # Catalog Search Service
-Search functionalities are provided by this service. It communicates with the ontological data source, which stores products and user services persistently.
+The implemented search mechanism focus on an ontological search. Therefore, it takes all information of an entity into account, which includes its location in a taxonomy as well as all entities’ properties. To enable this, a formalization of the catalogues lies is a precondition and is provided by the indexing service by.
 
-The service can use  a local ontology (file) or a Marmotta instance (url) as data source. In each of the cases, a different property must be set.
+##Approach: 
+The goal of this search is to define iteratively in a user driven process which properties of a product or service are relevant for the current search request. Only the selected properties are used to show the user concrete products or services (search result). The explorative behaviour of the search is supported by a graph-based navigation, which allows the iterative exploration of the search space. In so doing, the user learns the available information (product structure and specific instances) for a product/service while he is exploring the search space. Intensional queries are intensively used to support this feature. 
 
-In the case of Marmotta, you need the Spring property: nimble.shared.property.marmottauri {any URL}
-In the case of local file, you need the Spring property: nimble.shared.property.ontologyfile {abolute path to the file}
-In the case of SOLR Index: nimble.shared.property.useSOLRIndex {true | false}
 
+You can run this service as a Docker with the following command (just an example): docker run –p 8050:8080 search-service:0.0.1 
 
-In the case of using Marmotta in combinbation with SOLR Index you need the parameters  nimble.shared.property.marmottauri and nimble.shared.property.useSOLRIndex
-
-you can run this service as a Docker with the following command (just an example): docker run –p 8050:8080  -e NIMBLE_SHARED_PROPERTY_MARMOTTAURI:http://134.168.33.237:8080/marmotta search-service:0.0.1 
+##Comment: 
+The search mechanism using ontologies (file based or accessible by a triple store) and corresponding SPARQL queries are not supported any longer. In the case of interest, please contact: [email protected] 
 
 
 -------------------------------------------------
 1. Swagger problem  
-(1) Das Maven-Plugin kann nicht integriert werden, was nicht weiter schlimm ist. Hier einfach den Fehler in eine Warnung umwandeln.
-In Eclipse: "Preferences -> Maven -> Error/Warnings" und Fehler in Warnung umwandeln: "Plugin execution not converted by lifecycle configuration”
-(2) Um den von Swagger autogenerierten Quellcode zu Eclipse hinzuzufügen bitte
-	(a) "mvn clean package” in der Konsole ausführen, um den Quellcode zu generieren. Um "mvn package" richtig auszuführen, die pfad zu owl Datei in "MediatorSPARQLDerivationTest" angepasst werden muss.
-
-	(b) Im “Project Explorer” in Eclipse den Ordner “target/generated-sources/swagger/src/gen/java/main” als Source Folder hinzufügen.
+(1) The Maven plugin cannot be integrated, which is not a bad thing. Here simply convert the error into a warning.
+In Eclipse: "Preferences -> Maven -> Error/Warnings" convert errors in warnings "Plugin execution not converted by lifecycle configuration”
+(2) To add the source code generated by Swagger auto to Eclipse please
+	(a) run "mvn clean package” in a shell to generate sourecode. 	
+	(b) Im “Project Explorer” in Eclipse the folder  “target/generated-sources/swagger/src/gen/java/main” set the folder as source folder.
 -------------------------------------------
-2. Debug program
-0) update the path within "start.bat"
-1) Start "start.bat"
-2) You will still need to attach the debugger in Eclipse by making a new Debug Configuration for a "Remote Java Application" on the relevant port.
-

libRepo/de/biba/mediator/de.biba.reasoning.mediator/maven-metadata-local.xml

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>de.biba.mediator</groupId>
-  <artifactId>de.biba.reasoning.mediator</artifactId>
-  <versioning>
-    <versions>
-      <version>0.0.4-SNAPSHOT</version>
-    </versions>
-    <lastUpdated>20170705151324</lastUpdated>
-  </versioning>
-</metadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>de.biba.mediator</groupId>
+  <artifactId>de.biba.reasoning.mediator</artifactId>
+  <versioning>
+    <versions>
+      <version>0.0.4-SNAPSHOT</version>
+    </versions>
+    <lastUpdated>20170705151324</lastUpdated>
+  </versioning>
+</metadata>

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -95,34 +96,22 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<version>1.4.2.RELEASE</version><!--$NO-MVN-MAN-VER$ -->
 		</dependency>
-
-
-
-
-		<!-- Mediator dependencies -->
-
+
 		<dependency>
 			<groupId>org.apache.solr</groupId>
 			<artifactId>solr-solrj</artifactId>
 			<version>6.0.0</version>
-		</dependency> 
-		
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.marmotta</groupId>
 			<artifactId>marmotta-client-java</artifactId>
 			<version>3.3.0</version>
 		</dependency>
-
-		<dependency>
-			<groupId>de.biba.mediator</groupId>
-			<artifactId>de.biba.reasoning.mediator</artifactId>
-			<version>0.0.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>de.biba.mediator</groupId>
-			<artifactId>de.biba.wrapper.xmlwrapper</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
+		<!-- <dependency> <groupId>de.biba.mediator</groupId> <artifactId>de.biba.reasoning.mediator</artifactId> 
+			<version>0.0.4-SNAPSHOT</version> </dependency> <dependency> <groupId>de.biba.mediator</groupId> 
+			<artifactId>de.biba.wrapper.xmlwrapper</artifactId> <version>0.0.1-SNAPSHOT</version> 
+			</dependency> -->
 		<dependency>
 			<groupId>org.apache.jena</groupId>
 			<artifactId>jena-arq</artifactId>
@@ -134,11 +123,8 @@
 			<version>3.1.0</version>
 			<type>pom</type>
 		</dependency>
-		<dependency>
-			<groupId>de.biba.mediator</groupId>
-			<artifactId>de.biba.triple.store.access</artifactId>
-			<version>0.0.9-SNAPSHOT</version>
-		</dependency>
+		<!-- <dependency> <groupId>de.biba.mediator</groupId> <artifactId>de.biba.triple.store.access</artifactId> 
+			<version>0.1.0-SNAPSHOT</version> </dependency> -->
 		<!-- https://mvnrepository.com/artifact/javax.json/javax.json-api -->
 		<dependency>
 			<groupId>org.glassfish</groupId>
@@ -155,23 +141,12 @@
 			<artifactId>jdom2</artifactId>
 			<version>2.0.6</version>
 		</dependency>
-		<dependency>
-			<groupId>de.biba.mediator</groupId>
-			<artifactId>de.biba.wrapper.xmlwrapper</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-		</dependency>
-
-
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
 			<version>2.11.0</version>
 		</dependency>
 
-		<!-- Mujst be clarified why it cannot be imported like the others -->
-		<!-- <dependency> <groupId>de.biba.mediator</groupId> <artifactId>de.biba.wrapper.simplehttpWrapper</artifactId> 
-			<version>0.0.1-SNAPSHOT</version> <scope>system</scope> <systemPath>${pom.basedir}/lib/de.biba.wrapper.simplehttpWrapper.jar</systemPath> 
-			</dependency> -->
 
 		<!--SpringFox dependencies -->
 		<dependency>