You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by go...@apache.org on 2011/12/01 16:16:32 UTC
svn commit: r1209115 - in
/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component:
hub/ instance/
Author: gokturk
Date: Thu Dec 1 15:16:31 2011
New Revision: 1209115
URL: http://svn.apache.org/viewvc?rev=1209115&view=rev
Log:
Instance management related package changes...
Added:
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/InstanceManager.java
Removed:
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ConfigurationManager.java
Modified:
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentHub.java
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentManager.java
directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/instance/ADSComponentInstance.java
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentHub.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentHub.java?rev=1209115&r1=1209114&r2=1209115&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentHub.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentHub.java Thu Dec 1 15:16:31 2011
@@ -102,7 +102,7 @@ public class ComponentHub
/*
* Used to manage instances' DIT hooks.
*/
- private ConfigurationManager configManager = new ConfigurationManager();
+ private InstanceManager configManager = new InstanceManager();
/*
* Used to manage components
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentManager.java?rev=1209115&r1=1209114&r2=1209115&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/ComponentManager.java Thu Dec 1 15:16:31 2011
@@ -72,7 +72,7 @@ public class ComponentManager
/*
* Configuration Manager
*/
- private ConfigurationManager configManager;
+ private InstanceManager instanceManager;
/*
* Ldif deferred writing queue.
@@ -85,13 +85,13 @@ public class ComponentManager
private LdapCoreSessionConnection ldapConn;
- public ComponentManager( ComponentCacheManager cacheManager, ConfigurationManager configManager )
+ public ComponentManager( ComponentCacheManager cacheManager, InstanceManager instanceManager )
{
schemaGenerators = new Hashtable<String, ComponentSchemaGenerator>();
instanceGenerators = new Hashtable<String, ADSComponentInstanceGenerator>();
this.cacheManager = cacheManager;
- this.configManager = configManager;
+ this.instanceManager = instanceManager;
}
@@ -155,7 +155,7 @@ public class ComponentManager
{
ADSComponentInstance instance = generator.createInstance( component, properties );
- instance.setConfigManager( configManager );
+ instance.setInstanceManager( instanceManager );
if ( instance != null )
{
Added: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/InstanceManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/InstanceManager.java?rev=1209115&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/InstanceManager.java (added)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/hub/InstanceManager.java Thu Dec 1 15:16:31 2011
@@ -0,0 +1,25 @@
+/*
+ * 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.directory.server.component.hub;
+
+public class InstanceManager
+{
+
+}
Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/instance/ADSComponentInstance.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/instance/ADSComponentInstance.java?rev=1209115&r1=1209114&r2=1209115&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/instance/ADSComponentInstance.java (original)
+++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/instance/ADSComponentInstance.java Thu Dec 1 15:16:31 2011
@@ -23,7 +23,7 @@ package org.apache.directory.server.comp
import java.util.Properties;
import org.apache.directory.server.component.ADSComponent;
-import org.apache.directory.server.component.hub.ConfigurationManager;
+import org.apache.directory.server.component.hub.InstanceManager;
/**
@@ -51,12 +51,22 @@ public class ADSComponentInstance
/*
* Dn value shows where the configuration hook is set on DIT.
*/
- private String configHookDn;
+ private String DITHookDn;
/*
* ConfigurationManager to manage instance's DIT hooks.
*/
- private ConfigurationManager configManager;
+ private InstanceManager instanceManager;
+
+ /*
+ * Specifies whether this instance's DIT hook will be watched for changes.
+ */
+ private boolean isReconfigurable;
+
+ /*
+ * Specifies whether instance is avtive or cached
+ */
+ private boolean isActive = false;
/**
@@ -116,27 +126,63 @@ public class ADSComponentInstance
/**
* @return the configHookDn
*/
- public String getConfigHookDn()
+ public String getDITHookDn()
{
- return configHookDn;
+ return DITHookDn;
}
/**
* @param configHookDn the configHookDn to set
*/
- public void setConfigHookDn( String configHookDn )
+ public void setDITHookDn( String DITHookDn )
{
- this.configHookDn = configHookDn;
+ this.DITHookDn = DITHookDn;
}
/**
* @param configManager the configManager to set
*/
- public void setConfigManager( ConfigurationManager configManager )
+ public void setInstanceManager( InstanceManager instanceManager )
+ {
+ this.instanceManager = instanceManager;
+ }
+
+
+ /**
+ * @return the isActive
+ */
+ public boolean isActive()
+ {
+ return isActive;
+ }
+
+
+ /**
+ * Sets the instance active.
+ */
+ public void setActive()
+ {
+ this.isActive = true;
+ }
+
+
+ /**
+ * @return the isReconfigurable
+ */
+ public boolean isReconfigurable()
+ {
+ return isReconfigurable;
+ }
+
+
+ /**
+ * @param isReconfigurable the isReconfigurable to set
+ */
+ public void setReconfigurable( boolean isReconfigurable )
{
- this.configManager = configManager;
+ this.isReconfigurable = isReconfigurable;
}
}