From 9b179ea109a9cb1733021aaf77a9cb9f346a4d33 Mon Sep 17 00:00:00 2001
From: Jamie Bowen <jamie.bowen@forgerock.com>
Date: Tue, 25 Apr 2017 09:19:06 +0100
Subject: [PATCH] Uses OpenDJ CE version, GroupIds org.forgerock.ce

---
 openidm-provisioner-openicf/pom.xml                         | 2 +-
 .../openicf/impl/ConnectorInfoProviderServiceTest.java      | 4 ++--
 ....impl.OpenICFProvisionerServiceSolarisConnectorTest.json | 6 +++---
 ...icf.impl.OpenICFProvisionerServiceTestConnectorTest.json | 4 ++--
 ...nicf.impl.OpenICFProvisionerServiceXMLConnectorTest.json | 4 ++--
 openidm-ui-ria/openidm-ui-ria-admin/pom.xml                 | 6 +++---
 openidm-ui-ria/openidm-ui-ria-apps/pom.xml                  | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/openidm-provisioner-openicf/pom.xml b/openidm-provisioner-openicf/pom.xml
index 59fc2cec..e2552462 100644
--- a/openidm-provisioner-openicf/pom.xml
+++ b/openidm-provisioner-openicf/pom.xml
@@ -172,7 +172,7 @@
                                 <artifactItem>
                                     <groupId>org.forgerock.ce.openicf.connectors.os</groupId>
                                     <artifactId>openicf-solaris-connector</artifactId>
-                                    <version>1.1.0.0-EA</version>
+                                    <version>1.1.0.0</version>
                                     <type>bundle</type>
                                 </artifactItem>
                                 <!--artifactItem>
diff --git a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
index 9938c691..0e8d7582 100644
--- a/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
+++ b/openidm-provisioner-openicf/src/test/java/org/forgerock/openidm/provisioner/openicf/impl/ConnectorInfoProviderServiceTest.java
@@ -131,7 +131,7 @@ public void testFindConnectorInfo() throws Exception {
         InnerConnectorInfoProviderService instance = new InnerConnectorInfoProviderService();
         instance.activate(context);
 
-        ConnectorReference ref = new ConnectorReference(new ConnectorKey("org.forgerock.openicf.connectors.file.openicf-xml-connector", "1.1.0.0", "com.forgerock.openicf.xml.XMLConnector"));
+        ConnectorReference ref = new ConnectorReference(new ConnectorKey("org.forgerock.ce.openicf.connectors.file.openicf-xml-connector", "1.1.0.0", "com.forgerock.openicf.xml.XMLConnector"));
         Assert.assertNotNull(testableConnectorInfoProvider.findConnectorInfo(ref), "XML Connector is missing");
 
     }
@@ -139,7 +139,7 @@ public void testFindConnectorInfo() throws Exception {
     @Test
     public void testCreateSystemConfiguration() throws URISyntaxException {
         ConnectorInfo xmlConnectorInfo = null;
-        ConnectorKey key = new ConnectorKey("org.forgerock.openicf.connectors.file.openicf-xml-connector", "1.1.0.0", "com.forgerock.openicf.xml.XMLConnector");
+        ConnectorKey key = new ConnectorKey("org.forgerock.ce.openicf.connectors.file.openicf-xml-connector", "1.1.0.0", "com.forgerock.openicf.xml.XMLConnector");
         for (ConnectorInfo info : testableConnectorInfoProvider.getAllConnectorInfo()) {
             if (key.equals(info.getConnectorKey())) {
                 xmlConnectorInfo = info;
diff --git a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceSolarisConnectorTest.json b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceSolarisConnectorTest.json
index 9ce64b56..46f0b781 100644
--- a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceSolarisConnectorTest.json
+++ b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceSolarisConnectorTest.json
@@ -2,8 +2,8 @@
    "name" : "Solaris",
    "connectorRef" :
       {
-         "bundleName" : "org.forgerock.openicf.connectors.os.openicf-solaris-connector",
-         "bundleVersion" : "1.1.0.0-EA",
+         "bundleName" : "org.forgerock.ce.openicf.connectors.os.openicf-solaris-connector",
+         "bundleVersion" : "1.1.0.0",
          "connectorName" : "org.identityconnectors.solaris.SolarisConnector"
       },
    "producerBufferSize" : 100,
@@ -44,4 +44,4 @@
    "operationOptions" :
       {
       }
-}
\ No newline at end of file
+}
diff --git a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceTestConnectorTest.json b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceTestConnectorTest.json
index d5f3f402..86280488 100644
--- a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceTestConnectorTest.json
+++ b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceTestConnectorTest.json
@@ -2,7 +2,7 @@
    "name" : "Test",
    "connectorRef" :
       {
-         "bundleName" : "org.forgerock.openidm.provisioner.openicf.connector.TestConnector.bundle",
+         "bundleName" : "org.forgerock.ce.openidm.provisioner.openicf.connector.TestConnector.bundle",
          "bundleVersion" : "1.0",
          "connectorName" : "org.forgerock.openidm.provisioner.openicf.connector.TestConnector"
       },
@@ -89,4 +89,4 @@
                       ]
           }
       ]
-}
\ No newline at end of file
+}
diff --git a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceXMLConnectorTest.json b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceXMLConnectorTest.json
index 698bff1c..9948a492 100644
--- a/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceXMLConnectorTest.json
+++ b/openidm-provisioner-openicf/src/test/resources/config/org.forgerock.openidm.provisioner.openicf.impl.OpenICFProvisionerServiceXMLConnectorTest.json
@@ -9,7 +9,7 @@
    "hasId" : "true",
    "connectorRef" :
       {
-         "bundleName" : "org.forgerock.openicf.connectors.file.openicf-xml-connector",
+        "bundleName" : "org.forgerock.ce.openicf.connectors.file.openicf-xml-connector",
          "bundleVersion" : "1.1.0.0",
          "connectorName" : "com.forgerock.openicf.xml.XMLConnector"
       },
@@ -412,4 +412,4 @@
    "operationOptions" :
       {
       }
-}
\ No newline at end of file
+}
diff --git a/openidm-ui-ria/openidm-ui-ria-admin/pom.xml b/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
index 1e29be96..545dfab4 100644
--- a/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
+++ b/openidm-ui-ria/openidm-ui-ria-admin/pom.xml
@@ -41,7 +41,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.commons-ce.ui</groupId>
+            <groupId>org.forgerock.ce.commons.ui</groupId>
             <artifactId>forgerock-ui-user</artifactId>
 	    <version>1.0.0</version>
             <type>zip</type>
@@ -137,7 +137,7 @@
                                 <configuration>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>org.forgerock.commons-ce.ui</groupId>
+                                            <groupId>org.forgerock.ce.commons.ui</groupId>
                                             <artifactId>forgerock-ui-user</artifactId>
                                             <version>${forgerock-ui.version}</version>
                                             <type>zip</type>
@@ -223,7 +223,7 @@
                                     <includeGroupIds>org.apache.servicemix.bundles</includeGroupIds>
                                     <artifactItems>
                                         <artifactItem>
-                                            <groupId>org.forgerock.commons.ui</groupId>
+                                            <groupId>org.forgerock.ce.commons.ui</groupId>
                                             <artifactId>forgerock-ui-user</artifactId>
                                             <version>${forgerock-ui.version}</version>
                                             <type>zip</type>
diff --git a/openidm-ui-ria/openidm-ui-ria-apps/pom.xml b/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
index a8c1eb66..49d46de6 100644
--- a/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
+++ b/openidm-ui-ria/openidm-ui-ria-apps/pom.xml
@@ -41,7 +41,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.commons.ui</groupId>
+            <groupId>org.forgerock.ce.commons.ui</groupId>
             <artifactId>forgerock-ui-commons</artifactId>
             <version>${forgerock-ui.version}</version>
             <type>zip</type>
@@ -112,7 +112,7 @@
                     <configuration>
                         <artifactItems>
                         <artifactItem>
-                            <groupId>org.forgerock.commons.ui</groupId>
+                            <groupId>org.forgerock.ce.commons.ui</groupId>
                             <artifactId>forgerock-ui-commons</artifactId>
                             <version>${forgerock-ui.version}</version>
                             <type>zip</type>