[jboss-cvs] JBossAS SVN: r90242 - in branches/JBPAPP_5_0: 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
Tue Jun 16 04:54:16 EDT 2009
Author: emuckenhuber
Date: 2009-06-16 04:54:16 -0400 (Tue, 16 Jun 2009)
New Revision: 90242
Removed:
branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java
Modified:
branches/JBPAPP_5_0/component-matrix/pom.xml
branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/ServiceBindingMgrPersistenceFormatTestCase.java
Log:
update to jboss-man 2.1.1.CR1
Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml 2009-06-16 08:52:17 UTC (rev 90241)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml 2009-06-16 08:54:16 UTC (rev 90242)
@@ -80,7 +80,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.Beta2</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/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-06-16 08:52:17 UTC (rev 90241)
+++ branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java 2009-06-16 08:54:16 UTC (rev 90242)
@@ -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/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java
===================================================================
--- branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java 2009-06-16 08:52:17 UTC (rev 90241)
+++ branches/JBPAPP_5_0/profileservice/src/main/org/jboss/profileservice/management/TempManagedComponentImpl.java 2009-06-16 08:54:16 UTC (rev 90242)
@@ -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;
- }
-}
Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/ServiceBindingMgrPersistenceFormatTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/ServiceBindingMgrPersistenceFormatTestCase.java 2009-06-16 08:52:17 UTC (rev 90241)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/profileservice/persistenceformat/test/ServiceBindingMgrPersistenceFormatTestCase.java 2009-06-16 08:54:16 UTC (rev 90242)
@@ -34,13 +34,13 @@
import org.jboss.kernel.spi.deployment.KernelDeployment;
import org.jboss.managed.api.ManagedComponent;
import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.plugins.ManagedComponentImpl;
import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.MapCompositeValueSupport;
import org.jboss.metatype.api.values.MetaValue;
import org.jboss.metatype.api.values.SimpleValue;
import org.jboss.metatype.api.values.SimpleValueSupport;
-import org.jboss.profileservice.management.TempManagedComponentImpl;
import org.jboss.services.binding.ServiceBindingManager;
import org.jboss.system.server.profileservice.persistence.xml.PersistenceRoot;
import org.jboss.xb.binding.Unmarshaller;
@@ -120,7 +120,7 @@
setPortValue("HttpsConnector", bindingSets, 13245);
// Persist
- ManagedComponent component = new TempManagedComponentImpl(null, null, mo);
+ ManagedComponent component = new ManagedComponentImpl(null, null, mo);
PersistenceRoot root = getPersistenceFactory().updateComponent(deploymentMO, component);
root.setClassName(AbstractKernelDeployment.class.getName());
root = restore(root);
More information about the jboss-cvs-commits
mailing list