You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/05/18 20:53:04 UTC
svn commit: r945820 - in /geronimo/server/trunk/plugins:
client/client-deployer/src/main/plan/ client/client/src/main/history/
client/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/
connector-1_6/geronimo-connector-builder-1_6...
Author: djencks
Date: Tue May 18 18:53:03 2010
New Revision: 945820
URL: http://svn.apache.org/viewvc?rev=945820&view=rev
Log:
GERONIMO-5025 support for jndi configuration in application.xml (part 2)
Modified:
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/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/transaction-1_6/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
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=945820&r1=945819&r2=945820&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 May 18 18:53:03 2010
@@ -68,6 +68,13 @@
<pattern>
<name>LifecycleMethodBuilder</name>
</pattern>
+ <pattern>
+ <!-- TODO do app clients get web beans? -->
+ <name>ManagedResourceRefBuilder</name>
+ </pattern>
+ <pattern>
+ <name>BValNamingBuilder</name>
+ </pattern>
</references>
<reference name="ConnectorModuleBuilder">
<name>ClientConnectorBuilder</name>
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=945820&r1=945819&r2=945820&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 May 18 18:53:03 2010
@@ -7,6 +7,36 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <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>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
<type>jar</type>
@@ -22,11 +52,26 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-core</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+ <artifactId>bval-jsr303</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>sxc-jaxb</artifactId>
<type>jar</type>
@@ -58,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-core</artifactId>
<type>jar</type>
</dependency>
@@ -68,6 +118,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-main</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-management</artifactId>
<type>jar</type>
</dependency>
@@ -83,6 +138,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-client</artifactId>
<type>jar</type>
</dependency>
@@ -178,6 +238,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-registry</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-saaj_1.3_spec</artifactId>
<type>jar</type>
</dependency>
@@ -187,6 +252,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-api</artifactId>
<type>jar</type>
@@ -233,6 +303,11 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
@@ -242,6 +317,16 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
<type>jar</type>
@@ -271,4 +356,9 @@
<artifactId>tranql-connector</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
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=945820&r1=945819&r2=945820&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 May 18 18:53:03 2010
@@ -405,6 +405,7 @@ public class AppClientModuleBuilder impl
null,
new LinkedHashSet<Module>(Collections.singleton(module)),
new ModuleList(),
+ null,
null);
return appInfo;
} else {
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=945820&r1=945819&r2=945820&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 Tue May 18 18:53:03 2010
@@ -46,6 +46,8 @@ 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.NamingBuilder;
+import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
import org.apache.geronimo.kernel.Jsr77Naming;
@@ -139,6 +141,7 @@ public class ConnectorModuleBuilderTest
null,
serviceBuilder,
null,
+ new NamingBuilderCollection(Collections.<NamingBuilder>emptyList()),
kernel.getNaming(),
null,
bundleContext);
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=945820&r1=945819&r2=945820&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 Tue May 18 18:53:03 2010
@@ -23,6 +23,16 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-main</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>j2ee-security</artifactId>
<type>car</type>
</dependency>
@@ -38,15 +48,50 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jpa_2.0_spec</artifactId>
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-registry</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.tranql</groupId>
<artifactId>tranql-connector</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java?rev=945820&r1=945819&r2=945820&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTestSupport.java Tue May 18 18:53:03 2010
@@ -84,6 +84,8 @@ public abstract class EARConfigBuilderTe
protected static final ModuleBuilderExtension persistenceUnitBuilder = null;
+ protected static final NamingBuilder namingBuilder = new NamingBuilderCollection(Collections.<NamingBuilder>emptySet());
+
protected static final Naming naming = new Jsr77Naming();
protected static final AbstractName rootConfig = naming.createRootName(new Artifact("test", "stuff", "", "car"), "test", "test") ;
@@ -158,6 +160,7 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
+ namingBuilder,
naming,
artifactResolvers,
bundleContext);
@@ -190,7 +193,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -226,7 +232,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -262,7 +271,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -298,7 +310,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -334,7 +349,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
@@ -371,7 +389,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
@@ -407,7 +428,10 @@ public abstract class EARConfigBuilderTe
appClientConfigBuilder,
serviceBuilder,
persistenceUnitBuilder,
- naming, artifactResolvers, bundleContext);
+ namingBuilder,
+ naming,
+ artifactResolvers,
+ bundleContext);
ConfigurationData configurationData = null;
DeploymentContext context = null;
Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java?rev=945820&r1=945819&r2=945820&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java (original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/LifecycleMethodBuilder.java Tue May 18 18:53:03 2010
@@ -51,8 +51,9 @@ import org.apache.xmlbeans.XmlObject;
*/
public class LifecycleMethodBuilder extends AbstractNamingBuilder {
public void buildNaming(XmlObject specDD, XmlObject plan, Module module, Map<EARContext.Key, Object> sharedContext) throws DeploymentException {
- // skip ejb modules... they have alreayd been processed
- if (module.getType() == ConfigurationModuleType.EJB) {
+ // skip ejb modules... they have already been processed
+ //skip ears, they have no standalone components
+ if (module.getType() == ConfigurationModuleType.EJB || module.getType() == ConfigurationModuleType.EAR) {
return;
}
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=945820&r1=945819&r2=945820&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 Tue May 18 18:53:03 2010
@@ -64,6 +64,9 @@
<name>UnavailableAppClientBuilder</name>
</pattern>
</references>
+ <reference name="NamingBuilders">
+ <name>NamingBuilders</name>
+ </reference>
<reference name="ArtifactResolvers">
<name>ArtifactResolver</name>
</reference>
@@ -147,6 +150,9 @@
<pattern>
<name>ManagedResourceRefBuilder</name>
</pattern>
+ <pattern>
+ <name>BValNamingBuilder</name>
+ </pattern>
</references>
</gbean>
Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=945820&r1=945819&r2=945820&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue May 18 18:53:03 2010
@@ -27,8 +27,33 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-registry</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-bundleutils</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-finder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>