From b2b2a9a8dd5e0f4d71511ec7d06b30ca06e96d34 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Dec 2013 18:06:25 +0000
Subject: [PATCH] Additional fix OPENDJ-1223: Copy DataProvider PoC from branch to OpenDJ 3 trunk
---
opendj-server/src/main/java/org/forgerock/opendj/server/core/AttachmentHolder.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/RestoreConfig.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/Privilege.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/ImportableDataProvider.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/ArchivableDataProvider.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/BindRequestContext.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/ExportableDataProvider.java | 0
opendj-server/pom.xml | 2 +-
opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/BackupConfig.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/package-info.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderCfg.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEventListener.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderStatus.java | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java | 0
opendj-server/src/site/xdoc/index.xml.vm | 0
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java | 0
22 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/opendj-server3/pom.xml b/opendj-server/pom.xml
similarity index 98%
rename from opendj-server3/pom.xml
rename to opendj-server/pom.xml
index c37f192..eb37c06 100644
--- a/opendj-server3/pom.xml
+++ b/opendj-server/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.forgerock.opendj</groupId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>opendj-server3</artifactId>
+ <artifactId>opendj-server</artifactId>
<name>OpenDJ LDAP Directory Server</name>
<description>
This module includes the core functionality of the OpenDJ LDAP Directory Server.
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/ArchivableDataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/ArchivableDataProvider.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/ArchivableDataProvider.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/ArchivableDataProvider.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/Attachment.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/Attachment.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/Attachment.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/AttachmentHolder.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/AttachmentHolder.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/AttachmentHolder.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/AttachmentHolder.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/BackupConfig.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/BackupConfig.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/BackupConfig.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/BackupConfig.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/BindRequestContext.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/BindRequestContext.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/BindRequestContext.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/BindRequestContext.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderCfg.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderCfg.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderCfg.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderCfg.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEvent.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderEventListener.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEventListener.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderEventListener.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderEventListener.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderID.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderStatus.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderStatus.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/DataProviderStatus.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderStatus.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/ExportableDataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/ExportableDataProvider.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/ExportableDataProvider.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/ExportableDataProvider.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/ImportableDataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/ImportableDataProvider.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/ImportableDataProvider.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/ImportableDataProvider.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/Operation.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/Operation.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/Operation.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/Privilege.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/Privilege.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/Privilege.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/Privilege.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/RestoreConfig.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/RestoreConfig.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/RestoreConfig.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/RestoreConfig.java
diff --git a/opendj-server3/src/main/java/org/forgerock/opendj/server/core/package-info.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/package-info.java
similarity index 100%
rename from opendj-server3/src/main/java/org/forgerock/opendj/server/core/package-info.java
rename to opendj-server/src/main/java/org/forgerock/opendj/server/core/package-info.java
diff --git a/opendj-server3/src/site/xdoc/index.xml.vm b/opendj-server/src/site/xdoc/index.xml.vm
similarity index 100%
rename from opendj-server3/src/site/xdoc/index.xml.vm
rename to opendj-server/src/site/xdoc/index.xml.vm
--
Gitblit v1.10.0