[jboss-cvs] JBossAS SVN: r70465 - trunk/profileservice/src/main/org/jboss/profileservice/management/builders.

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

Author: scott.stark at jboss.org
Date: 2008-03-06 01:42:10 -0500 (Thu, 06 Mar 2008)
New Revision: 70465

Removed:
   trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java
Modified:
   trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
Log:
Comment out use of aop wrappers

Deleted: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java	2008-03-06 06:41:37 UTC (rev 70464)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/ConnectionFactoryDeployerManagedObjectBuilder.java	2008-03-06 06:42:10 UTC (rev 70465)
@@ -1,61 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, 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.profileservice.management.builders;
-
-import java.util.Map;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.plugins.advice.WrapperAdvice;
-import org.w3c.dom.Document;
-
-/**
- * A ManagedObjectBuilder for use as an override to the ConnectionFactoryDeployer
- * 
- * @author Scott.Stark at jboss.org
- * @author adrian at jboss.org
- * @version $Revision$
- */
-public class ConnectionFactoryDeployerManagedObjectBuilder
-   implements ManagedObjectCreator
-{
-   private static Logger log = Logger.getLogger(ConnectionFactoryDeployerManagedObjectBuilder.class);
-
-   public void build(DeploymentUnit unit, Map<String, ManagedObject> map) 
-      throws DeploymentException
-   {
-      String name = unit.getSimpleName();
-      if(name.endsWith("-ds.xml"))
-      {
-         Map<String, Object> attachments = unit.getTransientManagedObjects().getAttachments();
-         log.debug(name+" attachments: "+attachments);
-         String attachName = Document.class.getName();
-         Document document = unit.getAttachment(attachName, Document.class);
-         ManagedObject mo = new DomDataSourceManagedObject(attachName, document);
-         ManagedObject wrapMO = WrapperAdvice.wrapManagedObject(mo);
-         map.put(attachName, wrapMO);
-      }
-   }
-}

Modified: trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java
===================================================================
--- trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java	2008-03-06 06:41:37 UTC (rev 70464)
+++ trunk/profileservice/src/main/org/jboss/profileservice/management/builders/FakeConnectionFactoryDeployerManagedObjectBuilder.java	2008-03-06 06:42:10 UTC (rev 70465)
@@ -34,7 +34,6 @@
 import org.jboss.managed.plugins.DefaultFieldsImpl;
 import org.jboss.managed.plugins.ManagedObjectImpl;
 import org.jboss.managed.plugins.ManagedPropertyImpl;
-import org.jboss.managed.plugins.advice.WrapperAdvice;
 import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
@@ -51,7 +50,7 @@
 public class FakeConnectionFactoryDeployerManagedObjectBuilder
    implements ManagedObjectCreator
 {
-   private static Logger log = Logger.getLogger(ConnectionFactoryDeployerManagedObjectBuilder.class);
+   private static Logger log = Logger.getLogger(FakeConnectionFactoryDeployerManagedObjectBuilder.class);
    /**
     * A mapping from the managed property name to the attachment property name.
     */
@@ -90,8 +89,8 @@
          ServiceMetaData dsMetaData = services.get(0);
          String attachName = ServiceMetaData.class.getName();
          ManagedObject mo = new ServiceManagedObject(attachName, dsMetaData, propertyNameMappings);
-         ManagedObject wrapMO = WrapperAdvice.wrapManagedObject(mo);
-         map.put(attachName, wrapMO);
+         //ManagedObject wrapMO = WrapperAdvice.wrapManagedObject(mo);
+         map.put(attachName, mo);
          // The datasource type...
          attachName = "FakeConnectionFactoryDeployer.datasource-type";
          ManagedObjectImpl typeMO = new ManagedObjectImpl(attachName);
@@ -108,8 +107,8 @@
          f21.setMetaType(SimpleMetaType.STRING);
          ManagedPropertyImpl dsType = new ManagedPropertyImpl(typeMO, f21);
          typeMO.getProperties().put("datasource-type", dsType);
-         wrapMO = WrapperAdvice.wrapManagedObject(typeMO);
-         map.put(attachName, wrapMO);
+         //wrapMO = WrapperAdvice.wrapManagedObject(typeMO);
+         map.put(attachName, typeMO);
       }
    }
 }