[jboss-cvs] JBossAS SVN: r62487 - in projects/microcontainer/trunk: kernel/src/tests/org/jboss/test/kernel/config/test and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Apr 23 11:30:34 EDT 2007


Author: alesj
Date: 2007-04-23 11:30:33 -0400 (Mon, 23 Apr 2007)
New Revision: 62487

Added:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderFactory.java
Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
   projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
   projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
Log:
BeanMetaDataBuilderFactory introduction.

Added: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderFactory.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderFactory.java	                        (rev 0)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderFactory.java	2007-04-23 15:30:33 UTC (rev 62487)
@@ -0,0 +1,67 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* 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.beans.metadata.plugins.builder;
+
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+
+/**
+ * Create new Builder.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class BeanMetaDataBuilderFactory
+{
+   /**
+    * Create builder from bean.
+    *
+    * @param bean bean class name
+    * @return new Builder
+    */
+   public static BeanMetaDataBuilder createBuilder(String bean)
+   {
+      return new BeanMetaDataBuilderImpl(bean);
+   }
+
+   /**
+    * Create builder from name and bean.
+    *
+    * @param name bean name
+    * @param bean bean class name
+    * @return new Builder
+    */
+   public static BeanMetaDataBuilder createBuilder(String name, String bean)
+   {
+      return new BeanMetaDataBuilderImpl(name, bean);
+   }
+
+   /**
+    * Create builder from BeanMetaData.
+    *
+    * @param beanMetaData bean meta data
+    * @return new builder
+    */
+   public static BeanMetaDataBuilder createBuilder(AbstractBeanMetaData beanMetaData)
+   {
+      return new BeanMetaDataBuilderImpl(beanMetaData);
+   }
+}

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java	2007-04-23 15:18:58 UTC (rev 62486)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/builder/BeanMetaDataBuilderImpl.java	2007-04-23 15:30:33 UTC (rev 62487)
@@ -50,7 +50,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class BeanMetaDataBuilderImpl implements BeanMetaDataBuilder
+class BeanMetaDataBuilderImpl implements BeanMetaDataBuilder
 {
    private AbstractBeanMetaData beanMetaData;
    // parameter builders

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2007-04-23 15:18:58 UTC (rev 62486)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/config/test/BeanMetaDataBuilderTestCase.java	2007-04-23 15:30:33 UTC (rev 62487)
@@ -25,7 +25,7 @@
 import java.util.Arrays;
 
 import junit.framework.Test;
-import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderImpl;
+import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.kernel.Kernel;
@@ -55,7 +55,7 @@
 
    public void testConstructor() throws Throwable
    {
-      BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl("FromBMD", SimpleBean.class.getName());
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("FromBMD", SimpleBean.class.getName());
       builder.addConstructorParameter(String.class.getName(), "TestConstructor");
       BeanMetaData beanMetaData = builder.getBeanMetaData();
       SimpleBean fbmd = (SimpleBean)instantiateAndConfigure(beanMetaData);
@@ -67,7 +67,7 @@
 
    public void testProperty() throws Throwable
    {
-      BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl("PropBMD", SimpleBean.class.getName())
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("PropBMD", SimpleBean.class.getName())
             .addPropertyMetaData("adouble", 3.1459)
             .addPropertyMetaData("anint", "123")
             .addPropertyMetaData("collection", new ArrayList());
@@ -85,7 +85,7 @@
    {
       Kernel kernel = bootstrap();
 
-      BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl("SLB", SimpleLifecycleBean.class.getName())
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("SLB", SimpleLifecycleBean.class.getName())
          .addCreateParameter(String.class.getName(), "ParamCreate")
          .setStart("doStart")
          .addStartParameter(String.class.getName(), "ParamStart")
@@ -113,7 +113,7 @@
    {
       Kernel kernel = bootstrap();
 
-      BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl("SLB", SimpleLifecycleBean.class.getName())
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder("SLB", SimpleLifecycleBean.class.getName())
          .addInstall("installParam", String.class.getName(), "Install")
          .addUninstall("uninstallParam", String.class.getName(), "Uninstall");
       BeanMetaData beanMetaData = builder.getBeanMetaData();
@@ -133,11 +133,11 @@
 
    public void testDemandSupply() throws Throwable
    {
-      BeanMetaDataBuilder demand = new BeanMetaDataBuilderImpl("DemandBean", SimpleBean.class.getName());
+      BeanMetaDataBuilder demand = BeanMetaDataBuilderFactory.createBuilder("DemandBean", SimpleBean.class.getName());
       demand.addDemand("Barrier");
       BeanMetaData demandBean = demand.getBeanMetaData();
 
-      BeanMetaDataBuilder supply = new BeanMetaDataBuilderImpl("SupplyBean", SimpleLifecycleBean.class.getName());
+      BeanMetaDataBuilder supply = BeanMetaDataBuilderFactory.createBuilder("SupplyBean", SimpleLifecycleBean.class.getName());
       supply.addSupply("Barrier");
       BeanMetaData supplyBean = supply.getBeanMetaData();
 
@@ -160,11 +160,11 @@
 
    public void testDependency() throws Throwable
    {
-      BeanMetaDataBuilder dependOn = new BeanMetaDataBuilderImpl("DependOnBean", SimpleBean.class.getName());
+      BeanMetaDataBuilder dependOn = BeanMetaDataBuilderFactory.createBuilder("DependOnBean", SimpleBean.class.getName());
       dependOn.addDependency("DependencyResolver");
       BeanMetaData dependOnBean = dependOn.getBeanMetaData();
 
-      BeanMetaDataBuilder resolver = new BeanMetaDataBuilderImpl("DependencyResolver", SimpleLifecycleBean.class.getName());
+      BeanMetaDataBuilder resolver = BeanMetaDataBuilderFactory.createBuilder("DependencyResolver", SimpleLifecycleBean.class.getName());
       BeanMetaData resolverBean = resolver.getBeanMetaData();
 
       AbstractKernelDeployment deployment = new AbstractKernelDeployment();

Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java	2007-04-23 15:18:58 UTC (rev 62486)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/deployers/BundleActivatorDeployer.java	2007-04-23 15:30:33 UTC (rev 62487)
@@ -21,7 +21,7 @@
 */
 package org.jboss.osgi.plugins.deployers;
 
-import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderImpl;
+import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.deployers.plugins.deployers.helpers.AbstractRealDeployer;
@@ -65,7 +65,7 @@
             String name = createBundleActivatorBeanName(deployment);
             // todo - get deployment context in non-depricated way
             BundleContext bundleContext = new BundleContextImpl(unit.getDeploymentContext());
-            BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl(name, bundleActivator)
+            BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(name, bundleActivator)
                   .addStartParameter(BundleContext.class.getName(), bundleContext)
                   .addStopParameter(BundleContext.class.getName(), bundleContext);
             BeanMetaData beanMetaData = builder.getBeanMetaData();

Modified: projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java
===================================================================
--- projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java	2007-04-23 15:18:58 UTC (rev 62486)
+++ projects/microcontainer/trunk/osgi-int/src/main/org/jboss/osgi/plugins/facade/BundleContextImpl.java	2007-04-23 15:30:33 UTC (rev 62487)
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderImpl;
+import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.deployers.spi.structure.DeploymentContext;
@@ -348,7 +348,7 @@
       {
          service = ServiceFactoryProxy.createProxy(service, interfaces);
       }
-      BeanMetaDataBuilder builder = new BeanMetaDataBuilderImpl(GUID.asString(), serviceInfo.getName());
+      BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(GUID.asString(), serviceInfo.getName());
       BeanMetaData metaData = builder.getBeanMetaData();
       KernelControllerContext context;
       try




More information about the jboss-cvs-commits mailing list