[jboss-cvs] JBossAS SVN: r88170 - in branches/Branch_5_x/profileservice/src: main/org/jboss/profileservice/management and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon May 4 17:46:02 EDT 2009
Author: scott.stark at jboss.org
Date: 2009-05-04 17:46:02 -0400 (Mon, 04 May 2009)
New Revision: 88170
Added:
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedMBeanDeploymentFactory.java
Removed:
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedDeploymentFactory.java
Modified:
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ProxyManagedDeploymentFactory.java
branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml
Log:
JBAS-6676, rename ManagedDeploymentFactory to ManagedMBeanDeploymentFactory
Deleted: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedDeploymentFactory.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedDeploymentFactory.java 2009-05-04 21:44:18 UTC (rev 88169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedDeploymentFactory.java 2009-05-04 21:46:02 UTC (rev 88170)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.profileservic.spi;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import org.jboss.managed.api.ManagedDeployment;
-
-/**
- * @author Scott.Stark at jboss.org
- * @version $Revision:$
- */
-public interface ManagedDeploymentFactory
-{
- public static class MBeanDeployment
- {
- String name;
- Collection <MBeanComponent> components;
- public MBeanDeployment(String name)
- {
- this(name, new ArrayList<MBeanComponent>());
- }
- public MBeanDeployment(String name, Collection <MBeanComponent> components)
- {
- this.name = name;
- this.components = components;
- }
- public String getName()
- {
- return name;
- }
- public Collection<MBeanComponent> getComponents()
- {
- return components;
- }
- public void setComponents(Collection<MBeanComponent> components)
- {
- this.components = components;
- }
- public synchronized void addComponent(MBeanComponent comp)
- {
- if(components == null)
- components = new ArrayList<MBeanComponent>();
- components.add(comp);
- }
- public String toString()
- {
- return "MBeanDeployment("+name+"), "+components;
- }
- }
- public static class MBeanComponent
- {
- String type;
- String subtype;
- ObjectName name;
- public MBeanComponent(ObjectName name, String type, String subtype)
- {
- super();
- this.type = type;
- this.subtype = subtype;
- this.name = name;
- }
- public ObjectName getName()
- {
- return name;
- }
- public String getType()
- {
- return type;
- }
- public String getSubtype()
- {
- return subtype;
- }
- public String toString()
- {
- return "MBeanComponent("+name+","+type+","+subtype+")";
- }
- }
- public String getFactoryName();
- public Collection<MBeanDeployment> getDeployments(MBeanServer mbeanServer);
-}
Copied: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedMBeanDeploymentFactory.java (from rev 88168, branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedDeploymentFactory.java)
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedMBeanDeploymentFactory.java (rev 0)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservic/spi/ManagedMBeanDeploymentFactory.java 2009-05-04 21:46:02 UTC (rev 88170)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.profileservic.spi;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.jboss.managed.api.ManagedDeployment;
+
+/**
+ * @author Scott.Stark at jboss.org
+ * @version $Revision:$
+ */
+public interface ManagedMBeanDeploymentFactory
+{
+ public static class MBeanDeployment
+ {
+ String name;
+ Collection <MBeanComponent> components;
+ public MBeanDeployment(String name)
+ {
+ this(name, new ArrayList<MBeanComponent>());
+ }
+ public MBeanDeployment(String name, Collection <MBeanComponent> components)
+ {
+ this.name = name;
+ this.components = components;
+ }
+ public String getName()
+ {
+ return name;
+ }
+ public Collection<MBeanComponent> getComponents()
+ {
+ return components;
+ }
+ public void setComponents(Collection<MBeanComponent> components)
+ {
+ this.components = components;
+ }
+ public synchronized void addComponent(MBeanComponent comp)
+ {
+ if(components == null)
+ components = new ArrayList<MBeanComponent>();
+ components.add(comp);
+ }
+ public String toString()
+ {
+ return "MBeanDeployment("+name+"), "+components;
+ }
+ }
+ public static class MBeanComponent
+ {
+ String type;
+ String subtype;
+ ObjectName name;
+ public MBeanComponent(ObjectName name, String type, String subtype)
+ {
+ super();
+ this.type = type;
+ this.subtype = subtype;
+ this.name = name;
+ }
+ public ObjectName getName()
+ {
+ return name;
+ }
+ public String getType()
+ {
+ return type;
+ }
+ public String getSubtype()
+ {
+ return subtype;
+ }
+ public String toString()
+ {
+ return "MBeanComponent("+name+","+type+","+subtype+")";
+ }
+ }
+ public String getFactoryName();
+ public Collection<MBeanDeployment> getDeployments(MBeanServer mbeanServer);
+}
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-05-04 21:44:18 UTC (rev 88169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-05-04 21:46:02 UTC (rev 88170)
@@ -85,9 +85,9 @@
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.MetaValueFactory;
import org.jboss.metatype.api.values.SimpleValue;
-import org.jboss.profileservic.spi.ManagedDeploymentFactory;
-import org.jboss.profileservic.spi.ManagedDeploymentFactory.MBeanComponent;
-import org.jboss.profileservic.spi.ManagedDeploymentFactory.MBeanDeployment;
+import org.jboss.profileservic.spi.ManagedMBeanDeploymentFactory;
+import org.jboss.profileservic.spi.ManagedMBeanDeploymentFactory.MBeanComponent;
+import org.jboss.profileservic.spi.ManagedMBeanDeploymentFactory.MBeanDeployment;
import org.jboss.profileservice.spi.NoSuchDeploymentException;
import org.jboss.profileservice.spi.NoSuchProfileException;
import org.jboss.profileservice.spi.Profile;
@@ -165,8 +165,8 @@
/** ManagedObjectFactory used for platform mbean ManagedObjects */
ManagedObjectFactory managedObjFactory = ManagedObjectFactory.getInstance();
/** */
- private HashMap<String, ManagedDeploymentFactory> mdfs =
- new HashMap<String, ManagedDeploymentFactory>();
+ private HashMap<String, ManagedMBeanDeploymentFactory> mdfs =
+ new HashMap<String, ManagedMBeanDeploymentFactory>();
private MBeanServer mbeanServer;
private MBeanManagedObjectFactory mbeanMOFactory = new MBeanManagedObjectFactory();
@@ -228,7 +228,7 @@
loadProfiles(trace);
// Process mbean components that need to be exposed as ManagedDeployment/ManagedComponent
- for(ManagedDeploymentFactory mdf : mdfs.values())
+ for(ManagedMBeanDeploymentFactory mdf : mdfs.values())
{
log.debug("Processing deployments for factory: "+mdf.getFactoryName());
Collection<MBeanDeployment> deployments = mdf.getDeployments(mbeanServer);
@@ -987,13 +987,13 @@
return new HashSet<String>(templates.keySet());
}
- public void addManagedDeployments(ManagedDeploymentFactory factory)
+ public void addManagedMBeanDeployments(ManagedMBeanDeploymentFactory factory)
{
log.info("addManagedDeployment, "+factory);
String name = factory.getFactoryName();
this.mdfs.put(name, factory);
}
- public void removeManagedDeployments(ManagedDeploymentFactory factory)
+ public void removeManagedMBeanDeployments(ManagedMBeanDeploymentFactory factory)
{
log.info("removeManagedDeployment, "+factory);
String name = factory.getFactoryName();
Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ProxyManagedDeploymentFactory.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ProxyManagedDeploymentFactory.java 2009-05-04 21:44:18 UTC (rev 88169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ProxyManagedDeploymentFactory.java 2009-05-04 21:46:02 UTC (rev 88170)
@@ -36,8 +36,8 @@
import org.jboss.managed.api.ManagedDeployment;
import org.jboss.managed.api.ManagedObject;
import org.jboss.metadata.spi.MetaData;
-import org.jboss.profileservic.spi.ManagedDeploymentFactory;
-import org.jboss.profileservic.spi.ManagedDeploymentFactory.MBeanDeployment;
+import org.jboss.profileservic.spi.ManagedMBeanDeploymentFactory;
+import org.jboss.profileservic.spi.ManagedMBeanDeploymentFactory.MBeanDeployment;
/**
* A ManagedDeploymentFactory that acts as a facade on top of mbean deployments
@@ -46,7 +46,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision:$
*/
-public class ProxyManagedDeploymentFactory implements ManagedDeploymentFactory
+public class ProxyManagedDeploymentFactory implements ManagedMBeanDeploymentFactory
{
/** Name under which the factory will be registered */
private String factoryName;
Modified: branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml 2009-05-04 21:44:18 UTC (rev 88169)
+++ branches/Branch_5_x/profileservice/src/resources/profileservice-jboss-beans.xml 2009-05-04 21:46:02 UTC (rev 88170)
@@ -114,8 +114,8 @@
<incallback method="addTemplate"/>
<uncallback method="removeTemplate"/>
<!-- Accept any implementor of ManagedDeployment -->
- <incallback method="addManagedDeployments"/>
- <uncallback method="removeManagedDeployments"/>
+ <incallback method="addManagedMBeanDeployments"/>
+ <uncallback method="removeManagedMBeanDeployments"/>
</bean>
<!--
More information about the jboss-cvs-commits
mailing list