Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33D1EC479 for ; Tue, 23 Dec 2014 14:52:26 +0000 (UTC) Received: (qmail 83027 invoked by uid 500); 23 Dec 2014 14:52:26 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 82979 invoked by uid 500); 23 Dec 2014 14:52:26 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 82969 invoked by uid 99); 23 Dec 2014 14:52:26 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Dec 2014 14:52:26 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 280D6AC092A; Tue, 23 Dec 2014 14:52:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1647586 [1/2] - in /manifoldcf/branches/dev_1x: ./ connectors/email/ connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/ connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notif... Date: Tue, 23 Dec 2014 14:52:22 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20141223145225.280D6AC092A@hades.apache.org> Author: kwright Date: Tue Dec 23 14:52:20 2014 New Revision: 1647586 URL: http://svn.apache.org/r1647586 Log: Pull up fix for CONNECTORS-1119 from trunk Added: manifoldcf/branches/dev_1x/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/ - copied from r1647585, manifoldcf/trunk/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/ manifoldcf/branches/dev_1x/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/ - copied from r1647585, manifoldcf/trunk/connectors/email/connector/src/main/native2ascii/org/apache/manifoldcf/crawler/notifications/ manifoldcf/branches/dev_1x/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/ - copied from r1647585, manifoldcf/trunk/connectors/email/connector/src/main/resources/org/apache/manifoldcf/crawler/notifications/ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editnotification.jsp - copied unchanged from r1647585, manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editnotification.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/listnotifications.jsp - copied unchanged from r1647585, manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewnotification.jsp - copied unchanged from r1647585, manifoldcf/trunk/framework/crawler-ui/src/main/webapp/viewnotification.jsp manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnection.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnection.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectionManager.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectionManager.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnector.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnector.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectorManager.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectorManager.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectorPool.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/INotificationConnectorPool.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectionManagerFactory.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectionManagerFactory.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorFactory.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorFactory.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorManagerFactory.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorManagerFactory.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorPoolFactory.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/NotificationConnectorPoolFactory.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/NotificationManager.java - copied unchanged from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/NotificationManager.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notification/ - copied from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notification/ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notificationconnectorpool/ - copied from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notificationconnectorpool/ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notificationconnmgr/ - copied from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notificationconnmgr/ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notifications/ - copied from r1647585, manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/notifications/ Modified: manifoldcf/branches/dev_1x/ (props changed) manifoldcf/branches/dev_1x/CHANGES.txt manifoldcf/branches/dev_1x/connectors/email/build.xml manifoldcf/branches/dev_1x/framework/ (props changed) manifoldcf/branches/dev_1x/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml manifoldcf/branches/dev_1x/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editjob.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editoutput.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/edittransformation.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/execute.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/navigation.jsp manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewjob.jsp manifoldcf/branches/dev_1x/framework/example-common/connectors.xml manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/CacheKeyFactory.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/IdleCleanupThread.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobNotificationThread.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/ManifoldCF.java manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties manifoldcf/branches/dev_1x/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties Propchange: manifoldcf/branches/dev_1x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 23 14:52:20 2014 @@ -44,6 +44,7 @@ /manifoldcf/branches/CONNECTORS-1100:1637693-1640317 /manifoldcf/branches/CONNECTORS-1104:1640149-1640198 /manifoldcf/branches/CONNECTORS-1118:1644108-1644398 +/manifoldcf/branches/CONNECTORS-1119:1645497-1647584 /manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451 /manifoldcf/branches/CONNECTORS-120-1:1416450-1417056 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634 @@ -118,4 +119,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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1634155,1634188,163 4202,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 +/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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1634155,1634188,163 4202,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 Modified: manifoldcf/branches/dev_1x/CHANGES.txt URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/CHANGES.txt (original) +++ manifoldcf/branches/dev_1x/CHANGES.txt Tue Dec 23 14:52:20 2014 @@ -3,6 +3,9 @@ $Id$ ======================= 1.9-dev ===================== +CONNECTORS-1119: Add support for notification connectors, and +an email notification connector. +(Karl Wright) ======================= Release 1.8 ===================== Modified: manifoldcf/branches/dev_1x/connectors/email/build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/email/build.xml?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/connectors/email/build.xml (original) +++ manifoldcf/branches/dev_1x/connectors/email/build.xml Tue Dec 23 14:52:20 2014 @@ -35,6 +35,10 @@ limitations under the License. + + + + \ No newline at end of file Propchange: manifoldcf/branches/dev_1x/framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 23 14:52:20 2014 @@ -113,4 +113,4 @@ /manifoldcf/branches/CONNECTORS-989/framework:1611600-1612101 /manifoldcf/branches/CONNECTORS-990/framework:1610284-1610707 /manifoldcf/trunk:1629122 -/manifoldcf/trunk/framework: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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1 642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574 +/manifoldcf/trunk/framework: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,1625023,1625095,1625103,1625108,1625264,1625270,1625394,1625400,1625910,1626090,1626097,1626102,1626638-1626639,1626973,1627687,1627690,1627959,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,1632013,1632289,1632844,1633108,1633193,1633202,1633348,1633364,1634145,1634148,1634155,1634264,1634373,1634530,1635438,1635809,1636146,1636180,1636207,1636232,1636334,1636519,1636570,1636684,1636940,1637011,1639593,1639600,1640018,1640101,1640199,1640314,1640319,1640749,1640772,1640925,1640941,1641222,1641557,1641559,1641724,1641911,1 642163,1642255,1642318,1644197,1644399,1646317,1646397,1646403,1646640,1647574,1647585 Modified: manifoldcf/branches/dev_1x/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java (original) +++ manifoldcf/branches/dev_1x/framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/IdleCleanupThread.java Tue Dec 23 14:52:20 2014 @@ -53,6 +53,7 @@ public class IdleCleanupThread extends T IThreadContext threadContext = ThreadContextFactory.make(); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext); @@ -66,6 +67,7 @@ public class IdleCleanupThread extends T { // Do the cleanup repositoryConnectorPool.pollAllConnectors(); + notificationConnectorPool.pollAllConnectors(); outputConnectorPool.pollAllConnectors(); transformationConnectorPool.pollAllConnectors(); authorityConnectorPool.pollAllConnectors(); Modified: manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml (original) +++ manifoldcf/branches/dev_1x/framework/buildfiles/connector-build.xml Tue Dec 23 14:52:20 2014 @@ -888,6 +888,25 @@ + + + + + + + + + + + + + + + + + + + Modified: manifoldcf/branches/dev_1x/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java (original) +++ manifoldcf/branches/dev_1x/framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/IdleCleanupThread.java Tue Dec 23 14:52:20 2014 @@ -53,6 +53,7 @@ public class IdleCleanupThread extends T IThreadContext threadContext = ThreadContextFactory.make(); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext); @@ -66,6 +67,7 @@ public class IdleCleanupThread extends T { // Do the cleanup repositoryConnectorPool.pollAllConnectors(); + notificationConnectorPool.pollAllConnectors(); outputConnectorPool.pollAllConnectors(); transformationConnectorPool.pollAllConnectors(); authorityConnectorPool.pollAllConnectors(); Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/java/org/apache/manifoldcf/crawlerui/IdleCleanupThread.java Tue Dec 23 14:52:20 2014 @@ -53,6 +53,7 @@ public class IdleCleanupThread extends T IThreadContext threadContext = ThreadContextFactory.make(); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); IAuthorityConnectorPool authorityConnectorPool = AuthorityConnectorPoolFactory.make(threadContext); @@ -66,6 +67,7 @@ public class IdleCleanupThread extends T { // Do the cleanup repositoryConnectorPool.pollAllConnectors(); + notificationConnectorPool.pollAllConnectors(); outputConnectorPool.pollAllConnectors(); transformationConnectorPool.pollAllConnectors(); authorityConnectorPool.pollAllConnectors(); Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editjob.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editjob.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editjob.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editjob.jsp Tue Dec 23 14:52:20 2014 @@ -33,6 +33,8 @@ IJobManager manager = JobManagerFactory.make(threadContext); IRepositoryConnectionManager connMgr = RepositoryConnectionManagerFactory.make(threadContext); IRepositoryConnection[] connList = connMgr.getAllConnections(); + INotificationConnectionManager notificationMgr = NotificationConnectionManagerFactory.make(threadContext); + INotificationConnection[] notificationList = notificationMgr.getAllConnections(); IOutputConnectionManager outputMgr = OutputConnectionManagerFactory.make(threadContext); IOutputConnection[] outputList = outputMgr.getAllConnections(); ITransformationConnectionManager transformationMgr = TransformationConnectionManagerFactory.make(threadContext); @@ -40,6 +42,7 @@ IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); // Figure out tab name and sequence number @@ -89,6 +92,10 @@ int[] pipelinePrerequisites = new int[0]; Specification[] pipelineSpecifications = new Specification[0]; + String[] notificationConnectionNames = new String[0]; + String[] notificationDescriptions = new String[0]; + Specification[] notificationSpecifications = new Specification[0]; + ArrayList scheduleRecords = new ArrayList(); EnumeratedValues dayOfWeek = null; @@ -141,6 +148,16 @@ pipelinePrerequisites[j] = job.getPipelineStagePrerequisite(j); pipelineSpecifications[j] = job.getPipelineStageSpecification(j); } + notificationConnectionNames = new String[job.countNotifications()]; + notificationDescriptions = new String[job.countNotifications()]; + notificationSpecifications = new Specification[job.countNotifications()]; + for (int j = 0; j < job.countNotifications(); j++) + { + notificationConnectionNames[j] = job.getNotificationConnectionName(j); + notificationDescriptions[j] = job.getNotificationDescription(j); + notificationSpecifications[j] = job.getNotificationSpecification(j); + } + type = job.getType(); startMethod = job.getStartMethod(); hopcountMode = job.getHopcountMode(); @@ -209,11 +226,19 @@ String saveCheckMethod = "checkSpecificationForSave"; String[] pipelineCheckMethods = new String[pipelineConnectionNames.length]; String[] pipelineCheckForSaveMethods = new String[pipelineConnectionNames.length]; + String[] notificationCheckMethods = new String[notificationConnectionNames.length]; + String[] notificationCheckForSaveMethods = new String[notificationConnectionNames.length]; + for (int j = 0; j < pipelineConnectionNames.length; j++) { pipelineCheckMethods[j] = "unknown"; pipelineCheckForSaveMethods[j] = "unknown"; } + for (int j = 0; j < notificationConnectionNames.length; j++) + { + notificationCheckMethods[j] = "unknown"; + notificationCheckForSaveMethods[j] = "unknown"; + } if (connection != null) { @@ -255,6 +280,20 @@ } } + for (int j = 0; j < notificationConnectionNames.length; j++) + { + INotificationConnection notificationConnection = notificationMgr.load(notificationConnectionNames[j]); + if (notificationConnection != null) + { + INotificationConnector notificationConnector = NotificationConnectorFactory.getConnectorNoCheck(notificationConnection.getClassName()); + if (notificationConnector != null) + { + notificationCheckMethods[j] = notificationConnector.getFormCheckJavascriptMethodName(1+pipelineConnectionNames.length+j); + notificationCheckForSaveMethods[j] = notificationConnector.getFormPresaveCheckJavascriptMethodName(1+pipelineConnectionNames.length+j); + } + + } + } %> @@ -351,6 +390,16 @@ } <% } + for (int j = 0; j < notificationCheckForSaveMethods.length; j++) + { +%> + if (window.<%=notificationCheckForSaveMethods[j]%>) + { + if (<%=notificationCheckForSaveMethods[j]%>() == false) + return; + } +<% + } %> if (window.<%=saveCheckMethod%>) { @@ -418,7 +467,28 @@ else postFormSetAnchor("pipeline_"+(n-1)+"_tag"); } + + function AppendNotification() + { + if (editjob.notification_connectionname.value == "") + { + alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editjob.SelectANotificationConnectionName")%>"); + editjob.notification_connectionname.focus(); + return; + } + document.editjob.notification_op.value="Add"; + postFormSetAnchor("notification_tag"); + } + function DeleteNotification(n) + { + eval("document.editjob.notification_"+n+"_op.value = 'Delete'"); + if (n == 0) + postFormSetAnchor("notification_tag"); + else + postFormSetAnchor("notification_"+(n-1)+"_tag"); + } + function AddScheduledTime() { if (editjob.duration.value != "" && !isInteger(editjob.duration.value)) @@ -486,6 +556,16 @@ } <% } + for (int j = 0; j < notificationCheckMethods.length; j++) + { +%> + if (window.<%=notificationCheckMethods[j]%>) + { + if (<%=notificationCheckMethods[j]%>() == false) + return false; + } +<% + } %> // Check the connector part if (window.<%=checkMethod%>) @@ -664,6 +744,33 @@ %> +<% + for (int j = 0; j < notificationConnectionNames.length; j++) + { + INotificationConnection notificationConnection = notificationMgr.load(notificationConnectionNames[j]); + if (notificationConnection != null) + { + INotificationConnector notificationConnector = notificationConnectorPool.grab(notificationConnection); + if (notificationConnector != null) + { + try + { + notificationConnector.outputSpecificationHeader(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),notificationSpecifications[j],1+pipelineConnectionNames.length+j,tabsArray); + } + finally + { + notificationConnectorPool.release(notificationConnection,notificationConnector); + } + } + } + Integer connectionSequenceNumber = new Integer(1+pipelineConnectionNames.length+j); + while (sequenceArray.size() < tabsArray.size()) + { + sequenceArray.add(connectionSequenceNumber); + } + } +%> + @@ -1216,7 +1323,94 @@ - + +<% + alreadyPresent = new HashSet(); + for (int j = 0; j < notificationConnectionNames.length; j++) + { + alreadyPresent.add(notificationConnectionNames[j]); + } + if (notificationList.length > 0) + { +%> + + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.NotificationsColon")%> + + + + + + + + +<% + rowCounter = 0; + for (int j = 0; j < notificationConnectionNames.length; j++) + { + String notificationConnectionName = notificationConnectionNames[j]; + String notificationDescription = notificationDescriptions[j]; + if (notificationDescription == null) + notificationDescription = ""; +%> + "> + + + + + +<% + } + if (notificationList.length != alreadyPresent.size()) + { +%> + + + + + + + +<% + } +%> +
+ + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.StageNumber")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.NotificationDescription")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.NotificationConnectionName")%>
+ + + " alt='<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editjob.Deletenotification")%>' onclick="javascript:DeleteNotification(<%=j%>);"/> + <%=(j+pipelineConnectionNames.length+2)%>. + + + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(notificationConnectionName)%> + +
+ + + + + + + +
+ + +<% + } +%>
@@ -1252,6 +1446,7 @@ %> + <% for (int j = 0; j < pipelineConnectionNames.length; j++) { @@ -1266,6 +1461,18 @@ <% } + for (int j = 0; j < notificationConnectionNames.length; j++) + { + String notificationConnectionName = notificationConnectionNames[j]; + String notificationDescription = notificationDescriptions[j]; + if (notificationDescription == null) + notificationDescription = ""; +%> + + +<% + } + %> @@ -1791,6 +1998,26 @@ } } } + } + + for (int j = 0; j < notificationConnectionNames.length; j++) + { + INotificationConnection notificationConnection = notificationMgr.load(notificationConnectionNames[j]); + if (notificationConnection != null) + { + INotificationConnector notificationConnector = notificationConnectorPool.grab(notificationConnection); + if (notificationConnector != null) + { + try + { + notificationConnector.outputSpecificationBody(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),notificationSpecifications[j],1+pipelineConnectionNames.length+j,tabSequenceInt,tabName); + } + finally + { + notificationConnectorPool.release(notificationConnection,notificationConnector); + } + } + } } %> Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editoutput.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editoutput.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/editoutput.jsp Tue Dec 23 14:52:20 2014 @@ -232,7 +232,7 @@ { %>

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.EditOutputConnection")%>

-
No output connectors registered
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editoutput.NoOutputConnectorsRegistered")%>
<% } else Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/edittransformation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/edittransformation.jsp Tue Dec 23 14:52:20 2014 @@ -231,8 +231,8 @@ if (set.getRowCount() == 0) { %> -

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%>

-
No transformation connectors registered
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%>

+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%>
<% } else Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/execute.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/execute.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/execute.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/execute.jsp Tue Dec 23 14:52:20 2014 @@ -47,6 +47,7 @@ IJobManager manager = JobManagerFactory.make(threadContext); IAuthorityGroupManager authGroupManager = AuthorityGroupManagerFactory.make(threadContext); IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(threadContext); + INotificationConnectionManager notificationManager = NotificationConnectionManagerFactory.make(threadContext); IAuthorityConnectionManager authConnManager = AuthorityConnectionManagerFactory.make(threadContext); IMappingConnectionManager mappingConnManager = MappingConnectionManagerFactory.make(threadContext); IOutputConnectionManager outputManager = OutputConnectionManagerFactory.make(threadContext); @@ -55,6 +56,7 @@ IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); String type = variableContext.getParameter("type"); String op = variableContext.getParameter("op"); @@ -865,6 +867,121 @@ <% } } + else if (type != null && op != null && type.equals("notification")) + { + // -- Notification connection editing operations -- + if (op.equals("Save") || op.equals("Continue")) + { + try + { + // Set up a connection object that is a merge of an existing connection object plus what was posted. + INotificationConnection connection = null; + boolean isNew = true; + String x = variableContext.getParameter("isnewconnection"); + if (x != null) + isNew = x.equals("true"); + + String connectionName = variableContext.getParameter("connname"); + // If the connectionname is not null, load the connection description and prepopulate everything with what comes from it. + if (connectionName != null && connectionName.length() > 0 && !isNew) + { + connection = notificationManager.load(connectionName); + } + + if (connection == null) + { + connection = notificationManager.create(); + if (connectionName != null && connectionName.length() > 0) + connection.setName(connectionName); + } + + // Gather all the data from the form. + connection.setIsNew(isNew); + x = variableContext.getParameter("description"); + if (x != null) + connection.setDescription(x); + x = variableContext.getParameter("classname"); + if (x != null) + connection.setClassName(x); + x = variableContext.getParameter("maxconnections"); + if (x != null && x.length() > 0) + connection.setMaxConnections(Integer.parseInt(x)); + + String error = NotificationConnectorFactory.processConfigurationPost(threadContext,connection.getClassName(),variableContext,pageContext.getRequest().getLocale(),connection.getConfigParams()); + + if (error != null) + { + variableContext.setParameter("text",error); + variableContext.setParameter("target","listnotifications.jsp"); +%> + +<% + } + + if (op.equals("Continue")) + { + threadContext.save("ConnectionObject",connection); +%> + +<% + } + else if (op.equals("Save")) + { + notificationManager.save(connection); + variableContext.setParameter("connname",connectionName); +%> + +<% + } + } + catch (ManifoldCFException e) + { + e.printStackTrace(); + variableContext.setParameter("text",e.getMessage()); + variableContext.setParameter("target","listnotifications.jsp"); +%> + +<% + } + } + else if (op.equals("Delete")) + { + try + { + String connectionName = variableContext.getParameter("connname"); + if (connectionName == null) + throw new ManifoldCFException("Missing connection parameter"); + notificationManager.delete(connectionName); +%> + +<% + } + catch (ManifoldCFException e) + { + e.printStackTrace(); + variableContext.setParameter("text",e.getMessage()); + variableContext.setParameter("target","listnotifications.jsp"); +%> + +<% + } + } + else if (op.equals("Cancel")) + { +%> + +<% + } + else + { + // Error + variableContext.setParameter("text","Illegal parameter to notification connection execution page"); + variableContext.setParameter("target","listnotifications.jsp"); +%> + +<% + } + } else if (type != null && op != null && type.equals("job")) { // -- Job editing operations -- @@ -918,6 +1035,21 @@ job.addPipelineStage(precedent, isOutput, connectionName, description); } } + x = variableContext.getParameter("notification_count"); + if (x != null) + { + // Do we need to keep the old specifications around, or can we destroy them? + // Not clear that retention is required., so I'm not wasting time trying to implement that. + int count = Integer.parseInt(x); + job.clearNotifications(); + for (int j = 0; j < count; j++) + { + // Gather everything first; we'll look at edits later + String connectionName = variableContext.getParameter("notification_"+j+"_connectionname"); + String description = variableContext.getParameter("notification_"+j+"_description"); + job.addNotification(connectionName, description); + } + } x = variableContext.getParameter("schedulerecords"); String[] y; @@ -1268,6 +1400,34 @@ } } + for (int j = 0; j < job.countNotifications(); j++) + { + INotificationConnection notificationConnection = notificationManager.load(job.getNotificationConnectionName(j)); + if (notificationConnection != null) + { + INotificationConnector notificationConnector = notificationConnectorPool.grab(notificationConnection); + if (notificationConnector != null) + { + try + { + String error = notificationConnector.processSpecificationPost(variableContext,pageContext.getRequest().getLocale(),job.getNotificationSpecification(j),1+job.countPipelineStages()+j); + if (error != null) + { + variableContext.setParameter("text",error); + variableContext.setParameter("target","listjobs.jsp"); +%> + +<% + } + } + finally + { + notificationConnectorPool.release(notificationConnection,notificationConnector); + } + } + } + } + // Now, after gathering is complete, consider doing changes to the pipeline. int currentStage = 0; for (int j = 0; j < job.countPipelineStages(); j++) @@ -1298,6 +1458,7 @@ else currentStage++; } + x = variableContext.getParameter("output_op"); if (x != null && x.equals("Add")) { @@ -1308,6 +1469,28 @@ job.addPipelineStage(precedent,true,connectionName,description); } + currentStage = 0; + for (int j = 0; j < job.countNotifications(); j++) + { + // Look at the operation + x = variableContext.getParameter("notification_"+j+"_op"); + if (x != null && x.equals("Delete")) + { + // Delete this pipeline stage (and rewire other stages according to rules) + job.deleteNotification(currentStage); + } + else + currentStage++; + } + x = variableContext.getParameter("notification_op"); + if (x != null && x.equals("Add")) + { + // Append a new stage at the end + String connectionName = variableContext.getParameter("notification_connectionname"); + String description = variableContext.getParameter("notification_description"); + job.addNotification(connectionName,description); + } + if (op.equals("Continue")) { threadContext.save("JobObject",job); Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/navigation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/navigation.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/navigation.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/navigation.jsp Tue Dec 23 14:52:20 2014 @@ -54,6 +54,9 @@
  • "><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListRepositoryConnections")%>
    • +
  • + "><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.ListNotificationConnections")%> +

    • <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Jobs")%>

      Modified: manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewjob.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewjob.jsp (original) +++ manifoldcf/branches/dev_1x/framework/crawler-ui/src/main/webapp/viewjob.jsp Tue Dec 23 14:52:20 2014 @@ -82,10 +82,12 @@ IJobManager manager = JobManagerFactory.make(threadContext); IOutputConnectionManager outputManager = OutputConnectionManagerFactory.make(threadContext); IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(threadContext); + INotificationConnectionManager notificationManager = NotificationConnectionManagerFactory.make(threadContext); ITransformationConnectionManager transformationManager = TransformationConnectionManagerFactory.make(threadContext); IOutputConnectorPool outputConnectorPool = OutputConnectorPoolFactory.make(threadContext); IRepositoryConnectorPool repositoryConnectorPool = RepositoryConnectorPoolFactory.make(threadContext); + INotificationConnectorPool notificationConnectorPool = NotificationConnectorPoolFactory.make(threadContext); ITransformationConnectorPool transformationConnectorPool = TransformationConnectorPoolFactory.make(threadContext); String jobID = variableContext.getParameter("jobid"); @@ -205,6 +207,37 @@ + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationsColon")%> + + + + + + + +<% + for (int j = 0; j < job.countNotifications(); j++) + { +%> + "> + + + + +<% + } + if (job.countNotifications() == 0) + { +%> + +<% + } +%> +
      <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationDescription")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationConnectionName")%>
      <%=(j+job.countPipelineStages()+2)%>.<%=(job.getNotificationDescription(j)!=null)?org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationDescription(j)):""%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationConnectionName(j))%>
      <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoNotificationConnections")%>
      + + + +
      @@ -757,6 +790,39 @@ <% } + + for (int j = 0; j < job.countNotifications(); j++) + { +%> + +
      + + + <%=(j+job.countPipelineStages()+2)%>. + + + +<% + Specification os = job.getNotificationSpecification(j); + INotificationConnection thisConnection = notificationManager.load(job.getNotificationConnectionName(j)); + INotificationConnector notificationConnector = notificationConnectorPool.grab(thisConnection); + if (notificationConnector != null) + { + try + { + notificationConnector.viewSpecification(new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),os,1+job.countPipelineStages()+j); + } + finally + { + notificationConnectorPool.release(thisConnection,notificationConnector); + } + } +%> + + +<% + } + %>
      Modified: manifoldcf/branches/dev_1x/framework/example-common/connectors.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/example-common/connectors.xml?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/example-common/connectors.xml (original) +++ manifoldcf/branches/dev_1x/framework/example-common/connectors.xml Tue Dec 23 14:52:20 2014 @@ -36,5 +36,7 @@ - + + + Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/CacheKeyFactory.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/CacheKeyFactory.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/CacheKeyFactory.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/CacheKeyFactory.java Tue Dec 23 14:52:20 2014 @@ -63,6 +63,24 @@ public class CacheKeyFactory extends org return "REPOSITORYCONNECTION_"+connectionName; } + /** Construct a key which represents the general list of notification connectors. + *@return the cache key. + */ + public static String makeNotificationConnectionsKey() + { + return "NOTIFICATIONCONNECTIONS"; + } + + /** Construct a key which represents an individual notification connection. + *@param connectionName is the name of the connector. + *@return the cache key. + */ + public static String makeNotificationConnectionKey(String connectionName) + { + return "NOTIFICATIONCONNECTION_"+connectionName; + } + + /** Construct a key which represents the general list of jobs - for queries * that depend on the fixed kind of job data, not the dynamic data (e.g. status) *@return the cache key. Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobDescription.java Tue Dec 23 14:52:20 2014 @@ -141,6 +141,53 @@ public interface IJobDescription *@return the newly-created output specification. */ public Specification insertPipelineStage(int index, boolean isOutput, String pipelineStageConnectionName, String pipelineStageDescription); + + /** Clear notification connections. + */ + public void clearNotifications(); + + /** Add a notification. + *@param notificationConnectionName is the name of the notification connection to add. + *@param notificationDescription is a description of the notification being added. + *@return the empty specification for this notification. + */ + public Specification addNotification(String notificationConnectionName, String notificationDescription); + + /** Get a count of pipeline connections. + *@return the current number of pipeline connections. + */ + public int countNotifications(); + + /** Get a specific notification connection name. + *@param index is the index of the notification whose connection name to get. + *@return the name of the connection. + */ + public String getNotificationConnectionName(int index); + + /** Get a specific notification description. + *@param index is the index of the notification whose description to get. + *@return the name of the connection. + */ + public String getNotificationDescription(int index); + + /** Get a specific notification specification. + *@param index is the index of the notification whose specification is needed. + *@return the specification for the connection. + */ + public Specification getNotificationSpecification(int index); + + /** Delete a notification. + *@param index is the index of the notification to delete. + */ + public void deleteNotification(int index); + + /** Insert a new notification. + *@param index is the index to insert pipeline stage before + *@param notificationConnectionName is the connection name. + *@param notificationDescription is the description. + *@return the newly-created output specification. + */ + public Specification insertNotification(int index, String notificationConnectionName, String notificationDescription); /** Set the job type. *@param type is the type (as an integer). Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IJobManager.java Tue Dec 23 14:52:20 2014 @@ -118,6 +118,13 @@ public interface IJobManager public boolean checkIfReference(String connectionName) throws ManifoldCFException; + /** See if there's a reference to a notification connection name. + *@param connectionName is the name of the connection. + *@return true if there is a reference, false otherwise. + */ + public boolean checkIfNotificationReference(String connectionName) + throws ManifoldCFException; + /** See if there's a reference to an output connection name. *@param connectionName is the name of the connection. *@return true if there is a reference, false otherwise. @@ -966,12 +973,35 @@ public interface IJobManager public void noteConnectorRegistration(String[] connectionNames) throws ManifoldCFException; + /** Note the deregistration of a notification connector used by the specified connections. + * This method will be called when the connector is deregistered. Jobs that use these connections + * must therefore enter appropriate states. + *@param connectionNames is the set of connection names. + */ + public void noteNotificationConnectorDeregistration(String[] connectionNames) + throws ManifoldCFException; + + /** Note the registration of a notification connector used by the specified connections. + * This method will be called when a connector is registered, on which the specified + * connections depend. + *@param connectionNames is the set of connection names. + */ + public void noteNotificationConnectorRegistration(String[] connectionNames) + throws ManifoldCFException; + /** Note a change in connection configuration. * This method will be called whenever a connection's configuration is modified, or when an external repository change * is signalled. */ public void noteConnectionChange(String connectionName) throws ManifoldCFException; + + /** Note a change in notification connection configuration. + * This method will be called whenever a connection's configuration is modified, or when an external repository change + * is signalled. + */ + public void noteNotificationConnectionChange(String connectionName) + throws ManifoldCFException; /** Note the deregistration of an output connector used by the specified connections. * This method will be called when the connector is deregistered. Jobs that use these connections Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobDescription.java Tue Dec 23 14:52:20 2014 @@ -44,6 +44,7 @@ public class JobDescription implements I protected String description = null; protected String connectionName = null; protected final List pipelineStages = new ArrayList(); + protected final List notifications = new ArrayList(); protected int type = TYPE_CONTINUOUS; protected int startMethod = START_WINDOWBEGIN; protected int priority = 5; @@ -103,6 +104,12 @@ public class JobDescription implements I pipelineStage.getDescription(), ((OutputSpecification)pipelineStage.getSpecification()).duplicate(readOnly))); } + for (Notification notification : notifications) + { + rval.notifications.add(new Notification(notification.getConnectionName(), + notification.getDescription(), + notification.getSpecification().duplicate(readOnly))); + } rval.description = description; rval.type = type; // No direct modification of this object is possible @@ -146,6 +153,10 @@ public class JobDescription implements I { pipelineStage.getSpecification().makeReadOnly(); } + for (Notification notification : notifications) + { + notification.getSpecification().makeReadOnly(); + } documentSpecification.makeReadOnly(); } @@ -344,6 +355,8 @@ public class JobDescription implements I @Override public void deletePipelineStage(int index) { + if (readOnly) + throw new IllegalStateException("Attempt to change read-only object"); PipelineStage ps = pipelineStages.remove(index); int stage = index; while (stage < pipelineStages.size()) @@ -353,6 +366,100 @@ public class JobDescription implements I } } + /** Clear notification connections. + */ + @Override + public void clearNotifications() + { + if (readOnly) + throw new IllegalStateException("Attempt to change read-only object"); + notifications.clear(); + } + + /** Add a notification. + *@param notificationConnectionName is the name of the notification connection to add. + *@param notificationDescription is a description of the notification being added. + *@return the empty specification for this notification. + */ + @Override + public Specification addNotification(String notificationConnectionName, String notificationDescription) + { + if (readOnly) + throw new IllegalStateException("Attempt to change read-only object"); + Notification ps = new Notification(notificationConnectionName,notificationDescription); + notifications.add(ps); + return ps.getSpecification(); + } + + /** Get a count of pipeline connections. + *@return the current number of pipeline connections. + */ + @Override + public int countNotifications() + { + return notifications.size(); + } + + /** Get a specific notification connection name. + *@param index is the index of the notification whose connection name to get. + *@return the name of the connection. + */ + @Override + public String getNotificationConnectionName(int index) + { + return notifications.get(index).getConnectionName(); + } + + /** Get a specific notification description. + *@param index is the index of the notification whose description to get. + *@return the name of the connection. + */ + @Override + public String getNotificationDescription(int index) + { + return notifications.get(index).getDescription(); + } + + /** Get a specific notification specification. + *@param index is the index of the notification whose specification is needed. + *@return the specification for the connection. + */ + @Override + public Specification getNotificationSpecification(int index) + { + return notifications.get(index).getSpecification(); + } + + /** Delete a notification. + *@param index is the index of the notification to delete. + */ + @Override + public void deleteNotification(int index) + { + if (readOnly) + throw new IllegalStateException("Attempt to change read-only object"); + notifications.remove(index); + } + + /** Insert a new notification. + *@param index is the index to insert pipeline stage before + *@param notificationConnectionName is the connection name. + *@param notificationDescription is the description. + *@return the newly-created output specification. + */ + @Override + public Specification insertNotification(int index, String notificationConnectionName, String notificationDescription) + { + if (readOnly) + throw new IllegalStateException("Attempt to change read-only object"); + // What we do here depends on the kind of stage we're inserting. + // Both kinds take the current stage's prerequisite as their own. But what happens to the current stage will + // differ as to whether its reference changes or not. + Notification ps = new Notification(notificationConnectionName,notificationDescription); + notifications.add(index,ps); + return ps.getSpecification(); + } + /** Set the job type. *@param type is the type (as an integer). */ @@ -646,6 +753,43 @@ public class JobDescription implements I rval.add(value); } + protected static class Notification + { + protected final String connectionName; + protected final String description; + protected final Specification specification; + + public Notification(String connectionName, String description) + { + this.connectionName = connectionName; + this.description = description; + this.specification = new Specification(); + } + + public Notification(String connectionName, String description, Specification spec) + { + this.connectionName = connectionName; + this.description = description; + this.specification = spec; + } + + public Specification getSpecification() + { + return specification; + } + + public String getConnectionName() + { + return connectionName; + } + + public String getDescription() + { + return description; + } + + } + protected static class PipelineStage { protected int prerequisiteStage; Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Tue Dec 23 14:52:20 2014 @@ -46,6 +46,7 @@ public class JobManager implements IJobM protected final IDBInterface database; protected final IOutputConnectionManager outputMgr; protected final IRepositoryConnectionManager connectionMgr; + protected final INotificationConnectionManager notificationMgr; protected final ITransformationConnectionManager transformationMgr; protected final IOutputConnectorManager outputConnectorMgr; @@ -80,6 +81,7 @@ public class JobManager implements IJobM eventManager = new EventManager(database); outputMgr = OutputConnectionManagerFactory.make(threadContext); connectionMgr = RepositoryConnectionManagerFactory.make(threadContext); + notificationMgr = NotificationConnectionManagerFactory.make(threadContext); transformationMgr = TransformationConnectionManagerFactory.make(threadContext); outputConnectorMgr = OutputConnectorManagerFactory.make(threadContext); connectorMgr = ConnectorManagerFactory.make(threadContext); @@ -96,7 +98,8 @@ public class JobManager implements IJobM { jobs.install(transformationMgr.getTableName(),transformationMgr.getConnectionNameColumn(), outputMgr.getTableName(),outputMgr.getConnectionNameColumn(), - connectionMgr.getTableName(),connectionMgr.getConnectionNameColumn()); + connectionMgr.getTableName(),connectionMgr.getConnectionNameColumn(), + notificationMgr.getTableName(),notificationMgr.getConnectionNameColumn()); jobQueue.install(jobs.getTableName(),jobs.idField); hopCount.install(jobs.getTableName(),jobs.idField); carryDown.install(jobs.getTableName(),jobs.idField); @@ -435,6 +438,124 @@ public class JobManager implements IJobM } } + /** Note the deregistration of a notification connector used by the specified connections. + * This method will be called when the connector is deregistered. Jobs that use these connections + * must therefore enter appropriate states. + *@param connectionNames is the set of connection names. + */ + @Override + public void noteNotificationConnectorDeregistration(String[] connectionNames) + throws ManifoldCFException + { + // For each connection, find the corresponding list of jobs. From these jobs, we want the job id and the status. + List list = new ArrayList(); + int maxCount = database.findConjunctionClauseMax(new ClauseDescription[]{}); + int currentCount = 0; + int i = 0; + while (i < connectionNames.length) + { + if (currentCount == maxCount) + { + noteNotificationConnectionDeregistration(list); + list.clear(); + currentCount = 0; + } + + list.add(connectionNames[i++]); + currentCount++; + } + if (currentCount > 0) + noteNotificationConnectionDeregistration(list); + } + + /** Note deregistration for a batch of notification connection names. + */ + protected void noteNotificationConnectionDeregistration(List list) + throws ManifoldCFException + { + // Query for the matching jobs, and then for each job potentially adjust the state + Long[] jobIDs = jobs.findJobsMatchingNotifications(list); + if (jobIDs.length == 0) + return; + + StringBuilder query = new StringBuilder(); + ArrayList newList = new ArrayList(); + + query.append("SELECT ").append(jobs.idField).append(",").append(jobs.statusField) + .append(" FROM ").append(jobs.getTableName()).append(" WHERE ") + .append(database.buildConjunctionClause(newList,new ClauseDescription[]{ + new MultiClause(jobs.idField,jobIDs)})) + .append(" FOR UPDATE"); + IResultSet set = database.performQuery(query.toString(),newList,null,null); + int i = 0; + while (i < set.getRowCount()) + { + IResultRow row = set.getRow(i++); + Long jobID = (Long)row.getValue(jobs.idField); + int statusValue = jobs.stringToStatus((String)row.getValue(jobs.statusField)); + jobs.noteNotificationConnectorDeregistration(jobID,statusValue); + } + } + + /** Note the registration of a notification connector used by the specified connections. + * This method will be called when a connector is registered, on which the specified + * connections depend. + *@param connectionNames is the set of connection names. + */ + @Override + public void noteNotificationConnectorRegistration(String[] connectionNames) + throws ManifoldCFException + { + // For each connection, find the corresponding list of jobs. From these jobs, we want the job id and the status. + List list = new ArrayList(); + int maxCount = database.findConjunctionClauseMax(new ClauseDescription[]{}); + int currentCount = 0; + int i = 0; + while (i < connectionNames.length) + { + if (currentCount == maxCount) + { + noteNotificationConnectionRegistration(list); + list.clear(); + currentCount = 0; + } + + list.add(connectionNames[i++]); + currentCount++; + } + if (currentCount > 0) + noteNotificationConnectionRegistration(list); + } + + /** Note registration for a batch of connection names. + */ + protected void noteNotificationConnectionRegistration(List list) + throws ManifoldCFException + { + // Query for the matching jobs, and then for each job potentially adjust the state + Long[] jobIDs = jobs.findJobsMatchingNotifications(list); + if (jobIDs.length == 0) + return; + + StringBuilder query = new StringBuilder(); + ArrayList newList = new ArrayList(); + + query.append("SELECT ").append(jobs.idField).append(",").append(jobs.statusField) + .append(" FROM ").append(jobs.getTableName()).append(" WHERE ") + .append(database.buildConjunctionClause(newList,new ClauseDescription[]{ + new MultiClause(jobs.idField,jobIDs)})) + .append(" FOR UPDATE"); + IResultSet set = database.performQuery(query.toString(),newList,null,null); + int i = 0; + while (i < set.getRowCount()) + { + IResultRow row = set.getRow(i++); + Long jobID = (Long)row.getValue(jobs.idField); + int statusValue = jobs.stringToStatus((String)row.getValue(jobs.statusField)); + jobs.noteNotificationConnectorDeregistration(jobID,statusValue); + } + } + /** Note the deregistration of an output connector used by the specified connections. * This method will be called when the connector is deregistered. Jobs that use these connections * must therefore enter appropriate states. @@ -682,6 +803,17 @@ public class JobManager implements IJobM jobs.noteConnectionChange(connectionName); } + /** Note a change in notification connection configuration. + * This method will be called whenever a notification connection's configuration is modified, or when an external repository change + * is signalled. + */ + @Override + public void noteNotificationConnectionChange(String connectionName) + throws ManifoldCFException + { + jobs.noteConnectionChange(connectionName); + } + /** Note a change in output connection configuration. * This method will be called whenever a connection's configuration is modified, or when an external target config change * is signalled. @@ -875,6 +1007,17 @@ public class JobManager implements IJobM return jobs.checkIfReference(connectionName); } + /** See if there's a reference to a notification connection name. + *@param connectionName is the name of the connection. + *@return true if there is a reference, false otherwise. + */ + @Override + public boolean checkIfNotificationReference(String connectionName) + throws ManifoldCFException + { + return jobs.checkIfNotificationReference(connectionName); + } + /** See if there's a reference to an output connection name. *@param connectionName is the name of the connection. *@return true if there is a reference, false otherwise. Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java Tue Dec 23 14:52:20 2014 @@ -346,6 +346,7 @@ public class Jobs extends org.apache.man protected final HopFilterManager hopFilterManager; protected final ForcedParamManager forcedParamManager; protected final PipelineManager pipelineManager; + protected final NotificationManager notificationManager; protected final IOutputConnectionManager outputMgr; protected final IRepositoryConnectionManager connectionMgr; @@ -368,6 +369,7 @@ public class Jobs extends org.apache.man hopFilterManager = new HopFilterManager(threadContext,database); forcedParamManager = new ForcedParamManager(threadContext,database); pipelineManager = new PipelineManager(threadContext,database); + notificationManager = new NotificationManager(threadContext,database); cacheManager = CacheManagerFactory.make(threadContext); lockManager = LockManagerFactory.make(threadContext); @@ -381,7 +383,8 @@ public class Jobs extends org.apache.man */ public void install(String transTableName, String transNameField, String outputTableName, String outputNameField, - String connectionTableName, String connectionNameField) + String connectionTableName, String connectionNameField, + String notificationConnectionTableName, String notificationConnectionNameField) throws ManifoldCFException { // Standard practice: Have a loop around everything, in case upgrade needs it. @@ -530,6 +533,7 @@ public class Jobs extends org.apache.man pipelineManager.writeOutputStage(id,outputConnectionName,outputConnectionSpec); } } + notificationManager.install(getTableName(),idField,notificationConnectionTableName,notificationConnectionNameField); scheduleManager.install(getTableName(),idField); hopFilterManager.install(getTableName(),idField); forcedParamManager.install(getTableName(),idField); @@ -587,6 +591,7 @@ public class Jobs extends org.apache.man forcedParamManager.deinstall(); hopFilterManager.deinstall(); scheduleManager.deinstall(); + notificationManager.deinstall(); pipelineManager.deinstall(); performDrop(null); } @@ -624,6 +629,27 @@ public class Jobs extends org.apache.man analyzeTable(); } + /** Find a list of jobs matching specified notification names. + */ + public Long[] findJobsMatchingNotifications(List notificationConnectionNames) + throws ManifoldCFException + { + StringBuilder query = new StringBuilder(); + ArrayList params = new ArrayList(); + query.append("SELECT ").append(idField) + .append(" FROM ").append(getTableName()).append(" t1 WHERE EXISTS("); + notificationManager.buildNotificationQueryClause(query,params,"t1."+idField,notificationConnectionNames); + query.append(")"); + IResultSet set = performQuery(query.toString(),params,null,null); + Long[] rval = new Long[set.getRowCount()]; + for (int i = 0; i < rval.length; i++) + { + IResultRow row = set.getRow(i); + rval[i] = (Long)row.getValue(idField); + } + return rval; + } + /** Find a list of jobs matching specified transformation names. */ public Long[] findJobsMatchingTransformations(List transformationConnectionNames) @@ -871,6 +897,7 @@ public class Jobs extends org.apache.man hopFilterManager.deleteRows(id); forcedParamManager.deleteRows(id); pipelineManager.deleteRows(id); + notificationManager.deleteRows(id); ArrayList params = new ArrayList(); String query = buildConjunctionClause(params,new ClauseDescription[]{ new UnitaryClause(idField,id)}); @@ -1024,6 +1051,14 @@ public class Jobs extends org.apache.man values.put(assessmentStateField,assessmentStateToString(ASSESSMENT_UNKNOWN)); } + // Changing notifications should never reset seeding. + /* + if (isSame) + { + isSame = notificationManager.compareRows(id,jobDescription); + } + */ + if (isSame) { String oldDocSpecXML = (String)row.getValue(documentSpecField); @@ -1045,6 +1080,7 @@ public class Jobs extends org.apache.man new UnitaryClause(idField,id)}); performUpdate(values," WHERE "+query,params,null); pipelineManager.deleteRows(id); + notificationManager.deleteRows(id); scheduleManager.deleteRows(id); hopFilterManager.deleteRows(id); forcedParamManager.deleteRows(id); @@ -1063,6 +1099,8 @@ public class Jobs extends org.apache.man // Write pipeline rows pipelineManager.writeRows(id,jobDescription); + // Write notification rows + notificationManager.writeRows(id,jobDescription); // Write schedule records scheduleManager.writeRows(id,jobDescription); // Write hop filter rows @@ -1573,6 +1611,16 @@ public class Jobs extends org.apache.man invalidateCurrentUnregisteredState(jobID,oldStatusValue); } + /** Signal to a job that its underlying notification connector has gone away. + *@param jobID is the identifier of the job. + *@param oldStatusValue is the current status value for the job. + */ + public void noteNotificationConnectorDeregistration(Long jobID, int oldStatusValue) + throws ManifoldCFException + { + // MHL + } + /** Signal to a job that its underlying connector has gone away. *@param jobID is the identifier of the job. *@param oldStatusValue is the current status value for the job. @@ -1613,6 +1661,16 @@ public class Jobs extends org.apache.man performUpdate(newValues,"WHERE "+query,list,invKey); } + /** Signal to a job that its underlying notification connector has returned. + *@param jobID is the identifier of the job. + *@param oldStatusValue is the current status value for the job. + */ + public void noteNotificationConnectorRegistration(Long jobID, int oldStatusValue) + throws ManifoldCFException + { + // MHL + } + /** Signal to a job that its underlying connector has returned. *@param jobID is the identifier of the job. *@param oldStatusValue is the current status value for the job. @@ -1639,6 +1697,16 @@ public class Jobs extends org.apache.man performUpdate(newValues,"WHERE "+query,list,null); } + /** Note a change in notification connection configuration. + * This method will be called whenever a notification connection's configuration is modified, or when an external repository change + * is signalled. + */ + public void noteNotificationConnectionChange(String connectionName) + throws ManifoldCFException + { + // Notification configuration change does not change anything in a crawl + } + /** Note a change in output connection configuration. * This method will be called whenever a connection's configuration is modified, or when an external target config change * is signalled. @@ -3059,6 +3127,21 @@ public class Jobs extends org.apache.man return set.getRowCount() > 0; } + /** See if there's a reference to a notification connection name. + *@param connectionName is the name of the connection. + *@return true if there is a reference, false otherwise. + */ + public boolean checkIfNotificationReference(String connectionName) + throws ManifoldCFException + { + ArrayList list = new ArrayList(); + String query = buildConjunctionClause(list,new ClauseDescription[]{ + new UnitaryClause(notificationManager.notificationNameField,connectionName)}); + IResultSet set = performQuery("SELECT "+notificationManager.ownerIDField+" FROM "+notificationManager.getTableName()+ + " WHERE "+query,list,new StringSet(getJobsKey()),null); + return set.getRowCount() > 0; + } + /** See if there's a reference to an output connection name. *@param connectionName is the name of the connection. *@return true if there is a reference, false otherwise. @@ -3616,6 +3699,7 @@ public class Jobs extends org.apache.man // Fill in schedules for jobs pipelineManager.getRows(returnValues,idList,params); + notificationManager.getRows(returnValues,idList,params); scheduleManager.getRows(returnValues,idList,params); hopFilterManager.getRows(returnValues,idList,params); forcedParamManager.getRows(returnValues,idList,params); Modified: manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java?rev=1647586&r1=1647585&r2=1647586&view=diff ============================================================================== --- manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java (original) +++ manifoldcf/branches/dev_1x/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/CrawlerAgent.java Tue Dec 23 14:52:20 2014 @@ -784,6 +784,7 @@ public class CrawlerAgent implements IAg // Threads are down; release connectors RepositoryConnectorPoolFactory.make(threadContext).flushUnusedConnectors(); + NotificationConnectorPoolFactory.make(threadContext).flushUnusedConnectors(); numWorkerThreads = 0; numDeleteThreads = 0; numExpireThreads = 0;