directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1338647 [1/2] - in /directory/apacheds/branches/apacheds-osgi/hub: api/src/main/java/org/apache/directory/server/hub/api/ api/src/main/java/org/apache/directory/server/hub/api/component/ api/src/main/java/org/apache/directory/server/hub/ap...
Date Tue, 15 May 2012 11:10:46 GMT
Author: gokturk
Date: Tue May 15 11:10:44 2012
New Revision: 1338647

URL: http://svn.apache.org/viewvc?rev=1338647&view=rev
Log:
* Fixed class names to comply with camel casing

Added:
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcConfiguration.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCConfiguration.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcProperty.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCProperty.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcRuntime.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCRuntime.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcMetadataDescriptor.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCMetadataDescriptor.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcOperationsManager.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCOperationsManager.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyDescription.java
      - copied, changed from r1338640, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyDescription.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyType.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyType.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DcMetadataRegistry.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DCMetadataRegistry.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PidHandlerRegistry.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PIDHandlerRegistry.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DcMetadataBuilder.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DCMetadataBuilder.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDcHandler.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDCHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DcHandlerConstants.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DCHandlerConstants.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/meta/DcMetadataNormalizer.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/meta/DCMetadataNormalizer.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/ApacheDsConfigStore.java
      - copied, changed from r1338634, directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/ApacheDSConfigStore.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/OidManager.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/OIDManager.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/StoreDcBuilder.java
      - copied, changed from r1338498, directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/StoreDCBuilder.java
Removed:
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCConfiguration.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCProperty.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCRuntime.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCMetadataDescriptor.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCOperationsManager.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyDescription.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyType.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DCMetadataRegistry.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PIDHandlerRegistry.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DCMetadataBuilder.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDCHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DCHandlerConstants.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/meta/DCMetadataNormalizer.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/ApacheDSConfigStore.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/OIDManager.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/StoreDCBuilder.java
Modified:
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/ComponentHub.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/HubStore.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponent.java
    directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponentConstants.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoConnector.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoOperations.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryComponentHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryInterceptorHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryPartitionHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryServerHandler.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/ComponentHubImpl.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/HubClientManager.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/configurator/ConfiguratorInterceptor.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionConnector.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionMetaDescriptorGenerator.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionOperations.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/StoreConfigManager.java
    directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/store/StoreSchemaManager.java

Modified: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/ComponentHub.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/ComponentHub.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/ComponentHub.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/ComponentHub.java Tue May 15 11:10:44 2012
@@ -20,16 +20,16 @@
 
 package org.apache.directory.server.hub.api;
 
-import org.apache.directory.server.hub.api.component.DCConfiguration;
+import org.apache.directory.server.hub.api.component.DcConfiguration;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.exception.HubAbortException;
 import org.apache.directory.server.hub.api.exception.StoreNotValidException;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
-import org.apache.directory.server.hub.api.meta.DCOperationsManager;
-import org.apache.directory.server.hub.api.registry.DCMetadataRegistry;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcOperationsManager;
+import org.apache.directory.server.hub.api.registry.DcMetadataRegistry;
 import org.apache.directory.server.hub.api.registry.DirectoryComponentRegistry;
 import org.apache.directory.server.hub.api.registry.InjectionRegistry;
-import org.apache.directory.server.hub.api.registry.PIDHandlerRegistry;
+import org.apache.directory.server.hub.api.registry.PidHandlerRegistry;
 
 
 
@@ -40,7 +40,7 @@ public interface ComponentHub
     public abstract void init() throws StoreNotValidException;
 
 
-    public abstract void connectHandler( DCMetadataDescriptor metadata, DCOperationsManager operationsManager )
+    public abstract void connectHandler( DcMetadataDescriptor metadata, DcOperationsManager operationsManager )
         throws HubAbortException;
 
 
@@ -50,7 +50,7 @@ public interface ComponentHub
     public abstract void updateComponentName( DirectoryComponent component, String newPID ) throws HubAbortException;
 
 
-    public abstract void updateComponent( DirectoryComponent component, DCConfiguration newConfiguration )
+    public abstract void updateComponent( DirectoryComponent component, DcConfiguration newConfiguration )
         throws HubAbortException;
 
 
@@ -75,12 +75,12 @@ public interface ComponentHub
     public abstract DirectoryComponentRegistry getDCRegistry();
 
 
-    public abstract DCMetadataRegistry getMetaRegistry();
+    public abstract DcMetadataRegistry getMetaRegistry();
 
 
     public abstract InjectionRegistry getInjectionRegistry();
 
 
-    public abstract PIDHandlerRegistry getPIDHandlerRegistry();
+    public abstract PidHandlerRegistry getPIDHandlerRegistry();
 
 }
\ No newline at end of file

Modified: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/HubStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/HubStore.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/HubStore.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/HubStore.java Tue May 15 11:10:44 2012
@@ -23,11 +23,11 @@ package org.apache.directory.server.hub.
 
 import java.util.List;
 
-import org.apache.directory.server.hub.api.component.DCConfiguration;
+import org.apache.directory.server.hub.api.component.DcConfiguration;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.exception.HubStoreException;
 import org.apache.directory.server.hub.api.exception.StoreNotValidException;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
 
 
 
@@ -37,26 +37,26 @@ public interface HubStore
     public void init( ComponentHub hub ) throws StoreNotValidException;
 
 
-    List<DCMetadataDescriptor> getMetadataDescriptors() throws HubStoreException;
+    List<DcMetadataDescriptor> getMetadataDescriptors() throws HubStoreException;
 
 
     List<DirectoryComponent> getComponents() throws HubStoreException;
 
 
-    void installMetadataDescriptor( DCMetadataDescriptor metadata ) throws HubStoreException;
+    void installMetadataDescriptor( DcMetadataDescriptor metadata ) throws HubStoreException;
 
 
-    void updateMetadataDescriptor( DCMetadataDescriptor oldMetadata, DCMetadataDescriptor newMetadata )
+    void updateMetadataDescriptor( DcMetadataDescriptor oldMetadata, DcMetadataDescriptor newMetadata )
         throws HubStoreException;
 
 
-    void uninstallMetadataDescriptor( DCMetadataDescriptor metadata ) throws HubStoreException;
+    void uninstallMetadataDescriptor( DcMetadataDescriptor metadata ) throws HubStoreException;
 
 
     void installComponent( DirectoryComponent component ) throws HubStoreException;
 
 
-    void updateComponent( DirectoryComponent component, DCConfiguration newConfiguration ) throws HubStoreException;
+    void updateComponent( DirectoryComponent component, DcConfiguration newConfiguration ) throws HubStoreException;
 
 
     void uninstallComponent( DirectoryComponent component ) throws HubStoreException;

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcConfiguration.java (from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcConfiguration.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcConfiguration.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCConfiguration.java&r1=1338634&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCConfiguration.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcConfiguration.java Tue May 15 11:10:44 2012
@@ -27,35 +27,35 @@ import java.util.Iterator;
 import java.util.List;
 
 
-public class DCConfiguration implements Iterable<DCProperty>
+public class DcConfiguration implements Iterable<DcProperty>
 {
-    private List<DCProperty> properties;
-    private Hashtable<String, DCProperty> propertyMap;
+    private List<DcProperty> properties;
+    private Hashtable<String, DcProperty> propertyMap;
     private Integer collectionIndex = null;
 
     private Hashtable<String, String> constantProperties = new Hashtable<String, String>();
 
 
-    public DCConfiguration( List<DCProperty> properties )
+    public DcConfiguration( List<DcProperty> properties )
     {
         this.properties = properties;
-        propertyMap = new Hashtable<String, DCProperty>();
+        propertyMap = new Hashtable<String, DcProperty>();
 
-        for ( DCProperty property : properties )
+        for ( DcProperty property : properties )
         {
             propertyMap.put( property.getName(), property );
         }
     }
 
 
-    public DCConfiguration( DCConfiguration configuration )
+    public DcConfiguration( DcConfiguration configuration )
     {
-        properties = new ArrayList<DCProperty>();
-        propertyMap = new Hashtable<String, DCProperty>();
+        properties = new ArrayList<DcProperty>();
+        propertyMap = new Hashtable<String, DcProperty>();
 
-        for ( DCProperty prop : configuration )
+        for ( DcProperty prop : configuration )
         {
-            addProperty( new DCProperty( prop.getName(), prop.getValue() ) );
+            addProperty( new DcProperty( prop.getName(), prop.getValue() ) );
         }
 
         collectionIndex = configuration.getCollectionIndex();
@@ -63,13 +63,13 @@ public class DCConfiguration implements 
 
 
     @Override
-    public Iterator<DCProperty> iterator()
+    public Iterator<DcProperty> iterator()
     {
         return properties.iterator();
     }
 
 
-    public void addProperty( DCProperty property )
+    public void addProperty( DcProperty property )
     {
         properties.add( property );
         propertyMap.put( property.getName(), property );
@@ -78,7 +78,7 @@ public class DCConfiguration implements 
 
     public void removeProperty( String propertyName )
     {
-        DCProperty removing = propertyMap.remove( propertyName );
+        DcProperty removing = propertyMap.remove( propertyName );
         if ( removing != null )
         {
             properties.remove( removing );
@@ -86,7 +86,7 @@ public class DCConfiguration implements 
     }
 
 
-    public DCProperty getProperty( String propertyName )
+    public DcProperty getProperty( String propertyName )
     {
         return propertyMap.get( propertyName );
     }

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcProperty.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCProperty.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcProperty.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcProperty.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCProperty.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCProperty.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcProperty.java Tue May 15 11:10:44 2012
@@ -21,14 +21,14 @@
 package org.apache.directory.server.hub.api.component;
 
 
-public class DCProperty
+public class DcProperty
 {
     private String name;
     private String value;
     private Object object;
 
 
-    public DCProperty( String name, String value )
+    public DcProperty( String name, String value )
     {
         this.name = name;
         this.value = value;

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcRuntime.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCRuntime.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcRuntime.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcRuntime.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCRuntime.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DCRuntime.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DcRuntime.java Tue May 15 11:10:44 2012
@@ -21,13 +21,13 @@
 package org.apache.directory.server.hub.api.component;
 
 
-public class DCRuntime
+public class DcRuntime
 {
     private Object pojo;
     private Object specialObject;
 
 
-    public DCRuntime( Object specialObject, Object pojo )
+    public DcRuntime( Object specialObject, Object pojo )
     {
         this.specialObject = specialObject;
         this.pojo = pojo;

Modified: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponent.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponent.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponent.java Tue May 15 11:10:44 2012
@@ -30,7 +30,7 @@ public class DirectoryComponent
     private String componentManagerPID;
     private String componentName;
     private String configLocation;
-    private DCConfiguration configuration;
+    private DcConfiguration configuration;
 
     private List<String> errors = new ArrayList<String>();
     private List<String> warnings = new ArrayList<String>();
@@ -39,11 +39,11 @@ public class DirectoryComponent
 
     private boolean dirty;
 
-    private DCRuntime runtimeInfo;
+    private DcRuntime runtimeInfo;
 
 
     public DirectoryComponent( String componentManagerPID, String componentName,
-        DCConfiguration configuration )
+        DcConfiguration configuration )
     {
         this.componentManagerPID = componentManagerPID;
         this.componentName = componentName;
@@ -69,25 +69,25 @@ public class DirectoryComponent
     }
 
 
-    public void setConfiguration( DCConfiguration configuration )
+    public void setConfiguration( DcConfiguration configuration )
     {
         this.configuration = configuration;
     }
 
 
-    public DCConfiguration getConfiguration()
+    public DcConfiguration getConfiguration()
     {
         return configuration;
     }
 
 
-    public void setRuntimeInfo( DCRuntime runtieInfo )
+    public void setRuntimeInfo( DcRuntime runtieInfo )
     {
         this.runtimeInfo = runtieInfo;
     }
 
 
-    public DCRuntime getRuntimeInfo()
+    public DcRuntime getRuntimeInfo()
     {
         return runtimeInfo;
     }

Modified: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponentConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponentConstants.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponentConstants.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/component/DirectoryComponentConstants.java Tue May 15 11:10:44 2012
@@ -21,8 +21,8 @@
 package org.apache.directory.server.hub.api.component;
 
 
-import org.apache.directory.server.hub.api.meta.DCPropertyDescription;
-import org.apache.directory.server.hub.api.meta.DCPropertyType;
+import org.apache.directory.server.hub.api.meta.DcPropertyDescription;
+import org.apache.directory.server.hub.api.meta.DcPropertyType;
 
 
 public class DirectoryComponentConstants
@@ -40,6 +40,6 @@ public class DirectoryComponentConstants
     public static final String DC_SET_PROP_TYPE = "ads-set-containing";
     public static final String DC_ARRAY_PROP_TYPE = "ads-array-containing";
 
-    public static DCPropertyDescription itemDescription = new DCPropertyDescription( DCPropertyType.REFERENCE, "item",
+    public static DcPropertyDescription itemDescription = new DcPropertyDescription( DcPropertyType.REFERENCE, "item",
         "", "null", "", false, false, "" );
 }

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcMetadataDescriptor.java (from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCMetadataDescriptor.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcMetadataDescriptor.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcMetadataDescriptor.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCMetadataDescriptor.java&r1=1338634&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCMetadataDescriptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcMetadataDescriptor.java Tue May 15 11:10:44 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.hub.a
 import org.osgi.framework.Version;
 
 
-public class DCMetadataDescriptor
+public class DcMetadataDescriptor
 {
     private String metadataPID;
     private Version metaVersion;
@@ -36,16 +36,16 @@ public class DCMetadataDescriptor
     private String[] implemented = new String[0];
     private String[] extended = new String[0];
 
-    private DCPropertyDescription[] properties;
+    private DcPropertyDescription[] properties;
 
-    private Hashtable<String, DCPropertyDescription> propertyMap;
+    private Hashtable<String, DcPropertyDescription> propertyMap;
 
     private Hashtable<String, String> constants;
 
     private boolean factory;
 
 
-    public DCMetadataDescriptor(
+    public DcMetadataDescriptor(
         String metadataPID,
         boolean isFactory,
         Version metaVersion,
@@ -53,7 +53,7 @@ public class DCMetadataDescriptor
         String[] implemented,
         String[] extended,
         Hashtable<String, String> constants,
-        DCPropertyDescription[] properties )
+        DcPropertyDescription[] properties )
     {
         this.metadataPID = metadataPID;
         this.factory = isFactory;
@@ -64,11 +64,11 @@ public class DCMetadataDescriptor
         this.constants = constants;
         this.properties = properties;
 
-        propertyMap = new Hashtable<String, DCPropertyDescription>();
+        propertyMap = new Hashtable<String, DcPropertyDescription>();
 
         if ( properties != null )
         {
-            for ( DCPropertyDescription p : properties )
+            for ( DcPropertyDescription p : properties )
             {
                 propertyMap.put( p.getName(), p );
             }
@@ -112,13 +112,13 @@ public class DCMetadataDescriptor
     }
 
 
-    public DCPropertyDescription[] getPropertyDescriptons()
+    public DcPropertyDescription[] getPropertyDescriptons()
     {
         return properties;
     }
 
 
-    public DCPropertyDescription getPropertyDescription( String propertyName )
+    public DcPropertyDescription getPropertyDescription( String propertyName )
     {
         if ( propertyName.startsWith( DirectoryComponentConstants.DC_PROP_ITEM_PREFIX ) )
         {
@@ -129,7 +129,7 @@ public class DCMetadataDescriptor
     }
 
 
-    public boolean compatibleWith( DCMetadataDescriptor metadata )
+    public boolean compatibleWith( DcMetadataDescriptor metadata )
     {
         Version version = metadata.getMetaVersion();
 

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcOperationsManager.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCOperationsManager.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcOperationsManager.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcOperationsManager.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCOperationsManager.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCOperationsManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcOperationsManager.java Tue May 15 11:10:44 2012
@@ -27,7 +27,7 @@ import org.apache.directory.server.hub.a
 
 
 
-public interface DCOperationsManager
+public interface DcOperationsManager
 {
     void instantiateComponent( DirectoryComponent component ) throws ComponentInstantiationException;
 

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyDescription.java (from r1338640, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyDescription.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyDescription.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyDescription.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyDescription.java&r1=1338640&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyDescription.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyDescription.java Tue May 15 11:10:44 2012
@@ -21,9 +21,9 @@
 package org.apache.directory.server.hub.api.meta;
 
 
-public class DCPropertyDescription
+public class DcPropertyDescription
 {
-    private DCPropertyType propertyContext;
+    private DcPropertyType propertyContext;
     private String name;
     private String type;
     private String defaultValue;
@@ -33,14 +33,14 @@ public class DCPropertyDescription
     private String containerFor;
 
 
-    public DCPropertyDescription( String name, String type, String defaultValue, String description, boolean mandatory,
+    public DcPropertyDescription( String name, String type, String defaultValue, String description, boolean mandatory,
         boolean immutable, String containerFor )
     {
         this( null, name, type, defaultValue, description, mandatory, immutable, containerFor );
     }
 
 
-    public DCPropertyDescription( DCPropertyType propertyContext, String name, String type, String defaultValue,
+    public DcPropertyDescription( DcPropertyType propertyContext, String name, String type, String defaultValue,
         String description, boolean mandatory, boolean immutable, String containerFor )
     {
         this.propertyContext = propertyContext;
@@ -102,13 +102,13 @@ public class DCPropertyDescription
     }
 
 
-    public DCPropertyType getPropertyContext()
+    public DcPropertyType getPropertyContext()
     {
         return propertyContext;
     }
 
 
-    public void setPropertyContext( DCPropertyType propertyContext )
+    public void setPropertyContext( DcPropertyType propertyContext )
     {
         this.propertyContext = propertyContext;
     }

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyType.java (from r1338634, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyType.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyType.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyType.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyType.java&r1=1338634&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DCPropertyType.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/meta/DcPropertyType.java Tue May 15 11:10:44 2012
@@ -21,7 +21,7 @@
 package org.apache.directory.server.hub.api.meta;
 
 
-public enum DCPropertyType
+public enum DcPropertyType
 {
     PRIMITIVE,
     REFERENCE,

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DcMetadataRegistry.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DCMetadataRegistry.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DcMetadataRegistry.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DcMetadataRegistry.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DCMetadataRegistry.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DCMetadataRegistry.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/DcMetadataRegistry.java Tue May 15 11:10:44 2012
@@ -24,24 +24,24 @@ package org.apache.directory.server.hub.
 import java.util.Hashtable;
 import java.util.List;
 
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
 
 
 
-public class DCMetadataRegistry
+public class DcMetadataRegistry
 {
-    private Hashtable<String, DCMetadataDescriptor> metadatas = new Hashtable<String, DCMetadataDescriptor>();
+    private Hashtable<String, DcMetadataDescriptor> metadatas = new Hashtable<String, DcMetadataDescriptor>();
 
 
-    public void addMetadataDescriptor( DCMetadataDescriptor meta )
+    public void addMetadataDescriptor( DcMetadataDescriptor meta )
     {
         metadatas.put( meta.getMetadataPID(), meta );
     }
 
 
-    public void addMetadataDescriptor( List<DCMetadataDescriptor> metas )
+    public void addMetadataDescriptor( List<DcMetadataDescriptor> metas )
     {
-        for ( DCMetadataDescriptor meta : metas )
+        for ( DcMetadataDescriptor meta : metas )
         {
             addMetadataDescriptor( meta );
         }
@@ -54,7 +54,7 @@ public class DCMetadataRegistry
     }
 
 
-    public DCMetadataDescriptor getMetadataDescriptor( String metaPID )
+    public DcMetadataDescriptor getMetadataDescriptor( String metaPID )
     {
         return metadatas.get( metaPID );
     }

Copied: directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PidHandlerRegistry.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PIDHandlerRegistry.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PidHandlerRegistry.java?p2=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PidHandlerRegistry.java&p1=directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PIDHandlerRegistry.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PIDHandlerRegistry.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/api/src/main/java/org/apache/directory/server/hub/api/registry/PidHandlerRegistry.java Tue May 15 11:10:44 2012
@@ -23,22 +23,22 @@ package org.apache.directory.server.hub.
 
 import java.util.Hashtable;
 
-import org.apache.directory.server.hub.api.meta.DCOperationsManager;
+import org.apache.directory.server.hub.api.meta.DcOperationsManager;
 
 
 
-public class PIDHandlerRegistry
+public class PidHandlerRegistry
 {
-    private Hashtable<String, DCOperationsManager> handlers = new Hashtable<String, DCOperationsManager>();
+    private Hashtable<String, DcOperationsManager> handlers = new Hashtable<String, DcOperationsManager>();
 
 
-    public void setPIDHandler( String pid, DCOperationsManager operationsManager )
+    public void setPIDHandler( String pid, DcOperationsManager operationsManager )
     {
         handlers.put( pid, operationsManager );
     }
 
 
-    public DCOperationsManager getPIDHandler( String pid )
+    public DcOperationsManager getPIDHandler( String pid )
     {
         return handlers.get( pid );
     }

Copied: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DcMetadataBuilder.java (from r1338634, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DCMetadataBuilder.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DcMetadataBuilder.java?p2=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DcMetadataBuilder.java&p1=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DCMetadataBuilder.java&r1=1338634&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DCMetadataBuilder.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/DcMetadataBuilder.java Tue May 15 11:10:44 2012
@@ -27,8 +27,8 @@ import java.util.Hashtable;
 import java.util.List;
 import org.apache.directory.server.component.handler.ipojo.property.DirectoryPropertyDescription;
 import org.apache.directory.server.hub.api.component.util.ComponentConstants;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
-import org.apache.directory.server.hub.api.meta.DCPropertyDescription;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcPropertyDescription;
 import org.apache.felix.ipojo.ComponentFactory;
 import org.apache.felix.ipojo.architecture.ComponentTypeDescription;
 import org.apache.felix.ipojo.architecture.PropertyDescription;
@@ -36,14 +36,14 @@ import org.apache.felix.ipojo.metadata.E
 import org.osgi.framework.Version;
 
 
-public class DCMetadataBuilder
+public class DcMetadataBuilder
 {
-    public static DCMetadataDescriptor generateDCMetadata( ComponentFactory factory )
+    public static DcMetadataDescriptor generateDCMetadata( ComponentFactory factory )
     {
         String metadataPID = factory.getName();
         Version metaVersion = factory.getBundleContext().getBundle().getVersion();
 
-        List<DCPropertyDescription> properties = new ArrayList<DCPropertyDescription>();
+        List<DcPropertyDescription> properties = new ArrayList<DcPropertyDescription>();
 
         Hashtable<String, String> constants = new Hashtable<String, String>();
 
@@ -77,7 +77,7 @@ public class DCMetadataBuilder
             }
             else
             {
-                properties.add( new DCPropertyDescription( name, type,
+                properties.add( new DcPropertyDescription( name, type,
                     defaultValue, description, mandatory, immutable, containerFor ) );
             }
         }
@@ -95,8 +95,8 @@ public class DCMetadataBuilder
         String[] implemented = parseArray( interfaces );
         String[] extended = parseArray( sclasses );
 
-        DCMetadataDescriptor metadata = new DCMetadataDescriptor( metadataPID, true, metaVersion, className,
-            implemented, extended, constants, properties.toArray( new DCPropertyDescription[0] ) );
+        DcMetadataDescriptor metadata = new DcMetadataDescriptor( metadataPID, true, metaVersion, className,
+            implemented, extended, constants, properties.toArray( new DcPropertyDescription[0] ) );
 
         return metadata;
     }

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoConnector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoConnector.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoConnector.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoConnector.java Tue May 15 11:10:44 2012
@@ -28,8 +28,8 @@ import org.apache.directory.server.hub.a
 import org.apache.directory.server.hub.api.HubConnector;
 import org.apache.directory.server.hub.api.component.util.ComponentConstants;
 import org.apache.directory.server.hub.api.exception.HubAbortException;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
-import org.apache.directory.server.hub.api.meta.DCOperationsManager;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcOperationsManager;
 import org.apache.felix.ipojo.ComponentFactory;
 import org.apache.felix.ipojo.architecture.PropertyDescription;
 import org.osgi.framework.BundleContext;
@@ -66,8 +66,8 @@ public class IPojoConnector implements H
     {
         if ( isDirectoryFactory( factory ) )
         {
-            DCMetadataDescriptor metadata = DCMetadataBuilder.generateDCMetadata( factory );
-            DCOperationsManager operationsManager = new IPojoOperations( factory );
+            DcMetadataDescriptor metadata = DcMetadataBuilder.generateDCMetadata( factory );
+            DcOperationsManager operationsManager = new IPojoOperations( factory );
 
             try
             {

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoOperations.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoOperations.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoOperations.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/core/src/main/java/org/apache/directory/server/hub/connector/ipojo/core/IPojoOperations.java Tue May 15 11:10:44 2012
@@ -24,12 +24,12 @@ package org.apache.directory.server.hub.
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.apache.directory.server.hub.api.component.DCProperty;
-import org.apache.directory.server.hub.api.component.DCRuntime;
+import org.apache.directory.server.hub.api.component.DcProperty;
+import org.apache.directory.server.hub.api.component.DcRuntime;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.exception.ComponentInstantiationException;
 import org.apache.directory.server.hub.api.exception.ComponentReconfigurationException;
-import org.apache.directory.server.hub.api.meta.DCOperationsManager;
+import org.apache.directory.server.hub.api.meta.DcOperationsManager;
 import org.apache.felix.ipojo.ComponentFactory;
 import org.apache.felix.ipojo.ComponentInstance;
 import org.apache.felix.ipojo.ConfigurationException;
@@ -38,7 +38,7 @@ import org.apache.felix.ipojo.MissingHan
 import org.apache.felix.ipojo.UnacceptableConfiguration;
 
 
-public class IPojoOperations implements DCOperationsManager
+public class IPojoOperations implements DcOperationsManager
 {
 
     private ComponentFactory factory;
@@ -54,7 +54,7 @@ public class IPojoOperations implements 
     public void instantiateComponent( DirectoryComponent component ) throws ComponentInstantiationException
     {
         Dictionary<String, Object> configuration = new Hashtable<String, Object>();
-        for ( DCProperty prop : component.getConfiguration() )
+        for ( DcProperty prop : component.getConfiguration() )
         {
             configuration.put( prop.getName(), prop.getObject() );
         }
@@ -68,7 +68,7 @@ public class IPojoOperations implements 
             InstanceManager manager = ( InstanceManager ) instance;
             Object pojo = manager.getPojoObject();
 
-            component.setRuntimeInfo( new DCRuntime( manager, pojo ) );
+            component.setRuntimeInfo( new DcRuntime( manager, pojo ) );
         }
         catch ( UnacceptableConfiguration e )
         {
@@ -91,7 +91,7 @@ public class IPojoOperations implements 
     @Override
     public void reconfigureComponent( DirectoryComponent component ) throws ComponentReconfigurationException
     {
-        DCRuntime runtime = component.getRuntimeInfo();
+        DcRuntime runtime = component.getRuntimeInfo();
         if ( runtime == null || runtime.getSpecialObject() == null )
         {
             throw new ComponentReconfigurationException( "Failed to reconfigure disposed component:"
@@ -107,7 +107,7 @@ public class IPojoOperations implements 
         }
 
         Dictionary<String, Object> configuration = new Hashtable<String, Object>();
-        for ( DCProperty prop : component.getConfiguration() )
+        for ( DcProperty prop : component.getConfiguration() )
         {
             configuration.put( prop.getName(), prop.getObject() );
         }
@@ -127,7 +127,7 @@ public class IPojoOperations implements 
     @Override
     public void disposeComponent( DirectoryComponent component )
     {
-        DCRuntime runtime = component.getRuntimeInfo();
+        DcRuntime runtime = component.getRuntimeInfo();
         if ( runtime == null || runtime.getSpecialObject() == null )
         {
             component.setRuntimeInfo( null );

Copied: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDcHandler.java (from r1338634, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDCHandler.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDcHandler.java?p2=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDcHandler.java&p1=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDCHandler.java&r1=1338634&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDCHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/AbstractDcHandler.java Tue May 15 11:10:44 2012
@@ -57,7 +57,7 @@ import org.osgi.framework.InvalidSyntaxE
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AbstractDCHandler extends PrimitiveHandler
+public abstract class AbstractDcHandler extends PrimitiveHandler
 {
 
     /**
@@ -234,7 +234,7 @@ public abstract class AbstractDCHandler 
     public void configure( Element metadata, Dictionary configuration ) throws ConfigurationException
     {
         // Owning ApacheDS instance
-        String ownerADS = ( String ) configuration.get( DCHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME );
+        String ownerADS = ( String ) configuration.get( DcHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME );
         m_ownerADSInstance = ownerADS;
 
         // Build the map
@@ -352,7 +352,7 @@ public abstract class AbstractDCHandler 
             if ( m_ownerADSInstance != null )
             {
                 Properties ownerADSProps = new Properties();
-                ownerADSProps.put( DCHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME, m_ownerADSInstance );
+                ownerADSProps.put( DcHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME, m_ownerADSInstance );
                 m_providedServiceHandler.addProperties( ownerADSProps );
             }
 
@@ -366,7 +366,7 @@ public abstract class AbstractDCHandler 
             {
                 String currentFilter = dep.getFilter();
 
-                String ownerProp = DCHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME;
+                String ownerProp = DcHandlerConstants.DSCOMPONENT_OWNER_PROP_NAME;
                 String owningRestriction = "(|(!(" + ownerProp + "=*))(" + ownerProp + "=" + m_ownerADSInstance + "))";
 
                 String augmentedFilter = "(&" + currentFilter + owningRestriction + ")";

Copied: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DcHandlerConstants.java (from r1338498, directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DCHandlerConstants.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DcHandlerConstants.java?p2=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DcHandlerConstants.java&p1=directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DCHandlerConstants.java&r1=1338498&r2=1338647&rev=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DCHandlerConstants.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DcHandlerConstants.java Tue May 15 11:10:44 2012
@@ -21,7 +21,7 @@
 package org.apache.directory.server.component.handler.ipojo;
 
 
-public class DCHandlerConstants
+public class DcHandlerConstants
 {
     /*
      * Handler names for Component Handlers

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryComponentHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryComponentHandler.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryComponentHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryComponentHandler.java Tue May 15 11:10:44 2012
@@ -22,26 +22,25 @@ package org.apache.directory.server.comp
 
 
 import java.util.Hashtable;
-import java.util.Properties;
 
 import org.apache.felix.ipojo.annotations.Handler;
 import org.apache.felix.ipojo.metadata.Element;
 
-@Handler(name = DCHandlerConstants.DSCOMPONENT_HANDLER_NAME, namespace = DCHandlerConstants.DSCOMPONENT_HANDLER_NS)
-public class DirectoryComponentHandler extends AbstractDCHandler
+@Handler(name = DcHandlerConstants.DSCOMPONENT_HANDLER_NAME, namespace = DcHandlerConstants.DSCOMPONENT_HANDLER_NS)
+public class DirectoryComponentHandler extends AbstractDcHandler
 {
 
     @Override
     protected String getHandlerName()
     {
-        return DCHandlerConstants.DSCOMPONENT_HANDLER_NAME;
+        return DcHandlerConstants.DSCOMPONENT_HANDLER_NAME;
     }
 
 
     @Override
     protected String getHandlerNamespaceName()
     {
-        return DCHandlerConstants.DSCOMPONENT_HANDLER_NS;
+        return DcHandlerConstants.DSCOMPONENT_HANDLER_NS;
     }
 
 

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryInterceptorHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryInterceptorHandler.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryInterceptorHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryInterceptorHandler.java Tue May 15 11:10:44 2012
@@ -29,21 +29,21 @@ import org.apache.felix.ipojo.annotation
 import org.apache.felix.ipojo.metadata.Element;
 
 
-@Handler(name = DCHandlerConstants.DSINTERCEPTOR_HANDLER_NAME, namespace = DCHandlerConstants.DSINTERCEPTOR_HANDLER_NS)
-public class DirectoryInterceptorHandler extends AbstractDCHandler
+@Handler(name = DcHandlerConstants.DSINTERCEPTOR_HANDLER_NAME, namespace = DcHandlerConstants.DSINTERCEPTOR_HANDLER_NS)
+public class DirectoryInterceptorHandler extends AbstractDcHandler
 {
 
     @Override
     protected String getHandlerName()
     {
-        return DCHandlerConstants.DSINTERCEPTOR_HANDLER_NAME;
+        return DcHandlerConstants.DSINTERCEPTOR_HANDLER_NAME;
     }
 
 
     @Override
     protected String getHandlerNamespaceName()
     {
-        return DCHandlerConstants.DSINTERCEPTOR_HANDLER_NS;
+        return DcHandlerConstants.DSINTERCEPTOR_HANDLER_NS;
     }
 
 

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryPartitionHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryPartitionHandler.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryPartitionHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryPartitionHandler.java Tue May 15 11:10:44 2012
@@ -28,21 +28,21 @@ import org.apache.felix.ipojo.annotation
 import org.apache.felix.ipojo.metadata.Element;
 
 
-@Handler(name = DCHandlerConstants.DSPARTITION_HANDLER_NAME, namespace = DCHandlerConstants.DSPARTITION_HANDLER_NS)
-public class DirectoryPartitionHandler extends AbstractDCHandler
+@Handler(name = DcHandlerConstants.DSPARTITION_HANDLER_NAME, namespace = DcHandlerConstants.DSPARTITION_HANDLER_NS)
+public class DirectoryPartitionHandler extends AbstractDcHandler
 {
 
     @Override
     protected String getHandlerName()
     {
-        return DCHandlerConstants.DSPARTITION_HANDLER_NAME;
+        return DcHandlerConstants.DSPARTITION_HANDLER_NAME;
     }
 
 
     @Override
     protected String getHandlerNamespaceName()
     {
-        return DCHandlerConstants.DSPARTITION_HANDLER_NS;
+        return DcHandlerConstants.DSPARTITION_HANDLER_NS;
     }
 
 

Modified: directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryServerHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryServerHandler.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryServerHandler.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/connectors/ipojo/handler/src/main/java/org/apache/directory/server/component/handler/ipojo/DirectoryServerHandler.java Tue May 15 11:10:44 2012
@@ -28,21 +28,21 @@ import org.apache.felix.ipojo.annotation
 import org.apache.felix.ipojo.metadata.Element;
 
 
-@Handler(name = DCHandlerConstants.DSSERVER_HANDLER_NAME, namespace = DCHandlerConstants.DSSERVER_HANDLER_NS)
-public class DirectoryServerHandler extends AbstractDCHandler
+@Handler(name = DcHandlerConstants.DSSERVER_HANDLER_NAME, namespace = DcHandlerConstants.DSSERVER_HANDLER_NS)
+public class DirectoryServerHandler extends AbstractDcHandler
 {
 
     @Override
     protected String getHandlerName()
     {
-        return DCHandlerConstants.DSSERVER_HANDLER_NAME;
+        return DcHandlerConstants.DSSERVER_HANDLER_NAME;
     }
 
 
     @Override
     protected String getHandlerNamespaceName()
     {
-        return DCHandlerConstants.DSSERVER_HANDLER_NS;
+        return DcHandlerConstants.DSSERVER_HANDLER_NS;
     }
 
 

Modified: directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/ComponentHubImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/ComponentHubImpl.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/ComponentHubImpl.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/ComponentHubImpl.java Tue May 15 11:10:44 2012
@@ -33,9 +33,9 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.hub.api.AbstractHubClient;
 import org.apache.directory.server.hub.api.ComponentHub;
 import org.apache.directory.server.hub.api.HubStore;
-import org.apache.directory.server.hub.api.component.DCConfiguration;
-import org.apache.directory.server.hub.api.component.DCProperty;
-import org.apache.directory.server.hub.api.component.DCRuntime;
+import org.apache.directory.server.hub.api.component.DcConfiguration;
+import org.apache.directory.server.hub.api.component.DcProperty;
+import org.apache.directory.server.hub.api.component.DcRuntime;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.component.DirectoryComponentConstants;
 import org.apache.directory.server.hub.api.component.util.InterceptionPoint;
@@ -47,18 +47,18 @@ import org.apache.directory.server.hub.a
 import org.apache.directory.server.hub.api.exception.HubAbortException;
 import org.apache.directory.server.hub.api.exception.HubStoreException;
 import org.apache.directory.server.hub.api.exception.StoreNotValidException;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
-import org.apache.directory.server.hub.api.meta.DCOperationsManager;
-import org.apache.directory.server.hub.api.meta.DCPropertyDescription;
-import org.apache.directory.server.hub.api.meta.DCPropertyType;
-import org.apache.directory.server.hub.api.registry.DCMetadataRegistry;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcOperationsManager;
+import org.apache.directory.server.hub.api.meta.DcPropertyDescription;
+import org.apache.directory.server.hub.api.meta.DcPropertyType;
+import org.apache.directory.server.hub.api.registry.DcMetadataRegistry;
 import org.apache.directory.server.hub.api.registry.DirectoryComponentRegistry;
 import org.apache.directory.server.hub.api.registry.InjectionRegistry;
-import org.apache.directory.server.hub.api.registry.PIDHandlerRegistry;
+import org.apache.directory.server.hub.api.registry.PidHandlerRegistry;
 import org.apache.directory.server.hub.connector.ipojo.core.IPojoConnector;
 import org.apache.directory.server.hub.core.configurator.ConfiguratorInterceptor;
 import org.apache.directory.server.hub.core.connector.collection.CollectionConnector;
-import org.apache.directory.server.hub.core.meta.DCMetadataNormalizer;
+import org.apache.directory.server.hub.core.meta.DcMetadataNormalizer;
 import org.apache.directory.server.hub.core.util.DCDependency;
 import org.apache.directory.server.hub.core.util.ParentLink;
 import org.apache.directory.server.hub.core.util.DCDependency.DCDependencyType;
@@ -70,9 +70,9 @@ public class ComponentHubImpl implements
 {
     // Registries
     private DirectoryComponentRegistry componentsReg = new DirectoryComponentRegistry();
-    private DCMetadataRegistry metadatasReg = new DCMetadataRegistry();
+    private DcMetadataRegistry metadatasReg = new DcMetadataRegistry();
     private InjectionRegistry injectionsReg = new InjectionRegistry();
-    private PIDHandlerRegistry handlersReg = new PIDHandlerRegistry();
+    private PidHandlerRegistry handlersReg = new PidHandlerRegistry();
     private ParentLinkRegistry parentLinksReg = new ParentLinkRegistry();
 
     private CollectionConnector collectionConnector;
@@ -103,7 +103,7 @@ public class ComponentHubImpl implements
 
         try
         {
-            List<DCMetadataDescriptor> metadatas = store.getMetadataDescriptors();
+            List<DcMetadataDescriptor> metadatas = store.getMetadataDescriptors();
             metadatasReg.addMetadataDescriptor( metadatas );
 
             List<DirectoryComponent> components = store.getComponents();
@@ -134,12 +134,12 @@ public class ComponentHubImpl implements
      * @see org.apache.directory.server.hub.ComponentHub#connectHandler(org.apache.directory.server.hub.component.meta.DCMetadataDescriptor, org.apache.directory.server.hub.component.meta.DCOperationsManager)
      */
     @Override
-    public void connectHandler( DCMetadataDescriptor metadata, DCOperationsManager operationsManager )
+    public void connectHandler( DcMetadataDescriptor metadata, DcOperationsManager operationsManager )
         throws HubAbortException
     {
-        DCMetadataDescriptor existingMetadata = metadatasReg.getMetadataDescriptor( metadata.getMetadataPID() );
+        DcMetadataDescriptor existingMetadata = metadatasReg.getMetadataDescriptor( metadata.getMetadataPID() );
 
-        DCMetadataNormalizer.normalizeDCMetadata( metadata );
+        DcMetadataNormalizer.normalizeDCMetadata( metadata );
 
         if ( existingMetadata == null )
         {
@@ -195,7 +195,7 @@ public class ComponentHubImpl implements
     @Override
     public void disconnectHandler( String handlerPID )
     {
-        DCMetadataDescriptor meta = metadatasReg.getMetadataDescriptor( handlerPID );
+        DcMetadataDescriptor meta = metadatasReg.getMetadataDescriptor( handlerPID );
         if ( meta != null )
         {
             deactivateHandler( handlerPID );
@@ -237,10 +237,10 @@ public class ComponentHubImpl implements
      * @see org.apache.directory.server.hub.ComponentHub#updateComponent(org.apache.directory.server.hub.component.DirectoryComponent, org.apache.directory.server.hub.component.DCConfiguration)
      */
     @Override
-    public void updateComponent( DirectoryComponent component, DCConfiguration newConfiguration )
+    public void updateComponent( DirectoryComponent component, DcConfiguration newConfiguration )
         throws HubAbortException
     {
-        DCMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
+        DcMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
 
         setInjectionProperties( metadata, newConfiguration );
 
@@ -260,12 +260,12 @@ public class ComponentHubImpl implements
         // Immutable property change handling
         if ( component.getRuntimeInfo() != null )
         {
-            for ( DCProperty prop : newConfiguration )
+            for ( DcProperty prop : newConfiguration )
             {
-                DCPropertyDescription pd = metadata.getPropertyDescription( prop.getName() );
+                DcPropertyDescription pd = metadata.getPropertyDescription( prop.getName() );
                 if ( pd != null && pd.isImmutable() )
                 {
-                    DCProperty oldProp = component.getConfiguration().getProperty( prop.getName() );
+                    DcProperty oldProp = component.getConfiguration().getProperty( prop.getName() );
                     if ( oldProp != null && !( oldProp.getValue().equals( prop.getValue() ) ) )
                     {
                         // We're changing immutable property of live component
@@ -332,7 +332,7 @@ public class ComponentHubImpl implements
 
         if ( componentsReg.getComponents( component.getComponentManagerPID() ) != null )
         {
-            DCMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
+            DcMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
             if ( !metadata.isFactory() )
             {
                 throw new HubAbortException( metadata.getMetadataPID() + "can not have more than 1 instance" );
@@ -467,33 +467,33 @@ public class ComponentHubImpl implements
     }
 
 
-    private void setInjectionProperties( DCMetadataDescriptor metadata, DCConfiguration configuration )
+    private void setInjectionProperties( DcMetadataDescriptor metadata, DcConfiguration configuration )
     {
 
-        for ( DCPropertyDescription pd : metadata.getPropertyDescriptons() )
+        for ( DcPropertyDescription pd : metadata.getPropertyDescriptons() )
         {
-            if ( pd.getPropertyContext() == DCPropertyType.INJECTION )
+            if ( pd.getPropertyContext() == DcPropertyType.INJECTION )
             {
                 if ( pd.isMandatory() )
                 {
-                    configuration.addProperty( new DCProperty( pd.getName(), null ) );
+                    configuration.addProperty( new DcProperty( pd.getName(), null ) );
                 }
             }
         }
     }
 
 
-    private void validateConfiguration( DirectoryComponent component, DCConfiguration configuration )
+    private void validateConfiguration( DirectoryComponent component, DcConfiguration configuration )
         throws BadConfigurationException
     {
-        DCMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
+        DcMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
 
-        for ( DCProperty property : configuration )
+        for ( DcProperty property : configuration )
         {
             String propertyName = property.getName();
             String propertyValue = property.getValue();
 
-            DCPropertyDescription pd = metadata.getPropertyDescription( propertyName );
+            DcPropertyDescription pd = metadata.getPropertyDescription( propertyName );
 
             if ( pd == null )
             {
@@ -522,13 +522,13 @@ public class ComponentHubImpl implements
                             + " is lacking property:" + propertyName );
                     }
 
-                    DCMetadataDescriptor referenceMetadata = metadatasReg.getMetadataDescriptor( reference
+                    DcMetadataDescriptor referenceMetadata = metadatasReg.getMetadataDescriptor( reference
                         .getComponentManagerPID() );
 
                     // Means iterating property is a collection item, we should match type with container type.
                     if ( metadata.is( Collection.class.getName() ) )
                     {
-                        DCProperty containerProp = null;
+                        DcProperty containerProp = null;
 
                         if ( metadata.is( List.class.getName() ) )
                         {
@@ -591,7 +591,7 @@ public class ComponentHubImpl implements
     private void processConfiguration( DirectoryComponent component ) throws BadConfigurationException
     {
         parentLinksReg.destroyComponentLinks( component );
-        DCMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
+        DcMetadataDescriptor metadata = metadatasReg.getMetadataDescriptor( component.getComponentManagerPID() );
 
         // Loading meta-constant properties into component
         Hashtable<String, String> constants = metadata.getConstants();
@@ -603,12 +603,12 @@ public class ComponentHubImpl implements
             }
         }
 
-        for ( DCProperty property : component.getConfiguration() )
+        for ( DcProperty property : component.getConfiguration() )
         {
             String propertyName = property.getName();
             String propertyValue = property.getValue();
 
-            DCPropertyDescription pd = metadata.getPropertyDescription( propertyName );
+            DcPropertyDescription pd = metadata.getPropertyDescription( propertyName );
 
             if ( pd == null )
             {
@@ -650,13 +650,13 @@ public class ComponentHubImpl implements
                             + " is lacking property:" + propertyName );
                     }
 
-                    DCMetadataDescriptor referenceMetadata = metadatasReg.getMetadataDescriptor( reference
+                    DcMetadataDescriptor referenceMetadata = metadatasReg.getMetadataDescriptor( reference
                         .getComponentManagerPID() );
 
                     // Means iterating property is a collection item, we should match type with container type.
                     if ( metadata.is( Collection.class.getName() ) )
                     {
-                        DCProperty containerProp = null;
+                        DcProperty containerProp = null;
 
                         if ( metadata.is( List.class.getName() ) )
                         {
@@ -721,7 +721,7 @@ public class ComponentHubImpl implements
 
     private void instantiateComponent( DirectoryComponent component )
     {
-        DCOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
+        DcOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
         if ( opManager == null )
         {
             return;
@@ -761,7 +761,7 @@ public class ComponentHubImpl implements
 
     private void reconfigureComponent( DirectoryComponent component )
     {
-        DCOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
+        DcOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
         if ( opManager == null )
         {
             return;
@@ -782,7 +782,7 @@ public class ComponentHubImpl implements
                 {
                     DirectoryComponent parent = parentLink.getParent();
                     parent.getConfiguration().addProperty(
-                        new DCProperty( DirectoryComponentConstants.DC_PROP_INNER_RECONF_NAME, parentLink
+                        new DcProperty( DirectoryComponentConstants.DC_PROP_INNER_RECONF_NAME, parentLink
                             .getLinkPoint() ) );
 
                     reconfigureComponent( parent );
@@ -815,7 +815,7 @@ public class ComponentHubImpl implements
             }
         }
 
-        DCOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
+        DcOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
         if ( opManager != null )
         {
             opManager.disposeComponent( component );
@@ -832,7 +832,7 @@ public class ComponentHubImpl implements
         {
             for ( ParentLink parentLink : parents )
             {
-                DCProperty refProperty = parentLink.getParent().getConfiguration()
+                DcProperty refProperty = parentLink.getParent().getConfiguration()
                     .getProperty( parentLink.getLinkPoint() );
                 refProperty.setValue( "null" );
 
@@ -840,7 +840,7 @@ public class ComponentHubImpl implements
             }
         }
 
-        DCOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
+        DcOperationsManager opManager = handlersReg.getPIDHandler( component.getComponentManagerPID() );
         if ( opManager != null )
         {
             opManager.disposeComponent( component );
@@ -855,7 +855,7 @@ public class ComponentHubImpl implements
         configurator = new ConfiguratorInterceptor();
         configurator.init( this );
 
-        DCConfiguration config = new DCConfiguration( new ArrayList<DCProperty>() );
+        DcConfiguration config = new DcConfiguration( new ArrayList<DcProperty>() );
         config.addConstant( InterceptorConstants.PROP_INTERCEPTION_POINT, InterceptionPoint.END.toString() );
         config.addConstant( InterceptorConstants.PROP_INTERCEPTOR_OPERATIONS,
             "[" +
@@ -866,14 +866,14 @@ public class ComponentHubImpl implements
                 + "]" );
 
         DirectoryComponent component = new DirectoryComponent( "configuratorMeta", "configuratorInterceptor", config );
-        component.setRuntimeInfo( new DCRuntime( null, configurator ) );
+        component.setRuntimeInfo( new DcRuntime( null, configurator ) );
         component.setConfigLocation( "ads-instance=configuratorInterceptor,ou=config" );
         component.setDirty( false );
 
-        DCMetadataDescriptor configuratorMeta =
-            new DCMetadataDescriptor( "configuratorMeta", false, new Version( "2.0.0" ),
+        DcMetadataDescriptor configuratorMeta =
+            new DcMetadataDescriptor( "configuratorMeta", false, new Version( "2.0.0" ),
                 ConfiguratorInterceptor.class.getName(), new String[]
-                    { Interceptor.class.getName() }, new String[0], null, new DCPropertyDescription[0] );
+                    { Interceptor.class.getName() }, new String[0], null, new DcPropertyDescription[0] );
 
         metadatasReg.addMetadataDescriptor( configuratorMeta );
         componentsReg.addDirectoryComponent( component );
@@ -896,7 +896,7 @@ public class ComponentHubImpl implements
      * @see org.apache.directory.server.hub.ComponentHub#getMetaRegistry()
      */
     @Override
-    public DCMetadataRegistry getMetaRegistry()
+    public DcMetadataRegistry getMetaRegistry()
     {
         return metadatasReg;
     }
@@ -916,7 +916,7 @@ public class ComponentHubImpl implements
      * @see org.apache.directory.server.hub.ComponentHub#getPIDHandlerRegistry()
      */
     @Override
-    public PIDHandlerRegistry getPIDHandlerRegistry()
+    public PidHandlerRegistry getPIDHandlerRegistry()
     {
         return handlersReg;
     }

Modified: directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/HubClientManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/HubClientManager.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/HubClientManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/HubClientManager.java Tue May 15 11:10:44 2012
@@ -32,7 +32,7 @@ import org.apache.directory.server.hub.a
 import org.apache.directory.server.hub.api.ComponentHub;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.exception.HubAbortException;
-import org.apache.directory.server.hub.api.meta.DCMetadataDescriptor;
+import org.apache.directory.server.hub.api.meta.DcMetadataDescriptor;
 
 
 public class HubClientManager
@@ -56,7 +56,7 @@ public class HubClientManager
 
         for ( DirectoryComponent component : existing )
         {
-            DCMetadataDescriptor metadata = hub.getMetaRegistry().getMetadataDescriptor(
+            DcMetadataDescriptor metadata = hub.getMetaRegistry().getMetadataDescriptor(
                 component.getComponentManagerPID() );
             if ( metadata.is( type ) )
             {
@@ -140,7 +140,7 @@ public class HubClientManager
     {
         List<AbstractHubClient> registeredClients = new ArrayList<AbstractHubClient>();
 
-        DCMetadataDescriptor metadata = hub.getMetaRegistry()
+        DcMetadataDescriptor metadata = hub.getMetaRegistry()
             .getMetadataDescriptor( component.getComponentManagerPID() );
 
         Set<String> registeredTypes = typeRegistrations.keySet();

Modified: directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/configurator/ConfiguratorInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/configurator/ConfiguratorInterceptor.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/configurator/ConfiguratorInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/configurator/ConfiguratorInterceptor.java Tue May 15 11:10:44 2012
@@ -36,12 +36,12 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.hub.api.ComponentHub;
 import org.apache.directory.server.hub.api.HubConnector;
-import org.apache.directory.server.hub.api.component.DCConfiguration;
-import org.apache.directory.server.hub.api.component.DCProperty;
+import org.apache.directory.server.hub.api.component.DcConfiguration;
+import org.apache.directory.server.hub.api.component.DcProperty;
 import org.apache.directory.server.hub.api.component.DirectoryComponent;
 import org.apache.directory.server.hub.api.component.DirectoryComponentConstants;
 import org.apache.directory.server.hub.api.exception.HubAbortException;
-import org.apache.directory.server.hub.core.store.StoreDCBuilder;
+import org.apache.directory.server.hub.core.store.StoreDcBuilder;
 import org.apache.directory.server.hub.core.store.StoreSchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -55,7 +55,7 @@ import org.apache.directory.shared.ldap.
 public class ConfiguratorInterceptor extends BaseInterceptor implements HubConnector
 {
     private ComponentHub hub;
-    private StoreDCBuilder dcBuilder;
+    private StoreDcBuilder dcBuilder;
 
 
     public ConfiguratorInterceptor()
@@ -72,7 +72,7 @@ public class ConfiguratorInterceptor ext
     {
         super.init( directoryService );
 
-        dcBuilder = new StoreDCBuilder( directoryService.getSchemaManager() );
+        dcBuilder = new StoreDcBuilder( directoryService.getSchemaManager() );
     }
 
 
@@ -102,13 +102,13 @@ public class ConfiguratorInterceptor ext
                 DirectoryComponent parentComponent = hub.getDCRegistry().getComponentByLocation( parentDn.toString() );
                 if ( parentComponent.getComponentManagerPID().startsWith( StoreSchemaConstants.HUB_OC_COLLECTION ) )
                 {
-                    DCConfiguration newConfiguration = new DCConfiguration( parentComponent.getConfiguration() );
+                    DcConfiguration newConfiguration = new DcConfiguration( parentComponent.getConfiguration() );
 
                     String itemID = DirectoryComponentConstants.DC_PROP_ITEM_PREFIX
                         + component.getComponentPID();
 
                     newConfiguration.addProperty(
-                        new DCProperty( itemID, component.getComponentPID() ) );
+                        new DcProperty( itemID, component.getComponentPID() ) );
 
                     try
                     {
@@ -207,7 +207,7 @@ public class ConfiguratorInterceptor ext
                 modifyContext.getModItems() );
             DirectoryComponent newComponent = dcBuilder.buildComponentFromEntry( modifiedEntry );
 
-            DCConfiguration newConfiguration = newComponent.getConfiguration();
+            DcConfiguration newConfiguration = newComponent.getConfiguration();
 
             try
             {

Modified: directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionConnector.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionConnector.java?rev=1338647&r1=1338646&r2=1338647&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionConnector.java (original)
+++ directory/apacheds/branches/apacheds-osgi/hub/core/src/main/java/org/apache/directory/server/hub/core/connector/collection/CollectionConnector.java Tue May 15 11:10:44 2012
@@ -24,8 +24,8 @@ package org.apache.directory.server.hub.
 import org.apache.directory.server.hub.api.ComponentHub;
 import org.apache.directory.server.hub.api.HubConnector;
 import org.apache.directory.server.hub.api.exception.HubAbortException;
-import org.apache.directory.server.hub.api.meta.DCPropertyDescription;
-import org.apache.directory.server.hub.api.meta.DCPropertyType;
+import org.apache.directory.server.hub.api.meta.DcPropertyDescription;
+import org.apache.directory.server.hub.api.meta.DcPropertyType;
 
 
 public class CollectionConnector implements HubConnector



Mime
View raw message