Daniel Kinzler has submitted this change and it was merged.
Change subject: Small changes to fix some stuff breaking during test on server.
......................................................................
Small changes to fix some stuff breaking during test on server.
Change-Id: Ibe20e20107c8b7b872bd24c49283f81459aea234
---
M client/pom.xml
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
M
client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
M client/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/pom.xml
A myrrix-claimprops/src/main/webapp/META-INF/context.xml
M myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
M myrrix-refprops/pom.xml
A myrrix-refprops/src/main/webapp/META-INF/context.xml
M myrrix-refprops/src/main/webapp/WEB-INF/web.xml
10 files changed, 24 insertions(+), 56 deletions(-)
Approvals:
Daniel Kinzler: Verified; Looks good to me, approved
diff --git a/client/pom.xml b/client/pom.xml
index a785365..b056a0a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -19,6 +19,7 @@
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<powermock.version>1.5.1</powermock.version>
+ <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>
</properties>
<dependencies>
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
index 3bfaa83..2c81817 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/recommenders/util/TranslatedRecommendedItemDatasetParser.java
@@ -89,14 +89,14 @@
float countSum = 0, count = 0;
if (keyFound.apply(temp) == true) {
- key = temp;
- temp = reader.readLine();
+ key = temp.trim();
+ temp = reader.readLine().trim();
}
while (keyFound.apply(temp) == false) {
- String strings[] = temp.split(",");
+ String strings[] = temp.trim().split(",");
String item = strings[0].trim();
- count = Integer.parseInt(strings[1].trim());
+ count = Integer.parseInt(strings[1]);
countSum += count;
list.add(new TranslatedRecommendedItemImpl(item, count));
temp = reader.readLine();
diff --git
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
index c771856..999260e 100644
---
a/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
+++
b/client/src/main/java/org/wikimedia/wikibase/entitysuggester/client/servlets/suggest/AbstractSuggesterServlet.java
@@ -7,8 +7,6 @@
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
-import javax.servlet.UnavailableException;
-import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.mahout.cf.taste.common.TasteException;
@@ -41,10 +39,7 @@
public void init() throws ServletException {
Recommender recommender = getRecommender();
if (recommender == null) {
- WebServlet webServlet =
this.getClass().getAnnotation(WebServlet.class);
- String ingestAction = "/entitysuggester" +
webServlet.urlPatterns();
- throw new UnavailableException("Please initialize the
recommendation engine by using " + ingestAction
- + "before making any requests to this suggester servlet");
+ throw new ServletException("Please initialize the recommendation
engine by using the ingest servlet before making any requests to this suggester
servlet");
}
}
@@ -67,7 +62,7 @@
inputList = INPUT_SEPARATOR.splitToList(pathInfo.substring(1));
}
int howMany = getHowMany(request);
-
+
try {
String jsonSuggestions =
getRecommender().recommendAsJSON(inputList, howMany);
response.getWriter().write(jsonSuggestions);
@@ -85,9 +80,9 @@
try {
howMany = Integer.parseInt(request.getParameter("howMany"));
} catch (NumberFormatException nfe) {
- return 0;
+ howMany = 0;
}
- Preconditions.checkArgument(howMany > 0, "howMany must be positive");
+ Preconditions.checkArgument(howMany > 0, "URL parameter howMany is
mandatory and must be positive");
return howMany;
}
}
diff --git a/client/src/main/webapp/META-INF/context.xml
b/client/src/main/webapp/META-INF/context.xml
index 396da1c..d3756bb 100644
--- a/client/src/main/webapp/META-INF/context.xml
+++ b/client/src/main/webapp/META-INF/context.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/client"/>
+<Context antiJARLocking="true" path="/entitysuggester"/>
diff --git a/myrrix-claimprops/pom.xml b/myrrix-claimprops/pom.xml
index 0663106..9f0b995 100644
--- a/myrrix-claimprops/pom.xml
+++ b/myrrix-claimprops/pom.xml
@@ -8,7 +8,7 @@
<version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>myrrix-web1</artifactId>
+ <artifactId>myrrix-claimprops</artifactId>
<packaging>war</packaging>
<name>Myrrix Web (WAR) - Claim Property Suggester</name>
<version>0.1</version>
@@ -41,7 +41,6 @@
</resource>
</webResources>
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
- <webXml>es-web.xml</webXml>
</configuration>
</plugin>
</plugins>
@@ -86,4 +85,7 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
+ <properties>
+ <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>
+ </properties>
</project>
diff --git a/myrrix-claimprops/src/main/webapp/META-INF/context.xml
b/myrrix-claimprops/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000..9178e25
--- /dev/null
+++ b/myrrix-claimprops/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/myrrix-claimprops"/>
diff --git a/myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
b/myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
index 39ccec5..7add916 100644
--- a/myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
+++ b/myrrix-claimprops/src/main/webapp/WEB-INF/web.xml
@@ -21,7 +21,7 @@
<context-param>
<param-name>net.myrrix.web.InitListener.LOCAL_INPUT_DIR</param-name>
- <param-value>myrrix</param-value>
+ <param-value>myrrix-claimprops</param-value>
</context-param>
<!--
@@ -108,16 +108,6 @@
<servlet-class>net.myrrix.web.servlets.LogServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>EntitySuggesterServlet</servlet-name>
-
<servlet-class>org.wikimedia.wikibase.entitysuggester.client.servlets.EntitySuggesterServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>DataIngestServlet</servlet-name>
-
<servlet-class>org.wikimedia.wikibase.entitysuggester.client.servlets.DataIngestServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
<servlet-mapping>
<servlet-name>PreferenceServlet</servlet-name>
@@ -166,14 +156,6 @@
<servlet-mapping>
<servlet-name>AllItemIDsServlet</servlet-name>
<url-pattern>/item/allIDs</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>EntitySuggesterServlet</servlet-name>
- <url-pattern>/entitysuggester/suggest/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>DataIngestServlet</servlet-name>
- <url-pattern>/entitysuggester/ingest/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
diff --git a/myrrix-refprops/pom.xml b/myrrix-refprops/pom.xml
index 55ce34c..dcd415b 100644
--- a/myrrix-refprops/pom.xml
+++ b/myrrix-refprops/pom.xml
@@ -8,7 +8,7 @@
<version>0.0.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>myrrix-web2</artifactId>
+ <artifactId>myrrix-refprops</artifactId>
<packaging>war</packaging>
<name>Myrrix Web (WAR) - Source Ref Property Suggester</name>
<version>0.1</version>
@@ -41,7 +41,6 @@
</resource>
</webResources>
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
- <webXml>es-web.xml</webXml>
</configuration>
</plugin>
</plugins>
@@ -86,4 +85,7 @@
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
+ <properties>
+ <netbeans.hint.deploy.server>Tomcat</netbeans.hint.deploy.server>
+ </properties>
</project>
diff --git a/myrrix-refprops/src/main/webapp/META-INF/context.xml
b/myrrix-refprops/src/main/webapp/META-INF/context.xml
new file mode 100644
index 0000000..d7474e9
--- /dev/null
+++ b/myrrix-refprops/src/main/webapp/META-INF/context.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context antiJARLocking="true" path="/myrrix-refprops"/>
diff --git a/myrrix-refprops/src/main/webapp/WEB-INF/web.xml
b/myrrix-refprops/src/main/webapp/WEB-INF/web.xml
index 39ccec5..d238f33 100644
--- a/myrrix-refprops/src/main/webapp/WEB-INF/web.xml
+++ b/myrrix-refprops/src/main/webapp/WEB-INF/web.xml
@@ -21,7 +21,7 @@
<context-param>
<param-name>net.myrrix.web.InitListener.LOCAL_INPUT_DIR</param-name>
- <param-value>myrrix</param-value>
+ <param-value>myrrix-refprops</param-value>
</context-param>
<!--
@@ -108,16 +108,6 @@
<servlet-class>net.myrrix.web.servlets.LogServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <servlet>
- <servlet-name>EntitySuggesterServlet</servlet-name>
-
<servlet-class>org.wikimedia.wikibase.entitysuggester.client.servlets.EntitySuggesterServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>DataIngestServlet</servlet-name>
-
<servlet-class>org.wikimedia.wikibase.entitysuggester.client.servlets.DataIngestServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
<servlet-mapping>
<servlet-name>PreferenceServlet</servlet-name>
@@ -166,14 +156,6 @@
<servlet-mapping>
<servlet-name>AllItemIDsServlet</servlet-name>
<url-pattern>/item/allIDs</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>EntitySuggesterServlet</servlet-name>
- <url-pattern>/entitysuggester/suggest/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>DataIngestServlet</servlet-name>
- <url-pattern>/entitysuggester/ingest/*</url-pattern>
</servlet-mapping>
<servlet-mapping>
--
To view, visit https://gerrit.wikimedia.org/r/85957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe20e20107c8b7b872bd24c49283f81459aea234
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikidataEntitySuggester
Gerrit-Branch: master
Gerrit-Owner: Nilesh <nil...@nileshc.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Nilesh <nil...@nileshc.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
