Rick,
Are the following dependencies really needed? It seems like not:
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>stax2-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>woodstox-core-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <type>jar</type>
+ </dependency>
Jarek
On Fri, Oct 8, 2010 at 10:53 AM, <rickmcguire@apache.org> wrote:
> Author: rickmcguire
> Date: Fri Oct 8 14:53:15 2010
> New Revision: 1005852
>
> URL: http://svn.apache.org/viewvc?rev=1005852&view=rev
> Log:
> GERONIMO-5230 Add Bean Validation Support to the connector 1.6 implementation.
>
> Changes to Geronimo base.
>
>
> Removed:
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapper.java
> Modified:
> geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.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/AdminObjectWrapperGBean.java
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.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/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
> geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
> geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
> geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
> geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
>
> Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -332,6 +332,16 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.ops4j.pax.logging</groupId>
> <artifactId>pax-logging-api</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -176,4 +176,14 @@
> <artifactId>xbean-reflect</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -26,19 +26,4 @@
> <artifactId>j2ee-deployer</artifactId>
> <type>car</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-bval</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-bval-builder</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-validation_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -17,6 +17,26 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>commons-lang</groupId>
> + <artifactId>commons-lang</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>javassist</groupId>
> + <artifactId>javassist</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>net.sourceforge.serp</groupId>
> + <artifactId>serp</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.aries</groupId>
> <artifactId>org.apache.aries.util</artifactId>
> <type>jar</type>
> @@ -337,6 +357,21 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/clustering/plugin-farm/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -56,9 +56,4 @@
> <artifactId>geronimo-plugin-farm</artifactId>
> <type>jar</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-validation_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/pom.xml Fri Oct 8 14:53:15 2010
> @@ -53,6 +53,13 @@
>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>bval-deployer</artifactId>
> + <version>${project.version}</version>
> + <type>car</type>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>transaction-1_6</artifactId>
> <version>${project.version}</version>
> <type>car</type>
>
> 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=1005852&r1=1005851&r2=1005852&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 Fri Oct 8 14:53:15 2010
> @@ -8,6 +8,11 @@
> </module-id>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>bval-deployer</artifactId>
> + <type>car</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>j2ee-deployer</artifactId>
> <type>car</type>
> </dependency>
> @@ -92,6 +97,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-validation_1.0_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.servicemix.bundles</groupId>
> <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
> <type>jar</type>
> @@ -107,6 +117,16 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/src/main/plan/plan.xml Fri Oct 8 14:53:15 2010
> @@ -31,6 +31,11 @@
> <reference name="ServiceBuilders">
> <name>GBeanBuilder</name>
> </reference>
> + <references name="ModuleBuilderExtensions">
> + <pattern>
> + <name>BValModuleBuilderExtension</name>
> + </pattern>
> + </references>
> <xml-attribute name="defaultEnvironment">
> <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
> <dependencies>
> @@ -84,6 +89,11 @@
> </dependencies>
> </environment>
> </xml-attribute>
> + <references name="ModuleBuilderExtensions">
> + <pattern>
> + <name>BValModuleBuilderExtension</name>
> + </pattern>
> + </references>
> </gbean>
>
> <gbean name="ClientResourceRefBuilder" class="org.apache.geronimo.connector.deployment.ResourceRefBuilder">
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/pom.xml Fri Oct 8 14:53:15 2010
> @@ -87,6 +87,12 @@
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> </dependency>
> +
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval</artifactId>
> + <version>${project.version}</version>
> + </dependency>
>
> <dependency>
> <groupId>org.apache.geronimo.framework</groupId>
>
> 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=1005852&r1=1005851&r2=1005852&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 Fri Oct 8 14:53:15 2010
> @@ -17,6 +17,7 @@
>
> package org.apache.geronimo.connector.wrapper;
>
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> import org.apache.geronimo.connector.ActivationSpecWrapper;
> import org.apache.geronimo.connector.ResourceAdapterWrapper;
> import org.apache.geronimo.gbean.DynamicGBean;
> @@ -41,8 +42,9 @@ public class ActivationSpecWrapperGBean
> public ActivationSpecWrapperGBean(@ParamAttribute(name="activationSpecClass")final String activationSpecClass,
> @ParamAttribute(name="containerId")final String containerId,
> @ParamReference(name="ResourceAdapaterWrapper", namingType = NameFactory.RESOURCE_ADAPTER)final ResourceAdapterWrapper resourceAdapterWrapper,
> - @ParamSpecial(type = SpecialAttributeType.classLoader)final ClassLoader cl) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
> - super(activationSpecClass, containerId, resourceAdapterWrapper, cl);
> + @ParamSpecial(type = SpecialAttributeType.classLoader)final ClassLoader cl,
> + @ParamReference(name = "ValidatorFactory", namingType = NameFactory.VALIDATOR_FACTORY) ValidatorFactoryGBean validatorFactory) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
> + super(activationSpecClass, containerId, resourceAdapterWrapper, cl, validatorFactory != null ? validatorFactory.getFactory() : null);
> delegate = new DynamicGBeanDelegate();
> delegate.addAll(activationSpec);
> }
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.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/AdminObjectWrapperGBean.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperGBean.java Fri Oct 8 14:53:15 2010
> @@ -17,49 +17,192 @@
>
> package org.apache.geronimo.connector.wrapper;
>
> +import java.lang.reflect.Constructor;
> +import java.util.HashMap;
> +import java.util.Map;
> +import java.util.Set;
> +
> +import javax.resource.spi.ResourceAdapterAssociation;
> +import javax.validation.ConstraintViolation;
> +import javax.validation.ConstraintViolationException;
> +import javax.validation.Validator;
> +import javax.validation.ValidatorFactory;
> +
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> +import org.apache.geronimo.connector.AdminObjectWrapper;
> +import org.apache.geronimo.connector.ResourceAdapterWrapper;
> import org.apache.geronimo.gbean.AbstractName;
> -import org.apache.geronimo.gbean.GBeanInfo;
> -import org.apache.geronimo.gbean.GBeanInfoBuilder;
> +import org.apache.geronimo.gbean.DynamicGBean;
> +import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> +import org.apache.geronimo.gbean.GBeanLifecycle;
> +import org.apache.geronimo.gbean.annotation.GBean;
> +import org.apache.geronimo.gbean.annotation.OsgiService;
> +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.Kernel;
> import org.apache.geronimo.management.geronimo.JCAAdminObject;
> -import org.apache.geronimo.connector.ResourceAdapterWrapper;
> +import org.apache.geronimo.naming.ResourceSource;
> +import org.osgi.framework.Bundle;
> +import org.osgi.framework.ServiceFactory;
> +import org.osgi.framework.ServiceRegistration;
>
> /**
> - * @version $Revision$
> + * Wrapper around AdminObject that exposes its config-properties as GBeanAttributes and
> + * supplies a disconnectable proxy to bind in jndi.
> + *
> + * @version $Rev$ $Date$
> */
> -public class AdminObjectWrapperGBean {
> +@OsgiService
> +@GBean(j2eeType = NameFactory.JCA_ADMIN_OBJECT)
> +public class AdminObjectWrapperGBean extends AdminObjectWrapper implements DynamicGBean, JCAAdminObject, ResourceSource<RuntimeException>, GBeanLifecycle, ServiceFactory {
> + private final DynamicGBeanDelegate delegate;
> +
> + private final Kernel kernel;
> + private final AbstractName abstractName;
> + private final String objectName;
> +
> + /**
> + * Normal managed constructor.
> + *
> + * @param adminObjectInterface Interface the proxy will implement.
> + * @param adminObjectClass Class of admin object to be wrapped.
> + * @throws IllegalAccessException
> + * @throws InstantiationException
> + */
> + public AdminObjectWrapperGBean(
> + @ParamAttribute(name="adminObjectInterface") String adminObjectInterface,
> + @ParamAttribute(name="adminObjectClass") String adminObjectClass,
> + @ParamReference(name="ResourceAdapterWrapper", namingType = NameFactory.JCA_RESOURCE_ADAPTER) ResourceAdapterWrapper resourceAdapterWrapper,
> + @ParamSpecial(type = SpecialAttributeType.kernel) Kernel kernel,
> + @ParamSpecial(type = SpecialAttributeType.abstractName) AbstractName abstractName,
> + @ParamSpecial(type = SpecialAttributeType.objectName) String objectName,
> + @ParamSpecial(type = SpecialAttributeType.classLoader) ClassLoader cl,
> + @ParamReference(name = "ValidatorFactory", namingType = NameFactory.VALIDATOR_FACTORY) ValidatorFactoryGBean validatorFactory) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
> + super(adminObjectInterface, adminObjectClass, resourceAdapterWrapper, cl, validatorFactory == null ? null : validatorFactory.getFactory());
> + this.kernel = kernel;
> + this.abstractName = abstractName;
> + this.objectName = objectName;
> + delegate = new DynamicGBeanDelegate();
> + delegate.addAll(adminObject);
> + }
> +
> + /**
> + * Returns disconnectable proxy for binding in jndi.
> + * @return proxy implementing adminObjectInterface.
> + */
> + public Object $getResource() {
> + return adminObject;
> + }
> +
> + //DynamicGBean implementation
> +
> + /**
> + * Delegating DynamicGBean getAttribute method.
> + * @param name of attribute.
> + * @return attribute value.
> + * @throws Exception
> + */
> + public Object getAttribute(final String name) throws Exception {
> + return delegate.getAttribute(name);
> + }
> +
> + /**
> + * Delegating DynamicGBean setAttribute method.
> + * @param name of attribute.
> + * @param value of attribute to be set.
> + * @throws Exception
> + */
> + public void setAttribute(final String name, final Object value) throws Exception {
> + delegate.setAttribute(name, value);
> + }
> +
> + /**
> + * no-op DynamicGBean method
> + * @param name
> + * @param arguments
> + * @param types
> + * @return nothing, there are no operations.
> + * @throws Exception
> + */
> + public Object invoke(final String name, final Object[] arguments, final String[] types) throws Exception {
> + //we have no dynamic operations.
> + return null;
> + }
> +
> + /**
> + * Gets the config properties in the form of a map where the key is the
> + * property name and the value is property type (as a String not a Class).
> + */
> + public Map getConfigProperties() {
> + String[] props = delegate.getProperties();
> + Map map = new HashMap();
> + for (int i = 0; i < props.length; i++) {
> + String prop = props[i];
> + if(prop.equals("logWriter")) {
> + continue;
> + }
> + map.put(prop, delegate.getPropertyType(prop));
> + }
> + return map;
> + }
> +
> + public void setConfigProperty(String property, Object value) throws Exception {
> + Class cls = delegate.getPropertyType(property);
> + if(value != null && value instanceof String && !cls.getName().equals("java.lang.String")) {
> + if(cls.isPrimitive()) {
> + if(cls.equals(int.class)) {
> + cls = Integer.class;
> + } else if(cls.equals(boolean.class)) {
> + cls = Boolean.class;
> + } else if(cls.equals(float.class)) {
> + cls = Float.class;
> + } else if(cls.equals(double.class)) {
> + cls = Double.class;
> + } else if(cls.equals(long.class)) {
> + cls = Long.class;
> + } else if(cls.equals(short.class)) {
> + cls = Short.class;
> + } else if(cls.equals(byte.class)) {
> + cls = Byte.class;
> + } else if(cls.equals(char.class)) {
> + cls = Character.class;
> + }
> + }
> + Constructor con = cls.getConstructor(new Class[]{String.class});
> + value = con.newInstance(new Object[]{value});
> + }
> + kernel.setAttribute(abstractName, property, value);
> + }
> +
> + public Object getConfigProperty(String property) throws Exception {
> + return delegate.getAttribute(property);
> + }
> +
> + public String getObjectName() {
> + return objectName;
> + }
>
> - public static final GBeanInfo GBEAN_INFO;
> + public boolean isStateManageable() {
> + return false;
> + }
>
> - static {
> - GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AdminObjectWrapperGBean.class, AdminObjectWrapper.class, NameFactory.JCA_ADMIN_OBJECT);
> - infoBuilder.addAttribute("adminObjectInterface", String.class, true);
> - infoBuilder.addAttribute("adminObjectClass", String.class, true);
> - infoBuilder.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.JCA_RESOURCE_ADAPTER);
> - infoBuilder.addAttribute("kernel", Kernel.class, false);
> - infoBuilder.addAttribute("abstractName", AbstractName.class, false);
> - infoBuilder.addAttribute("objectName", String.class, false);
> - infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
> -
> - infoBuilder.addOperation("$getResource");
> - infoBuilder.addInterface(JCAAdminObject.class);
> -
> - infoBuilder.setConstructor(new String[]{
> - "adminObjectInterface",
> - "adminObjectClass",
> - "ResourceAdapterWrapper",
> - "kernel",
> - "abstractName",
> - "objectName",
> - "classLoader"
> - });
> + public boolean isStatisticsProvider() {
> + return false;
> + }
>
> - GBEAN_INFO = infoBuilder.getBeanInfo();
> + public boolean isEventProvider() {
> + return false;
> }
>
> - public static GBeanInfo getGBeanInfo() {
> - return GBEAN_INFO;
> + @Override
> + public Object getService(Bundle bundle, ServiceRegistration serviceRegistration) {
> + return adminObject;
> }
>
> + @Override
> + public void ungetService(Bundle bundle, ServiceRegistration serviceRegistration, Object o) {
> + }
> }
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.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/ResourceAdapterWrapperGBean.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/ResourceAdapterWrapperGBean.java Fri Oct 8 14:53:15 2010
> @@ -23,6 +23,7 @@ import javax.resource.spi.XATerminator;
> import javax.resource.spi.work.WorkManager;
> import javax.transaction.TransactionSynchronizationRegistry;
>
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> import org.apache.geronimo.connector.work.GeronimoWorkManager;
> import org.apache.geronimo.gbean.DynamicGBean;
> import org.apache.geronimo.gbean.DynamicGBeanDelegate;
> @@ -62,8 +63,9 @@ public class ResourceAdapterWrapperGBean
> @ParamReference(name="TransactionManager", namingType = NameFactory.JTA_RESOURCE)RecoverableTransactionManager transactionManager,
> @ParamReference(name="TransactionSynchronizationRegistry", namingType = NameFactory.JTA_RESOURCE) TransactionSynchronizationRegistry transactionSynchronizationRegistry,
> @ParamSpecial(type= SpecialAttributeType.classLoader )ClassLoader cl,
> - @ParamSpecial(type= SpecialAttributeType.objectName )String objectName) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
> - super(objectName, resourceAdapterClass, messageListenerToActivationSpecMap, new GeronimoBootstrapContext(workManager, xaTerminator, transactionSynchronizationRegistry), transactionManager, cl);
> + @ParamSpecial(type= SpecialAttributeType.objectName )String objectName,
> + @ParamReference(name = "ValidatorFactory", namingType = NameFactory.VALIDATOR_FACTORY) ValidatorFactoryGBean validatorFactory) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
> + super(objectName, resourceAdapterClass, messageListenerToActivationSpecMap, new GeronimoBootstrapContext(workManager, xaTerminator, transactionSynchronizationRegistry), transactionManager, cl, validatorFactory != null ? validatorFactory.getFactory() : null);
> delegate = new DynamicGBeanDelegate();
> delegate.addAll(resourceAdapter);
> this.objectName = objectName;
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.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/ManagedConnectionFactoryWrapper.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/main/java/org/apache/geronimo/connector/wrapper/outbound/ManagedConnectionFactoryWrapper.java Fri Oct 8 14:53:15 2010
> @@ -21,13 +21,19 @@ import java.lang.reflect.Constructor;
> import java.util.HashMap;
> import java.util.LinkedHashSet;
> import java.util.Map;
> +import java.util.Set;
>
> import javax.resource.ResourceException;
> import javax.resource.spi.ManagedConnectionFactory;
> import javax.resource.spi.ResourceAdapterAssociation;
> +import javax.validation.ConstraintViolation;
> +import javax.validation.ConstraintViolationException;
> +import javax.validation.Validator;
> +import javax.validation.ValidatorFactory;
>
> import org.slf4j.Logger;
> import org.slf4j.LoggerFactory;
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> import org.apache.geronimo.connector.ResourceAdapterWrapper;
> import org.apache.geronimo.connector.outbound.ConnectionManagerContainer;
> import org.apache.geronimo.gbean.AbstractName;
> @@ -61,11 +67,11 @@ public class ManagedConnectionFactoryWra
>
> private DynamicGBeanDelegate delegate;
>
> -
> private final Kernel kernel;
> private final AbstractName abstractName;
> private final String objectName;
> private final ClassLoader classLoader;
> + private final ValidatorFactory validatorFactory;
>
> //default constructor for enhancement proxy endpoint
> public ManagedConnectionFactoryWrapper() {
> @@ -81,6 +87,7 @@ public class ManagedConnectionFactoryWra
> classLoader = null;
> resourceAdapterWrapper = null;
> jndiName = null;
> + validatorFactory = null;
> }
>
> public ManagedConnectionFactoryWrapper(String managedConnectionFactoryClass,
> @@ -94,7 +101,8 @@ public class ManagedConnectionFactoryWra
> Kernel kernel,
> AbstractName abstractName,
> String objectName,
> - ClassLoader cl) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
> + ClassLoader cl,
> + ValidatorFactoryGBean validatorFactory) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
> this.managedConnectionFactoryClass = managedConnectionFactoryClass;
> this.connectionFactoryInterface = connectionFactoryInterface;
> this.implementedInterfaces = implementedInterfaces;
> @@ -102,6 +110,7 @@ public class ManagedConnectionFactoryWra
> this.connectionInterface = connectionInterface;
> this.connectionImplClass = connectionImplClass;
> this.jndiName = jndiName;
> + this.validatorFactory = validatorFactory != null ? validatorFactory.getFactory() : null;
>
> for (String interfaceName: implementedInterfaces) {
> allImplementedInterfaces.add(cl.loadClass(interfaceName));
> @@ -153,6 +162,16 @@ public class ManagedConnectionFactoryWra
> }
>
> public void doStart() throws Exception {
> + // if we have a validator factory at this point, then validate
> + // the resource adaptor instance
> + if (validatorFactory != null) {
> + Validator validator = validatorFactory.getValidator();
> +
> + Set generalSet = validator.validate(managedConnectionFactory);
> + if (!generalSet.isEmpty()) {
> + throw new ConstraintViolationException("Constraint violation for ManagedConnectionFactory " + managedConnectionFactoryClass, generalSet);
> + }
> + }
> //register with resource adapter
> if (managedConnectionFactory instanceof ResourceAdapterAssociation) {
> if (resourceAdapterWrapper == null) {
>
> 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=1005852&r1=1005851&r2=1005852&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 Fri Oct 8 14:53:15 2010
> @@ -16,6 +16,7 @@
> */
> package org.apache.geronimo.connector.wrapper.outbound;
>
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> import org.apache.geronimo.connector.ResourceAdapterWrapper;
> import org.apache.geronimo.connector.outbound.ConnectionManagerContainer;
> import org.apache.geronimo.gbean.AbstractName;
> @@ -46,6 +47,7 @@ public class ManagedConnectionFactoryWra
> infoFactory.addAttribute("abstractName", AbstractName.class, false);
> infoFactory.addAttribute("objectName", String.class, false);
> infoFactory.addAttribute("classLoader", ClassLoader.class, false);
> + infoFactory.addReference("ValidatorFactory", ValidatorFactoryGBean.class, NameFactory.VALIDATOR_FACTORY);
>
> infoFactory.addReference("ResourceAdapterWrapper", ResourceAdapterWrapper.class, NameFactory.RESOURCE_ADAPTER);
>
> @@ -61,7 +63,9 @@ public class ManagedConnectionFactoryWra
> "kernel",
> "abstractName",
> "objectName",
> - "classLoader"});
> + "classLoader",
> + "ValidatorFactory"
> + });
>
> GBEAN_INFO = infoFactory.getBeanInfo();
> }
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.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/AdminObjectWrapperTest.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-1_6/src/test/java/org/apache/geronimo/connector/wrapper/AdminObjectWrapperTest.java Fri Oct 8 14:53:15 2010
> @@ -86,7 +86,7 @@ public class AdminObjectWrapperTest exte
> kernel = KernelFactory.newInstance(bundleContext).createKernel(j2eeContext.getJ2eeDomainName());
> kernel.boot();
>
> - GBeanData aow = buildGBeanData("name", TARGET_NAME, AdminObjectWrapperGBean.getGBeanInfo());
> + GBeanData aow = buildGBeanData("name", TARGET_NAME, AdminObjectWrapperGBean.class);
> selfName = aow.getAbstractName();
> aow.setAttribute("adminObjectInterface", MockAdminObject.class.getName());
> aow.setAttribute("adminObjectClass", MockAdminObjectImpl.class.getName());
> @@ -95,7 +95,7 @@ public class AdminObjectWrapperTest exte
> kernel.startGBean(selfName);
> }
>
> - 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-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=1005852&r1=1005851&r2=1005852&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 Fri Oct 8 14:53:15 2010
> @@ -62,7 +62,6 @@ import org.apache.geronimo.connector.out
> import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
> import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
> import org.apache.geronimo.connector.wrapper.ActivationSpecWrapperGBean;
> -import org.apache.geronimo.connector.wrapper.AdminObjectWrapper;
> import org.apache.geronimo.connector.wrapper.AdminObjectWrapperGBean;
> import org.apache.geronimo.connector.wrapper.JCAResourceImplGBean;
> import org.apache.geronimo.connector.wrapper.ResourceAdapterImplGBean;
> @@ -98,6 +97,7 @@ import org.apache.geronimo.j2ee.deployme
> import org.apache.geronimo.j2ee.deployment.EARContext;
> import org.apache.geronimo.j2ee.deployment.Module;
> import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
> +import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
> import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
> import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
> import org.apache.geronimo.kernel.GBeanNotFoundException;
> @@ -201,6 +201,7 @@ public class ConnectorModuleBuilder impl
> private final String defaultWorkManagerName;
>
> private final PackageAdmin packageAdmin;
> + private final Collection<ModuleBuilderExtension> moduleBuilderExtensions;
>
> public ConnectorModuleBuilder(@ParamAttribute(name = "defaultEnvironment") Environment defaultEnvironment,
> @ParamAttribute(name = "defaultMaxSize") int defaultMaxSize,
> @@ -211,6 +212,7 @@ public class ConnectorModuleBuilder impl
> @ParamAttribute(name = "defaultXAThreadCaching") boolean defaultXAThreadCaching,
> @ParamAttribute(name = "defaultWorkManagerName") String defaultWorkManagerName,
> @ParamReference(name = "ServiceBuilders", namingType = NameFactory.MODULE_BUILDER) Collection<NamespaceDrivenBuilder> serviceBuilders,
> + @ParamReference(name = "ModuleBuilderExtensions", namingType = NameFactory.MODULE_BUILDER) Collection<ModuleBuilderExtension> moduleBuilderExtensions,
> @ParamSpecial(type = SpecialAttributeType.bundleContext) BundleContext bundleContext) {
> this.defaultEnvironment = defaultEnvironment;
>
> @@ -221,12 +223,11 @@ public class ConnectorModuleBuilder impl
> this.defaultXATransactionCaching = defaultXATransactionCaching;
> this.defaultXAThreadCaching = defaultXAThreadCaching;
> this.defaultWorkManagerName = defaultWorkManagerName;
> + this.moduleBuilderExtensions = moduleBuilderExtensions == null ? new ArrayList<ModuleBuilderExtension>() : moduleBuilderExtensions;
> this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
> ServiceReference sr = bundleContext.getServiceReference(PackageAdmin.class.getName());
> packageAdmin = (PackageAdmin) bundleContext.getService(sr);
> - }
> -
> - @Override
> + }
> public void doStart() throws Exception {
> XmlBeansUtil.registerNamespaceUpdates(NAMESPACE_UPDATES);
> }
> @@ -250,7 +251,7 @@ public class ConnectorModuleBuilder impl
> public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
> return createModule(plan, moduleFile, "rar", null, null, null, naming, idBuilder);
> }
> -
> +
> @Override
> public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object o1, Module module, Naming naming, ModuleIDBuilder moduleIDBuilder) throws DeploymentException {
> return createModule(plan, moduleFile, targetPath, specDDUrl, environment, module, naming, moduleIDBuilder);
> @@ -376,7 +377,13 @@ public class ConnectorModuleBuilder impl
> } else {
> name = FileUtils.removeExtension(targetPath, ".rar");
> }
> - return new ConnectorModule<Connector, XmlObject>(standAlone, moduleName, name, environment, moduleFile, targetPath, connector, gerConnector, specDD, parentModule == null? null: parentModule.getJndiContext(), parentModule);
> +
> + Module module = new ConnectorModule<Connector, XmlObject>(standAlone, moduleName, name, environment, moduleFile, targetPath, connector, gerConnector, specDD, parentModule == null? null: parentModule.getJndiContext(), parentModule);
> +
> + for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
> + mbe.createModule(module, plan, moduleFile, targetPath, specDDUrl, environment, null, moduleName, naming, idBuilder);
> + }
> + return module;
> }
>
> public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
> @@ -413,11 +420,17 @@ public class ConnectorModuleBuilder impl
> } catch (IOException e) {
> throw new DeploymentException("Problem deploying connector", e);
> }
> + for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
> + mbe.installModule(earFile, earContext, module, configurationStores, targetConfigurationStore, repository);
> + }
> }
>
> public void initContext(EARContext earContext, Module module, Bundle bundle) throws DeploymentException {
> log.info("deploying bundle " + bundle + " at " + bundle.getLocation());
> ConnectorModule<Connector, XmlObject> resourceModule = (ConnectorModule<Connector, XmlObject>) module;
> +
> + // all connector objects wrappers get injected with the validator reference
> + AbstractName validatorName = module.getEarContext().getNaming().createChildName(module.getModuleName(), "ValidatorFactory", NameFactory.VALIDATOR_FACTORY);
>
> BundleAnnotationFinder classFinder;
> try {
> @@ -489,18 +502,20 @@ public class ConnectorModuleBuilder impl
> resourceAdapterGBeanData.setReferencePattern("XATerminator", earContext.getTransactionManagerName());
> resourceAdapterGBeanData.setReferencePattern("TransactionManager", earContext.getTransactionManagerName());
> resourceAdapterGBeanData.setReferencePattern("TransactionSynchronizationRegistry", earContext.getTransactionManagerName());
> +
> + resourceAdapterGBeanData.setReferencePattern("ValidatorFactory", validatorName);
> //This was previously in a separate if block, whether or not resourceAdapterClass was set. I don't think this makes sense
> - Map activationSpecInfoMap = getActivationSpecInfoMap(resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener(), bundle);
> + Map activationSpecInfoMap = getActivationSpecInfoMap(validatorName, resourceAdapter.getInboundResourceAdapter().getMessageAdapter().getMessageListener(), bundle);
> resourceAdapterModuleData.setAttribute("activationSpecInfoMap", activationSpecInfoMap);
> }
>
> resourceAdapterModuleData.setAttribute("resourceAdapterGBeanData", resourceAdapterGBeanData);
> }
>
> - Map adminObjectInfoMap = getAdminObjectInfoMap(resourceAdapter.getAdminObject(), bundle);
> + Map adminObjectInfoMap = getAdminObjectInfoMap(validatorName, resourceAdapter.getAdminObject(), bundle);
> resourceAdapterModuleData.setAttribute("adminObjectInfoMap", adminObjectInfoMap);
> if (resourceAdapter.getOutboundResourceAdapter() != null) {
> - Map managedConnectionFactoryInfoMap = getManagedConnectionFactoryInfoMap(resourceAdapter.getOutboundResourceAdapter().getConnectionDefinition(), bundle);
> + Map managedConnectionFactoryInfoMap = getManagedConnectionFactoryInfoMap(validatorName, resourceAdapter.getOutboundResourceAdapter().getConnectionDefinition(), bundle);
> resourceAdapterModuleData.setAttribute("managedConnectionFactoryInfoMap", managedConnectionFactoryInfoMap);
> }
>
> @@ -538,6 +553,11 @@ public class ConnectorModuleBuilder impl
> serviceBuilders.build(geronimoConnector, earContext, earContext);
>
> addConnectorGBeans(earContext, jcaResourcejsr77Name, resourceAdapterModuleData, connector, geronimoConnector, bundle);
> +
> + // also give the extensions a crack at this
> + for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
> + mbe.initContext(earContext, module, bundle);
> + }
>
> }
>
> @@ -831,6 +851,9 @@ public class ConnectorModuleBuilder impl
> //all our gbeans are added in the initContext step
> //in case we decide connectors should be separate bundles
> module.addAsChildConfiguration();
> + for (ModuleBuilderExtension mbe : moduleBuilderExtensions) {
> + mbe.addGBeans(earContext, module, bundle, repository);
> + }
> }
>
> public String getSchemaNamespace() {
> @@ -948,7 +971,7 @@ public class ConnectorModuleBuilder impl
> }
> }
>
> - private Map<String, GBeanData> getActivationSpecInfoMap(List<MessageListener> messageListeners, Bundle bundle) throws DeploymentException {
> + private Map<String, GBeanData> getActivationSpecInfoMap(AbstractName validatorName, List<MessageListener> messageListeners, Bundle bundle) throws DeploymentException {
> Map<String, GBeanData> activationSpecInfos = new HashMap<String, GBeanData>();
> for (MessageListener messageListener : messageListeners) {
> String messageListenerInterface = messageListener.getMessageListenerType();
> @@ -963,6 +986,7 @@ public class ConnectorModuleBuilder impl
>
> GBeanData activationSpecInfo = new GBeanData(gbeanInfo);
> activationSpecInfo.setAttribute("activationSpecClass", activationSpecClassName);
> + activationSpecInfo.setReferencePattern("ValidatorFactory", validatorName);
> activationSpecInfos.put(messageListenerInterface, activationSpecInfo);
> }
> return activationSpecInfos;
> @@ -1023,7 +1047,7 @@ public class ConnectorModuleBuilder impl
> }
> }
>
> - private Map getManagedConnectionFactoryInfoMap(List<ConnectionDefinition> connectionDefinitions, Bundle bundle) throws DeploymentException {
> + private Map getManagedConnectionFactoryInfoMap(AbstractName validatorName, List<ConnectionDefinition> connectionDefinitions, Bundle bundle) throws DeploymentException {
> Map<String, GBeanData> managedConnectionFactoryInfos = new HashMap<String, GBeanData>();
> for (ConnectionDefinition connectionDefinition : connectionDefinitions) {
> GBeanInfoBuilder managedConnectionFactoryInfoBuilder = new GBeanInfoBuilder(ManagedConnectionFactoryWrapper.class, ManagedConnectionFactoryWrapperGBean.GBEAN_INFO);
> @@ -1040,15 +1064,16 @@ public class ConnectorModuleBuilder impl
> managedConnectionFactoryGBeanData.setAttribute("connectionFactoryImplClass", connectionDefinition.getConnectionFactoryImplClass());
> managedConnectionFactoryGBeanData.setAttribute("connectionInterface", connectionDefinition.getConnectionInterface());
> managedConnectionFactoryGBeanData.setAttribute("connectionImplClass", connectionDefinition.getConnectionImplClass());
> + managedConnectionFactoryGBeanData.setReferencePattern("ValidatorFactory", validatorName);
> managedConnectionFactoryInfos.put(connectionfactoryInterface, managedConnectionFactoryGBeanData);
> }
> return managedConnectionFactoryInfos;
> }
>
> - private Map getAdminObjectInfoMap(List<AdminObject> adminObjects, Bundle bundle) throws DeploymentException {
> + private Map getAdminObjectInfoMap(AbstractName validatorName, List<AdminObject> adminObjects, Bundle bundle) throws DeploymentException {
> Map<String, GBeanData> adminObjectInfos = new HashMap<String, GBeanData>();
> for (AdminObject adminObject : adminObjects) {
> - GBeanInfoBuilder adminObjectInfoBuilder = new GBeanInfoBuilder(AdminObjectWrapper.class, AdminObjectWrapperGBean.GBEAN_INFO);
> + GBeanInfoBuilder adminObjectInfoBuilder = new GBeanInfoBuilder(AdminObjectWrapperGBean.class, new AnnotationGBeanInfoBuilder(AdminObjectWrapperGBean.class).buildGBeanInfo());
> String adminObjectClassName = adminObject.getAdminObjectClass();
> GBeanData adminObjectGBeanData = setUpDynamicGBeanWithProperties(adminObjectClassName, adminObjectInfoBuilder, adminObject.getConfigProperty(), bundle, Collections.<String>emptySet());
>
> @@ -1056,6 +1081,7 @@ public class ConnectorModuleBuilder impl
> String adminObjectInterface = adminObject.getAdminObjectInterface();
> adminObjectGBeanData.setAttribute("adminObjectInterface", adminObjectInterface);
> adminObjectGBeanData.setAttribute("adminObjectClass", adminObjectClassName);
> + adminObjectGBeanData.setReferencePattern("ValidatorFactory", validatorName);
> adminObjectInfos.put(adminObjectInterface, adminObjectGBeanData);
> }
> return adminObjectInfos;
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Fri Oct 8 14:53:15 2010
> @@ -31,6 +31,7 @@ import java.util.jar.JarFile;
>
> import javax.naming.Reference;
> import javax.sql.DataSource;
> +import org.apache.geronimo.bval.ValidatorFactoryGBean;
> import org.apache.geronimo.common.DeploymentException;
> import org.apache.geronimo.deployment.DeploymentContext;
> import org.apache.geronimo.deployment.ModuleIDBuilder;
> @@ -135,7 +136,7 @@ public class ConnectorModuleBuilderTest
> Collections.singleton(repository),
> null,
> null,
> - new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder), bundleContext),
> + new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(serviceBuilder), null, bundleContext),
> activationSpecInfoLocator,
> null,
> serviceBuilder,
> @@ -157,7 +158,10 @@ public class ConnectorModuleBuilderTest
> context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, rarFile, idBuilder), plan, rarFile, Collections.singleton(configurationStore), artifactResolver, configurationStore);
> // add the a j2ee server so the application context reference can be resolved
> context.addGBean("geronimo", J2EEServerImpl.GBEAN_INFO);
> -
> + // add the module validator so the connector artifacts will resolve to an instance
> + AbstractName abstractName = context.getNaming().createChildName(((Module)plan).getModuleName(), "ValidatorFactory", NameFactory.VALIDATOR_FACTORY);
> + GBeanData gbeanData = new GBeanData(abstractName, ValidatorFactoryGBean.class);
> + context.addGBean(gbeanData);
> configData = context.getConfigurationData();
> } finally {
> if (context != null) {
> @@ -343,7 +347,7 @@ public class ConnectorModuleBuilderTest
> String resourceAdapterName = "testRA";
>
> try {
> - ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(new GBeanBuilder(null, null)), bundleContext);
> + ConnectorModuleBuilder moduleBuilder = new ConnectorModuleBuilder(defaultEnvironment, defaultMaxSize, defaultMinSize, defaultBlockingTimeoutMilliseconds, defaultidleTimeoutMinutes, defaultXATransactionCaching, defaultXAThreadCaching, defaultWorkManagerName, Collections.<NamespaceDrivenBuilder>singleton(new GBeanBuilder(null, null)), null, bundleContext);
> File rarFile = action.getRARFile();
>
> ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
> @@ -378,6 +382,10 @@ public class ConnectorModuleBuilderTest
> Bundle bundle = earContext.getDeploymentBundle();
> moduleBuilder.initContext(earContext, module, bundle);
> moduleBuilder.addGBeans(earContext, module, bundle, Collections.singleton(repository));
> + // add the module validator so the connector artifacts will resolve to an instance
> + AbstractName abstractName = earContext.getNaming().createChildName(module.getModuleName(), "ValidatorFactory", NameFactory.VALIDATOR_FACTORY);
> + GBeanData gbeanData = new GBeanData(abstractName, ValidatorFactoryGBean.class);
> + earContext.addGBean(gbeanData);
>
> ConfigurationData configurationData = earContext.getConfigurationData();
> AbstractName moduleAbstractName = earContext.getModuleName();
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/MessageDestinationTest.java Fri Oct 8 14:53:15 2010
> @@ -134,8 +134,8 @@ public class MessageDestinationTest exte
> adminObjectRefBuilder.initContext(specDD, plan, module);
> AbstractName n1 = naming.createChildName(baseName, "l1", NameFactory.JCA_ADMIN_OBJECT);
> AbstractName n2 = naming.createChildName(baseName, "l2", NameFactory.JCA_ADMIN_OBJECT);
> - configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.GBEAN_INFO));
> - configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.GBEAN_INFO));
> + configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.class));
> + configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.class));
> adminObjectRefBuilder.buildNaming(specDD, plan, module, componentContext);
> assertEquals(2, module.getJndiScope(JndiScope.comp).size());
> }
> @@ -158,8 +158,8 @@ public class MessageDestinationTest exte
> adminObjectRefBuilder.initContext(specDD, plan, module);
> AbstractName n1 = naming.createChildName(baseName, "l1", NameFactory.JCA_ADMIN_OBJECT);
> AbstractName n2 = naming.createChildName(baseName, "l2", NameFactory.JCA_ADMIN_OBJECT);
> - configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.GBEAN_INFO));
> - configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.GBEAN_INFO));
> + configuration.addGBean(new GBeanData(n1, AdminObjectWrapperGBean.class));
> + configuration.addGBean(new GBeanData(n2, AdminObjectWrapperGBean.class));
> adminObjectRefBuilder.buildNaming(specDD, plan, module, componentContext);
> assertEquals(2, module.getJndiScope(JndiScope.comp).size());
> }
>
> Modified: geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/connector-1_6/transaction-1_6/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,26 @@
> <type>car</type>
> </module-id>
> <dependency>
> + <groupId>commons-beanutils</groupId>
> + <artifactId>commons-beanutils</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>commons-collections</groupId>
> + <artifactId>commons-collections</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.aries.transaction</groupId>
> <artifactId>org.apache.aries.transaction.blueprint</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.bval</groupId>
> + <artifactId>org.apache.bval.bundle</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.components</groupId>
> <artifactId>geronimo-connector</artifactId>
> <type>jar</type>
> @@ -28,6 +43,11 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-connector-1_6</artifactId>
> <type>jar</type>
> </dependency>
> @@ -47,6 +67,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-validation_1.0_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/console/console-jetty/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -12,6 +12,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.bval</groupId>
> + <artifactId>org.apache.bval.bundle</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>dwr</artifactId>
> <type>jar</type>
> @@ -47,6 +52,11 @@
> <type>car</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.plugins</groupId>
> <artifactId>console-core</artifactId>
> <type>jar</type>
> @@ -67,6 +77,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-validation_1.0_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -12,6 +12,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.bval</groupId>
> + <artifactId>org.apache.bval.bundle</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>dwr</artifactId>
> <type>jar</type>
> @@ -52,6 +57,11 @@
> <type>car</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.plugins</groupId>
> <artifactId>console-core</artifactId>
> <type>jar</type>
> @@ -77,6 +87,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-validation_1.0_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.tranql</groupId>
> <artifactId>tranql-connector</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/cxf/cxf/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -106,4 +106,14 @@
> <artifactId>bcprov-jdk15</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml (original)
> +++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/pom.xml Fri Oct 8 14:53:15 2010
> @@ -106,6 +106,12 @@
>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval-builder</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-test-ddbean</artifactId>
> <version>${project.version}</version>
> <scope>test</scope>
>
> Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,6 +7,21 @@
> <type>car</type>
> </module-id>
> <dependency>
> + <groupId>commons-beanutils</groupId>
> + <artifactId>commons-beanutils</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>commons-collections</groupId>
> + <artifactId>commons-collections</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.bval</groupId>
> + <artifactId>org.apache.bval.bundle</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>j2ee-server</artifactId>
> <type>car</type>
> @@ -28,6 +43,16 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-bval-builder</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-j2ee-builder</artifactId>
> <type>jar</type>
> </dependency>
> @@ -72,6 +97,11 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.apache.geronimo.specs</groupId>
> + <artifactId>geronimo-validation_1.0_spec</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.apache.openejb</groupId>
> <artifactId>openejb-jee</artifactId>
> <type>jar</type>
> @@ -81,4 +111,14 @@
> <artifactId>xbean-bundleutils</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/j2ee/javaee-builder-support/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -121,4 +121,14 @@
> <artifactId>xbean-bundleutils</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/j2ee/jsr88-ear-configurer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -141,4 +141,14 @@
> <artifactId>xbean-naming</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/j2ee/jsr88-war-configurer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -312,6 +312,16 @@
> <type>jar</type>
> </dependency>
> <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> <groupId>org.ops4j.pax.logging</groupId>
> <artifactId>pax-logging-api</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/jetty8/jetty8-clustering-wadi/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>javax.xml.stream</groupId>
> - <artifactId>stax-api</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>castor</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/jetty8/jetty8-deployer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>javax.xml.stream</groupId>
> - <artifactId>stax-api</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>connector-deployer-1_6</artifactId>
> <type>car</type>
> @@ -31,39 +26,4 @@
> <artifactId>geronimo-jetty8-builder</artifactId>
> <type>jar</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-web</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jacc_1.4_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-jaspic_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-osgi-locator</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.xbean</groupId>
> - <artifactId>xbean-bundleutils</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.codehaus.woodstox</groupId>
> - <artifactId>stax2-api</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.codehaus.woodstox</groupId>
> - <artifactId>woodstox-core-asl</artifactId>
> - <type>jar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/jetty8/jetty8/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>javax.xml.stream</groupId>
> - <artifactId>stax-api</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>castor</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,16 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>commons-beanutils</groupId>
> - <artifactId>commons-beanutils</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>commons-collections</groupId>
> - <artifactId>commons-collections</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.bundles</groupId>
> <artifactId>commons-digester</artifactId>
> <type>jar</type>
> @@ -52,11 +42,6 @@
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-validation_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.myfaces.core</groupId>
> <artifactId>myfaces-api</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,13 +7,18 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>commons-beanutils</groupId>
> - <artifactId>commons-beanutils</artifactId>
> + <groupId>commons-logging</groupId>
> + <artifactId>commons-logging-api</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.bval</groupId>
> - <artifactId>org.apache.bval.bundle</artifactId>
> + <groupId>javassist</groupId>
> + <artifactId>javassist</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>net.sourceforge.serp</groupId>
> + <artifactId>serp</artifactId>
> <type>jar</type>
> </dependency>
> <dependency>
> @@ -58,11 +63,6 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-bval</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-openejb</artifactId>
> <type>jar</type>
> </dependency>
> @@ -102,11 +102,6 @@
> <type>jar</type>
> </dependency>
> <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-validation_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.openejb</groupId>
> <artifactId>commons-dbcp-all</artifactId>
> <type>jar</type>
> @@ -211,4 +206,19 @@
> <artifactId>swizzle-stream</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-log4j12</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>commons-collections</groupId>
> - <artifactId>commons-collections</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>commons-lang</groupId>
> <artifactId>commons-lang</artifactId>
> <type>jar</type>
>
> Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,21 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>commons-beanutils</groupId>
> - <artifactId>commons-beanutils</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>commons-collections</groupId>
> - <artifactId>commons-collections</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.bval</groupId>
> - <artifactId>org.apache.bval.bundle</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>j2ee-deployer</artifactId>
> <type>car</type>
> @@ -33,11 +18,6 @@
> </dependency>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-bval</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-persistence-jpa20</artifactId>
> <type>jar</type>
> </dependency>
> @@ -46,9 +26,4 @@
> <artifactId>geronimo-persistence-jpa20-builder</artifactId>
> <type>jar</type>
> </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.specs</groupId>
> - <artifactId>geronimo-validation_1.0_spec</artifactId>
> - <type>jar</type>
> - </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -116,4 +116,14 @@
> <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
> Modified: geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/uddi/uddi-jetty/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -7,11 +7,6 @@
> <type>car</type>
> </module-id>
> <dependency>
> - <groupId>commons-collections</groupId>
> - <artifactId>commons-collections</artifactId>
> - <type>jar</type>
> - </dependency>
> - <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>cxf</artifactId>
> <type>car</type>
>
> Modified: geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml?rev=1005852&r1=1005851&r2=1005852&view=diff
> ==============================================================================
> --- geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml (original)
> +++ geronimo/server/trunk/plugins/wab/web-extender/src/main/history/dependencies.xml Fri Oct 8 14:53:15 2010
> @@ -131,4 +131,14 @@
> <artifactId>xbean-bundleutils</artifactId>
> <type>jar</type>
> </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>stax2-api</artifactId>
> + <type>jar</type>
> + </dependency>
> + <dependency>
> + <groupId>org.codehaus.woodstox</groupId>
> + <artifactId>woodstox-core-asl</artifactId>
> + <type>jar</type>
> + </dependency>
> </plugin-artifact>
>
>
>
|