Author: kwright
Date: Fri Oct 25 11:07:32 2013
New Revision: 1535681
URL: http://svn.apache.org/r1535681
Log:
Change the method name for group reference checks.
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authgroups/AuthorityGroupManager.java
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnectionManager.java
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authgroups/AuthorityGroupManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authgroups/AuthorityGroupManager.java?rev=1535681&r1=1535680&r2=1535681&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authgroups/AuthorityGroupManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authgroups/AuthorityGroupManager.java
Fri Oct 25 11:07:32 2013
@@ -354,9 +354,9 @@ public class AuthorityGroupManager exten
try
{
// Check if anything refers to this group name
- if (repoManager.isReferenced(name))
+ if (repoManager.isGroupReferenced(name))
throw new ManifoldCFException("Can't delete authority group
'"+name+"': existing repository connections refer to it");
- if (authManager.isReferenced(name))
+ if (authManager.isGroupReferenced(name))
throw new ManifoldCFException("Can't delete authority group
'"+name+"': existing authority connections refer to it");
ManifoldCF.noteConfigurationChange();
ArrayList params = new ArrayList();
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java?rev=1535681&r1=1535680&r2=1535681&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/authority/AuthorityConnectionManager.java
Fri Oct 25 11:07:32 2013
@@ -275,7 +275,8 @@ public class AuthorityConnectionManager
*@param groupName is the authority group name.
*@return true if referenced, false otherwise.
*/
- public boolean isReferenced(String groupName)
+ @Override
+ public boolean isGroupReferenced(String groupName)
throws ManifoldCFException
{
StringSetBuffer ssb = new StringSetBuffer();
@@ -536,8 +537,6 @@ public class AuthorityConnectionManager
public void delete(String name)
throws ManifoldCFException
{
- // Grab repository connection manager handle, to check on legality of
deletion.
- IRepositoryConnectionManager repoManager =
RepositoryConnectionManagerFactory.make(threadContext);
StringSetBuffer ssb = new StringSetBuffer();
ssb.add(getAuthorityConnectionsKey());
@@ -549,9 +548,6 @@ public class AuthorityConnectionManager
beginTransaction();
try
{
- // Check if anything refers to this connection name
- if (repoManager.isReferenced(name))
- throw new ManifoldCFException("Can't delete authority connection
'"+name+"': existing repository connections refer to it");
ManifoldCF.noteConfigurationChange();
ArrayList params = new ArrayList();
String query = buildConjunctionClause(params,new ClauseDescription[]{
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java?rev=1535681&r1=1535680&r2=1535681&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/authorities/interfaces/IAuthorityConnectionManager.java
Fri Oct 25 11:07:32 2013
@@ -49,7 +49,7 @@ public interface IAuthorityConnectionMan
*@param authorityGroup is the authority group name.
*@return true if referenced, false otherwise.
*/
- public boolean isReferenced(String authorityGroup)
+ public boolean isGroupReferenced(String authorityGroup)
throws ManifoldCFException;
/** Obtain a list of the authority connections, ordered by name.
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnectionManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnectionManager.java?rev=1535681&r1=1535680&r2=1535681&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnectionManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/interfaces/IRepositoryConnectionManager.java
Fri Oct 25 11:07:32 2013
@@ -89,7 +89,7 @@ public interface IRepositoryConnectionMa
*@param authorityGroup is the authority group name.
*@return true if referenced, false otherwise.
*/
- public boolean isReferenced(String authorityGroup)
+ public boolean isGroupReferenced(String authorityGroup)
throws ManifoldCFException;
/** Get a list of repository connections that share the same connector.
Modified:
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java?rev=1535681&r1=1535680&r2=1535681&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-792/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/repository/RepositoryConnectionManager.java
Fri Oct 25 11:07:32 2013
@@ -555,7 +555,8 @@ public class RepositoryConnectionManager
*@param groupName is the group name.
*@return true if referenced, false otherwise.
*/
- public boolean isReferenced(String groupName)
+ @Override
+ public boolean isGroupReferenced(String groupName)
throws ManifoldCFException
{
StringSetBuffer ssb = new StringSetBuffer();
