Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fixes #152 so we use the domain name "hawtio" which is a little easie…
…r on the eye and helps folks grok what the mbeans are for more easily; so all our mbeans are now inside the same "hawtio" domain to avoid polluting JMX
  • Loading branch information
jstrachan committed Dec 6, 2013
1 parent 4de7362 commit 318542f
Show file tree
Hide file tree
Showing 30 changed files with 35 additions and 35 deletions.
Expand Up @@ -152,7 +152,7 @@ public void setRemoteRepositories(List<RemoteRepository> remoteRepositories) {

@Override
protected String getDefaultObjectName() {
return "io.hawt.aether:type=AetherFacade";
return "hawtio:type=AetherFacade";
}

protected RepositorySystem newManualSystem() throws PlexusContainerException, ComponentLookupException {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-core/src/main/java/io/hawt/config/ConfigFacade.java
Expand Up @@ -34,7 +34,7 @@ public void init() throws Exception {

@Override
protected String getDefaultObjectName() {
return "io.hawt.config:type=ConfigFacade";
return "hawtio:type=ConfigFacade";
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion hawtio-dozer/src/main/java/io/hawt/dozer/DozerFacade.java
Expand Up @@ -44,7 +44,7 @@ public void destroy() throws Exception {

@Override
protected String getDefaultObjectName() {
return "io.hawt.dozer:type=DozerFacade";
return "hawtio:type=DozerFacade";
}

}
2 changes: 1 addition & 1 deletion hawtio-git/src/main/java/io/hawt/git/GitFacadeSupport.java
Expand Up @@ -382,7 +382,7 @@ protected ObjectId getBranchObjectId(Git git, String branch) {

@Override
protected String getDefaultObjectName() {
return "io.hawt.git:type=GitFacade";
return "hawtio:type=GitFacade";
}

protected String doGetContent(Git git, String objectId, String pathOrBlobPath) {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-git/src/test/java/io/hawt/git/GitFacadeTest.java
Expand Up @@ -182,7 +182,7 @@ public void createFileAndListDirectory() throws Exception {

// now lets make a new git facade to check we can work with existing repos
GitFacade anotherGit = createTestGitFacade();
anotherGit.setObjectName(new ObjectName("io.hawt.git:type=GitFacadePart2"));
anotherGit.setObjectName(new ObjectName("hawtio:type=GitFacadePart2"));
anotherGit.setConfigDirectory(git.getRootGitDirectory());
anotherGit.init();

Expand Down
2 changes: 1 addition & 1 deletion hawtio-ide/src/main/java/io/hawt/ide/IdeFacade.java
Expand Up @@ -39,7 +39,7 @@ public void init() throws Exception {

@Override
protected String getDefaultObjectName() {
return "io.hawt.ide:type=IdeFacade";
return "hawtio:type=IdeFacade";
}

/**
Expand Down
Expand Up @@ -43,7 +43,7 @@ public void init() throws Exception {

@Override
protected String getDefaultObjectName() {
return "io.hawt.introspect:type=Introspector";
return "hawtio:type=Introspector";
}

/**
Expand Down
Expand Up @@ -64,7 +64,7 @@ public void init() {

@Override
protected String getDefaultObjectName() {
return "io.hawt.jsonschema:type=SchemaLookup";
return "hawtio:type=SchemaLookup";
}

protected Class getClass(String name) {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-junit/src/main/java/io/hawt/junit/JUnitFacade.java
Expand Up @@ -38,7 +38,7 @@ public void init() throws Exception {

@Override
protected String getDefaultObjectName() {
return "io.hawt.junit:type=JUnitFacade";
return "hawtio:type=JUnitFacade";
}

@Override
Expand Down
Expand Up @@ -70,7 +70,7 @@ public void init() {
}

if (objectName == null) {
objectName = new ObjectName("io.hawt.jvm.local:type=JVMList");
objectName = new ObjectName("hawtio:type=JVMList");
}
if (mBeanServer == null) {
mBeanServer = ManagementFactory.getPlatformMBeanServer();
Expand Down
Expand Up @@ -434,7 +434,7 @@ protected BooleanQuery createTextSearchQuery(String searchText) {

@Override
protected String getDefaultObjectName() {
return "io.hawt.maven:type=Indexer";
return "hawtio:type=Indexer";
}

/**
Expand Down
Expand Up @@ -22,7 +22,7 @@ public class ConfigAdmin implements ConfigAdminMXBean {

void init() throws Exception {
if (objectName == null) {
objectName = new ObjectName("io.hawt.osgi:type=ConfigAdmin");
objectName = new ObjectName("hawtio:type=ConfigAdmin");
}
if (mBeanServer == null) {
mBeanServer = ManagementFactory.getPlatformMBeanServer();
Expand Down
Expand Up @@ -21,7 +21,7 @@ public class OSGiTools implements OSGiToolsMXBean {

void init() throws Exception {
if (objectName == null) {
objectName = new ObjectName("io.hawt.osgi:type=OSGiTools");
objectName = new ObjectName("hawtio:type=OSGiTools");
}
if (mBeanServer == null) {
mBeanServer = ManagementFactory.getPlatformMBeanServer();
Expand Down
Expand Up @@ -97,7 +97,7 @@ public void setWatcher(WatcherBlueprintContainer watcher) {

@Override
protected String getDefaultObjectName() {
return "io.hawt.blueprint:type=WatcherFacade";
return "hawtio:type=WatcherFacade";
}

}
Expand Up @@ -114,7 +114,7 @@ public void setWatcher(WatcherSpringContext watcher) {

@Override
protected String getDefaultObjectName() {
return "io.hawt.spring:type=WatcherFacade";
return "hawtio:type=WatcherFacade";
}

}
2 changes: 1 addition & 1 deletion hawtio-web/src/main/java/io/hawt/jmx/JmxTreeWatcher.java
Expand Up @@ -80,7 +80,7 @@ public String getVersion() {
}

protected ObjectName getObjectName() throws Exception {
return new ObjectName("io.hawt.jmx:type=TreeWatcher");
return new ObjectName("hawtio:type=TreeWatcher");
}

protected NotificationListener getNotificationListener() {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/java/io/hawt/jmx/UploadManager.java
Expand Up @@ -71,7 +71,7 @@ public void destroy() throws Exception {
}

protected ObjectName getObjectName() throws Exception {
return new ObjectName("io.hawt.jmx:type=UploadManager");
return new ObjectName("hawtio:type=UploadManager");
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/core/js/workspace.ts
Expand Up @@ -127,11 +127,11 @@ module Core {
}

// lets also listen to see if we have a JMX tree watcher
if (this.treeContainsDomainAndProperties("io.hawt.jmx", {type: "TreeWatcher"})) {
if (this.treeContainsDomainAndProperties("hawtio", {type: "TreeWatcher"})) {
if (this.treeWatchRegisterHandle === null) {
this.treeWatchRegisterHandle = this.jolokia.register(angular.bind(this, this.maybeReloadTree), {
type: "read",
mbean: "io.hawt.jmx:type=TreeWatcher",
mbean: "hawtio:type=TreeWatcher",
attribute: "Counter"
});
} else {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/dozer/js/dozerHelpers.ts
Expand Up @@ -154,7 +154,7 @@ module Dozer {


export function getIntrospectorMBean(workspace: Workspace) {
return Core.getMBeanTypeObjectName(workspace, "io.hawt.introspect", "Introspector");
return Core.getMBeanTypeObjectName(workspace, "hawtio", "Introspector");
}

export function loadModelFromTree(rootTreeNode, oldModel: Mappings): Mappings {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/fabric/js/fabricHelpers.ts
Expand Up @@ -13,7 +13,7 @@ module Fabric {
export var openShiftFabricMBean = Fabric.jmxDomain + ":type=OpenShift";
export var mqManagerMBean = Fabric.jmxDomain + ":type=MQManager";

var schemaLookupDomain = "io.hawt.jsonschema";
var schemaLookupDomain = "hawtio";
var schemaLookupType = "SchemaLookup";

export var schemaLookupMBean = schemaLookupDomain + ":type=" + schemaLookupType;
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/fabric/js/navbar.ts
Expand Up @@ -29,7 +29,7 @@ module Fabric {
if ($scope.hasFabric) {
var containerId = null;
Fabric.containerWebAppURL(jolokia, "drools-wb-distribution-wars", containerId, onDroolsUrl, onDroolsUrl);
$scope.canUpload = workspace.treeContainsDomainAndProperties('io.hawt.jmx', {type: 'UploadManager'});
$scope.canUpload = workspace.treeContainsDomainAndProperties('hawtio', {type: 'UploadManager'});
}
}

Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/git/js/gitHelpers.ts
Expand Up @@ -12,7 +12,7 @@ module Git {
return null;
}

export var jmxDomain = "io.hawt.git";
export var jmxDomain = "hawtio";
export var mbeanType = "GitFacade";

export function hasGit(workspace:Workspace) {
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/ide/js/ideHelpers.ts
Expand Up @@ -7,7 +7,7 @@ module IDE {
* Returns the mbean name of the IDE Facade mbean if its available
*/
export function getIdeMBean(workspace:Workspace) {
return Core.getMBeanTypeObjectName(workspace, "io.hawt.ide", "IdeFacade");
return Core.getMBeanTypeObjectName(workspace, "hawtio", "IdeFacade");
}

/**
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/junit/js/junitHelpers.ts
Expand Up @@ -13,10 +13,10 @@ module JUnit {
}

export function getJUnitMBean(workspace: Workspace) {
return Core.getMBeanTypeObjectName(workspace, "io.hawt.junit", "JUnitFacade");
return Core.getMBeanTypeObjectName(workspace, "hawtio", "JUnitFacade");
}

export function getIntrospectorMBean(workspace: Workspace) {
return Core.getMBeanTypeObjectName(workspace, "io.hawt.introspect", "Introspector");
return Core.getMBeanTypeObjectName(workspace, "hawtio", "Introspector");
}
}
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/jvm/js/jvmHelpers.ts
Expand Up @@ -44,6 +44,6 @@ module JVM {
}

export function hasLocalMBean(workspace) {
return workspace.treeContainsDomainAndProperties('io.hawt.jvm.local', {type: 'JVMList'});
return workspace.treeContainsDomainAndProperties('hawtio', {type: 'JVMList'});
}
}
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/jvm/js/jvmPlugin.ts
Expand Up @@ -12,7 +12,7 @@ module Jvm {
when('/jvm/connect', {templateUrl: 'app/jvm/html/connect.html'}).
when('/jvm/local', {templateUrl: 'app/jvm/html/local.html'});
}).
constant('mbeanName', 'io.hawt.jvm.local:type=JVMList').
constant('mbeanName', 'hawtio:type=JVMList').
run(($location, workspace:Workspace, viewRegistry, layoutFull, helpRegistry) => {

viewRegistry[pluginName] = layoutFull;
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/maven/js/mavenHelpers.ts
Expand Up @@ -15,15 +15,15 @@ module Maven {
export function getMavenIndexerMBean(workspace:Workspace) {
if (workspace) {
var mavenStuff = workspace.mbeanTypesToDomain["Indexer"] || {};
var object = mavenStuff["io.hawt.maven"] || {};
var object = mavenStuff["hawtio"] || {};
return object.objectName;
} else return null;
}

export function getAetherMBean(workspace:Workspace) {
if (workspace) {
var mavenStuff = workspace.mbeanTypesToDomain["AetherFacade"] || {};
var object = mavenStuff["io.hawt.aether"] || {};
var object = mavenStuff["hawtio"] || {};
return object.objectName;
} else return null;
}
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/osgi/js/bundle.ts
Expand Up @@ -135,7 +135,7 @@ module Osgi {
divEl.innerHTML +=
"<div class='alert alert-error'>" +
"<button type='button' class='close' data-dismiss='alert'>&times;</button>" +
"The io.hawt.osgi.OSGiTools MBean is not available. Please contact technical support." +
"The hawtio.OSGiTools MBean is not available. Please contact technical support." +
"</div>";
}

Expand All @@ -144,7 +144,7 @@ module Osgi {
divEl.innerHTML +=
"<div class='alert alert-error'>" +
"<button type='button' class='close' data-dismiss='alert'>&times;</button>" +
"Problem invoking io.hawt.osgi.OSGiTools MBean. " + response +
"Problem invoking hawtio.OSGiTools MBean. " + response +
"</div>";
}

Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/osgi/js/osgiHelpers.ts
Expand Up @@ -329,7 +329,7 @@ module Osgi {
if (workspace) {
var mbeanTypesToDomain = workspace.mbeanTypesToDomain;
var toolsFacades = mbeanTypesToDomain["OSGiTools"];
var hawtioFolder = toolsFacades["io.hawt.osgi"];
var hawtioFolder = toolsFacades["hawtio"];
return hawtioFolder["objectName"];
}
return null;
Expand All @@ -339,7 +339,7 @@ module Osgi {
if (workspace) {
var mbeanTypesToDomain = workspace.mbeanTypesToDomain;
var configAdminFacades = mbeanTypesToDomain["ConfigAdmin"];
var hawtioFolder = configAdminFacades["io.hawt.osgi"];
var hawtioFolder = configAdminFacades["hawtio"];
return hawtioFolder["objectName"];
}
return null;
Expand Down
2 changes: 1 addition & 1 deletion hawtio-web/src/main/webapp/app/ui/js/fileUpload.ts
Expand Up @@ -3,7 +3,7 @@
*/
module UI {

export var fileUploadMBean = "io.hawt.jmx:type=UploadManager";
export var fileUploadMBean = "hawtio:type=UploadManager";

export class FileUpload {

Expand Down

0 comments on commit 318542f

Please sign in to comment.