svn commit: r1688034 - in /manifoldcf/branches/dev_1x: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/

kwright Sun, 28 Jun 2015 11:30:05 -0700

Author: kwright
Date: Sun Jun 28 18:29:28 2015
New Revision: 1688034

URL: http://svn.apache.org/r1688034
Log:
Pull up fix for CONNECFTORS-1216 from trunk


Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
    
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
    
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
    
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jun 28 18:29:28 2015
@@ -124,4 +124,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,1678551,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303
+/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,1679730,1679826,1681390,1681735,1682232,1682252,1682410,1682602,1682622,1682719,1683208,1683506,1683529,1683768,1684015,1684017,1684153,1684156,1684712,1684866,1685547,1687097,1687303,1687768

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1688034&r1=1688033&r2=1688034&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Sun Jun 28 18:29:28 2015
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.10-dev =====================
 
+CONNECTORS-1216: Set default core/collection name
+and add required check on Solr connector.
+(Shinichiro Abe)
+
 CONNECTORS-1215: Fuzzyml parser needs to ignore "<" followed by
 whitespace, since those are technically not valid tags and some sites
 care.

Modified: 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1688034&r1=1688033&r2=1688034&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Sun Jun 28 18:29:28 2015
@@ -349,7 +349,7 @@ public class SolrConnector extends org.a
 
         String core = params.getParameter(SolrConfig.PARAM_CORE);
         if (core != null && core.length() == 0)
-          core = null;
+          core = "collection1";
 
         // Pick up timeouts
         String socketTimeoutString = 
params.getParameter(SolrConfig.PARAM_SOCKET_TIMEOUT);
@@ -795,6 +795,12 @@ public class SolrConnector extends org.a
 "    editconnection.webappname.focus();\n"+
 "    return false;\n"+
 "  }\n"+
+"  if (editconnection.core.value == \"\")\n"+
+"  {\n"+
+"    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.PleaseSupplySolrCoreName")+"\");\n"+
+"    editconnection.core.focus();\n"+
+"    return false;\n"+
+"  }\n"+
 "  if (editconnection.core.value != \"\" && 
editconnection.core.value.indexOf(\"/\") != -1)\n"+
 "  {\n"+
 "    
alert(\""+Messages.getBodyJavascriptString(locale,"SolrConnector.CoreNameCannotHaveCharacters")+"\");\n"+
@@ -985,7 +991,7 @@ public class SolrConnector extends org.a
 
     String core = parameters.getParameter(SolrConfig.PARAM_CORE);
     if (core == null)
-      core = "";
+      core = "collection1";
 
     String znodePath = 
parameters.getParameter(SolrConfig.PARAM_ZOOKEEPER_ZNODE_PATH);
     if (znodePath == null)

Modified: 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties?rev=1688034&r1=1688033&r2=1688034&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_en_US.properties
 Sun Jun 28 18:29:28 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=Please supply a valid Solr 
server name
 SolrConnector.SolrServerPortMustBeAValidInteger=Solr server port must be a 
valid integer
 SolrConnector.WebApplicationNameCannotHaveCharacters=Web application name 
cannot have '/' characters
+SolrConnector.PleaseSupplySolrCoreName=Please supply Solr core name
 SolrConnector.CoreNameCannotHaveCharacters=Core name cannot have '/' characters
 SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=Web application 
must be specified if core is specified
 SolrConnector.ConnectionTimeoutMustBeInteger=Connection timeout must be an 
integer

Modified: 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties?rev=1688034&r1=1688033&r2=1688034&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_ja_JP.properties
 Sun Jun 28 18:29:28 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=æ£ããSolrãµã¼ãåãå
¥åãã¦ãã ãã
 
SolrConnector.SolrServerPortMustBeAValidInteger=Solrãµã¼ããã¼ãçªå·ã«ã¯æ´æ°ãå
¥åãã¦ãã ãã
 
SolrConnector.WebApplicationNameCannotHaveCharacters=Webã¢ããªã±ã¼ã·ã§ã³åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
+SolrConnector.PleaseSupplySolrCoreName=ã³ã¢åãå¥åãã¦ãã ãã
 
SolrConnector.CoreNameCannotHaveCharacters=ã³ã¢åã«ã¯æåã/ãã¯ä½¿ãã¾ãã
 
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=ã³ã¢ãæå®ããå
 ´åã¯Webã¢ããªã±ã¼ã·ã§ã³ãæå®ãã¦ãã ãã
 SolrConnector.ConnectionTimeoutMustBeInteger=ã³ãã¯ã·ã§ã³ã¿ã¤ã 
ã¢ã¦ãã«ã¯æ´æ°ãå¥åãã¦ãã ãã

Modified: 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties?rev=1688034&r1=1688033&r2=1688034&view=diff
==============================================================================
--- 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 (original)
+++ 
manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/common_zh_CN.properties
 Sun Jun 28 18:29:28 2015
@@ -86,6 +86,7 @@ SolrConnector.ZnodePathMustStartWithACha
 SolrConnector.PleaseSupplyAValidSolrServerName=è¯·è¾å
¥ææçSolræå¡å¨å
 SolrConnector.SolrServerPortMustBeAValidInteger=Solræå¡å¨ç«¯å£å¿
é¡»ä¸ºææçæ´æ°
 
SolrConnector.WebApplicationNameCannotHaveCharacters=Webåºç¨ç¨åºåä¸è½å
å«åç¬¦â/â
+SolrConnector.PleaseSupplySolrCoreName==è¯·è¾å¥SolrCoreå
 SolrConnector.CoreNameCannotHaveCharacters=Coreåä¸è½åå«åç¬¦â/â
 
SolrConnector.WebApplicationMustBeSpecifiedIfCoreIsSpecified=å¦Coreå·²æå®åéæå®Webåºç¨ç¨åº
 SolrConnector.ConnectionTimeoutMustBeInteger=è¿æ¥è¶æ¶å¼å¿é¡»ä¸ºæ´æ°

svn commit: r1688034 - in /manifoldcf/branches/dev_1x: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ connectors/solr/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/solr/

Reply via email to