freme-project/basic-services#66 change freme-cloud test packages to use

e-opennlp location detection service
freme-project · Jul 28, 2016 · 13a784b · 13a784b
1 parent 45ba323
commit 13a784b
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 40 deletions.
diff --git a/freme-cloud-broker/src/main/resources/application.properties b/freme-cloud-broker/src/main/resources/application.properties
@@ -17,6 +17,6 @@ security.basic-enabled=false
 
 #security.basic-enabled: false
 
-load-balancer.worker1.local-endpoint: /e-capitalization
-load-balancer.worker1.target-endpoint: /e-capitalization
+load-balancer.worker1.local-endpoint: /e-nlp/namedEntityRecognition
+load-balancer.worker1.target-endpoint: /e-nlp/namedEntityRecognition
 load-balancer.worker1.service-name: freme-ner
diff --git a/freme-cloud-worker/pom.xml b/freme-cloud-worker/pom.xml
@@ -7,7 +7,7 @@
 		<version>0.9-SNAPSHOT</version>
 	</parent>
 	<artifactId>freme-cloud-worker</artifactId>
-	
+
 	<properties>
 		<docker.image.prefix>springio</docker.image.prefix>
 	</properties>
@@ -23,6 +23,17 @@
 			<artifactId>eureka-client</artifactId>
 			<version>0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>de.dkt</groupId>
+			<artifactId>e-NLP</artifactId>
+			<version>0.2</version>
+			<exclusions>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 
 	<repositories>
@@ -57,40 +68,52 @@
 			</snapshots>
 		</repository>
 	</repositories>
-        <build>
-                <plugins>
-                        <plugin>
-                                <groupId>org.apache.maven.plugins</groupId>
-                                <artifactId>maven-jar-plugin</artifactId>
-                                <configuration  combine.self="override"></configuration>
-                        </plugin>
-                        <plugin>
-                                <groupId>com.spotify</groupId>
-                                <artifactId>docker-maven-plugin</artifactId>
-                                <version>0.4.11</version>
-                                <configuration>
-                                        <imageName>nordpolemil/freme-cloud-worker</imageName>
-                                        <dockerDirectory>src/main/docker</dockerDirectory>
-                                        <resources>
-                                                <resource>
-                                                        <targetPath>/</targetPath>
-                                                        <directory>${project.build.directory}/freme-package/</directory>
-                                                        <include>app-full.jar</include>
-                                                        <include>config/application.properties</include>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration combine.self="override"></configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>0.4.11</version>
+				<configuration>
+					<imageName>nordpolemil/freme-cloud-worker</imageName>
+					<dockerDirectory>src/main/docker</dockerDirectory>
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<directory>${project.build.directory}/freme-package/</directory>
+							<include>app-full.jar</include>
+							<include>config/application.properties</include>
+
+						</resource>
+					</resources>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<finalName>app</finalName>
+				</configuration>
+			</plugin>
 
-                                                </resource>
-                                        </resources>
-                                </configuration>
-                        </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<configuration>
+					<nonFilteredFileExtensions>
+						<nonFilteredFileExtension>bin</nonFilteredFileExtension>
+						<nonFilteredFileExtension>ext</nonFilteredFileExtension>
+					</nonFilteredFileExtensions>
+				</configuration>
+			</plugin>
+		</plugins>
 
-                        <plugin>
-                                <groupId>org.springframework.boot</groupId>
-                                <artifactId>spring-boot-maven-plugin</artifactId>
-                                <configuration>
-                                        <finalName>app</finalName>
-                                </configuration>
-                        </plugin>
-                </plugins>
-        </build>
+	</build>
 </project>
 
diff --git a/freme-cloud-worker/src/main/resources/package.xml b/freme-cloud-worker/src/main/resources/package.xml
@@ -8,11 +8,8 @@
 	http://www.springframework.org/schema/context/spring-context.xsd">
 
 	<import resource="classpath:spring-configurations/freme-common.xml" />
-        <import resource="classpath:spring-configurations/e-capitalization.xml" />
-
 	<import resource="classpath:spring-configurations/eureka-client.xml" />
-<!--	<import resource="classpath:spring-configurations/eopennlp.xml" />
--->
+	<import resource="classpath:spring-configurations/eopennlp.xml" />
 
 	<!-- basic services -->
 

diff --git a/freme-cloud-worker/src/main/resources/trainedModels/ner/ner-wikinerEn_LOC.bin b/freme-cloud-worker/src/main/resources/trainedModels/ner/ner-wikinerEn_LOC.bin
diff --git a/freme-cloud-worker/src/main/resources/trainedModels/sent/en-sent.bin b/freme-cloud-worker/src/main/resources/trainedModels/sent/en-sent.bin