You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2010/02/17 16:57:35 UTC
svn commit: r911029 [12/19] - in /incubator/lcf/trunk:
modules/connectors/documentum/connector/org/apache/lcf/crawler/authorities/DCTM/
modules/connectors/documentum/connector/org/apache/lcf/crawler/connectors/DCTM/
modules/connectors/documentum/crawle...
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/resultreport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/resultreport.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/resultreport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/resultreport.jsp Wed Feb 17 15:57:27 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.lcf.crawler.system.Metacarta.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.lcf.crawler.system.LCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/showjobstatus.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/showjobstatus.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/showjobstatus.jsp Wed Feb 17 15:57:27 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.lcf.crawler.system.Metacarta.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.lcf.crawler.system.LCF.checkMaintenanceUnderway();
%>
@@ -213,7 +213,7 @@
<%
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
out.println("Error: "+e.getMessage());
e.printStackTrace();
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/simplereport.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/simplereport.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/simplereport.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/simplereport.jsp Wed Feb 17 15:57:27 2010
@@ -20,7 +20,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-boolean maintenanceUnderway = org.apache.lcf.crawler.system.Metacarta.checkMaintenanceUnderway();
+boolean maintenanceUnderway = org.apache.lcf.crawler.system.LCF.checkMaintenanceUnderway();
%>
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/viewauthority.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/viewauthority.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/viewauthority.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/viewauthority.jsp Wed Feb 17 15:57:27 2010
@@ -71,7 +71,7 @@
IAuthorityConnection connection = manager.load(connectionName);
if (connection == null)
{
- throw new MetacartaException("No such authority: '"+connectionName+"'");
+ throw new LCFException("No such authority: '"+connectionName+"'");
}
else
{
@@ -110,7 +110,7 @@
}
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -162,7 +162,7 @@
<%
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/viewconnection.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/viewconnection.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/viewconnection.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/viewconnection.jsp Wed Feb 17 15:57:27 2010
@@ -72,7 +72,7 @@
IRepositoryConnection connection = connManager.load(connectionName);
if (connection == null)
{
- throw new MetacartaException("No such connection: '"+connectionName+"'");
+ throw new LCFException("No such connection: '"+connectionName+"'");
}
else
{
@@ -113,7 +113,7 @@
}
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -216,7 +216,7 @@
<%
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/viewjob.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/viewjob.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/viewjob.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/viewjob.jsp Wed Feb 17 15:57:27 2010
@@ -74,7 +74,7 @@
IJobDescription job = manager.load(new Long(jobID));
if (job == null)
{
- throw new MetacartaException("No such job: "+jobID);
+ throw new LCFException("No such job: "+jobID);
}
else
{
@@ -581,7 +581,7 @@
<%
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/crawler-ui/viewoutput.jsp
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/crawler-ui/viewoutput.jsp?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/crawler-ui/viewoutput.jsp (original)
+++ incubator/lcf/trunk/modules/framework/crawler-ui/viewoutput.jsp Wed Feb 17 15:57:27 2010
@@ -72,7 +72,7 @@
IOutputConnection connection = connManager.load(connectionName);
if (connection == null)
{
- throw new MetacartaException("No such connection: '"+connectionName+"'");
+ throw new LCFException("No such connection: '"+connectionName+"'");
}
else
{
@@ -109,7 +109,7 @@
}
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
connectionStatus = "Threw exception: '"+org.apache.lcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
@@ -160,7 +160,7 @@
<%
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
variableContext.setParameter("text",e.getMessage());
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/CheckAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/CheckAll.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/CheckAll.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/CheckAll.java Wed Feb 17 15:57:27 2010
@@ -42,7 +42,7 @@
System.exit(1);
}
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
try
{
IThreadContext tc = ThreadContextFactory.make();
@@ -85,7 +85,7 @@
else
connectionStatus = "Connector not installed";
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
connectionStatus = "Threw exception: '"+e.getMessage()+"'";
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/RegisterAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/RegisterAuthority.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/RegisterAuthority.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/RegisterAuthority.java Wed Feb 17 15:57:27 2010
@@ -45,13 +45,13 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
mgr.registerConnector(description,className);
System.err.println("Successfully registered connector '"+className+"'");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/ResetAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/ResetAll.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/ResetAll.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/ResetAll.java Wed Feb 17 15:57:27 2010
@@ -44,7 +44,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
// Now, get a list of the authority connections
IAuthorityConnectionManager mgr = AuthorityConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/SynchronizeAuthorities.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/SynchronizeAuthorities.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/SynchronizeAuthorities.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/SynchronizeAuthorities.java Wed Feb 17 15:57:27 2010
@@ -43,7 +43,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
IResultSet classNames = mgr.getConnectors();
@@ -56,14 +56,14 @@
{
AuthorityConnectorFactory.getConnectorNoCheck(classname);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
mgr.removeConnector(classname);
}
}
System.err.println("Successfully synchronized all authorities");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAllAuthorities.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAllAuthorities.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAllAuthorities.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAllAuthorities.java Wed Feb 17 15:57:27 2010
@@ -43,7 +43,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
IResultSet classNames = mgr.getConnectors();
@@ -55,7 +55,7 @@
}
System.err.println("Successfully unregistered all connectors");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAuthority.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAuthority.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAuthority.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/UnRegisterAuthority.java Wed Feb 17 15:57:27 2010
@@ -44,13 +44,13 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IAuthorityConnectorManager mgr = AuthorityConnectorManagerFactory.make(tc);
mgr.unregisterConnector(className);
System.err.println("Successfully unregistered connector '"+className+"'");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authconnmgr/AuthorityConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authconnmgr/AuthorityConnectorManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authconnmgr/AuthorityConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authconnmgr/AuthorityConnectorManager.java Wed Feb 17 15:57:27 2010
@@ -41,7 +41,7 @@
*@param database is the database handle.
*/
public AuthorityConnectorManager(IThreadContext threadContext, IDBInterface database)
- throws MetacartaException
+ throws LCFException
{
super(database,"authconnectors");
this.threadContext = threadContext;
@@ -51,7 +51,7 @@
/** Install or upgrade.
*/
public void install()
- throws MetacartaException
+ throws LCFException
{
beginTransaction();
try
@@ -71,7 +71,7 @@
addTableIndex(true,list);
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -91,7 +91,7 @@
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -110,7 +110,7 @@
}
performDrop(invKeys);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -132,7 +132,7 @@
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -159,7 +159,7 @@
// Either way, we must do the install/upgrade itself.
AuthorityConnectorFactory.install(threadContext,className);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -180,7 +180,7 @@
*@param description is the description to unregister.
*/
public void unregisterConnector(String className)
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
beginTransaction();
@@ -191,7 +191,7 @@
removeConnector(className);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -212,7 +212,7 @@
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
ArrayList list = new ArrayList();
@@ -225,7 +225,7 @@
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -238,7 +238,7 @@
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws MetacartaException
+ throws LCFException
{
StringSet invKeys = new StringSet(getCacheKey());
@@ -257,7 +257,7 @@
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws MetacartaException
+ throws LCFException
{
// Use the global table key; that's good enough because we don't expect stuff to change out from under very often.
StringSet invKeys = new StringSet(getCacheKey());
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authorities/BaseAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authorities/BaseAuthorityConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authorities/BaseAuthorityConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authorities/BaseAuthorityConnector.java Wed Feb 17 15:57:27 2010
@@ -43,7 +43,7 @@
*@param threadContext is the current thread context.
*/
public void install(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
// Base version does nothing.
}
@@ -55,7 +55,7 @@
*@param threadContext is the current thread context.
*/
public void deinstall(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
// Base version does nothing.
}
@@ -76,7 +76,7 @@
*@return the connection's status as a displayable string.
*/
public String check()
- throws MetacartaException
+ throws LCFException
{
return "Connection working";
}
@@ -85,7 +85,7 @@
* in active use.
*/
public void poll()
- throws MetacartaException
+ throws LCFException
{
// Base version does nothing.
}
@@ -93,7 +93,7 @@
/** Close the connection. Call this before discarding the repository connector.
*/
public void disconnect()
- throws MetacartaException
+ throws LCFException
{
params = null;
}
@@ -128,7 +128,7 @@
* (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
*/
public AuthorizationResponse getAuthorizationResponse(String userName)
- throws MetacartaException
+ throws LCFException
{
// Implementation for old-style behavior. Override this method for new-style behavior.
try
@@ -138,7 +138,7 @@
return new AuthorizationResponse(new String[0],AuthorizationResponse.RESPONSE_USERNOTFOUND);
return new AuthorizationResponse(accessTokens,AuthorizationResponse.RESPONSE_OK);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
// There's an authorization failure of some kind.
String[] defaultAccessTokens = getDefaultAccessTokens(userName);
@@ -170,7 +170,7 @@
* (Throw an exception if access is denied, usually because the authority is down).
*/
public String[] getAccessTokens(String userName)
- throws MetacartaException
+ throws LCFException
{
return null;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authority/AuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authority/AuthorityConnectionManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authority/AuthorityConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/authority/AuthorityConnectionManager.java Wed Feb 17 15:57:27 2010
@@ -22,7 +22,7 @@
import org.apache.lcf.authorities.interfaces.*;
import java.util.*;
import org.apache.lcf.authorities.interfaces.CacheKeyFactory;
-import org.apache.lcf.authorities.system.Metacarta;
+import org.apache.lcf.authorities.system.LCF;
import org.apache.lcf.crawler.interfaces.IRepositoryConnectionManager;
import org.apache.lcf.crawler.interfaces.RepositoryConnectionManagerFactory;
@@ -51,7 +51,7 @@
*@param threadContext is the thread context.
*/
public AuthorityConnectionManager(IThreadContext threadContext, IDBInterface database)
- throws MetacartaException
+ throws LCFException
{
super(database,"authconnections");
@@ -62,7 +62,7 @@
/** Install the manager.
*/
public void install()
- throws MetacartaException
+ throws LCFException
{
beginTransaction();
try
@@ -119,7 +119,7 @@
}
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -138,51 +138,51 @@
/** Uninstall the manager.
*/
public void deinstall()
- throws MetacartaException
+ throws LCFException
{
performDrop(null);
}
/** Export configuration */
public void exportConfiguration(java.io.OutputStream os)
- throws java.io.IOException, MetacartaException
+ throws java.io.IOException, LCFException
{
// Write a version indicator
- Metacarta.writeDword(os,1);
+ LCF.writeDword(os,1);
// Get the authority list
IAuthorityConnection[] list = getAllConnections();
// Write the number of authorities
- Metacarta.writeDword(os,list.length);
+ LCF.writeDword(os,list.length);
// Loop through the list and write the individual authority info
int i = 0;
while (i < list.length)
{
IAuthorityConnection conn = list[i++];
- Metacarta.writeString(os,conn.getName());
- Metacarta.writeString(os,conn.getDescription());
- Metacarta.writeString(os,conn.getClassName());
- Metacarta.writeString(os,conn.getConfigParams().toXML());
- Metacarta.writeDword(os,conn.getMaxConnections());
+ LCF.writeString(os,conn.getName());
+ LCF.writeString(os,conn.getDescription());
+ LCF.writeString(os,conn.getClassName());
+ LCF.writeString(os,conn.getConfigParams().toXML());
+ LCF.writeDword(os,conn.getMaxConnections());
}
}
/** Import configuration */
public void importConfiguration(java.io.InputStream is)
- throws java.io.IOException, MetacartaException
+ throws java.io.IOException, LCFException
{
- int version = Metacarta.readDword(is);
+ int version = LCF.readDword(is);
if (version != 1)
throw new java.io.IOException("Unknown authority configuration version: "+Integer.toString(version));
- int count = Metacarta.readDword(is);
+ int count = LCF.readDword(is);
int i = 0;
while (i < count)
{
IAuthorityConnection conn = create();
- conn.setName(Metacarta.readString(is));
- conn.setDescription(Metacarta.readString(is));
- conn.setClassName(Metacarta.readString(is));
- conn.getConfigParams().fromXML(Metacarta.readString(is));
- conn.setMaxConnections(Metacarta.readDword(is));
+ conn.setName(LCF.readString(is));
+ conn.setDescription(LCF.readString(is));
+ conn.setClassName(LCF.readString(is));
+ conn.getConfigParams().fromXML(LCF.readString(is));
+ conn.setMaxConnections(LCF.readDword(is));
// Attempt to save this connection
save(conn);
i++;
@@ -193,7 +193,7 @@
*@return an array of connection objects.
*/
public IAuthorityConnection[] getAllConnections()
- throws MetacartaException
+ throws LCFException
{
beginTransaction();
try
@@ -214,7 +214,7 @@
}
return loadMultiple(names);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -235,7 +235,7 @@
*@return the loaded connection object, or null if not found.
*/
public IAuthorityConnection load(String name)
- throws MetacartaException
+ throws LCFException
{
return loadMultiple(new String[]{name})[0];
}
@@ -245,7 +245,7 @@
*@return the loaded connection objects.
*/
public IAuthorityConnection[] loadMultiple(String[] names)
- throws MetacartaException
+ throws LCFException
{
// Build description objects
AuthorityConnectionDescription[] objectDescriptions = new AuthorityConnectionDescription[names.length];
@@ -268,7 +268,7 @@
*@return the new object.
*/
public IAuthorityConnection create()
- throws MetacartaException
+ throws LCFException
{
AuthorityConnection rval = new AuthorityConnection();
return rval;
@@ -278,7 +278,7 @@
*@param object is the object to save.
*/
public void save(IAuthorityConnection object)
- throws MetacartaException
+ throws LCFException
{
StringSetBuffer ssb = new StringSetBuffer();
ssb.add(getAuthorityConnectionsKey());
@@ -291,7 +291,7 @@
try
{
performLock();
- Metacarta.noteConfigurationChange();
+ LCF.noteConfigurationChange();
// See whether the instance exists
ArrayList params = new ArrayList();
params.add(object.getName());
@@ -320,7 +320,7 @@
cacheManager.invalidateKeys(ch);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -346,7 +346,7 @@
* name does not exist, no error is returned.
*/
public void delete(String name)
- throws MetacartaException
+ throws LCFException
{
// Grab repository connection manager handle, to check on legality of deletion.
IRepositoryConnectionManager repoManager = RepositoryConnectionManagerFactory.make(threadContext);
@@ -363,14 +363,14 @@
{
// Check if anything refers to this connection name
if (repoManager.isReferenced(name))
- throw new MetacartaException("Can't delete authority connection '"+name+"': existing repository connections refer to it");
- Metacarta.noteConfigurationChange();
+ throw new LCFException("Can't delete authority connection '"+name+"': existing repository connections refer to it");
+ LCF.noteConfigurationChange();
ArrayList params = new ArrayList();
params.add(name);
performDelete("WHERE "+nameField+"=?",params,null);
cacheManager.invalidateKeys(ch);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -427,7 +427,7 @@
*@return the corresponding repository connection objects.
*/
protected AuthorityConnection[] getAuthorityConnectionsMultiple(String[] connectionNames)
- throws MetacartaException
+ throws LCFException
{
AuthorityConnection[] rval = new AuthorityConnection[connectionNames.length];
HashMap returnIndex = new HashMap();
@@ -471,7 +471,7 @@
signalRollback();
throw e;
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
signalRollback();
throw e;
@@ -489,7 +489,7 @@
*@param params is the set of parameters.
*/
protected void getAuthorityConnectionsChunk(AuthorityConnection[] rval, Map returnIndex, String idList, ArrayList params)
- throws MetacartaException
+ throws LCFException
{
IResultSet set;
set = performQuery("SELECT * FROM "+getTableName()+" WHERE "+
@@ -610,7 +610,7 @@
* @return the newly created objects to cache, or null, if any object cannot be created.
* The order of the returned objects must correspond to the order of the object descriptinos.
*/
- public Object[] create(ICacheDescription[] objectDescriptions) throws MetacartaException
+ public Object[] create(ICacheDescription[] objectDescriptions) throws LCFException
{
// Turn the object descriptions into the parameters for the ToolInstance requests
String[] connectionNames = new String[objectDescriptions.length];
@@ -633,7 +633,7 @@
* @param objectDescription is the unique identifier of the object.
* @param cachedObject is the cached object.
*/
- public void exists(ICacheDescription objectDescription, Object cachedObject) throws MetacartaException
+ public void exists(ICacheDescription objectDescription, Object cachedObject) throws LCFException
{
// Cast what came in as what it really is
AuthorityConnectionDescription objectDesc = (AuthorityConnectionDescription)objectDescription;
@@ -651,7 +651,7 @@
/** Perform the desired operation. This method is called after either createGetObject()
* or exists() is called for every requested object.
*/
- public void execute() throws MetacartaException
+ public void execute() throws LCFException
{
// Does nothing; we only want to fetch objects in this cacher.
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectionManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectionManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectionManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectionManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -20,7 +20,7 @@
import org.apache.lcf.core.interfaces.*;
import java.util.*;
-import org.apache.lcf.authorities.system.Metacarta;
+import org.apache.lcf.authorities.system.LCF;
/** This is the factory class for authority connection manager objects.
*/
@@ -38,15 +38,15 @@
*@return the handle.
*/
public static IAuthorityConnectionManager make(IThreadContext tc)
- throws MetacartaException
+ throws LCFException
{
Object o = tc.get(objectName);
if (o == null || !(o instanceof IAuthorityConnectionManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
o = new org.apache.lcf.authorities.authority.AuthorityConnectionManager(tc,database);
tc.save(objectName,o);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorFactory.java Wed Feb 17 15:57:27 2010
@@ -38,7 +38,7 @@
*@param className is the class name.
*/
public static void install(IThreadContext threadContext, String className)
- throws MetacartaException
+ throws LCFException
{
IAuthorityConnector connector = getConnectorNoCheck(className);
connector.install(threadContext);
@@ -48,7 +48,7 @@
*@param className is the class name.
*/
public static void deinstall(IThreadContext threadContext, String className)
- throws MetacartaException
+ throws LCFException
{
IAuthorityConnector connector = getConnectorNoCheck(className);
connector.deinstall(threadContext);
@@ -59,7 +59,7 @@
*@return the folder string.
*/
public static String getJSPFolder(IThreadContext threadContext, String className)
- throws MetacartaException
+ throws LCFException
{
IAuthorityConnector connector = getConnector(threadContext,className);
if (connector == null)
@@ -70,7 +70,7 @@
/** Get the default response from a connector. Called if the connection attempt fails.
*/
public static AuthorizationResponse getDefaultAuthorizationResponse(IThreadContext threadContext, String className, String userName)
- throws MetacartaException
+ throws LCFException
{
IAuthorityConnector connector = getConnector(threadContext,className);
if (connector == null)
@@ -83,7 +83,7 @@
*@return the instance.
*/
public static IAuthorityConnector getConnectorNoCheck(String className)
- throws MetacartaException
+ throws LCFException
{
try
{
@@ -94,7 +94,7 @@
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new MetacartaException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new LCFException("Class '"+className+"' does not implement IAuthorityConnector.");
return (IAuthorityConnector)o;
}
catch (InvocationTargetException e)
@@ -103,42 +103,42 @@
if (z instanceof Error)
throw (Error)z;
else
- throw (MetacartaException)z;
+ throw (LCFException)z;
}
catch (ClassNotFoundException e)
{
- throw new MetacartaException("No class implementing IAuthorityConnector called '"+
+ throw new LCFException("No class implementing IAuthorityConnector called '"+
className+"'.",
e);
}
catch (NoSuchMethodException e)
{
- throw new MetacartaException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new LCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx().",
e);
}
catch (SecurityException e)
{
- throw new MetacartaException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new MetacartaException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new MetacartaException("Shouldn't happen!!!",e);
+ throw new LCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new MetacartaException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new MetacartaException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
@@ -149,7 +149,7 @@
*@return the instance.
*/
protected static IAuthorityConnector getConnector(IThreadContext threadContext, String className)
- throws MetacartaException
+ throws LCFException
{
IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadContext);
if (connMgr.isInstalled(className) == false)
@@ -164,7 +164,7 @@
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new MetacartaException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new LCFException("Class '"+className+"' does not implement IAuthorityConnector.");
return (IAuthorityConnector)o;
}
catch (InvocationTargetException e)
@@ -173,7 +173,7 @@
if (z instanceof Error)
throw (Error)z;
else
- throw (MetacartaException)z;
+ throw (LCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -181,38 +181,38 @@
if (connMgr.isInstalled(className) == false)
return null;
- throw new MetacartaException("No class implementing IAuthorityConnector called '"+
+ throw new LCFException("No class implementing IAuthorityConnector called '"+
className+"'.",
e);
}
catch (NoSuchMethodException e)
{
- throw new MetacartaException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new LCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx().",
e);
}
catch (SecurityException e)
{
- throw new MetacartaException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new MetacartaException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new MetacartaException("Shouldn't happen!!!",e);
+ throw new LCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new MetacartaException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new MetacartaException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
@@ -227,7 +227,7 @@
*/
public static IAuthorityConnector grab(IThreadContext threadContext,
String className, ConfigParams configInfo, int maxPoolSize)
- throws MetacartaException
+ throws LCFException
{
// System.out.println("In AuthorityConnectorManager.grab()");
@@ -258,7 +258,7 @@
*@param connector is the connector to release.
*/
public static void release(IAuthorityConnector connector)
- throws MetacartaException
+ throws LCFException
{
if (connector == null)
return;
@@ -280,7 +280,7 @@
* This method polls all inactive handles.
*/
public static void pollAllConnectors(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
// Go through the whole pool and notify everyone
synchronized (poolHash)
@@ -301,7 +301,7 @@
*@param threadContext is the local thread context.
*/
public static void closeAllConnectors(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
// Go through the whole pool and clean it out
synchronized (poolHash)
@@ -393,7 +393,7 @@
*@return the connector.
*/
public synchronized IAuthorityConnector getConnector(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
while (numFree == 0)
{
@@ -403,7 +403,7 @@
}
catch (InterruptedException e)
{
- throw new MetacartaException("Interrupted",e,MetacartaException.INTERRUPTED);
+ throw new LCFException("Interrupted",e,LCFException.INTERRUPTED);
}
}
@@ -426,7 +426,7 @@
Object[] arguments = new Object[0];
Object o = c.newInstance(arguments);
if (!(o instanceof IAuthorityConnector))
- throw new MetacartaException("Class '"+className+"' does not implement IAuthorityConnector.");
+ throw new LCFException("Class '"+className+"' does not implement IAuthorityConnector.");
// System.out.println("Authority connector instantiated");
rc = (IAuthorityConnector)o;
rc.connect(configParams);
@@ -438,7 +438,7 @@
if (z instanceof Error)
throw (Error)z;
else
- throw (MetacartaException)z;
+ throw (LCFException)z;
}
catch (ClassNotFoundException e)
{
@@ -446,38 +446,38 @@
if (connMgr.isInstalled(className) == false)
return null;
- throw new MetacartaException("No class implementing IAuthorityConnector called '"+
+ throw new LCFException("No class implementing IAuthorityConnector called '"+
className+"'.",
e);
}
catch (NoSuchMethodException e)
{
- throw new MetacartaException("No appropriate constructor for IAuthorityConnector implementation '"+
+ throw new LCFException("No appropriate constructor for IAuthorityConnector implementation '"+
className+"'. Need xxx(ConfigParams).",
e);
}
catch (SecurityException e)
{
- throw new MetacartaException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Protected constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalAccessException e)
{
- throw new MetacartaException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("Unavailable constructor for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (IllegalArgumentException e)
{
- throw new MetacartaException("Shouldn't happen!!!",e);
+ throw new LCFException("Shouldn't happen!!!",e);
}
catch (InstantiationException e)
{
- throw new MetacartaException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("InstantiationException for IAuthorityConnector implementation '"+className+"'",
e);
}
catch (ExceptionInInitializerError e)
{
- throw new MetacartaException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
+ throw new LCFException("ExceptionInInitializerError for IAuthorityConnector implementation '"+className+"'",
e);
}
}
@@ -497,7 +497,7 @@
*@param connector is the connector.
*/
public synchronized void releaseConnector(IAuthorityConnector connector)
- throws MetacartaException
+ throws LCFException
{
if (connector == null)
return;
@@ -513,7 +513,7 @@
/** Notify all free connectors.
*/
public synchronized void pollAll(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
int i = 0;
while (i < stack.size())
@@ -529,7 +529,7 @@
/** Release all free connectors.
*/
public synchronized void releaseAll(IThreadContext threadContext)
- throws MetacartaException
+ throws LCFException
{
while (stack.size() > 0)
{
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorManagerFactory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorManagerFactory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/AuthorityConnectorManagerFactory.java Wed Feb 17 15:57:27 2010
@@ -20,7 +20,7 @@
import org.apache.lcf.core.interfaces.*;
import java.util.*;
-import org.apache.lcf.authorities.system.Metacarta;
+import org.apache.lcf.authorities.system.LCF;
/** This class is the factory for the Authority Connector Manager.
*/
@@ -37,16 +37,16 @@
*@return the connector manager handle.
*/
public static IAuthorityConnectorManager make(IThreadContext tc)
- throws MetacartaException
+ throws LCFException
{
Object o = tc.get(connMgr);
if (o == null || !(o instanceof IAuthorityConnectorManager))
{
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
o = new org.apache.lcf.authorities.authconnmgr.AuthorityConnectorManager(tc,database);
tc.save(connMgr,o);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectionManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectionManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectionManager.java Wed Feb 17 15:57:27 2010
@@ -30,52 +30,52 @@
/** Install the manager.
*/
public void install()
- throws MetacartaException;
+ throws LCFException;
/** Uninstall the manager.
*/
public void deinstall()
- throws MetacartaException;
+ throws LCFException;
/** Export configuration */
public void exportConfiguration(java.io.OutputStream os)
- throws java.io.IOException, MetacartaException;
+ throws java.io.IOException, LCFException;
/** Import configuration */
public void importConfiguration(java.io.InputStream is)
- throws java.io.IOException, MetacartaException;
+ throws java.io.IOException, LCFException;
/** Obtain a list of the authority connections, ordered by name.
*@return an array of connection objects.
*/
public IAuthorityConnection[] getAllConnections()
- throws MetacartaException;
+ throws LCFException;
/** Load a authority connection by name.
*@param name is the name of the authority connection.
*@return the loaded connection object, or null if not found.
*/
public IAuthorityConnection load(String name)
- throws MetacartaException;
+ throws LCFException;
/** Create a new authority connection object.
*@return the new object.
*/
public IAuthorityConnection create()
- throws MetacartaException;
+ throws LCFException;
/** Save an authority connection object.
*@param object is the object to save.
*/
public void save(IAuthorityConnection object)
- throws MetacartaException;
+ throws LCFException;
/** Delete an authority connection.
*@param name is the name of the connection to delete. If the
* name does not exist, no error is returned.
*/
public void delete(String name)
- throws MetacartaException;
+ throws LCFException;
// Schema related
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnector.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnector.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnector.java Wed Feb 17 15:57:27 2010
@@ -35,7 +35,7 @@
*@param threadContext is the current thread context.
*/
public void install(IThreadContext threadContext)
- throws MetacartaException;
+ throws LCFException;
/** Uninstall the connector.
* This method is called to remove persistent storage for the connector, such as database tables etc.
@@ -43,7 +43,7 @@
*@param threadContext is the current thread context.
*/
public void deinstall(IThreadContext threadContext)
- throws MetacartaException;
+ throws LCFException;
/** Return the path for the UI interface JSP elements.
* These JSP's must be provided to allow the connector to be configured.
@@ -65,18 +65,18 @@
*@return the connection's status as a displayable string.
*/
public String check()
- throws MetacartaException;
+ throws LCFException;
/** This method is periodically called for all connectors that are connected but not
* in active use.
*/
public void poll()
- throws MetacartaException;
+ throws LCFException;
/** Close the connection. Call this before discarding the repository connector.
*/
public void disconnect()
- throws MetacartaException;
+ throws LCFException;
/** Get configuration information.
*@return the configuration information for this class.
@@ -99,7 +99,7 @@
* (Should throws an exception only when a condition cannot be properly described within the authorization response object.)
*/
public AuthorizationResponse getAuthorizationResponse(String userName)
- throws MetacartaException;
+ throws LCFException;
/** Obtain the default access tokens for a given user name.
*@param userName is the user name or identifier.
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectorManager.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectorManager.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectorManager.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/interfaces/IAuthorityConnectorManager.java Wed Feb 17 15:57:27 2010
@@ -28,12 +28,12 @@
/** Install.
*/
public void install()
- throws MetacartaException;
+ throws LCFException;
/** Uninstall. This also unregisters all connectors.
*/
public void deinstall()
- throws MetacartaException;
+ throws LCFException;
/** Register a new connector.
* The connector's install method will also be called.
@@ -41,41 +41,41 @@
*@param className is the class name.
*/
public void registerConnector(String description, String className)
- throws MetacartaException;
+ throws LCFException;
/** Unregister a connector.
* The connector's deinstall method will also be called.
*@param className is the connector class to unregister.
*/
public void unregisterConnector(String className)
- throws MetacartaException;
+ throws LCFException;
/** Remove a connector.
* Call this when the connector cannot be instantiated.
*@param className is the connector class to remove.
*/
public void removeConnector(String className)
- throws MetacartaException;
+ throws LCFException;
/** Get ordered list of connectors.
*@return a resultset with the columns "description" and "classname".
* These will be ordered by description.
*/
public IResultSet getConnectors()
- throws MetacartaException;
+ throws LCFException;
/** Get a description given a class name.
*@param className is the class name.
*@return the description, or null if the class is not registered.
*/
public String getDescription(String className)
- throws MetacartaException;
+ throws LCFException;
/** Check if a particular connector is installed or not.
*@param className is the class name of the connector.
*@return true if installed, false otherwise.
*/
public boolean isInstalled(String className)
- throws MetacartaException;
+ throws LCFException;
}
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/AuthCheckThread.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/AuthCheckThread.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/AuthCheckThread.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/AuthCheckThread.java Wed Feb 17 15:57:27 2010
@@ -38,7 +38,7 @@
/** Constructor.
*/
public AuthCheckThread(String id, RequestQueue requestQueue)
- throws MetacartaException
+ throws LCFException
{
super();
this.requestQueue = requestQueue;
@@ -58,7 +58,7 @@
try
{
if (Thread.currentThread().isInterrupted())
- throw new MetacartaException("Interrupted",MetacartaException.INTERRUPTED);
+ throw new LCFException("Interrupted",LCFException.INTERRUPTED);
// Wait for a request.
AuthRequest theRequest = requestQueue.getRequest();
@@ -83,7 +83,7 @@
try
{
if (connector == null)
- exception = new MetacartaException("Authority connector "+theRequest.getClassName()+" is not registered.");
+ exception = new LCFException("Authority connector "+theRequest.getClassName()+" is not registered.");
else
{
// Get the acl for the user
@@ -91,9 +91,9 @@
{
response = connector.getAuthorizationResponse(theRequest.getUserID());
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
- if (e.getErrorCode() == MetacartaException.INTERRUPTED)
+ if (e.getErrorCode() == LCFException.INTERRUPTED)
throw e;
Logging.authorityService.warn("Authority error: "+e.getMessage(),e);
response = AuthorityConnectorFactory.getDefaultAuthorizationResponse(threadContext,theRequest.getClassName(),theRequest.getUserID());
@@ -106,9 +106,9 @@
AuthorityConnectorFactory.release(connector);
}
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
- if (e.getErrorCode() == MetacartaException.INTERRUPTED)
+ if (e.getErrorCode() == LCFException.INTERRUPTED)
throw e;
Logging.authorityService.warn("Authority connection exception: "+e.getMessage(),e);
response = AuthorityConnectorFactory.getDefaultAuthorizationResponse(threadContext,theRequest.getClassName(),theRequest.getUserID());
@@ -128,15 +128,15 @@
// Repeat, and only go to sleep if there are no more requests.
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
- if (e.getErrorCode() == MetacartaException.INTERRUPTED)
+ if (e.getErrorCode() == LCFException.INTERRUPTED)
break;
// Log it, but keep the thread alive
Logging.authorityService.error("Exception tossed: "+e.getMessage(),e);
- if (e.getErrorCode() == MetacartaException.SETUP_ERROR)
+ if (e.getErrorCode() == LCFException.SETUP_ERROR)
{
// Shut the whole system down!
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/IdleCleanupThread.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/IdleCleanupThread.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/IdleCleanupThread.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/IdleCleanupThread.java Wed Feb 17 15:57:27 2010
@@ -38,7 +38,7 @@
/** Constructor.
*/
public IdleCleanupThread()
- throws MetacartaException
+ throws LCFException
{
super();
setName("Idle cleanup thread");
@@ -60,17 +60,17 @@
AuthorityConnectorFactory.pollAllConnectors(threadContext);
// Sleep for the retry interval.
- Metacarta.sleep(15000L);
+ LCF.sleep(15000L);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
- if (e.getErrorCode() == MetacartaException.INTERRUPTED)
+ if (e.getErrorCode() == LCFException.INTERRUPTED)
break;
// Log it, but keep the thread alive
Logging.authorityService.error("Exception tossed",e);
- if (e.getErrorCode() == MetacartaException.SETUP_ERROR)
+ if (e.getErrorCode() == LCFException.SETUP_ERROR)
{
// Shut the whole system down!
System.exit(1);
Added: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/LCF.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/LCF.java?rev=911029&view=auto
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/LCF.java (added)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/authorities/system/LCF.java Wed Feb 17 15:57:27 2010
@@ -0,0 +1,234 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.lcf.authorities.system;
+
+import org.apache.lcf.core.interfaces.*;
+import org.apache.lcf.authorities.interfaces.*;
+import java.io.*;
+import java.util.*;
+
+public class LCF extends org.apache.lcf.core.system.LCF
+{
+ protected static boolean needInit = true;
+
+ // Threads
+ protected static IdleCleanupThread idleCleanupThread = null;
+ protected static AuthCheckThread[] authCheckThreads = null;
+
+ // Number of auth check threads
+ protected static int numAuthCheckThreads = 0;
+
+ protected static final String authCheckThreadCountProperty = "org.apache.lcf.authorityservice.threads";
+
+ // Request queue
+ protected static RequestQueue requestQueue = null;
+
+ /** Initialize environment.
+ */
+ public static synchronized void initializeEnvironment()
+ {
+ if (needInit == false)
+ return;
+
+ org.apache.lcf.core.system.LCF.initializeEnvironment();
+ Logging.initializeLoggers();
+ Logging.setLogLevels();
+ needInit = false;
+
+ }
+
+
+ /** Install all the authority manager system tables.
+ *@param threadcontext is the thread context.
+ */
+ public static void installSystemTables(IThreadContext threadcontext)
+ throws LCFException
+ {
+ IDBInterface mainDatabase = DBInterfaceFactory.make(threadcontext,
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
+
+ IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadcontext);
+ IAuthorityConnectionManager authConnMgr = AuthorityConnectionManagerFactory.make(threadcontext);
+
+ mainDatabase.beginTransaction();
+ try
+ {
+ connMgr.install();
+ authConnMgr.install();
+ }
+ catch (LCFException e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ mainDatabase.endTransaction();
+ }
+
+ }
+
+ /** Uninstall all the authority manager system tables.
+ *@param threadcontext is the thread context.
+ */
+ public static void deinstallSystemTables(IThreadContext threadcontext)
+ throws LCFException
+ {
+ IDBInterface mainDatabase = DBInterfaceFactory.make(threadcontext,
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
+
+ LCFException se = null;
+
+ IAuthorityConnectorManager connMgr = AuthorityConnectorManagerFactory.make(threadcontext);
+ IAuthorityConnectionManager authConnMgr = AuthorityConnectionManagerFactory.make(threadcontext);
+
+ mainDatabase.beginTransaction();
+ try
+ {
+ authConnMgr.deinstall();
+ connMgr.deinstall();
+ }
+ catch (LCFException e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ catch (Error e)
+ {
+ mainDatabase.signalRollback();
+ throw e;
+ }
+ finally
+ {
+ mainDatabase.endTransaction();
+ }
+ if (se != null)
+ throw se;
+
+ }
+
+ /** Start the authority system.
+ */
+ public static void startSystem(IThreadContext threadContext)
+ throws LCFException
+ {
+ // Read any parameters
+ String maxThreads = getProperty(authCheckThreadCountProperty);
+ if (maxThreads == null)
+ maxThreads = "10";
+ numAuthCheckThreads = new Integer(maxThreads).intValue();
+ if (numAuthCheckThreads < 1 || numAuthCheckThreads > 100)
+ throw new LCFException("Illegal value for the number of auth check threads");
+
+ // Start up threads
+ idleCleanupThread = new IdleCleanupThread();
+ idleCleanupThread.start();
+
+ requestQueue = new RequestQueue();
+
+ authCheckThreads = new AuthCheckThread[numAuthCheckThreads];
+ int i = 0;
+ while (i < numAuthCheckThreads)
+ {
+ authCheckThreads[i] = new AuthCheckThread(Integer.toString(i),requestQueue);
+ authCheckThreads[i].start();
+ i++;
+ }
+ }
+
+ /** Shut down the authority system.
+ */
+ public static void stopSystem(IThreadContext threadContext)
+ throws LCFException
+ {
+
+ while (idleCleanupThread != null || authCheckThreads != null)
+ {
+ if (idleCleanupThread != null)
+ {
+ idleCleanupThread.interrupt();
+ }
+ if (authCheckThreads != null)
+ {
+ int i = 0;
+ while (i < authCheckThreads.length)
+ {
+ Thread authCheckThread = authCheckThreads[i++];
+ if (authCheckThread != null)
+ authCheckThread.interrupt();
+ }
+ }
+
+ if (idleCleanupThread != null)
+ {
+ if (!idleCleanupThread.isAlive())
+ idleCleanupThread = null;
+ }
+ if (authCheckThreads != null)
+ {
+ int i = 0;
+ boolean isAlive = false;
+ while (i < authCheckThreads.length)
+ {
+ Thread authCheckThread = authCheckThreads[i];
+ if (authCheckThread != null)
+ {
+ if (!authCheckThread.isAlive())
+ authCheckThreads[i] = null;
+ else
+ isAlive = true;
+ }
+ i++;
+ }
+ if (!isAlive)
+ authCheckThreads = null;
+ }
+
+ try
+ {
+ LCF.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ }
+ }
+
+ // Release all authority connectors
+ AuthorityConnectorFactory.closeAllConnectors(threadContext);
+ numAuthCheckThreads = 0;
+ requestQueue = null;
+ }
+
+ /** Get the current request queue */
+ public static RequestQueue getRequestQueue()
+ {
+ return requestQueue;
+ }
+
+}
+
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ExportConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ExportConfiguration.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ExportConfiguration.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ExportConfiguration.java Wed Feb 17 15:57:27 2010
@@ -47,9 +47,9 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
- Metacarta.exportConfiguration(tc,exportFilename);
+ LCF.exportConfiguration(tc,exportFilename);
System.err.println("Configuration exported");
}
catch (Exception e)
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/FindJob.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/FindJob.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/FindJob.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/FindJob.java Wed Feb 17 15:57:27 2010
@@ -48,7 +48,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription[] jobs = jobManager.getAllJobs();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/GetJobSchedule.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/GetJobSchedule.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/GetJobSchedule.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/GetJobSchedule.java Wed Feb 17 15:57:27 2010
@@ -49,13 +49,13 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription job = jobManager.load(new Long(jobID));
if (job == null)
- throw new MetacartaException("No such job: "+jobID);
+ throw new LCFException("No such job: "+jobID);
int i = 0;
while (i < job.getScheduleRecordCount())
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ImportConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ImportConfiguration.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ImportConfiguration.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ImportConfiguration.java Wed Feb 17 15:57:27 2010
@@ -47,9 +47,9 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
- Metacarta.importConfiguration(tc,importFilename);
+ LCF.importConfiguration(tc,importFilename);
System.err.println("Configuration imported");
}
catch (Exception e)
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobStatuses.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobStatuses.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobStatuses.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobStatuses.java Wed Feb 17 15:57:27 2010
@@ -47,7 +47,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
JobStatus[] jobStatuses = jobManager.getAllStatus();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobs.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobs.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobs.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/ListJobs.java Wed Feb 17 15:57:27 2010
@@ -47,7 +47,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
IJobDescription[] jobs = jobManager.getAllJobs();
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/Register.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/Register.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/Register.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/Register.java Wed Feb 17 15:57:27 2010
@@ -45,12 +45,12 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -66,7 +66,7 @@
// For each connection name, modify the jobs to note that the connector is now installed
jobManager.noteConnectorRegistration(connectionNames);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
database.signalRollback();
throw e;
@@ -83,7 +83,7 @@
System.err.println("Successfully registered connector '"+className+"'");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunDocumentStatus.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunDocumentStatus.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunDocumentStatus.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunDocumentStatus.java Wed Feb 17 15:57:27 2010
@@ -75,7 +75,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -172,7 +172,7 @@
String state = states[i].trim();
Integer value = (Integer)stateMap.get(state.toLowerCase());
if (value == null)
- throw new MetacartaException("State value of '"+state+"' is illegal");
+ throw new LCFException("State value of '"+state+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
@@ -204,7 +204,7 @@
String status = statuses[i].trim();
Integer value = (Integer)statusMap.get(status.toLowerCase());
if (value == null)
- throw new MetacartaException("Status value of '"+status+"' is illegal");
+ throw new LCFException("Status value of '"+status+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxActivityHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxActivityHistory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxActivityHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxActivityHistory.java Wed Feb 17 15:57:27 2010
@@ -72,7 +72,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxBandwidthHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxBandwidthHistory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxBandwidthHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunMaxBandwidthHistory.java Wed Feb 17 15:57:27 2010
@@ -72,7 +72,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunQueueStatus.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunQueueStatus.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunQueueStatus.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunQueueStatus.java Wed Feb 17 15:57:27 2010
@@ -77,7 +77,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IJobManager jobManager = JobManagerFactory.make(tc);
@@ -174,7 +174,7 @@
String state = states[i].trim();
Integer value = (Integer)stateMap.get(state.toLowerCase());
if (value == null)
- throw new MetacartaException("State value of '"+state+"' is illegal");
+ throw new LCFException("State value of '"+state+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
@@ -206,7 +206,7 @@
String status = statuses[i].trim();
Integer value = (Integer)statusMap.get(status.toLowerCase());
if (value == null)
- throw new MetacartaException("Status value of '"+status+"' is illegal");
+ throw new LCFException("Status value of '"+status+"' is illegal");
rval[i++] = value.intValue();
}
return rval;
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunResultHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunResultHistory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunResultHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunResultHistory.java Wed Feb 17 15:57:27 2010
@@ -73,7 +73,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunSimpleHistory.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunSimpleHistory.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunSimpleHistory.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/RunSimpleHistory.java Wed Feb 17 15:57:27 2010
@@ -70,7 +70,7 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/SynchronizeConnectors.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/SynchronizeConnectors.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/SynchronizeConnectors.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/SynchronizeConnectors.java Wed Feb 17 15:57:27 2010
@@ -42,12 +42,12 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -61,7 +61,7 @@
{
RepositoryConnectorFactory.getConnectorNoCheck(className);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
// Deregistration should be done in a transaction
database.beginTransaction();
@@ -74,7 +74,7 @@
// Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
mgr.removeConnector(className);
}
- catch (MetacartaException e2)
+ catch (LCFException e2)
{
database.signalRollback();
throw e2;
@@ -92,7 +92,7 @@
}
System.err.println("Successfully synchronized all connectors");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegister.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegister.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegister.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegister.java Wed Feb 17 15:57:27 2010
@@ -44,12 +44,12 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -64,7 +64,7 @@
// Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
mgr.unregisterConnector(className);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
database.signalRollback();
throw e;
@@ -80,7 +80,7 @@
}
System.err.println("Successfully unregistered connector '"+className+"'");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);
Modified: incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegisterAll.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegisterAll.java?rev=911029&r1=911028&r2=911029&view=diff
==============================================================================
--- incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegisterAll.java (original)
+++ incubator/lcf/trunk/modules/framework/pull-agent/org/apache/lcf/crawler/UnRegisterAll.java Wed Feb 17 15:57:27 2010
@@ -42,12 +42,12 @@
try
{
- Metacarta.initializeEnvironment();
+ LCF.initializeEnvironment();
IThreadContext tc = ThreadContextFactory.make();
IDBInterface database = DBInterfaceFactory.make(tc,
- Metacarta.getMasterDatabaseName(),
- Metacarta.getMasterDatabaseUsername(),
- Metacarta.getMasterDatabasePassword());
+ LCF.getMasterDatabaseName(),
+ LCF.getMasterDatabaseUsername(),
+ LCF.getMasterDatabasePassword());
IConnectorManager mgr = ConnectorManagerFactory.make(tc);
IJobManager jobManager = JobManagerFactory.make(tc);
IRepositoryConnectionManager connManager = RepositoryConnectionManagerFactory.make(tc);
@@ -68,7 +68,7 @@
// Now that all jobs have been placed into an appropriate state, actually do the deregistration itself.
mgr.unregisterConnector(className);
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
database.signalRollback();
throw e;
@@ -85,7 +85,7 @@
}
System.err.println("Successfully unregistered all connectors");
}
- catch (MetacartaException e)
+ catch (LCFException e)
{
e.printStackTrace();
System.exit(1);