FIX Connectors bundleName and versions in samples (#34)

OpenIdentityPlatform · Jun 6, 2024 · d4c9b0e · d4c9b0e
1 parent 7228619
commit d4c9b0e
Show file tree

Hide file tree

Showing 33 changed files with 61 additions and 61 deletions.
diff --git a/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template b/custom-scripted-connector-bundler/src/main/resources/provisioner.openicf.json.template
@@ -5,7 +5,7 @@
     "version" : "1.4.{{version}}",
     "author" : "{{author}}",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.{{lower packageName}}-connector",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.{{lower packageName}}-connector",
         "bundleVersion" : "[1.4.0.0,2.0.0.0)",
         "connectorName" : "org.forgerock.openicf.connectors.{{lower packageName}}.{{packageName}}Connector"
     },

diff --git a/...c/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java b/...c/main/java/org/forgerock/openidm/provisioner/openicf/impl/OpenICFProvisionerService.java
@@ -603,8 +603,8 @@ String getSource(final String objectClass, final String... optionalId) {
      * "connectorRef" :
      *  {
      *      "connectorName": "org.identityconnectors.ldap.LdapConnector",
-     *      "bundleName": "org.forgerock.openicf.connectors.ldap-connector",
-     *      "bundleVersion": "[1.1.0.1,1.1.2.0)"
+     *      "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector",
+     *      "bundleVersion": "[1.1.0.1,2)"
      *  } ,
      * "ok" : true
      * }}
@@ -622,7 +622,7 @@ String getSource(final String objectClass, final String... optionalId) {
      * "connectorRef":
      * {
      *      "connectorName": "org.identityconnectors.ldap.LdapConnector",
-     *      "bundleName": "org.forgerock.openicf.connectors.ldap-connector",
+     *      "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector",
      *      "bundleVersion": "[1.4.0.0,2.0.0.0)"
      * },
      * "error": "connector not available",

diff --git a/...admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js b/...admin/src/test/qunit/org/forgerock/openidm/ui/admin/scheduler/SchedulerDetailsViewTest.js
@@ -50,7 +50,7 @@ define([
                 "config": "config/provisioner.openicf/ldap",
                 "objectTypes": [ "__ALL__", "account", "group" ],
                 "connectorRef": {
-                    "bundleName": "org.forgerock.openicf.connectors.ldap-connector",
+                    "bundleName": "org.openidentityplatform.openicf.connectors.ldap-connector",
                     "connectorName": "org.identityconnectors.ldap.LdapConnector",
                     "bundleVersion": "[1.4.0.0,2.0.0.0)"
                 },

diff --git a/openidm-zip/src/main/resources/getting-started.sh b/openidm-zip/src/main/resources/getting-started.sh
@@ -16,4 +16,4 @@
 # "Portions copyright [year] [name of copyright owner]".
 #
 
-./startup.sh -p samples/getting-started
+./$(dirname "$0")/startup.sh -p samples/getting-started
diff --git a/...idm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json b/...idm-zip/src/main/resources/samples/audit-sample/conf/provisioner.openicf-scriptedsql.json
@@ -1,8 +1,8 @@
 {
     "name" : "auditdb",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.groovy-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.groovy-connector",
+        "bundleVersion" : "[1.4.0.0,2)",
         "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/getting-started/README.txt b/openidm-zip/src/main/resources/samples/getting-started/README.txt
@@ -1,2 +1,2 @@
 For more information, see "Getting Started With OpenIDM":
-https://forgerock.org/openidm/doc/bootstrap/getting-started/index.html
+https://github.com/OpenIdentityPlatform/OpenIDM/wiki/Getting-Started
diff --git a/...-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json b/...-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-engineering.json
@@ -1,8 +1,8 @@
 {
     "name" : "engineering",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.csvfile-connector",
-        "bundleVersion" : "[1.5.1.4,1.6.0.0)",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.csvfile-connector",
+        "bundleVersion" : "[1.5.1.4,2)",
         "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json b/openidm-zip/src/main/resources/samples/getting-started/conf/provisioner.openicf-hr.json
@@ -1,8 +1,8 @@
 {
     "name" : "hr",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.csvfile-connector",
-        "bundleVersion" : "[1.5.1.4,1.6.0.0)",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.csvfile-connector",
+        "bundleVersion" : "[1.5.1.4,2)",
         "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldap.json
@@ -3,8 +3,8 @@
     "connectorRef" : {
         "connectorHostRef" : "#LOCAL",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector",
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)"
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
+        "bundleVersion" : "[1.4.0.0,2)"
     },
     "configurationProperties" : {
         "host" : "",

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-adldsldap.json
@@ -3,8 +3,8 @@
     "connectorRef" : {
         "connectorHostRef" : "#LOCAL",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector",
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)"
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
+        "bundleVersion" : "[1.4.0.0,2)"
     },
     "poolConfigOption" : {
         "maxObjects" : 10,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-contractordb.json
@@ -2,8 +2,8 @@
    "name" : "contractordb",
    "connectorRef" :
       {
-          "bundleName"    : "org.forgerock.openicf.connectors.databasetable-connector",
-          "bundleVersion" : "[1.1.0.2,1.2.0.0)",
+          "bundleName"    : "org.openidentityplatform.openicf.connectors.databasetable-connector",
+          "bundleVersion" : "[1.1.0.2,2)",
           "connectorName" : "org.identityconnectors.databasetable.DatabaseTableConnector"
       },
    "poolConfigOption" :

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-csv.json
@@ -1,8 +1,8 @@
 {
     "name" : "csv",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.csvfile-connector",
-        "bundleVersion" : "[1.5.1.4,1.6.0.0)",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.csvfile-connector",
+        "bundleVersion" : "[1.5.1.4,2)",
         "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-kerberos.json
@@ -5,8 +5,8 @@
   "version" : "1.4.0.0",
   "author" : "ForgeRock",
   "connectorRef" : {
-    "bundleName" : "org.forgerock.openicf.connectors.kerberos-connector",
-    "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+    "bundleName" : "org.openidentityplatform.openicf.connectors.kerberos-connector",
+    "bundleVersion" : "[1.4.0.0,2)",
     "connectorName" : "org.forgerock.openicf.connectors.kerberos.KerberosConnector"
   },
   "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap.json
@@ -1,8 +1,8 @@
 {
     "name" : "ldap",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
+        "bundleVersion" : "[1.4.0.0,2)",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector"
     },
     "configurationProperties" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ldap2.json
@@ -1,8 +1,8 @@
 {
     "name" : "ldap2",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
+        "bundleVersion" : "[1.4.0.0,2)",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector"
     },
     "configurationProperties" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-opendjldap.json
@@ -1,8 +1,8 @@
 {
     "name" : "OpenDJ",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
+        "bundleVersion" : "[1.4.0.0,2)",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-racfldap.json
@@ -4,8 +4,8 @@
     "connectorRef" :
     {
         "connectorHostRef" : "#LOCAL",
-        "bundleName" : "org.forgerock.openicf.connectors.mainframe.openicf-racf-connector",
-        "bundleVersion" : "[1.1.0.0,1.2.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.mainframe.openicf-racf-connector",
+        "bundleVersion" : "[1.1.0.0,2)",
         "connectorName" : "org.identityconnectors.racf.RacfConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedazure.json
@@ -3,8 +3,8 @@
     "connectorRef": {
         "connectorHostRef": "#LOCAL",
         "connectorName": "org.forgerock.openicf.connectors.groovy.ScriptedConnector",
-        "bundleName": "org.forgerock.openicf.connectors.groovy-connector",
-        "bundleVersion": "[1.4.0.0,1.5.0.0)"
+        "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector",
+        "bundleVersion": "[1.4.0.0,2)"
     },
     "operationTimeout": {
         "CREATE": -1,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedcrest.json
@@ -3,8 +3,8 @@
     "connectorRef": {
         "connectorHostRef": "#LOCAL",
         "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector",
-        "bundleName": "org.forgerock.openicf.connectors.groovy-connector",
-        "bundleVersion": "[1.4.0.0,1.5.0.0)"
+        "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector",
+        "bundleVersion": "[1.4.0.0,2)"
     },
     "poolConfigOption": {
         "maxObjects": 10,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedrest.json
@@ -3,8 +3,8 @@
     "connectorRef": {
         "connectorHostRef": "#LOCAL",
         "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector",
-        "bundleName": "org.forgerock.openicf.connectors.groovy-connector",
-        "bundleVersion": "[1.4.0.0,1.5.0.0)"
+        "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector",
+        "bundleVersion": "[1.4.0.0,2)"
     },
     "poolConfigOption": {
         "maxObjects": 10,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-scriptedsql.json
@@ -1,8 +1,8 @@
 {
     "name" : "scriptedsql",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.groovy-connector",
-        "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.groovy-connector",
+        "bundleVersion" : "[1.4.0.0,2)",
         "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-ssh.json
@@ -3,8 +3,8 @@
   "displayName" : "SSHConnector",
   "description" : "SSH connector for performing operations remotely via SSH",
   "connectorRef" : {
-    "bundleName" : "org.forgerock.openicf.connectors.ssh-connector",
-    "bundleVersion" : "[1.4.0.0,1.5.0.0)",
+    "bundleName" : "org.openidentityplatform.openicf.connectors.ssh-connector",
+    "bundleVersion" : "[1.4.0.0,2)",
     "connectorName" : "org.forgerock.openicf.connectors.ssh.SSHConnector"
   },
   "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json b/openidm-zip/src/main/resources/samples/provisioners/provisioner.openicf-xml.json
@@ -1,8 +1,8 @@
 {
     "name" : "xmlfile",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.xml-connector",
-        "bundleVersion" : "[1.1.0.3,1.2.0.0)",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector",
+        "bundleVersion" : "[1.1.0.3,2)",
         "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_AD.json
@@ -1,8 +1,8 @@
 {
     "name" : "ad",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.xml-connector",
-        "bundleVersion" : "1.1.0.3",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.xml-connector",
+        "bundleVersion" : "[1.1.0.3,2)",
         "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json b/openidm-zip/src/main/resources/samples/sample5/conf/provisioner.openicf-xml_LDAP.json
@@ -1,8 +1,8 @@
 {
     "name" : "ldap",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.xml-connector",
-        "bundleVersion" : "1.1.0.3",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.xml-connector",
+        "bundleVersion" : "[1.1.0.3,2)",
         "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json b/openidm-zip/src/main/resources/samples/sample6/alternatives/provisioner.openicf-fakead.json
@@ -1,7 +1,7 @@
 {
     "name" : "ad",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
         "bundleVersion" : "[1.4.0.0,2.0.0.0)",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector"
     },

diff --git a/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json b/openidm-zip/src/main/resources/samples/sample7/conf/provisioner.openicf-scimxml.json
@@ -1,8 +1,8 @@
 {
     "name" : "xmlfile",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.xml-connector",
-        "bundleVersion" : "1.1.0.3",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.xml-connector",
+        "bundleVersion" : "[1.1.0.3,2)",
         "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector"
     },
     "producerBufferSize" : 100,

diff --git a/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md b/openidm-zip/src/main/resources/samples/scriptedcrest2dj/README.md
@@ -131,8 +131,8 @@ OpenIDM Instructions
             {
               "ok": true,
               "connectorRef": {
-                "bundleVersion": "[1.4.0.0,1.5.0.0)",
-                "bundleName": "org.forgerock.openicf.connectors.groovy-connector",
+                "bundleVersion": "[1.4.0.0,2)",
+                "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector",
                 "connectorName": "org.forgerock.openicf.connectors.scriptedcrest.ScriptedCRESTConnector"
               },
               "objectTypes": [

diff --git a/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md b/openidm-zip/src/main/resources/samples/scriptedrest2dj/README.md
@@ -119,9 +119,9 @@ OpenIDM Instructions
                 "group"
               ],
               "connectorRef": {
-                "bundleName": "org.forgerock.openicf.connectors.groovy-connector",
+                "bundleName": "org.openidentityplatform.openicf.connectors.groovy-connector",
                 "connectorName": "org.forgerock.openicf.connectors.scriptedrest.ScriptedRESTConnector",
-                "bundleVersion": "[1.4.0.0,1.5.0.0)"
+                "bundleVersion": "[1.4.0.0,2)"
               },
               "displayName": "Scripted REST Connector",
               "ok": true

diff --git a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-BusinessCSV.json
@@ -1,8 +1,8 @@
 {
     "name" : "business",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.csvfile-connector",
-        "bundleVersion" : "1.5.1.4",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.csvfile-connector",
+        "bundleVersion" : "[1.5.1.4,2)",
         "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json b/openidm-zip/src/main/resources/samples/usecase/conf/provisioner.openicf-HRldap.json
@@ -1,7 +1,7 @@
 {
     "name" : "HR",
     "connectorRef" : {
-        "bundleName" : "org.forgerock.openicf.connectors.ldap-connector",
+        "bundleName" : "org.openidentityplatform.openicf.connectors.ldap-connector",
         "bundleVersion" : "[1.4.0.0,2.0.0.0)",
         "connectorName" : "org.identityconnectors.ldap.LdapConnector"
     },

diff --git a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-csv.json
@@ -1,8 +1,8 @@
 {
     "name" : "rolesFile",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.csvfile-connector",
-        "bundleVersion" : "1.5.1.4",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.csvfile-connector",
+        "bundleVersion" : "[1.5.1.4,2)",
         "connectorName" : "org.forgerock.openicf.csvfile.CSVFileConnector"
     },
     "poolConfigOption" : {

diff --git a/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json b/openidm-zip/src/main/resources/samples/workflow/conf/provisioner.openicf-xml.json
@@ -1,8 +1,8 @@
 {
     "name" : "xmlfile",
     "connectorRef" : {
-        "bundleName"    : "org.forgerock.openicf.connectors.xml-connector",
-        "bundleVersion" : "1.1.0.3",
+        "bundleName"    : "org.openidentityplatform.openicf.connectors.xml-connector",
+        "bundleVersion" : "[1.1.0.3,2)",
         "connectorName" : "org.forgerock.openicf.connectors.xml.XMLConnector"
     },
     "producerBufferSize" : 100,