Author: mlizewski
Date: Fri Jun 21 12:03:28 2013
New Revision: 1495403
URL: http://svn.apache.org/r1495403
Log:
removed some "magic constants",
fixed pom.xml for newer version of native2ascii-maven-plugin
Modified:
manifoldcf/branches/CONNECTORS-727/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
manifoldcf/branches/CONNECTORS-727/connectors/generic/pom.xml
Modified:
manifoldcf/branches/CONNECTORS-727/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-727/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java?rev=1495403&r1=1495402&r2=1495403&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-727/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-727/connectors/generic/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/generic/GenericConnector.java
Fri Jun 21 12:03:28 2013
@@ -73,6 +73,16 @@ public class GenericConnector extends Ba
* Deny access token for default authority
*/
private final static String defaultAuthorityDenyToken = "DEAD_AUTHORITY";
+
+ private final static String ACTION_PARAM_NAME = "action";
+
+ private final static String ACTION_CHECK = "check";
+
+ private final static String ACTION_SEED = "seed";
+
+ private final static String ACTION_ITEMS = "items";
+
+ private final static String ACTION_ITEM = "item";
private String genericLogin = null;
@@ -146,7 +156,7 @@ public class GenericConnector extends Ba
@Override
public String check() throws ManifoldCFException {
HttpClient client = getClient();
- HttpGet method = new HttpGet(genericEntryPoint + "?action=check");
+ HttpGet method = new HttpGet(genericEntryPoint + "?" + ACTION_PARAM_NAME +
"=" + ACTION_CHECK);
try {
HttpResponse response = client.execute(method);
try {
@@ -174,7 +184,7 @@ public class GenericConnector extends Ba
try {
StringBuilder url = new StringBuilder(genericEntryPoint);
- url.append("?action=seed");
+
url.append("?").append(ACTION_PARAM_NAME).append("=").append(ACTION_SEED);
if (startTime > 0) {
url.append("&startTime=").append(sdf.format(new Date(startTime)));
}
@@ -248,7 +258,7 @@ public class GenericConnector extends Ba
String[] rval = new String[documentIdentifiers.length];
try {
StringBuilder url = new StringBuilder(genericEntryPoint);
- url.append("?action=items");
+
url.append("?").append(ACTION_PARAM_NAME).append("=").append(ACTION_ITEMS);
for (int i = 0; i < rval.length; i++) {
url.append("&id[]=").append(URLEncoder.encode(documentIdentifiers[i],
"UTF-8"));
rval[i] = null;
@@ -407,7 +417,7 @@ public class GenericConnector extends Ba
} else {
try {
StringBuilder url = new StringBuilder(genericEntryPoint);
- url.append("?action=item");
+
url.append("?").append(ACTION_PARAM_NAME).append("=").append(ACTION_ITEM);
url.append("&id=").append(URLEncoder.encode(documentIdentifiers[i],
"UTF-8"));
for (int j = 0; j < spec.getChildCount(); j++) {
SpecificationNode sn = spec.getChild(j);
Modified: manifoldcf/branches/CONNECTORS-727/connectors/generic/pom.xml
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-727/connectors/generic/pom.xml?rev=1495403&r1=1495402&r2=1495403&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-727/connectors/generic/pom.xml (original)
+++ manifoldcf/branches/CONNECTORS-727/connectors/generic/pom.xml Fri Jun 21
12:03:28 2013
@@ -34,7 +34,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
<dest>target/classes</dest>
<src>connector/src/main/native2ascii</src>
@@ -47,7 +47,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>**/*.properties</includes>
+ <includes>
+
<include>**/*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
