You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/03/27 02:35:03 UTC
svn commit: r928119 - in /geronimo/server/branches/2.2/plugins:
connector/geronimo-connector-builder/
connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/
connector/geronimo-connector/src/main/java/org/apache/ger...
Author: djencks
Date: Sat Mar 27 01:35:02 2010
New Revision: 928119
URL: http://svn.apache.org/viewvc?rev=928119&view=rev
Log:
GERONIMO-5152 port changes from trunk
Removed:
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/AbstractConnectionManagerGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImplGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapperGBean.java
Modified:
geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/ (props changed)
geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ (props changed)
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/ (props changed)
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java
geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/ (props changed)
geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Propchange: geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 27 01:35:02 2010
@@ -0,0 +1 @@
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:912317,912420
Modified: geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Sat Mar 27 01:35:02 2010
@@ -25,6 +25,7 @@ import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
@@ -34,14 +35,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import java.util.Collections;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import javax.xml.namespace.QName;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.common.propertyeditor.PropertyEditors;
import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
@@ -51,7 +48,7 @@ import org.apache.geronimo.connector.JCA
import org.apache.geronimo.connector.ResourceAdapterImplGBean;
import org.apache.geronimo.connector.ResourceAdapterModuleImplGBean;
import org.apache.geronimo.connector.ResourceAdapterWrapperGBean;
-import org.apache.geronimo.connector.outbound.JCAConnectionFactoryImplGBean;
+import org.apache.geronimo.connector.outbound.JCAConnectionFactoryImpl;
import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapper;
import org.apache.geronimo.connector.outbound.ManagedConnectionFactoryWrapperGBean;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.LocalTransactions;
@@ -67,7 +64,6 @@ import org.apache.geronimo.deployment.Mo
import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
-import org.apache.geronimo.deployment.service.GBeanBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
@@ -78,8 +74,8 @@ import org.apache.geronimo.gbean.GAttrib
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.gbean.InvalidConfigurationException;
import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.InvalidConfigurationException;
import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.EARContext;
@@ -123,6 +119,8 @@ import org.apache.xmlbeans.XmlCursor;
import org.apache.xmlbeans.XmlDocumentProperties;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @version $Rev:385659 $ $Date$
@@ -976,7 +974,7 @@ public class ConnectorModuleBuilder impl
}
// ConnectionFactory
- GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryAbstractName, JCAConnectionFactoryImplGBean.GBEAN_INFO);
+ GBeanData connectionFactoryGBeanData = new GBeanData(connectionFactoryAbstractName, JCAConnectionFactoryImpl.class);
connectionFactoryGBeanData.setReferencePattern("JCAManagedConnectionFactory", managedConnectionFactoryAbstractName);
try {
Propchange: geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 27 01:35:02 2010
@@ -0,0 +1 @@
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper:912317
Modified: geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecWrapperGBean.java Sat Mar 27 01:35:02 2010
@@ -91,9 +91,6 @@ public class ActivationSpecWrapperGBean
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/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBean.java Sat Mar 27 01:35:02 2010
@@ -26,7 +26,9 @@ import java.io.Serializable;
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;
@@ -34,6 +36,11 @@ import org.apache.geronimo.gbean.Abstrac
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;
@@ -45,32 +52,31 @@ import org.apache.geronimo.transaction.m
/**
* @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();
@@ -123,41 +129,4 @@ public class GenericConnectionManagerGBe
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/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/JCAConnectionFactoryImpl.java Sat Mar 27 01:35:02 2010
@@ -19,7 +19,11 @@ package org.apache.geronimo.connector.ou
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 @@ import org.apache.geronimo.management.ge
/**
* @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/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperGBean.java Sat Mar 27 01:35:02 2010
@@ -45,10 +45,6 @@ public class ManagedConnectionFactoryWra
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/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinatorGBean.java Sat Mar 27 01:35:02 2010
@@ -20,6 +20,9 @@ package org.apache.geronimo.connector.ou
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;
@@ -27,11 +30,13 @@ import org.apache.geronimo.transaction.m
*
* @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);
@@ -49,23 +54,4 @@ public class ConnectionTrackingCoordinat
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/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/security/PasswordCredentialLoginModuleWrapper.java Sat Mar 27 01:35:02 2010
@@ -22,16 +22,30 @@ import java.util.HashMap;
import javax.resource.spi.ManagedConnectionFactory;
import org.apache.geronimo.connector.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;
import net.sf.cglib.beans.BeanMap;
/**
* @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);
}
Propchange: geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 27 01:35:02 2010
@@ -0,0 +1 @@
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper:912317
Modified: geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/GenericConnectionManagerGBeanSerializationTest.java Sat Mar 27 01:35:02 2010
@@ -43,7 +43,7 @@ public class GenericConnectionManagerGBe
Kernel kernel = new BasicKernel("test");
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, this.getClass().getClassLoader());
Modified: geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/ManagedConnectionFactoryWrapperTest.java Sat Mar 27 01:35:02 2010
@@ -106,11 +106,11 @@ public class ManagedConnectionFactoryWra
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, cl);
- 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());
@@ -118,7 +118,7 @@ public class ManagedConnectionFactoryWra
kernel.loadGBean(cmf, cl);
- 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());
@@ -135,7 +135,7 @@ public class ManagedConnectionFactoryWra
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/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java (original)
+++ geronimo/server/branches/2.2/plugins/connector/geronimo-connector/src/test/java/org/apache/geronimo/connector/outbound/security/GBeanTest.java Sat Mar 27 01:35:02 2010
@@ -21,6 +21,7 @@
package org.apache.geronimo.connector.outbound.security;
import junit.framework.TestCase;
+import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
/**
@@ -29,6 +30,6 @@ import org.apache.geronimo.gbean.GBeanIn
public class GBeanTest extends TestCase {
public void testGBeans() throws Exception {
- GBeanInfo gBeanInfo = PasswordCredentialLoginModuleWrapperGBean.getGBeanInfo();
+ new GBeanData(PasswordCredentialLoginModuleWrapper.class);
}
}
Propchange: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 27 01:35:02 2010
@@ -0,0 +1 @@
+/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8-builder/src/test/java/org/apache/geronimo/jetty8:912420
Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-builder/src/test/java/org/apache/geronimo/jetty7/deployment/JettyModuleBuilderTest.java Sat Mar 27 01:35:02 2010
@@ -244,7 +244,7 @@ public class JettyModuleBuilderTest exte
configurationManagerData.setReferencePattern("Stores", configStoreName);
bootstrap.addGBean(configurationManagerData);
- GBeanData serverData = new GBeanData(serverName, J2EEServerImpl.GBEAN_INFO);
+ GBeanData serverData = new GBeanData(serverName, J2EEServerImpl.class);
bootstrap.addGBean(serverData);
Collection defaultServlets = new HashSet();
@@ -258,17 +258,17 @@ public class JettyModuleBuilderTest exte
containerData.setAttribute("jettyHome", new File(BASEDIR, "target/var/jetty").toString());
containerData.setReferencePattern("ServerInfo", serverInfo.getAbstractName());
- GBeanData connector = bootstrap.addGBean("JettyConnector", HTTPSocketConnector.GBEAN_INFO);
+ GBeanData connector = bootstrap.addGBean("JettyConnector", HTTPSocketConnector.class);
connector.setAttribute("port", new Integer(5678));
connector.setAttribute("maxThreads", new Integer(50));
// connector.setAttribute("minThreads", new Integer(10));
connector.setReferencePattern("JettyContainer", containerName);
- GBeanData tm = bootstrap.addGBean("TransactionManager", GeronimoTransactionManagerGBean.GBEAN_INFO);
+ GBeanData tm = bootstrap.addGBean("TransactionManager", GeronimoTransactionManagerGBean.class);
tmName = tm.getAbstractName();
tm.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
- GBeanData ctc = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
+ GBeanData ctc = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.class);
ctcName = ctc.getAbstractName();
ctc.setReferencePattern("TransactionManager", tmName);
Modified: geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=928119&r1=928118&r2=928119&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/geronimo-tomcat6-builder/src/test/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Sat Mar 27 01:35:02 2010
@@ -308,7 +308,7 @@ public class TomcatModuleBuilderTest ext
tmName = tm.getAbstractName();
tm.setAttribute("defaultTransactionTimeoutSeconds", new Integer(10));
- GBeanData ctc = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.GBEAN_INFO);
+ GBeanData ctc = bootstrap.addGBean("ConnectionTrackingCoordinator", ConnectionTrackingCoordinatorGBean.class);
ctcName = ctc.getAbstractName();
ctc.setReferencePattern("TransactionManager", tmName);