geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1137974 - in /geronimo/server/trunk: plugingroups/client/ plugins/client/client-deployer/src/main/plan/ plugins/client/client/src/main/history/ plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/ plugin...
Date Tue, 21 Jun 2011 12:21:58 GMT
Author: genspring
Date: Tue Jun 21 12:21:57 2011
New Revision: 1137974

URL: http://svn.apache.org/viewvc?rev=1137974&view=rev
Log:
GERONIMO-6018 Geronimo does not support @ManagedBean defined in app client module.

1, added a openejb-client module to only contain openejb system and managed container.

2, add a ClientEJBBuiler so that client-deployer could use it to build @ManagedBean in app
client module.

3, updated EJBModuleBuilder and AppClientModuleBuilder to do the ejb in clientmodule deployment
work.

Added:
    geronimo/server/trunk/plugins/openejb/openejb-client/
    geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-client/src/
    geronimo/server/trunk/plugins/openejb/openejb-client/src/main/
    geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/
    geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml
      - copied, changed from r1137893, geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/
    geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/plan.xml
Modified:
    geronimo/server/trunk/plugingroups/client/pom.xml
    geronimo/server/trunk/plugins/client/client-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
    geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/pom.xml

Modified: geronimo/server/trunk/plugingroups/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/client/pom.xml?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/client/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/client/pom.xml Tue Jun 21 12:21:57 2011
@@ -51,6 +51,13 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-client</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>          
 
         <!--<dependency>-->
             <!--<groupId>org.apache.geronimo.configs</groupId>-->

Modified: geronimo/server/trunk/plugins/client/client-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client-deployer/src/main/plan/plan.xml?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/client/client-deployer/src/main/plan/plan.xml Tue Jun 21
12:21:57 2011
@@ -23,6 +23,7 @@
         <attribute name="connectionTrackerObjectName">?name=ConnectionTracker</attribute>
         <attribute name="corbaGBeanObjectName">?name=Server</attribute>
         <attribute name="credentialStoreName">?name=CredentialStore</attribute>
+        <attribute name="globalContextAbstractName">?name=JavaGlobalContext</attribute>
         <reference name="Repositories">
             <!--<gbean-name>*:name=Repository,*</gbean-name>-->
         </reference>
@@ -37,6 +38,9 @@
                 <name>PersistenceUnitBuilder</name>
             </pattern>
             <pattern>
+                <name>ClientEJBBuilder</name>
+            </pattern>
+            <pattern>
                 <name>BValModuleBuilderExtension</name>
             </pattern>
         </references>

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=1137974&r1=1137973&r2=1137974&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 Tue Jun
21 12:21:57 2011
@@ -268,6 +268,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-api</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
Tue Jun 21 12:21:57 2011
@@ -67,6 +67,7 @@ import org.apache.geronimo.j2ee.deployme
 import org.apache.geronimo.j2ee.deployment.NamingBuilder;
 import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+import org.apache.geronimo.j2ee.jndi.ApplicationJndi;
 import org.apache.geronimo.j2ee.jndi.JndiKey;
 import org.apache.geronimo.j2ee.jndi.JndiScope;
 import org.apache.geronimo.j2ee.management.impl.J2EEAppClientModuleImpl;
@@ -131,6 +132,7 @@ public class AppClientModuleBuilder impl
 
     private final ArtifactResolver clientArtifactResolver;
     private final URI uri;
+    private AbstractNameQuery globalContextAbstractName;
 
     public AppClientModuleBuilder(Environment defaultClientEnvironment,
                                   Environment defaultServerEnvironment,
@@ -138,6 +140,7 @@ public class AppClientModuleBuilder impl
                                   AbstractNameQuery connectionTrackerObjectName,
                                   AbstractNameQuery corbaGBeanObjectName,
                                   AbstractNameQuery credentialStoreName,
+                                  AbstractNameQuery globalContextAbstractName,
                                   Collection<Repository> repositories,
                                   ModuleBuilder connectorModuleBuilder,
                                   NamespaceDrivenBuilder serviceBuilder,
@@ -151,7 +154,10 @@ public class AppClientModuleBuilder impl
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                credentialStoreName, repositories, new SingleElementCollection<ModuleBuilder>(connectorModuleBuilder),
+                credentialStoreName, 
+                globalContextAbstractName,
+                repositories,
+                new SingleElementCollection<ModuleBuilder>(connectorModuleBuilder),
                 serviceBuilder == null ? Collections.<NamespaceDrivenBuilder>emptySet()
: Collections.singleton(serviceBuilder),
                 namingBuilders == null ? Collections.<NamingBuilder>emptySet() : namingBuilders,
                 moduleBuilderExtensions,
@@ -164,6 +170,7 @@ public class AppClientModuleBuilder impl
                                   AbstractNameQuery connectionTrackerObjectName,
                                   AbstractNameQuery corbaGBeanObjectName,
                                   AbstractNameQuery credentialStoreName,
+                                  AbstractNameQuery globalContextAbstractName,
                                   Collection<Repository> repositories,
                                   Collection<ModuleBuilder> connectorModuleBuilder,
                                   Collection<NamespaceDrivenBuilder> serviceBuilder,
@@ -179,7 +186,9 @@ public class AppClientModuleBuilder impl
                 transactionManagerObjectName,
                 connectionTrackerObjectName,
                 corbaGBeanObjectName,
-                credentialStoreName, repositories,
+                credentialStoreName, 
+                globalContextAbstractName,
+                repositories,
                 new SingleElementCollection<ModuleBuilder>(connectorModuleBuilder),
                 serviceBuilder,
                 namingBuilders,
@@ -195,6 +204,7 @@ public class AppClientModuleBuilder impl
                                    AbstractNameQuery connectionTrackerObjectName,
                                    AbstractNameQuery corbaGBeanObjectName,
                                    AbstractNameQuery credentialStoreName,
+                                   AbstractNameQuery globalContextAbstractName,
                                    Collection<Repository> repositories,
                                    SingleElementCollection<ModuleBuilder> connectorModuleBuilder,
                                    Collection<NamespaceDrivenBuilder> serviceBuilder,
@@ -209,6 +219,7 @@ public class AppClientModuleBuilder impl
         this.transactionManagerObjectName = transactionManagerObjectName;
         this.connectionTrackerObjectName = connectionTrackerObjectName;
         this.credentialStoreName = credentialStoreName;
+        this.globalContextAbstractName = globalContextAbstractName;
         this.repositories = repositories;
         this.connectorModuleBuilder = connectorModuleBuilder;
         this.serviceBuilder = new NamespaceDrivenBuilderCollection(serviceBuilder);
@@ -561,7 +572,7 @@ public class AppClientModuleBuilder impl
         }
 
         // construct the app client deployment context... this is the same class used by
the ear context
-        EARContext appClientDeploymentContext;
+        EARContext appClientDeploymentContext = null;
         
         
         try {
@@ -577,8 +588,10 @@ public class AppClientModuleBuilder impl
                     connectionTrackerObjectName,
                     corbaGBeanObjectName,
                     earContext);
+            
+            
             appClientModule.setEarContext(appClientDeploymentContext);
-            appClientModule.setRootEarContext(appClientDeploymentContext);
+            appClientModule.setRootEarContext(earContext);
 
 
       if (module.getParentModule() != null) {
@@ -658,7 +671,8 @@ public class AppClientModuleBuilder impl
             throw e;
         } catch (IOException e) {
            throw new DeploymentException(e);
-        } 
+        }
+        
         for (Module connectorModule : appClientModule.getModules()) {
             if (connectorModule instanceof ConnectorModule) {
                 getConnectorModuleBuilder().installModule(connectorModule.getModuleFile(),
appClientDeploymentContext, connectorModule, configurationStores, targetConfigurationStore,
repositories);
@@ -686,6 +700,19 @@ public class AppClientModuleBuilder impl
 
     public void addGBeans(EARContext earContext, Module module, Bundle earBundle, Collection
repositories) throws DeploymentException {
 
+        AbstractName appJndiName = module.getEarContext().getNaming().createChildName(earContext.getModuleName(),
"ApplicationJndi", "ApplicationJndi");
+        module.getEarContext().getGeneralData().put(EARContext.APPLICATION_JNDI_NAME_KEY,
appJndiName);
+        
+        GBeanData appContexts = new GBeanData(appJndiName, ApplicationJndi.class);
+        appContexts.setAttribute("globalContextSegment", module.getJndiContext().get(JndiScope.global));
+        appContexts.setAttribute("applicationContextMap", module.getJndiContext().get(JndiScope.app));
+        appContexts.setReferencePattern("GlobalContext", globalContextAbstractName);
+        try {
+            module.getEarContext().addGBean(appContexts);
+        } catch (GBeanAlreadyExistsException e1) {
+          throw new DeploymentException(e1);
+        }
+        
         AppClientModule appClientModule = (AppClientModule) module;
         JarFile moduleFile = module.getModuleFile();
 
@@ -1058,6 +1085,7 @@ public class AppClientModuleBuilder impl
         infoBuilder.addAttribute("connectionTrackerObjectName", AbstractNameQuery.class,
true);
         infoBuilder.addAttribute("corbaGBeanObjectName", AbstractNameQuery.class, true);
         infoBuilder.addAttribute("credentialStoreName", AbstractNameQuery.class, true);
+        infoBuilder.addAttribute("globalContextAbstractName", AbstractNameQuery.class, true);
         infoBuilder.addReference("Repositories", Repository.class, "Repository");
         infoBuilder.addReference("ConnectorModuleBuilder", ModuleBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
@@ -1073,6 +1101,7 @@ public class AppClientModuleBuilder impl
                 "connectionTrackerObjectName",
                 "corbaGBeanObjectName",
                 "credentialStoreName",
+                "globalContextAbstractName",
                 "Repositories",
                 "ConnectorModuleBuilder",
                 "ServiceBuilders",

Modified: geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
(original)
+++ geronimo/server/trunk/plugins/client/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/PlanParsingTest.java
Tue Jun 21 12:21:57 2011
@@ -41,7 +41,7 @@ public class PlanParsingTest extends Tes
 
     protected void setUp() throws Exception {
         super.setUp();
-        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null,
Collections.<Repository>emptyList(), null, null, null, Collections.<ModuleBuilderExtension>emptyList(),
clientArtifactResolver,"localhost",4021);
+        builder = new AppClientModuleBuilder(new Environment(), null, null, null, null, null,
null, Collections.<Repository>emptyList(), null, null, null, Collections.<ModuleBuilderExtension>emptyList(),
clientArtifactResolver,"localhost",4021);
         builder.doStart();
     }
 

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Tue Jun 21 12:21:57 2011
@@ -298,7 +298,7 @@ public class EjbModuleBuilder implements
                              Naming naming,
                              ModuleIDBuilder idBuilder) throws DeploymentException {
         //check for web module
-        if (module instanceof WebModule) {
+        if (module instanceof WebModule || module instanceof AppClientModule) {
             //check for WEB-INF/ejb-jar.xml
             Module ejbModule = createModule(plan, moduleFile, targetPath, null, environment,
module, naming, idBuilder, "WEB-INF/", true);
             if (ejbModule != null) {
@@ -497,7 +497,11 @@ public class EjbModuleBuilder implements
                 AbstractName earName = naming.createRootName(environment.getConfigId(), NameFactory.NULL,
NameFactory.J2EE_APPLICATION);
                 moduleName = naming.createChildName(earName, environment.getConfigId().toString(),
NameFactory.EJB_MODULE);
             } else {
-                moduleName = naming.createChildName(parentModule.getModuleName(), targetPath,
NameFactory.EJB_MODULE);
+                
+                AbstractName parentName = parentModule instanceof AppClientModule ? ((AppClientModule)
parentModule)
+                        .getAppClientName() : parentModule.getModuleName();
+                        
+                moduleName = naming.createChildName(parentName, targetPath, NameFactory.EJB_MODULE);
             }
 
             // Create XMLBeans version of EjbJarType for the AnnotatedApp interface
@@ -680,6 +684,9 @@ public class EjbModuleBuilder implements
                     subModule.setEarContext(module.getEarContext());
                     subModule.setRootEarContext(module.getRootEarContext());
                     //don't copy, module is already in classloader
+                    if(module instanceof AppClientModule){
+                        earContext = module.getEarContext();
+                    }
                     registerModule(subModule, earContext);
                 }
             }
@@ -748,6 +755,10 @@ public class EjbModuleBuilder implements
             LinkedHashSet<Module<?,?>> modules = module.getModules();
             for (Module<?,?> subModule: modules) {
                 if (subModule instanceof EjbModule)  {
+                    
+                    if(module instanceof AppClientModule){
+                        earContext = module.getEarContext();
+                    }
                     doInitContext(earContext, subModule, bundle);
                 }
             }
@@ -804,7 +815,9 @@ public class EjbModuleBuilder implements
        
         GBeanData ejbModuleGBeanData = new GBeanData(ejbModule.getModuleName(), EjbModuleImpl.class);
         try {
-            earContext.addGBean(ejbModuleGBeanData);
+
+          earContext.addGBean(ejbModuleGBeanData);
+            
         } catch (GBeanAlreadyExistsException e) {
             throw new DeploymentException("Could not add ejb module gbean", e);
         }

Added: geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml?rev=1137974&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-client/pom.xml Tue Jun 21 12:21:57 2011
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.configs</groupId>
+    <artifactId>openejb-client</artifactId>
+    <name>Geronimo Plugins, OpenEJB :: OpenEJB Client</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo integration of the OpenEJB, to add ejb container in AppClient
Container to support ManagedBean in appclient module.</description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-server</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>server-security-config</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>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openwebbeans</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxws_2.2_spec</artifactId>
+       </dependency>
+       
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        </dependency>      
+
+       <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
+        </dependency>
+        <dependency>
+            <!-- for openejb embedded support-->
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>commons-dbcp-all</artifactId>
+            <version>1.3-r699049</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openjpa2</artifactId>
+            <type>car</type>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-spec-corba</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-asm-shaded</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.swizzle</groupId>
+            <artifactId>swizzle-stream</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.quartz</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <category>EJB Container</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false" />
+                        </plugin-artifact>
+                    </instance>                    
+                </configuration>               
+            </plugin>
+        </plugins>
+    </build>
+</project>

Copied: geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml
(from r1137893, geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml?p2=geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml&p1=geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml&r1=1137893&r2=1137974&rev=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-client/src/main/history/dependencies.xml
Tue Jun 21 12:21:57 2011
@@ -2,7 +2,7 @@
 <plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>openejb</artifactId>
+        <artifactId>openejb-client</artifactId>
         <version>3.0-SNAPSHOT</version>
         <type>car</type>
     </module-id>
@@ -23,11 +23,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>system-database</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>transaction-1_6</artifactId>
         <type>car</type>
     </dependency>
@@ -53,6 +48,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -63,6 +63,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-api</artifactId>
         <type>jar</type>
     </dependency>

Added: geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/plan.xml?rev=1137974&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/plugins/openejb/openejb-client/src/main/plan/plan.xml Tue Jun 21
12:21:57 2011
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="OpenEJBSystemProperties" class="org.apache.geronimo.system.properties.SystemProperties">
+        <attribute name="systemProperties">
+            openejb.vendor.config=GERONIMO
+            openejb.log.factory=org.apache.openejb.util.PaxLogStreamFactory
+        </attribute>
+    </gbean>
+
+    <gbean name="OpenEjbSystem" class="org.apache.geronimo.openejb.OpenEjbSystemGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="ResourceAdapterWrappers"/>
+        <reference name="PersistenceUnitGBeans"/>
+    </gbean>
+
+    <gbean name="ExtendedEntityManagerRegistry" class="org.apache.geronimo.openejb.EntityManagerRegistryImpl">
+        <dependency>
+            <name>OpenEjbSystem</name>
+        </dependency>
+    </gbean>
+
+    <gbean name="DefaultManagedContainer" class="org.apache.geronimo.openejb.ManagedContainerGBean">
+        <reference name="OpenEjbSystem">
+            <name>OpenEjbSystem</name>
+        </reference>
+    </gbean>
+
+
+
+</module>

Modified: geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-deployer/src/main/plan/plan.xml Tue Jun
21 12:21:57 2011
@@ -80,6 +80,47 @@
             </environment>
         </xml-attribute>
     </gbean>
+    
+ <gbean name="ClientEJBBuilder" class="org.apache.geronimo.openejb.deployment.EjbModuleBuilder">
+        <attribute name="defaultCmpJTADataSource">SystemDatasource</attribute>
+        <attribute name="defaultCmpNonJTADataSource">NoTxDatasource</attribute>
+        <references name="ModuleBuilderExtensions">
+            <pattern>
+                <name>PersistenceUnitBuilder</name>
+            </pattern>
+            <pattern>
+                <name>SecurityBuilder</name>
+            </pattern>
+            <pattern>
+                <name>BValModuleBuilderExtension</name>
+            </pattern>
+        </references>
+        <references name="ServiceBuilders">
+            <pattern>
+                <name>GBeanBuilder</name>
+            </pattern>
+            <pattern>
+                <name>SecurityBuilder</name>
+            </pattern>
+        </references>
+        <reference name="NamingBuilders">
+            <name>NamingBuilders</name>
+        </reference>
+        <reference name="ResourceEnvironmentSetter">
+            <name>ResourceRefBuilder</name>
+        </reference>
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>${pom.groupId}</groupId>
+                        <artifactId>openejb-client</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>    
 
     <gbean name="EjbRefBuilder" class="org.apache.geronimo.openejb.deployment.EjbRefBuilder">
         <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>

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=1137974&r1=1137973&r2=1137974&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 Tue Jun
21 12:21:57 2011
@@ -53,6 +53,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jms_1.1_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -63,6 +68,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openejb</groupId>
+        <artifactId>mbean-annotation-api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-api</artifactId>
         <type>jar</type>
     </dependency>
@@ -132,11 +142,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=1137974&r1=1137973&r2=1137974&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Tue Jun 21 12:21:57 2011
@@ -38,6 +38,7 @@
         <module>geronimo-openejb-clustering-wadi</module>
         <module>geronimo-openejb-clustering-builder-wadi</module>
         <module>openejb</module>
+        <module>openejb-client</module>
         <module>openejb-deployer</module>
         <module>openejb-portlets</module>
         <module>openejb-console-jetty</module>



Mime
View raw message