[jboss-cvs] JBossAS SVN: r90239 - in branches/Branch_5_x: profileservice/src/main/org/jboss/profileservice/management and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: emuckenhuber
Date: 2009-06-16 04:41:49 -0400 (Tue, 16 Jun 2009)
New Revision: 90239

Removed:
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java
Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
Log:
update to jboss-man 2.1.1.CR1

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-06-16 08:14:25 UTC (rev 90238)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-06-16 08:41:49 UTC (rev 90239)
@@ -84,7 +84,7 @@
     <version.org.jboss.jpa>1.0.0</version.org.jboss.jpa>
     <version.org.jboss.logbridge>1.0.0.GA</version.org.jboss.logbridge>
     <version.org.jboss.logmanager>1.0.0.GA</version.org.jboss.logmanager>
-    <version.org.jboss.man>2.1.1.Beta3</version.org.jboss.man>
+    <version.org.jboss.man>2.1.1.CR1</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
     <version.org.jboss.metadata>1.0.1.GA</version.org.jboss.metadata>
     <version.org.jboss.microcontainer>2.0.6.GA</version.org.jboss.microcontainer>

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-06-16 08:14:25 UTC (rev 90238)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2009-06-16 08:41:49 UTC (rev 90239)
@@ -76,6 +76,7 @@
 import org.jboss.managed.api.annotation.ManagementProperty;
 import org.jboss.managed.api.annotation.ViewUse;
 import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.managed.plugins.ManagedComponentImpl;
 import org.jboss.managed.plugins.ManagedDeploymentImpl;
 import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
 import org.jboss.managed.plugins.jmx.ManagementFactoryUtils;
@@ -741,7 +742,7 @@
       if (mc != null && md.getComponent(mo.getName()) == null)
       {
          ComponentType type = new ComponentType(mc.type(), mc.subtype());
-         MutableManagedComponent comp = new TempManagedComponentImpl(type, md, mo);
+         MutableManagedComponent comp = new ManagedComponentImpl(type, md, mo);
          
          if(mo.getTransientAttachment(MBeanRuntimeComponentDispatcher.class.getName()) == null)
             comp = this.proxyFactory.createComponentProxy(comp);

Deleted: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java	2009-06-16 08:14:25 UTC (rev 90238)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java	2009-06-16 08:41:49 UTC (rev 90239)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file 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.profileservice.management;
-
-import java.io.ObjectStreamException;
-
-import org.jboss.managed.api.ComponentType;
-import org.jboss.managed.api.ManagedCommon;
-import org.jboss.managed.api.ManagedDeployment;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.RunStateMapper;
-import org.jboss.managed.plugins.ManagedComponentImpl;
-
-/**
- * Temp managed component impl where getParent points to the defining
- * ManagedObject.
- * 
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public class TempManagedComponentImpl extends ManagedComponentImpl
-{
-   private static final long serialVersionUID = 1;
-   
-   public TempManagedComponentImpl(ComponentType type, ManagedDeployment owner, ManagedObject mo)
-   {
-      this(type, owner, mo, null);
-   }
-   public TempManagedComponentImpl(ComponentType type, ManagedDeployment owner, ManagedObject mo,
-         RunStateMapper stateMapper)
-   {
-      super(type, owner, mo, stateMapper);
-   }
-
-   @Override
-   public ManagedCommon getParent()
-   {
-      return getDelegate();
-   }
-
-   private Object writeReplace() throws ObjectStreamException
-   {
-      // Only expose the ManagedComponentImpl
-      ManagedComponentImpl comp = new ManagedComponentImpl(getType(), getDeployment(), getDelegate(), getStateMapper()); 
-      comp.setRunState(getRunState());
-      return comp;
-   }
-}