update to the new domain name for fabric8

hawtio · Dec 16, 2013 · 1964c70 · 1964c70
1 parent 4b7f933
commit 1964c70
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 17 deletions.
diff --git a/hawtio-web/src/main/webapp/app/core/js/workspace.ts b/hawtio-web/src/main/webapp/app/core/js/workspace.ts
@@ -796,10 +796,10 @@ module Core {
     }
 
     hasFabricMBean() {
-      return this.hasDomainAndProperties('org.fusesource.fabric', {type: 'Fabric'});
+      return this.hasDomainAndProperties('io.fabric8', {type: 'Fabric'});
     }
     isFabricFolder() {
-      return this.hasDomainAndProperties('org.fusesource.fabric');
+      return this.hasDomainAndProperties('io.fabric8');
     }
 
     isCamelContext() {

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/test.html b/hawtio-web/src/main/webapp/app/fabric/html/test.html
@@ -9,7 +9,7 @@ <h3>Profile Link</h3>
           <a fabric-profile-link="default">Click me! (use the back button to get back)</a>
         </li>
         <li>
-          <a fabric-profile-link="default" file="org.fusesource.fabric.agent.properties">Me too!</a>
+          <a fabric-profile-link="default" file="io.fabric8.agent.properties">Me too!</a>
         </li>
         <li>
           <a href="http://www.google.com" fabric-profile-link="hawtio">Hey, this link's been overwritten!</a>

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/container.ts b/hawtio-web/src/main/webapp/app/fabric/js/container.ts
@@ -28,7 +28,7 @@ module Fabric {
 
     /*
     // handy for working around any randomly added fields that won't marshal
-    $scope.fields = jolokia.execute(Fabric.managerMBean, 'getFields(java.lang.String)', 'org.fusesource.fabric.api.Container');
+    $scope.fields = jolokia.execute(Fabric.managerMBean, 'getFields(java.lang.String)', 'io.fabric8.api.Container');
     $scope.fields.remove('fabricService');
     $scope.operation = 'getContainer(java.lang.String, java.util.List)'
     */

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createBroker.ts b/hawtio-web/src/main/webapp/app/fabric/js/createBroker.ts
@@ -61,7 +61,7 @@ module Fabric {
       $scope.entity.kind = "MasterSlave";
     }
 
-    Fabric.getDtoSchema("brokerConfig", "org.fusesource.fabric.api.jmx.MQBrokerConfigDTO", jolokia, (schema) => {
+    Fabric.getDtoSchema("brokerConfig", "io.fabric8.api.jmx.MQBrokerConfigDTO", jolokia, (schema) => {
       $scope.schema = schema;
       configureSchema(schema);
       jolokia.execute(Fabric.mqManagerMBean, "loadBrokerStatus()", onSuccess(onBrokerData));

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts b/hawtio-web/src/main/webapp/app/fabric/js/createFabric.ts
@@ -8,7 +8,7 @@ module Fabric {
       }
     });
 
-    Fabric.getSchema('createEnsemble', 'org.fusesource.fabric.api.CreateEnsembleOptions', jolokia, (schema) => {
+    Fabric.getSchema('createEnsemble', 'io.fabric8.api.CreateEnsembleOptions', jolokia, (schema) => {
       $scope.schema = schema;
       Core.$apply($scope);
     });

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/editFeatures.ts b/hawtio-web/src/main/webapp/app/fabric/js/editFeatures.ts
@@ -194,7 +194,7 @@ module Fabric {
       jolokia.request({
         type: 'exec', mbean: managerMBean,
         operation: 'getConfigurationFile(java.lang.String, java.lang.String, java.lang.String)',
-        arguments: [$scope.versionId, $scope.profileId, 'org.fusesource.fabric.agent.properties']
+        arguments: [$scope.versionId, $scope.profileId, 'io.fabric8.agent.properties']
       }, onSuccess($scope.doSave));
     };
 
@@ -219,7 +219,7 @@ module Fabric {
 
       configFile = lines.join('\n');
 
-      saveConfigFile(jolokia, $scope.versionId, $scope.profileId, 'org.fusesource.fabric.agent.properties', configFile.encodeBase64(), () => {
+      saveConfigFile(jolokia, $scope.versionId, $scope.profileId, 'io.fabric8.agent.properties', configFile.encodeBase64(), () => {
           notification('success', "Updated feature definitions...");
           Core.$apply($scope);
         }, (response) => {

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricHelpers.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricHelpers.ts
@@ -5,7 +5,7 @@ module Fabric {
 
   export var log:Logging.Logger = Logger.get("Fabric");
 
-  export var jmxDomain = "org.fusesource.fabric";
+  export var jmxDomain = "io.fabric8";
 
   export var managerMBean = Fabric.jmxDomain + ":type=Fabric";
   export var clusterManagerMBean = Fabric.jmxDomain + ":type=ClusterServiceManager";
@@ -22,8 +22,7 @@ module Fabric {
   var fabricTopLevel = "fabric/profiles/";
   export var profileSuffix = ".profile";
 
-  //export var jolokiaWebAppGroupId = "org.jolokia";
-  export var jolokiaWebAppGroupId = "org.fusesource.fabric.fabric-jolokia";
+  export var jolokiaWebAppGroupId = jmxDomain + "fabric-jolokia";
 
   export function fabricCreated(workspace) {
     return workspace.treeContainsDomainAndProperties(Fabric.jmxDomain, {type: "Fabric"});
@@ -687,7 +686,7 @@ module Fabric {
       container.jmxDomains.forEach((domain) => {
         if (domain === "org.fusesource.insight") {
           answer.push({
-            title: "Fuse Insight",
+            title: "Fabric8 Insight",
             type: "icon",
             src: "icon-eye-open"
           })
@@ -706,9 +705,9 @@ module Fabric {
             src: "app/fabric/img/camel.png"
           });
         }
-        if (domain === "org.fusesource.fabric") {
+        if (domain === "io.fabric8") {
           answer.push({
-            title: "Fuse Fabric",
+            title: "Fabric8",
             type: "img",
             src: "app/fabric/img/fabric.png"
           });

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts
@@ -4,7 +4,7 @@
  */
 module Fabric {
 
-  export var jmxDomain = 'org.fusesource.fabric';
+  export var jmxDomain = 'io.fabric8';
 
   export var templatePath = 'app/fabric/html/';
 

diff --git a/hawtio-web/src/main/webapp/app/health/js/healthHelpers.ts b/hawtio-web/src/main/webapp/app/health/js/healthHelpers.ts
@@ -8,7 +8,7 @@ module Health {
   export var healthDomains = {
     "org.apache.activemq": "ActiveMQ",
     "org.apache.camel": "Camel",
-    "org.fusesource.fabric": "Fabric"
+    "io.fabric8": "Fabric8"
   };
 
   export function hasHealthMBeans(workspace:Workspace) {

diff --git a/hawtio-web/src/main/webapp/app/insight/js/insightHelpers.ts b/hawtio-web/src/main/webapp/app/insight/js/insightHelpers.ts
@@ -3,7 +3,7 @@
  */
 module Insight {
 
-    export var managerMBean = "org.fusesource.fabric:type=Fabric";
+    export var managerMBean = "io.fabric8:type=Fabric";
 
     export var allContainers = { id: '-- all --' };