geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r912317 - in /geronimo/server/trunk/plugins/connector-1_6: connector-deployer-1_6/src/main/history/ geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ geronimo-connector-1_6/src/main/java/org/apache/geronimo/connect...
Date Sun, 21 Feb 2010 08:17:58 GMT
Author: djencks
Date: Sun Feb 21 08:17:57 2010
New Revision: 912317

URL: http://svn.apache.org/viewvc?rev=912317&view=rev
Log:
GERONIMO-5152 mostly, use annotations for gbeans

Removed:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/AbstractConnectionManagerGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImplGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java
Modified:
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapper.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBeanSerializationTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
Sun Feb 21 08:17:57 2010
@@ -17,11 +17,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.osgi.service.obr</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>asm-commons</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ActivationSpecWrapperGBean.java
Sun Feb 21 08:17:57 2010
@@ -93,9 +93,6 @@
 
         infoBuilder.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class,
NameFactory.RESOURCE_ADAPTER);
 
-        infoBuilder.addOperation("activate", new Class[]{MessageEndpointFactory.class});
-        infoBuilder.addOperation("deactivate", new Class[]{MessageEndpointFactory.class});
-
         infoBuilder.setConstructor(new String[]{
             "activationSpecClass",
             "containerId",

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBean.java
Sun Feb 21 08:17:57 2010
@@ -26,16 +26,21 @@
 
 import javax.resource.spi.ConnectionManager;
 import javax.security.auth.Subject;
-
+import org.apache.geronimo.connector.outbound.GenericConnectionManager;
+import org.apache.geronimo.connector.outbound.PoolingAttributes;
+import org.apache.geronimo.connector.outbound.SubjectSource;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.PoolingSupport;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTracker;
-import org.apache.geronimo.connector.outbound.GenericConnectionManager;
-import org.apache.geronimo.connector.outbound.SubjectSource;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
@@ -47,32 +52,31 @@
 /**
  * @version $Revision$
  */
+@GBean(j2eeType = NameFactory.JCA_CONNECTION_MANAGER)
 public class GenericConnectionManagerGBean extends GenericConnectionManager implements GBeanLifecycle,
Serializable, Externalizable {
     private Kernel kernel;
     private AbstractName abstractName;
     //externalizable format version
     private static final int VERSION = 1;
 
-    public GenericConnectionManagerGBean() {
-        super();
-        kernel = null;
-        abstractName = null;
-    }
-
-    public GenericConnectionManagerGBean(TransactionSupport transactionSupport,
-                                         PoolingSupport pooling,
-                                         boolean containerManagedSecurity,
-                                         ConnectionTracker connectionTracker,
-                                         RecoverableTransactionManager transactionManager,
-                                         String objectName,
-                                         AbstractName abstractName,
-                                         ClassLoader classLoader,
-                                         Kernel kernel) {
+    public GenericConnectionManagerGBean(@ParamAttribute(name="transactionSupport") TransactionSupport
transactionSupport,
+                                         @ParamAttribute(name="pooling")PoolingSupport pooling,
+                                         @ParamAttribute(name="containerManagedSecurity")boolean
containerManagedSecurity,
+                                         @ParamReference(name="ConnectionTracker", namingType
= NameFactory.JCA_CONNECTION_TRACKER)ConnectionTracker connectionTracker,
+                                         @ParamReference(name="TransactionManager", namingType
= NameFactory.JTA_RESOURCE)RecoverableTransactionManager transactionManager,
+                                         @ParamSpecial(type= SpecialAttributeType.objectName)String
objectName,
+                                         @ParamSpecial(type= SpecialAttributeType.abstractName)AbstractName
abstractName,
+                                         @ParamSpecial(type= SpecialAttributeType.classLoader)ClassLoader
classLoader,
+                                         @ParamSpecial(type= SpecialAttributeType.kernel)Kernel
kernel) {
         super(transactionSupport, pooling, getSubjectSource(containerManagedSecurity), connectionTracker,
transactionManager, objectName, classLoader);
         this.kernel = kernel;
         this.abstractName = abstractName;
     }
 
+    public GenericConnectionManagerGBean() {
+        super();
+    }
+
     public ConnectionManager getConnectionManager() {
         ConnectionManager unproxied = super.getConnectionManager();
         ProxyManager pm = kernel.getProxyManager();
@@ -125,41 +129,4 @@
         abstractName = (AbstractName) in.readObject();
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(GenericConnectionManagerGBean.class,
AbstractConnectionManagerGBean.GBEAN_INFO);
-
-        infoBuilder.addAttribute("transactionSupport", TransactionSupport.class, true);
-        infoBuilder.addAttribute("pooling", PoolingSupport.class, true);
-        infoBuilder.addAttribute("containerManagedSecurity", Boolean.TYPE, true);
-
-        infoBuilder.addAttribute("objectName", String.class, false);
-        infoBuilder.addAttribute("abstractName", AbstractName.class, false);
-        infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
-        infoBuilder.addAttribute("kernel", Kernel.class, false);
-
-        infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
-        infoBuilder.addReference("TransactionManager", RecoverableTransactionManager.class,
NameFactory.JTA_RESOURCE);
-
-
-        infoBuilder.setConstructor(new String[]{
-                "transactionSupport",
-                "pooling",
-                "containerManagedSecurity",
-                "ConnectionTracker",
-                "TransactionManager",
-                "objectName",
-                "abstractName",
-                "classLoader",
-                "kernel"
-        });
-
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/JCAConnectionFactoryImpl.java
Sun Feb 21 08:17:57 2010
@@ -19,7 +19,11 @@
 import java.util.Hashtable;
 
 import javax.management.ObjectName;
-
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.j2ee.management.impl.InvalidObjectNameException;
 import org.apache.geronimo.kernel.ObjectNameUtil;
 import org.apache.geronimo.management.geronimo.JCAConnectionFactory;
@@ -28,12 +32,13 @@
 /**
  * @version $Rev$ $Date$
  */
-public class JCAConnectionFactoryImpl implements JCAConnectionFactory  {
+@GBean(j2eeType = NameFactory.JCA_CONNECTION_FACTORY)
+public class JCAConnectionFactoryImpl implements JCAConnectionFactory {
     private final String objectName;
     private final JCAManagedConnectionFactory managedConnectionFactory;
 
-    public JCAConnectionFactoryImpl(String objectName, JCAManagedConnectionFactory managedConnectionFactory)
{
-        // todo do we really need to do this at runtime - shouldn't the builder set this
up correctly?
+    public JCAConnectionFactoryImpl(@ParamSpecial(type = SpecialAttributeType.objectName)
String objectName,
+                                    @ParamReference(name = "JCAManagedConnectionFactory",
namingType = NameFactory.JCA_MANAGED_CONNECTION_FACTORY) JCAManagedConnectionFactory managedConnectionFactory)
{
         ObjectName myObjectName = ObjectNameUtil.getObjectName(objectName);
         verifyObjectName(myObjectName);
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperGBean.java
Sun Feb 21 08:17:57 2010
@@ -46,10 +46,6 @@
         infoFactory.addAttribute("objectName", String.class, false);
         infoFactory.addAttribute("classLoader", ClassLoader.class, false);
 
-        infoFactory.addOperation("$getResource");
-        infoFactory.addOperation("$getConnectionFactory");
-        infoFactory.addOperation("$getManagedConnectionFactory");
-
         infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class,
NameFactory.RESOURCE_ADAPTER);
         infoFactory.addReference("ConnectionManagerContainer", ConnectionManagerContainer.class,
NameFactory.JCA_CONNECTION_MANAGER);
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
Sun Feb 21 08:17:57 2010
@@ -20,6 +20,9 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.transaction.manager.MonitorableTransactionManager;
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
@@ -31,11 +34,13 @@
  * 
  * @version $Revision$
  */
+@GBean(j2eeType = NameFactory.JCA_CONNECTION_TRACKER)
 public class ConnectionTrackingCoordinatorGBean extends ConnectionTrackingCoordinator implements
GBeanLifecycle {
     private final MonitorableTransactionManager monitorableTm;
     private final GeronimoTransactionListener listener;
 
-    public ConnectionTrackingCoordinatorGBean(MonitorableTransactionManager monitorableTm,
boolean lazyConnect) {
+    public ConnectionTrackingCoordinatorGBean(@ParamReference(name = "TransactionManager",
namingType = NameFactory.JTA_RESOURCE)MonitorableTransactionManager monitorableTm,
+                                              @ParamAttribute(name = "lazyConnect")boolean
lazyConnect) {
         super(lazyConnect);
         this.monitorableTm = monitorableTm;
         listener = new GeronimoTransactionListener(this);
@@ -53,23 +58,4 @@
         monitorableTm.removeTransactionAssociationListener(listener);
     }
 
-    public final static GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(ConnectionTrackingCoordinatorGBean.class,
NameFactory.JCA_CONNECTION_TRACKER);
-
-        infoFactory.addReference("TransactionManager", MonitorableTransactionManager.class,
NameFactory.JTA_RESOURCE);
-        infoFactory.addAttribute("lazyConnect", boolean.class, true);
-
-        infoFactory.addInterface(TrackedConnectionAssociator.class);
-        infoFactory.addInterface(ConnectionTracker.class);
-
-        infoFactory.setConstructor(new String[] {"TransactionManager", "lazyConnect"});
-        GBEAN_INFO = infoFactory.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
-
 }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapper.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapper.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/security/PasswordCredentialLoginModuleWrapper.java
Sun Feb 21 08:17:57 2010
@@ -22,15 +22,29 @@
 import javax.resource.spi.ManagedConnectionFactory;
 
 import org.apache.geronimo.connector.wrapper.outbound.ManagedConnectionFactoryWrapper;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.security.SecurityNames;
 import org.apache.geronimo.security.jaas.LoginModuleGBean;
 
 /**
  * @version $Rev$ $Date$
  */
+@GBean(j2eeType = SecurityNames.LOGIN_MODULE)
 public class PasswordCredentialLoginModuleWrapper extends LoginModuleGBean {
     public static final String MANAGED_CONNECTION_FACTORY_OPTION = "geronimo.managedconnectionfactory.option";
 
-    public PasswordCredentialLoginModuleWrapper(String loginModuleClass, String objectName,
boolean wrapPrincipals, Map<String, Object> options, String loginDomainName, ManagedConnectionFactoryWrapper
managedConnectionFactoryWrapper, ClassLoader classLoader) {
+    public PasswordCredentialLoginModuleWrapper(@ParamAttribute(name = "loginModuleClass")String
loginModuleClass,
+                                                @ParamSpecial(type = SpecialAttributeType.objectName)String
objectName,
+                                                @ParamAttribute(name="wrapPrincipals")boolean
wrapPrincipals,
+                                                @ParamAttribute(name="options")Map<String,
Object> options,
+                                                @ParamAttribute(name="loginDomainName")String
loginDomainName,
+                                                @ParamReference(name = "ManagedConnectionFactoryWrapper",
namingType = NameFactory.JCA_MANAGED_CONNECTION_FACTORY)ManagedConnectionFactoryWrapper managedConnectionFactoryWrapper,
+                                                @ParamSpecial(type = SpecialAttributeType.classLoader)ClassLoader
classLoader) {
         super(loginModuleClass, objectName, wrapPrincipals, getOptions(options, managedConnectionFactoryWrapper),
loginDomainName, classLoader);
     }
 

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBeanSerializationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBeanSerializationTest.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBeanSerializationTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/GenericConnectionManagerGBeanSerializationTest.java
Sun Feb 21 08:17:57 2010
@@ -48,7 +48,7 @@
         Kernel kernel = new BasicKernel("test", bundleContext);
         kernel.boot();
         AbstractName abstractName = new AbstractName(URI.create("foo/bar/1/car?name=ConnectionManager"));
-        GBeanData data = new GBeanData(abstractName, GenericConnectionManagerGBean.GBEAN_INFO);
+        GBeanData data = new GBeanData(abstractName, GenericConnectionManagerGBean.class);
         data.setAttribute("transactionSupport", NoTransactions.INSTANCE);
         data.setAttribute("pooling", new SinglePool(10, 0, 5000, 5, false, false, true));
         kernel.loadGBean(data, bundleContext);

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapperTest.java
Sun Feb 21 08:17:57 2010
@@ -114,11 +114,11 @@
         kernel.boot();
         ClassLoader cl = MockConnectionTrackingCoordinator.class.getClassLoader();
 
-        GBeanData ctc = buildGBeanData("name", "ConnectionTrackingCoordinator", MockConnectionTrackingCoordinator.getGBeanInfo());
+        GBeanData ctc = buildGBeanData("name", "ConnectionTrackingCoordinator", MockConnectionTrackingCoordinator.class);
         AbstractName ctcName = ctc.getAbstractName();
         kernel.loadGBean(ctc, bundleContext);
 
-        GBeanData cmf = buildGBeanData("name", "ConnectionManagerContainer", GenericConnectionManagerGBean.getGBeanInfo());
+        GBeanData cmf = buildGBeanData("name", "ConnectionManagerContainer", GenericConnectionManagerGBean.class);
         AbstractName cmfName = cmf.getAbstractName();
         cmf.setAttribute("transactionSupport", NoTransactions.INSTANCE);
         cmf.setAttribute("pooling", new NoPool());
@@ -126,7 +126,7 @@
         kernel.loadGBean(cmf, bundleContext);
 
 
-        GBeanData mcfw = buildGBeanData("name", TARGET_NAME, ManagedConnectionFactoryWrapperGBean.getGBeanInfo());
+        GBeanData mcfw = buildGBeanData("name", TARGET_NAME, ManagedConnectionFactoryWrapperGBean.class);
         managedConnectionFactoryName = mcfw.getAbstractName();
         mcfw.setAttribute("managedConnectionFactoryClass", MockManagedConnectionFactory.class.getName());
         mcfw.setAttribute("connectionFactoryInterface", ConnectionFactory.class.getName());
@@ -143,7 +143,7 @@
         kernel.startGBean(cmfName);
         kernel.startGBean(managedConnectionFactoryName);
     }
-    private GBeanData buildGBeanData(String key, String value, GBeanInfo info) {
+    private GBeanData buildGBeanData(String key, String value, Class info) {
         AbstractName abstractName = buildAbstractName(key, value);
         return new GBeanData(abstractName, info);
     }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/outbound/security/GBeanTest.java
Sun Feb 21 08:17:57 2010
@@ -21,8 +21,9 @@
 package org.apache.geronimo.connector.wrapper.outbound.security;
 
 import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.connector.wrapper.outbound.security.PasswordCredentialLoginModuleWrapperGBean;
+import org.apache.geronimo.gbean.GBeanInfoFactory;
 
 /**
  * @version $Rev$ $Date$
@@ -30,6 +31,6 @@
 public class GBeanTest extends TestCase {
 
     public void testGBeans() throws Exception {
-        GBeanInfo gBeanInfo = PasswordCredentialLoginModuleWrapperGBean.getGBeanInfo();
+        new GBeanData(PasswordCredentialLoginModuleWrapper.class);
     }
 }

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=912317&r1=912316&r2=912317&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Sun Feb 21 08:17:57 2010
@@ -39,7 +39,6 @@
 import java.util.zip.ZipEntry;
 
 import javax.xml.namespace.QName;
-
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.common.propertyeditor.PropertyEditors;
 import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
@@ -58,7 +57,7 @@
 import org.apache.geronimo.connector.wrapper.ResourceAdapterImplGBean;
 import org.apache.geronimo.connector.wrapper.ResourceAdapterModuleImplGBean;
 import org.apache.geronimo.connector.wrapper.ResourceAdapterWrapperGBean;
-import org.apache.geronimo.connector.wrapper.outbound.JCAConnectionFactoryImplGBean;
+import org.apache.geronimo.connector.wrapper.outbound.JCAConnectionFactoryImpl;
 import org.apache.geronimo.connector.wrapper.outbound.ManagedConnectionFactoryWrapper;
 import org.apache.geronimo.connector.wrapper.outbound.ManagedConnectionFactoryWrapperGBean;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
@@ -987,7 +986,7 @@
         }
 
         // ConnectionFactory
-        GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryAbstractName,
JCAConnectionFactoryImplGBean.GBEAN_INFO);
+        GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryAbstractName,
JCAConnectionFactoryImpl.class);
         connectionFactoryGBeanData.setReferencePattern("JCAManagedConnectionFactory", managedConnectionFactoryAbstractName);
 
         try {



Mime
View raw message