From scm-return-41127-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Apr 02 16:30:21 2010 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 723 invoked from network); 2 Apr 2010 16:30:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 2 Apr 2010 16:30:21 -0000 Received: (qmail 13191 invoked by uid 500); 2 Apr 2010 16:30:20 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 13146 invoked by uid 500); 2 Apr 2010 16:30:20 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 13139 invoked by uid 99); 2 Apr 2010 16:30:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 16:30:20 +0000 X-ASF-Spam-Status: No, hits=-1206.8 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Apr 2010 16:30:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BEF0B23888CB; Fri, 2 Apr 2010 16:29:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r930317 - in /geronimo/server/trunk/plugins/j2ee: geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/ j2ee-deployer/src/main/plan/ Date: Fri, 02 Apr 2010 16:29:58 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100402162958.BEF0B23888CB@eris.apache.org> Author: gawor Date: Fri Apr 2 16:29:58 2010 New Revision: 930317 URL: http://svn.apache.org/viewvc?rev=930317&view=rev Log: GERONIMO-5113: Expose DataSourceType through AnnotatedApp Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java?rev=930317&r1=930316&r2=930317&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApp.java Fri Apr 2 16:29:58 2010 @@ -19,6 +19,7 @@ package org.apache.geronimo.j2ee.deploym import java.util.List; +import org.apache.geronimo.xbeans.javaee6.DataSourceType; import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType; import org.apache.geronimo.xbeans.javaee6.EjbRefType; import org.apache.geronimo.xbeans.javaee6.EnvEntryType; @@ -127,6 +128,9 @@ public interface AnnotatedApp { PersistenceUnitRefType[] getPersistenceUnitRefArray(); PersistenceUnitRefType addNewPersistenceUnitRef(); + + DataSourceType[] getDataSourceArray(); + DataSourceType addNewDataSource(); String getComponentType(); } Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java?rev=930317&r1=930316&r2=930317&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedApplicationClient.java Fri Apr 2 16:29:58 2010 @@ -23,6 +23,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.geronimo.xbeans.javaee6.ApplicationClientType; +import org.apache.geronimo.xbeans.javaee6.DataSourceType; import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType; import org.apache.geronimo.xbeans.javaee6.EjbRefType; import org.apache.geronimo.xbeans.javaee6.EnvEntryType; @@ -198,6 +199,14 @@ public class AnnotatedApplicationClient return applicationClient.addNewPersistenceUnitRef(); } + public DataSourceType[] getDataSourceArray() { + return applicationClient.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return applicationClient.addNewDataSource(); + } + public String getComponentType() { return componentType; } Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java?rev=930317&r1=930316&r2=930317&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedEjbJar.java Fri Apr 2 16:29:58 2010 @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.geronimo.common.DeploymentException; +import org.apache.geronimo.xbeans.javaee6.DataSourceType; import org.apache.geronimo.xbeans.javaee6.EjbJarType; import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType; import org.apache.geronimo.xbeans.javaee6.EjbRefType; @@ -167,6 +168,14 @@ public class AnnotatedEjbJar implements return delegate.addNewPersistenceUnitRef(); } + public DataSourceType[] getDataSourceArray() { + return delegate.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return delegate.addNewDataSource(); + } + public String getComponentType() { return null; } @@ -205,7 +214,6 @@ public class AnnotatedEjbJar implements public static class EntityBean implements AnnotatedApp { private final EntityBeanType bean; - public EntityBean(EntityBeanType bean) { this.bean = bean; } @@ -214,72 +222,58 @@ public class AnnotatedEjbJar implements return bean.getEjbLocalRefArray(); } - public EjbLocalRefType addNewEjbLocalRef() { return bean.addNewEjbLocalRef(); } - public EjbRefType[] getEjbRefArray() { return bean.getEjbRefArray(); } - public EjbRefType addNewEjbRef() { return bean.addNewEjbRef(); } - public EnvEntryType[] getEnvEntryArray() { return bean.getEnvEntryArray(); } - public EnvEntryType addNewEnvEntry() { return bean.addNewEnvEntry(); } - public ServiceRefType[] getServiceRefArray() { return bean.getServiceRefArray(); } - public ServiceRefType addNewServiceRef() { return bean.addNewServiceRef(); } - public ResourceRefType[] getResourceRefArray() { return bean.getResourceRefArray(); } - public ResourceRefType addNewResourceRef() { return bean.addNewResourceRef(); } - public MessageDestinationRefType[] getMessageDestinationRefArray() { return bean.getMessageDestinationRefArray(); } - public MessageDestinationRefType addNewMessageDestinationRef() { return bean.addNewMessageDestinationRef(); } - public ResourceEnvRefType[] getResourceEnvRefArray() { return bean.getResourceEnvRefArray(); } - public ResourceEnvRefType addNewResourceEnvRef() { return bean.addNewResourceEnvRef(); } - public String toString() { return bean.xmlText(); } @@ -288,46 +282,46 @@ public class AnnotatedEjbJar implements throw new AssertionError("don't call this"); } - public LifecycleCallbackType[] getPostConstructArray() { return bean.getPostConstructArray(); } - public LifecycleCallbackType addPostConstruct() { return bean.addNewPostConstruct(); } - public LifecycleCallbackType[] getPreDestroyArray() { return bean.getPreDestroyArray(); } - public LifecycleCallbackType addPreDestroy() { return bean.addNewPreDestroy(); } - public PersistenceContextRefType[] getPersistenceContextRefArray() { return bean.getPersistenceContextRefArray(); } - public PersistenceContextRefType addNewPersistenceContextRef() { return bean.addNewPersistenceContextRef(); } - public PersistenceUnitRefType[] getPersistenceUnitRefArray() { return bean.getPersistenceUnitRefArray(); } - public PersistenceUnitRefType addNewPersistenceUnitRef() { return bean.addNewPersistenceUnitRef(); } + public DataSourceType[] getDataSourceArray() { + return bean.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return bean.addNewDataSource(); + } + public String getComponentType() { return bean.getEjbClass().getStringValue().trim(); } @@ -336,82 +330,74 @@ public class AnnotatedEjbJar implements public static class MessageDriveBean implements AnnotatedApp { private final MessageDrivenBeanType bean; - public MessageDriveBean(MessageDrivenBeanType bean) { this.bean = bean; } - public EjbLocalRefType[] getEjbLocalRefArray() { return bean.getEjbLocalRefArray(); } - public EjbLocalRefType addNewEjbLocalRef() { return bean.addNewEjbLocalRef(); } - public EjbRefType[] getEjbRefArray() { return bean.getEjbRefArray(); } - public EjbRefType addNewEjbRef() { return bean.addNewEjbRef(); } - public EnvEntryType[] getEnvEntryArray() { return bean.getEnvEntryArray(); } - public EnvEntryType addNewEnvEntry() { return bean.addNewEnvEntry(); } - public ServiceRefType[] getServiceRefArray() { return bean.getServiceRefArray(); } - public ServiceRefType addNewServiceRef() { return bean.addNewServiceRef(); } - public ResourceRefType[] getResourceRefArray() { return bean.getResourceRefArray(); } - public ResourceRefType addNewResourceRef() { return bean.addNewResourceRef(); } - public MessageDestinationRefType[] getMessageDestinationRefArray() { return bean.getMessageDestinationRefArray(); } - public MessageDestinationRefType addNewMessageDestinationRef() { return bean.addNewMessageDestinationRef(); } - public ResourceEnvRefType[] getResourceEnvRefArray() { return bean.getResourceEnvRefArray(); } - public ResourceEnvRefType addNewResourceEnvRef() { return bean.addNewResourceEnvRef(); } - + public DataSourceType[] getDataSourceArray() { + return bean.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return bean.addNewDataSource(); + } + public String toString() { return bean.xmlText(); } @@ -420,46 +406,38 @@ public class AnnotatedEjbJar implements throw new AssertionError("don't call this"); } - public LifecycleCallbackType[] getPostConstructArray() { return bean.getPostConstructArray(); } - public LifecycleCallbackType addPostConstruct() { return bean.addNewPostConstruct(); } - public LifecycleCallbackType[] getPreDestroyArray() { return bean.getPreDestroyArray(); } - public LifecycleCallbackType addPreDestroy() { return bean.addNewPreDestroy(); } - public PersistenceContextRefType[] getPersistenceContextRefArray() { return bean.getPersistenceContextRefArray(); } - public PersistenceContextRefType addNewPersistenceContextRef() { return bean.addNewPersistenceContextRef(); } - public PersistenceUnitRefType[] getPersistenceUnitRefArray() { return bean.getPersistenceUnitRefArray(); } - public PersistenceUnitRefType addNewPersistenceUnitRef() { return bean.addNewPersistenceUnitRef(); } - + public String getComponentType() { return bean.getEjbClass().getStringValue().trim(); } @@ -468,82 +446,66 @@ public class AnnotatedEjbJar implements public static class SessionBean implements AnnotatedApp { private final SessionBeanType bean; - public SessionBean(SessionBeanType bean) { this.bean = bean; } - public EjbLocalRefType[] getEjbLocalRefArray() { return bean.getEjbLocalRefArray(); } - public EjbLocalRefType addNewEjbLocalRef() { return bean.addNewEjbLocalRef(); } - public EjbRefType[] getEjbRefArray() { return bean.getEjbRefArray(); } - public EjbRefType addNewEjbRef() { return bean.addNewEjbRef(); } - public EnvEntryType[] getEnvEntryArray() { return bean.getEnvEntryArray(); } - public EnvEntryType addNewEnvEntry() { return bean.addNewEnvEntry(); } - public ServiceRefType[] getServiceRefArray() { return bean.getServiceRefArray(); } - public ServiceRefType addNewServiceRef() { return bean.addNewServiceRef(); } - public ResourceRefType[] getResourceRefArray() { return bean.getResourceRefArray(); } - public ResourceRefType addNewResourceRef() { return bean.addNewResourceRef(); } - public MessageDestinationRefType[] getMessageDestinationRefArray() { return bean.getMessageDestinationRefArray(); } - public MessageDestinationRefType addNewMessageDestinationRef() { return bean.addNewMessageDestinationRef(); } - public ResourceEnvRefType[] getResourceEnvRefArray() { return bean.getResourceEnvRefArray(); } - public ResourceEnvRefType addNewResourceEnvRef() { return bean.addNewResourceEnvRef(); } - public String toString() { return bean.xmlText(); } @@ -552,46 +514,46 @@ public class AnnotatedEjbJar implements throw new AssertionError("don't call this"); } - public LifecycleCallbackType[] getPostConstructArray() { return bean.getPostConstructArray(); } - public LifecycleCallbackType addPostConstruct() { return bean.addNewPostConstruct(); } - public LifecycleCallbackType[] getPreDestroyArray() { return bean.getPreDestroyArray(); } - public LifecycleCallbackType addPreDestroy() { return bean.addNewPreDestroy(); } - public PersistenceContextRefType[] getPersistenceContextRefArray() { return bean.getPersistenceContextRefArray(); } - public PersistenceContextRefType addNewPersistenceContextRef() { return bean.addNewPersistenceContextRef(); } - public PersistenceUnitRefType[] getPersistenceUnitRefArray() { return bean.getPersistenceUnitRefArray(); } - public PersistenceUnitRefType addNewPersistenceUnitRef() { return bean.addNewPersistenceUnitRef(); } + public DataSourceType[] getDataSourceArray() { + return bean.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return bean.addNewDataSource(); + } + public String getComponentType() { return bean.getEjbClass().getStringValue().trim(); } Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java?rev=930317&r1=930316&r2=930317&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java (original) +++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/main/java/org/apache/geronimo/j2ee/deployment/annotation/AnnotatedWebApp.java Fri Apr 2 16:29:58 2010 @@ -22,6 +22,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.geronimo.xbeans.javaee6.DataSourceType; import org.apache.geronimo.xbeans.javaee6.EjbLocalRefType; import org.apache.geronimo.xbeans.javaee6.EjbRefType; import org.apache.geronimo.xbeans.javaee6.EnvEntryType; @@ -196,6 +197,14 @@ public class AnnotatedWebApp implements return webApp.addNewPersistenceUnitRef(); } + public DataSourceType[] getDataSourceArray() { + return webApp.getDataSourceArray(); + } + + public DataSourceType addNewDataSource() { + return webApp.addNewDataSource(); + } + public String getComponentType() { return null; } Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=930317&r1=930316&r2=930317&view=diff ============================================================================== --- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Fri Apr 2 16:29:58 2010 @@ -118,6 +118,9 @@ PersistenceUnitRefBuilder + DataSourceBuilder + + ResourceRefBuilder