Author: kwright
Date: Tue Sep 24 12:56:24 2013
New Revision: 1525875
URL: http://svn.apache.org/r1525875
Log:
Expose ManifoldCFConfiguration class through ILockManager.
Added:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ManifoldCFConfiguration.java
- copied, changed from r1525861,
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFConfiguration.java
Removed:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFConfiguration.java
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ILockManager.java
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockManager.java
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ILockManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ILockManager.java?rev=1525875&r1=1525874&r2=1525875&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ILockManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ILockManager.java
Tue Sep 24 12:56:24 2013
@@ -19,13 +19,21 @@
package org.apache.manifoldcf.core.interfaces;
-/** The lock manager manages locks across all threads and JVMs and cluster
members. It also
-* manages shared data, which is not necessarily atomic and should be protected
by locks.
+/** The lock manager manages locks and shared data across all threads and JVMs
and cluster members. It also
+* manages transient shared data, which is not necessarily atomic and should be
protected by locks.
*/
public interface ILockManager
{
public static final String _rcsid = "@(#)$Id: ILockManager.java 988245
2010-08-23 18:39:35Z kwright $";
+ /** Get the current shared configuration. This configuration is available
in common among all nodes,
+ * and thus must not be accessed through here for the purpose of finding
configuration data that is specific to any one
+ * specific node.
+ *@param configurationData is the globally-shared configuration information.
+ */
+ public ManifoldCFConfiguration getSharedConfiguration()
+ throws ManifoldCFException;
+
/** Raise a flag. Use this method to assert a condition, or send a global
signal. The flag will be reset when the
* entire system is restarted.
*@param flagName is the name of the flag to set.
Copied:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ManifoldCFConfiguration.java
(from r1525861,
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFConfiguration.java)
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ManifoldCFConfiguration.java?p2=manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ManifoldCFConfiguration.java&p1=manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFConfiguration.java&r1=1525861&r2=1525875&rev=1525875&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCFConfiguration.java
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/ManifoldCFConfiguration.java
Tue Sep 24 12:56:24 2013
@@ -16,9 +16,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.manifoldcf.core.system;
+package org.apache.manifoldcf.core.interfaces;
-import org.apache.manifoldcf.core.interfaces.*;
import java.util.*;
import java.io.*;
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockManager.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockManager.java?rev=1525875&r1=1525874&r2=1525875&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockManager.java
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/lockmanager/LockManager.java
Tue Sep 24 12:56:24 2013
@@ -73,6 +73,18 @@ public class LockManager implements ILoc
/** Global flag information. This is used only when all of ManifoldCF is
run within one process. */
protected static HashMap globalFlags = new HashMap();
+ /** Get the current shared configuration. This configuration is available
in common among all nodes,
+ * and thus must not be accessed through here for the purpose of finding
configuration data that is specific to any one
+ * specific node.
+ *@param configurationData is the globally-shared configuration information.
+ */
+ public ManifoldCFConfiguration getSharedConfiguration()
+ throws ManifoldCFException
+ {
+ // Local implementation vectors through to system property file, which is
shared in this case
+ return ManifoldCF.getConfiguration();
+ }
+
/** Raise a flag. Use this method to assert a condition, or send a global
signal. The flag will be reset when the
* entire system is restarted.
*@param flagName is the name of the flag to set.
Modified:
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1525875&r1=1525874&r2=1525875&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
(original)
+++
manifoldcf/branches/CONNECTORS-13/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
Tue Sep 24 12:56:24 2013
@@ -255,6 +255,13 @@ public class ManifoldCF
}
+ /** Get current properties. Makes no attempt to reread or interpret them.
+ */
+ public static final ManifoldCFConfiguration getConfiguration()
+ {
+ return localConfiguration;
+ }
+
/** Reloads properties as needed.
*/
public static final void checkProperties()
