manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1678552 - in /manifoldcf/branches/dev_1x: ./ connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/ connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/
Date Sun, 10 May 2015 10:49:16 GMT
Author: kwright
Date: Sun May 10 10:49:15 2015
New Revision: 1678552

URL: http://svn.apache.org/r1678552
Log:
Pull up fix for CONNECTORS-1198 from trunk

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConfig.java
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editConfiguration_Parameters.html
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editSpecification_Configuration.html
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewConfiguration.html
    manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewSpecification.html

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 10 10:49:15 2015
@@ -123,4 +123,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
 4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
 1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471
+/manifoldcf/trunk:1620703,1620748,1620812,1620862,1621449,1621613,1621855,1622213,1622740,1622850,1622853-1622854,1623249,1623251,1623314,1623599,1623951,1623953-1623954,1623956,1623972,1624058,1624085,1624174,1624236,1624377,1624384,1624399,1624449,1624464,1624504,1624729-1624731,1624906,1624909-1624910,1624982,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,1628046,1628066,1628106,1628168,1628188,1628699,1628798,1628808,1628845,1628905,1629122,1629374-1629375,1629379,1629541,1629994,1630188,1630535,1630623,1630671,1630812,1630885,1631039,1631162,1631164,1631252,1631750,1631953,1632013,1632225,1632289,1632562,1632844,1632847,1632854,1633062-1633063,1633108,1633193,1633202,1633282,1633284,1633295,1633336,1633339,1633345,1633348,1633364,1633378,1633383,1633432,1633546,1633590,1633634,1633668,1633727,1633760,1633764,1633786,1633910,1633923,1634021,1634028,1634067,1634132,1634145,1634148,163
 4155,1634188,1634202,1634264,1634373,1634530,1634688,1634850,1634857,1635103,1635116,1635421,1635438,1635478,1635481,1635484,1635490,1635809,1635939,1636146,1636167,1636180,1636207,1636215,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1637310,1637350,1637364,1637373,1637378,1639259,1639593,1639600,1640018,1640101,1640199,1640204,1640208,1640314,1640319,1640749,1640772,1640805,1640888,1640925,1640941-1640942,1641222,1641328,1641557,1641559,1641629,1641633,1641724,1641754,1641911,1642163,1642255,1642318,1642531,1642650,1642658,1642673,1642716,1644197,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646408,1646640,1646947,1647574,1647585,1647608,1648686,1648976,1649201,1649203,1649529,1649605,1649628,1649794,1650351,1650722,1650741-1650742,1650745,1650747,1650911,1650954,1651332,1651539,1651907,1651921,1652071,1652974,1653175,1653899,1654651,1655205,1655261,1655264,1655377,1655411,1655618,1655914,1657346,1657443,1658004,1658036,1658121,1658155,1658188,1658463,1658476,
 1660258,1660276,1661454,1665848,1666160,1666781,1666820,1668312,1669100,1669238,1669487,1669523,1669586,1669660,1670614,1670625,1670715,1671496,1672169,1672301,1672616,1672737,1673559,1673573,1673579,1673722,1675781,1675898,1676094,1676882,1676910,1678300,1678329,1678471,1678551

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Sun May 10 10:49:15 2015
@@ -3,8 +3,12 @@ $Id$
 
 ======================= 1.10-dev =====================
 
+CONNECTORS-1198: SearchBlox connector session management not
+working properly.
+(Timo Selvaraj, Rafa Haro, Karl Wright)
+
 CONNECTORS-1197: Add "windows" file mode to file system output connector.
-(Karl Wright
+(Karl Wright)
 
 CONNECTORS-1195: Fix for NumberFormatException exception thrown in Maximum Bandwidth Report
 (Kishore Kumar)

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConfig.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConfig.java?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConfig.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConfig.java
Sun May 10 10:49:15 2015
@@ -12,9 +12,6 @@ class SearchBloxConfig {
 	static final String ATTRIBUTE_CONTENTBOOST = "content_boost";
 	static final String ATTRIBUTE_KEYWORDSBOOST = "keywords_boost";
 	static final String ATTRIBUTE_DESCRIPTIONBOOST = "description_boost";
-	static final String ATTRIBUTE_POOLSIZE = "poolsize";
-	static final String ATTRIBUTE_TIMEOUT_CONNECTION = "timeoutconnection";
-	static final String ATTRIBUTE_TIMEOUT_SOCKET = "timeoutsocket";
 	static final String ATTRIBUTE_INDEX_FORMAT = "indexformat";
 	static final String ATTRIBUTE_COLLECTION_NAME = "collection";
 

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/java/org/apache/manifoldcf/agents/output/searchblox/SearchBloxConnector.java
Sun May 10 10:49:15 2015
@@ -86,23 +86,26 @@ public class SearchBloxConnector extends
 	
 	private static final String SEARCHBLOX_ENDPOINT = "endpoint";
 	private static final String SEARCHBLOX_INDEXING_FORMAT = "indexformat";
-
-	private static final int BUILDER_DEFAULT_POOL_SIZE = 5;
-	private static final long BUILDER_DEFAULT_SOCKET_TIMEOUT = 60;
-	private static final long BUILDER_DEFAULT_CONNECTION_TIMEOUT = 60;
+	private static final String SEARCHBLOX_SOCKET_TIMEOUT = "sockettimeout";
+	private static final String SEARCHBLOX_CONNECTION_TIMEOUT = "connectiontimeout";
+	
+	private static final String BUILDER_DEFAULT_SOCKET_TIMEOUT = "60";
+	private static final String BUILDER_DEFAULT_CONNECTION_TIMEOUT = "60";
 
 	private SearchBloxClient client = null;
 	private String apiKey = null;
-	private String lastVersion = null;
 
-	private int poolSize = BUILDER_DEFAULT_POOL_SIZE;
-	private long socketTimeout = BUILDER_DEFAULT_SOCKET_TIMEOUT;
-	private long connectionTimeout = BUILDER_DEFAULT_CONNECTION_TIMEOUT;
-	
 	public SearchBloxConnector() {
 
 	}
 
+	/** Connect.
+	*/
+	@Override
+	public void connect(ConfigParams configParams) {
+		super.connect(configParams);
+	}
+	
 	/**
 	 * This method is called to assess whether to count this connector instance
 	 * should actually be counted as being connected.
@@ -138,12 +141,31 @@ public class SearchBloxConnector extends
 				CREATION_ACTIVITY };
 	}
 
-	protected void getSession() {
+	protected void getSession()
+		throws ManifoldCFException {
 		if (client == null) {
-			String endpoint = params.getParameter(SEARCHBLOX_ENDPOINT);
+			String connectionTimeoutString = params.getParameter(SEARCHBLOX_CONNECTION_TIMEOUT);
+			if (connectionTimeoutString == null)
+				connectionTimeoutString = BUILDER_DEFAULT_CONNECTION_TIMEOUT;
+			long connectionTimeout;
+			try {
+				connectionTimeout = Integer.parseInt(connectionTimeoutString);
+			} catch (NumberFormatException e) {
+				throw new ManifoldCFException("Bad connection timeout: "+e.getMessage(),e);
+			}
+			String socketTimeoutString = params.getParameter(SEARCHBLOX_SOCKET_TIMEOUT);
+			if (socketTimeoutString == null)
+				socketTimeoutString = BUILDER_DEFAULT_SOCKET_TIMEOUT;
+			long socketTimeout;
+			try {
+				socketTimeout = Integer.parseInt(socketTimeoutString);
+			} catch (NumberFormatException e) {
+				throw new ManifoldCFException("Bad socket timeout: "+e.getMessage(),e);
+			}
+			final String endpoint = params.getParameter(SEARCHBLOX_ENDPOINT);
 			this.apiKey = params.getParameter(SearchBloxDocument.API_KEY);
 			ResteasyClientBuilder builder = new ResteasyClientBuilder();
-			builder.connectionPoolSize(poolSize);
+			builder.connectionPoolSize(1);
 			builder.establishConnectionTimeout(connectionTimeout, TimeUnit.SECONDS);
 			builder.socketTimeout(socketTimeout, TimeUnit.SECONDS);
 			client = new SearchBloxClient(apiKey, builder, endpoint);
@@ -417,7 +439,7 @@ public class SearchBloxConnector extends
 			String tabName) throws ManifoldCFException, IOException {
 		super.outputConfigurationBody(threadContext, out, locale, parameters,
 				tabName);
-		Map<String, String> config = this.getConfigParameters(parameters);
+		Map<String, String> config = getConfigParameters(parameters);
 		outputResource(EDIT_CONFIG_FORWARD_PARAMETERS, out, locale, config,
 				tabName, null, null);
 	}
@@ -431,24 +453,37 @@ public class SearchBloxConnector extends
 	final private Map<String, String> getConfigParameters(
 			ConfigParams configParams) {
 		Map<String, String> map = new HashMap<String, String>();
-		if (configParams == null)
-			configParams = getConfiguration();
 
 		String apiKey = configParams.getParameter(SearchBloxDocument.API_KEY);
-		if(apiKey == null || apiKey.isEmpty())
+		if(apiKey == null)
 			apiKey = DEFAULT_APIKEY;
 		map.put(SearchBloxDocument.API_KEY, apiKey);
 		
 		String endpoint = configParams.getParameter(SEARCHBLOX_ENDPOINT);
-		if(endpoint == null || endpoint.isEmpty()) {
+		if(endpoint == null) {
 			endpoint = SearchBloxClient.DEFAULT_ENDPOINT;
 		}
 		map.put(SEARCHBLOX_ENDPOINT,
 				endpoint);
 		
 		String indexFormat = configParams.getParameter(SEARCHBLOX_INDEXING_FORMAT);
-		indexFormat = indexFormat == null ? IndexingFormat.JSON.name() : indexFormat;
+		if (indexFormat == null) {
+			indexFormat = IndexingFormat.JSON.name();
+		}
 		map.put(SEARCHBLOX_INDEXING_FORMAT, indexFormat);
+		
+		String connectionTimeout = configParams.getParameter(SEARCHBLOX_CONNECTION_TIMEOUT);
+		if (connectionTimeout == null) {
+			connectionTimeout = BUILDER_DEFAULT_CONNECTION_TIMEOUT;
+		}
+		map.put(SEARCHBLOX_CONNECTION_TIMEOUT, connectionTimeout);
+		
+		String socketTimeout = configParams.getParameter(SEARCHBLOX_SOCKET_TIMEOUT);
+		if (socketTimeout == null) {
+			socketTimeout = BUILDER_DEFAULT_SOCKET_TIMEOUT;
+		}
+		map.put(SEARCHBLOX_SOCKET_TIMEOUT, socketTimeout);
+		
 		return map;
 	}
 
@@ -495,6 +530,14 @@ public class SearchBloxConnector extends
 		if (indexformat != null)
 			parameters.setParameter(SEARCHBLOX_INDEXING_FORMAT, indexformat);
 
+		String connectionTimeout = variableContext.getParameter(SEARCHBLOX_CONNECTION_TIMEOUT);
+		if (connectionTimeout != null)
+			parameters.setParameter(SEARCHBLOX_CONNECTION_TIMEOUT, connectionTimeout);
+		
+		String socketTimeout = variableContext.getParameter(SEARCHBLOX_SOCKET_TIMEOUT);
+		if (socketTimeout != null)
+			parameters.setParameter(SEARCHBLOX_SOCKET_TIMEOUT, socketTimeout);
+		
 		return null;
 	}
 
@@ -528,13 +571,13 @@ public class SearchBloxConnector extends
 				"SearchBloxConnector.Configuration"));
 
 		// Fill in the specification header map, using data from all tabs.
-		fillInConfigurationSpecificationMap(paramMap, os);
+		fillInSpecificationMap(paramMap, os);
 
 		Messages.outputResourceWithVelocity(out, locale, EDIT_SPECIFICATION_JS,
 				paramMap);
 	}
 
-	private void fillInConfigurationSpecificationMap(
+	private void fillInSpecificationMap(
 			Map<String, Object> paramMap, Specification os) {
 
 		for (int i = 0, len = os.getChildCount(); i < len; i++) {
@@ -557,20 +600,6 @@ public class SearchBloxConnector extends
 						.getAttributeValue(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST);
 				if (descriptionBoost == null || descriptionBoost.isEmpty())
 					descriptionBoost = "0";
-				String poolSize = sn
-						.getAttributeValue(SearchBloxConfig.ATTRIBUTE_POOLSIZE);
-				if (poolSize == null || poolSize.isEmpty())
-					poolSize = String.valueOf(BUILDER_DEFAULT_POOL_SIZE);
-				String timeoutConnection = sn
-						.getAttributeValue(SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION);
-				if (timeoutConnection == null || timeoutConnection.isEmpty())
-					timeoutConnection = String
-							.valueOf(BUILDER_DEFAULT_CONNECTION_TIMEOUT);
-				String timeoutSocket = sn
-						.getAttributeValue(SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET);
-				if (timeoutSocket == null || timeoutSocket.isEmpty())
-					timeoutSocket = String
-							.valueOf(BUILDER_DEFAULT_SOCKET_TIMEOUT);
 
 				String collection = sn
 						.getAttributeValue(SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME);
@@ -585,13 +614,6 @@ public class SearchBloxConnector extends
 						keywordsBoost);
 				paramMap.put(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST.toUpperCase(),
 						descriptionBoost);
-				paramMap.put(SearchBloxConfig.ATTRIBUTE_POOLSIZE.toUpperCase(),
-						poolSize);
-				paramMap.put(SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION
-						.toUpperCase(), timeoutConnection);
-				paramMap.put(
-						SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET.toUpperCase(),
-						timeoutSocket);
 				paramMap.put(SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME
 						.toUpperCase(), collection);
 
@@ -604,13 +626,6 @@ public class SearchBloxConnector extends
 		paramMap.put(SearchBloxConfig.ATTRIBUTE_CONTENTBOOST.toUpperCase(), 0);
 		paramMap.put(SearchBloxConfig.ATTRIBUTE_KEYWORDSBOOST.toUpperCase(), 0);
 		paramMap.put(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST.toUpperCase(), 0);
-		paramMap.put(SearchBloxConfig.ATTRIBUTE_POOLSIZE.toUpperCase(),
-				BUILDER_DEFAULT_POOL_SIZE);
-		paramMap.put(
-				SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION.toUpperCase(),
-				BUILDER_DEFAULT_CONNECTION_TIMEOUT);
-		paramMap.put(SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET.toUpperCase(),
-				BUILDER_DEFAULT_SOCKET_TIMEOUT);
 		paramMap.put(SearchBloxConfig.ATTRIBUTE_INDEX_FORMAT.toUpperCase(),
 				IndexingFormat.XML.name());
 		paramMap.put(SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME.toUpperCase(),
@@ -642,7 +657,7 @@ public class SearchBloxConnector extends
 		paramMap.put("SEQNUM", Integer.toString(connectionSequenceNumber));
 
 		// Fill in the map with data from all tabs
-		fillInConfigurationSpecificationMap(paramMap, os);
+		fillInSpecificationMap(paramMap, os);
 
 		Messages.outputResourceWithVelocity(out, locale,
 				VIEW_SPECIFICATION_HTML, paramMap);
@@ -684,7 +699,7 @@ public class SearchBloxConnector extends
 		paramMap.put("SELECTEDNUM", Integer.toString(actualSequenceNumber));
 
 		// Fill in the field mapping tab data
-		fillInConfigurationSpecificationMap(paramMap, os);
+		fillInSpecificationMap(paramMap, os);
 
 		Messages.outputResourceWithVelocity(out, locale,
 				EDIT_SPECIFICATION_CONFIGURATION_HTML, paramMap);
@@ -724,12 +739,6 @@ public class SearchBloxConnector extends
 				+ SearchBloxConfig.ATTRIBUTE_KEYWORDSBOOST);
 		String descriptionBoost = variableContext.getParameter(seqPrefix
 				+ SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST);
-		String poolSize = variableContext.getParameter(seqPrefix
-				+ SearchBloxConfig.ATTRIBUTE_POOLSIZE);
-		String timeoutConnection = variableContext.getParameter(seqPrefix
-				+ SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION);
-		String timeoutSocket = variableContext.getParameter(seqPrefix
-				+ SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET);
 		String collection = variableContext.getParameter(seqPrefix
 				+ SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME);
 		String indexFormat = variableContext.getParameter(seqPrefix
@@ -751,11 +760,6 @@ public class SearchBloxConnector extends
 		node.setAttribute(SearchBloxConfig.ATTRIBUTE_CONTENTBOOST, contentBoost);
 		node.setAttribute(SearchBloxConfig.ATTRIBUTE_KEYWORDSBOOST, keywordsBoost);
 		node.setAttribute(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST, descriptionBoost);
-		node.setAttribute(SearchBloxConfig.ATTRIBUTE_POOLSIZE, poolSize);
-		node.setAttribute(SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION,
-				timeoutConnection);
-		node.setAttribute(SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET,
-				timeoutSocket);
 		node.setAttribute(SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME,
 				collection);
 		node.setAttribute(SearchBloxConfig.ATTRIBUTE_INDEX_FORMAT, indexFormat);
@@ -766,7 +770,7 @@ public class SearchBloxConnector extends
 	}
 	
 
-	protected class SpecPacker {
+	protected static class SpecPacker {
 		/** Arguments, from configuration */
 	    private final Multimap<String, String> args = HashMultimap.create();
 	    
@@ -794,17 +798,11 @@ public class SearchBloxConnector extends
 	          String keywordsBoost = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_KEYWORDSBOOST);
 	          String descriptionBoost = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST);
 	          String collection = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_COLLECTION_NAME);
-	          String poolSize = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_POOLSIZE);
-	          String connectTimeout = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION);
-	          String socketTimeout = node.getAttributeValue(SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET);
 	          args.put(SearchBloxConfig.ATTRIBUTE_TITLEBOOST, titleBoost);
 	          args.put(SearchBloxConfig.ATTRIBUTE_CONTENTBOOST, contentBoost);
 	          args.put(SearchBloxConfig.ATTRIBUTE_KEYWORDSBOOST, keywordsBoost);
 	          args.put(SearchBloxConfig.ATTRIBUTE_DESCRIPTIONBOOST, descriptionBoost);
 	          args.put(SearchBloxDocument.SEARCHBLOX_COLLECTION, collection);
-	          args.put(SearchBloxConfig.ATTRIBUTE_POOLSIZE, poolSize);
-	          args.put(SearchBloxConfig.ATTRIBUTE_TIMEOUT_CONNECTION, connectTimeout);
-	          args.put(SearchBloxConfig.ATTRIBUTE_TIMEOUT_SOCKET, socketTimeout);
 	          
 	        }
 	      }

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editConfiguration_Parameters.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editConfiguration_Parameters.html?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editConfiguration_Parameters.html
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editConfiguration_Parameters.html
Sun May 10 10:49:15 2015
@@ -42,6 +42,19 @@
  	  </select>
     </td>
   </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutConnection'))</nobr></td>
+    <td class="value">
+      <input type="text" name="connectiontimeout" size="16" value="$Encoder.attributeEscape($CONNECTIONTIMEOUT)"
/>
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutSocket'))</nobr></td>
+    <td class="value">
+      <input type="text" name="sockettimeout" size="16" value="$Encoder.attributeEscape($SOCKETTIMEOUT)"
/>
+    </td>
+  </tr>
+
 </table>
 
 #else
@@ -49,6 +62,8 @@
 <input type="hidden" name="apikey" value="$Encoder.attributeEscape($APIKEY)" />
 <input type="hidden" name="endpoint" value="$Encoder.attributeEscape($ENDPOINT)" />
 <input type="hidden" name="indexformat" value="$Encoder.attributeEscape($INDEXFORMAT)"/>
+<input type="hidden" name="connectiontimeout" value="$Encoder.attributeEscape($CONNECTIONTIMEOUT)"/>
+<input type="hidden" name="sockettimeout" value="$Encoder.attributeEscape($SOCKETTIMEOUT)"/>
 
 
 

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editSpecification_Configuration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editSpecification_Configuration.html?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editSpecification_Configuration.html
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/editSpecification_Configuration.html
Sun May 10 10:49:15 2015
@@ -44,24 +44,6 @@
     </td>
   </tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.PoolSize'))</nobr></td>
-    <td class="value">
-      <input type="text" name="s${SEQNUM}_poolsize" value="$Encoder.attributeEscape($POOLSIZE)"
/>
-    </td>
-  </tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutConnection'))</nobr></td>
-    <td class="value">
-      <input type="text" name="s${SEQNUM}_timeoutconnection" value="$Encoder.attributeEscape($TIMEOUTCONNECTION)"
/>
-    </td>
-  </tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutSocket'))</nobr></td>
-    <td class="value">
-      <input type="text" name="s${SEQNUM}_timeoutsocket" value="$Encoder.attributeEscape($TIMEOUTSOCKET)"
/>
-    </td>
-  </tr>
-  <tr>
     <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.Collection'))</nobr></td>
     <td class="value">
       <input type="text" name="s${SEQNUM}_collection" value="$Encoder.attributeEscape($COLLECTION)"
/>
@@ -76,9 +58,6 @@
 <input type="hidden" name="s${SEQNUM}_content_boost" value="${CONTENT_BOOST}"/>
 <input type="hidden" name="s${SEQNUM}_description_boost" value="${DESCRIPTION_BOOST}"/>
 <input type="hidden" name="s${SEQNUM}_keywords_boost" value="${KEYWORDS_BOOST}"/>
-<input type="hidden" name="s${SEQNUM}_poolsize" value="${POOLSIZE}"/>
-<input type="hidden" name="s${SEQNUM}_timeoutconnection" value="${TIMEOUTCONNECTION}"/>
-<input type="hidden" name="s${SEQNUM}_timeoutsocket" value="${TIMEOUTSOCKET}"/>
 <input type="hidden" name="s${SEQNUM}_collection" value="${COLLECTION}"/>
 
 #end
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewConfiguration.html?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewConfiguration.html
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewConfiguration.html
Sun May 10 10:49:15 2015
@@ -28,4 +28,13 @@
     <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.IndexFormat'))</nobr></td>
     <td class="value">$Encoder.bodyEscape($INDEXFORMAT)</td>
   </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutConnection'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($CONNECTIONTIMEOUT)</nobr></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutSocket'))</nobr></td>
+    <td class="value"><nobr>$Encoder.bodyEscape($SOCKETTIMEOUT)</nobr></td>
+  </tr>
 </table>
\ No newline at end of file

Modified: manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewSpecification.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewSpecification.html?rev=1678552&r1=1678551&r2=1678552&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewSpecification.html
(original)
+++ manifoldcf/branches/dev_1x/connectors/searchblox/connector/src/main/resources/org/apache/manifoldcf/agents/output/searchblox/viewSpecification.html
Sun May 10 10:49:15 2015
@@ -38,21 +38,6 @@
   </tr>
   <tr><td class="separator" colspan="2"><hr/></td></tr>
   <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.PoolSize'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($POOLSIZE)</nobr></td>
-  </tr>
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutConnection'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($TIMEOUTCONNECTION)</nobr></td>
-  </tr>
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
-    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.TimeoutSocket'))</nobr></td>
-    <td class="value"><nobr>$Encoder.bodyEscape($TIMEOUTSOCKET)</nobr></td>
-  </tr>
-  <tr><td class="separator" colspan="2"><hr/></td></tr>
-  <tr>
     <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('SearchBloxConnector.Collection'))</nobr></td>
     <td class="value"><nobr>$Encoder.bodyEscape($COLLECTION)</nobr></td>
   </tr>



Mime
View raw message