[jboss-cvs] JBossAS SVN: r81532 - in projects/ejb3/trunk: common and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 03:26:19 EST 2008
Author: ALRubinger
Date: 2008-11-25 03:26:18 -0500 (Tue, 25 Nov 2008)
New Revision: 81532
Added:
projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/
projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java
projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-jboss-beans.xml
Removed:
projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-beans.xml
Modified:
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/common/pom.xml
projects/ejb3/trunk/common/src/test/java/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase.java
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/deployers/pom.xml
projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java
projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt
projects/ejb3/trunk/plugin/pom.xml
projects/ejb3/trunk/proxy/pom.xml
projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java
projects/ejb3/trunk/test/pom.xml
projects/ejb3/trunk/test/src/main/java/org/jboss/ejb3/test/common/MetaDataHelper.java
Log:
[EJBTHREE-1599][EJBTHREE-1600] Upgrade EJB3 to jboss-metadata SNAPSHOT, and centralize the post-merge processor logic to be used outside deployers. Also allow ejb3-test to depend upon ejb3-common, not the other way around
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/build/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -331,7 +331,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
- <version>1.0.0.CR5</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/common/pom.xml
===================================================================
--- projects/ejb3/trunk/common/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/common/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -4,7 +4,7 @@
<parent>
<artifactId>jboss-ejb3-build</artifactId>
<groupId>org.jboss.ejb3</groupId>
- <version>0.13.11</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -84,21 +84,11 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>${version.org.jboss.microcontainer_jboss-kernel}</version>
</dependency>
- <!-- MC doesn't declare this as a proper dependency
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.0.0.Beta10</version>
- </dependency> -->
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-test</artifactId>
- <version>0.1.1</version>
- <scope>test</scope>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
</dependency>
</dependencies>
Added: projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java
===================================================================
--- projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java (rev 0)
+++ projects/ejb3/trunk/common/src/main/java/org/jboss/ejb3/common/metadata/MetadataUtil.java 2008-11-25 08:26:18 UTC (rev 81532)
@@ -0,0 +1,142 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.common.metadata;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.jboss.logging.Logger;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.process.chain.ProcessorChain;
+import org.jboss.metadata.process.chain.ejb.jboss.JBossMetaDataProcessorChain;
+import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.ClusterConfigDefaultValueProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.JBossMetaDataValidatorChainProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
+import org.jboss.metadata.process.processor.ejb.jboss.SetExplicitLocalJndiNameProcessor;
+
+/**
+ * MetadataUtil
+ *
+ * Contains helper methods central to EJB3 metadata
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+public class MetadataUtil
+{
+
+ // ------------------------------------------------------------------------------||
+ // Class Members ----------------------------------------------------------------||
+ // ------------------------------------------------------------------------------||
+
+ private static final Logger log = Logger.getLogger(MetadataUtil.class);
+
+ // ------------------------------------------------------------------------------||
+ // Constructor ------------------------------------------------------------------||
+ // ------------------------------------------------------------------------------||
+
+ /**
+ * Sole Constructor; in place to block instanciation
+ */
+ private MetadataUtil()
+ {
+ }
+
+ // ------------------------------------------------------------------------------||
+ // Helper Methods ---------------------------------------------------------------||
+ // ------------------------------------------------------------------------------||
+
+ /**
+ * Obtains the processors to be applied to metadata once merging is
+ * complete
+ */
+ @SuppressWarnings("unchecked")
+ public static Collection<JBossMetaDataProcessor<JBossMetaData>> getPostMergeMetadataProcessors(ClassLoader cl)
+ {
+ // Initialize
+ Collection<JBossMetaDataProcessor<JBossMetaData>> processors = new ArrayList<JBossMetaDataProcessor<JBossMetaData>>();
+
+ /*
+ * Add processors
+ *
+ * Maintainer's note: The order here is preserved
+ */
+
+ // JBMETA-122 Implicit Local Business Interface
+ processors.add(new SetDefaultLocalBusinessInterfaceProcessor<JBossMetaData>(cl));
+
+ // JBMETA-133, EJBTHREE-1539 Default ClusterConfig
+ processors.add(ClusterConfigDefaultValueProcessor.INSTANCE);
+
+ // JBMETA-143 Set explicit local JNDI name from @LocalBinding.jndiBinding
+ processors.add(SetExplicitLocalJndiNameProcessor.INSTANCE);
+
+ // JBMETA-118 Validation
+ processors.add(JBossMetaDataValidatorChainProcessor.INSTANCE);
+
+ /*
+ * End Processor Adding
+ */
+
+ // Return
+ return processors;
+ }
+
+ /**
+ * Obtains the ProcessorChain to be run upon a fully-merged
+ * metadata
+ *
+ * @param cl
+ * @return
+ */
+ public static ProcessorChain<JBossMetaData> getPostMergeMetadataProcessorChain(ClassLoader cl)
+ {
+ // Initialize
+ ProcessorChain<JBossMetaData> chain = new JBossMetaDataProcessorChain<JBossMetaData>();
+ StringBuffer logMessage = new StringBuffer("Creating ");
+ logMessage.append(ProcessorChain.class.getSimpleName());
+ logMessage.append(" with the following Processors:");
+
+ // Obtain processors to put in the chain
+ Collection<JBossMetaDataProcessor<JBossMetaData>> processors = getPostMergeMetadataProcessors(cl);
+
+ // For each of the processors
+ if (processors != null)
+ {
+ for (JBossMetaDataProcessor<JBossMetaData> processor : processors)
+ {
+ // Add to the chain
+ chain.addProcessor(processor);
+ logMessage.append(" ");
+ logMessage.append(processor);
+ }
+ }
+
+ // Log
+ log.debug(logMessage.toString());
+
+ // Return
+ return chain;
+ }
+
+}
Modified: projects/ejb3/trunk/common/src/test/java/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase.java
===================================================================
--- projects/ejb3/trunk/common/src/test/java/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase.java 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/common/src/test/java/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase.java 2008-11-25 08:26:18 UTC (rev 81532)
@@ -21,6 +21,8 @@
*/
package org.jboss.ejb3.test.common.registrar.unit;
+import java.net.URL;
+
import junit.framework.TestCase;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
@@ -29,7 +31,9 @@
import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.common.registrar.spi.NotBoundException;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -50,7 +54,9 @@
// Class Members ------------------------------------------------------------------||
// --------------------------------------------------------------------------------||
- private static EmbeddedTestMcBootstrap bootstrap;
+ private static BasicBootstrap bootstrap;
+
+ private static final String DEFAULT_SUFFIX_DEPLOYABLE_XML = "-jboss-beans.xml";
// --------------------------------------------------------------------------------||
// Tests --------------------------------------------------------------------------||
@@ -113,21 +119,23 @@
public static void beforeClass() throws Throwable
{
// Create and set a new MC Bootstrap
- Ejb3McRegistrarTestCase.setBootstrap(EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap());
+ BasicBootstrap bootstrap = new BasicBootstrap();
+ Ejb3McRegistrarTestCase.setBootstrap(bootstrap);
+ bootstrap.run();
+ Kernel kernel = bootstrap.getKernel();
// Bind the Ejb3Registrar
- Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(Ejb3McRegistrarTestCase.getBootstrap().getKernel()));
+ Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(kernel));
// Deploy
- Ejb3McRegistrarTestCase.bootstrap.deploy(Ejb3McRegistrarTestCase.class);
+ BasicXMLDeployer deployer = new BasicXMLDeployer(kernel);
+ URL deployUrl = getDeployableXmlUrl(Ejb3McRegistrarTestCase.class);
+ deployer.deploy(deployUrl);
}
@AfterClass
public static void afterClass() throws Exception
{
- // Shutdown MC
- Ejb3McRegistrarTestCase.bootstrap.shutdown();
-
// Set Bootstrap to null
Ejb3McRegistrarTestCase.setBootstrap(null);
}
@@ -136,14 +144,43 @@
// Accessors / Mutators -----------------------------------------------------------||
// --------------------------------------------------------------------------------||
- public static EmbeddedTestMcBootstrap getBootstrap()
+ public static BasicBootstrap getBootstrap()
{
return Ejb3McRegistrarTestCase.bootstrap;
}
- public static void setBootstrap(EmbeddedTestMcBootstrap bootstrap)
+ public static void setBootstrap(BasicBootstrap bootstrap)
{
Ejb3McRegistrarTestCase.bootstrap = bootstrap;
}
+
+ // --------------------------------------------------------------------------------||
+ // Helper Methods -----------------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ private static URL getDeployableXmlUrl(Class<?> clazz)
+ {
+ // Initialize
+ StringBuffer urlString = new StringBuffer();
+ // Assemble filename in form "fullyQualifiedClassName"
+ urlString.append(clazz.getName());
+
+ // Make a String
+ String flatten = urlString.toString();
+
+ // Adjust for filename structure instead of package structure
+ flatten = flatten.replace('.', '/');
+
+ // Append Suffix
+ flatten = flatten + DEFAULT_SUFFIX_DEPLOYABLE_XML;
+
+ // Get URL
+ URL url = Thread.currentThread().getContextClassLoader().getResource(flatten);
+ assert url != null : "URL was not found for " + flatten;
+
+ // Return
+ return url;
+ }
+
}
Deleted: projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-beans.xml
===================================================================
--- projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-beans.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-beans.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
- xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="org.jboss.ejb3.SimplePojo"
- class="org.jboss.ejb3.test.common.registrar.SimplePojo" />
-
-</deployment>
\ No newline at end of file
Copied: projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-jboss-beans.xml (from rev 81522, projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-beans.xml)
===================================================================
--- projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-jboss-beans.xml (rev 0)
+++ projects/ejb3/trunk/common/src/test/resources/org/jboss/ejb3/test/common/registrar/unit/Ejb3McRegistrarTestCase-jboss-beans.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+ xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="org.jboss.ejb3.SimplePojo"
+ class="org.jboss.ejb3.test.common.registrar.SimplePojo" />
+
+</deployment>
\ No newline at end of file
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/core/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.0-Beta7</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -383,7 +383,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-proxy</artifactId>
- <version>1.0.0-Beta4</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/deployers/pom.xml
===================================================================
--- projects/ejb3/trunk/deployers/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/deployers/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.0-Beta6</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- Model Version -->
@@ -24,6 +24,7 @@
<!-- Versioning -->
<version.org.jboss.deployers.jboss_deployers_spi>2.0.0.CR2</version.org.jboss.deployers.jboss_deployers_spi>
+ <version.org.jboss.ejb3_jboss.ejb3.common>1.0.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.common>
</properties>
@@ -41,6 +42,12 @@
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <version>${version.org.jboss.ejb3_jboss.ejb3.common}</version>
+ </dependency>
<!-- MC Deployers SPI -->
<dependency>
Modified: projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java
===================================================================
--- projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/deployers/src/main/java/org/jboss/ejb3/deployers/Ejb3MetadataProcessingDeployer.java 2008-11-25 08:26:18 UTC (rev 81532)
@@ -21,22 +21,14 @@
*/
package org.jboss.ejb3.deployers;
-import java.util.ArrayList;
-import java.util.Collection;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.ejb3.common.metadata.MetadataUtil;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.process.chain.ProcessorChain;
-import org.jboss.metadata.process.chain.ejb.jboss.JBossMetaDataProcessorChain;
-import org.jboss.metadata.process.processor.JBossMetaDataProcessor;
-import org.jboss.metadata.process.processor.ejb.jboss.ClusterConfigDefaultValueProcessor;
-import org.jboss.metadata.process.processor.ejb.jboss.JBossMetaDataValidatorChainProcessor;
-import org.jboss.metadata.process.processor.ejb.jboss.SetDefaultLocalBusinessInterfaceProcessor;
-import org.jboss.metadata.process.processor.ejb.jboss.SetExplicitLocalJndiNameProcessor;
/**
* Ejb3MetadataProcessingDeployer
@@ -121,8 +113,8 @@
return;
}
- // Get a Processor Chain
- ProcessorChain<JBossMetaData> chain = this.getProcessorChain(du);
+ // Get the Processor Chain
+ ProcessorChain<JBossMetaData> chain = MetadataUtil.getPostMergeMetadataProcessorChain(du.getClassLoader());
// Create new processed metadata
JBossMetaData processedMetadata = chain.process(md);
@@ -130,85 +122,4 @@
// Set the processed metadata as the output
du.addAttachment(OUTPUT, processedMetadata, JBossMetaData.class);
}
-
- // ------------------------------------------------------------------------------||
- // Internal Helper Methods ------------------------------------------------------||
- // ------------------------------------------------------------------------------||
-
- /**
- * Obtains the ProcessorChain to be run on the merged metadata
- *
- * @param du
- */
- protected ProcessorChain<JBossMetaData> getProcessorChain(DeploymentUnit du)
- {
- // Initialize
- ProcessorChain<JBossMetaData> chain = new JBossMetaDataProcessorChain<JBossMetaData>();
- StringBuffer logMessage = new StringBuffer("Creating ");
- logMessage.append(ProcessorChain.class.getSimpleName());
- logMessage.append(" with the following Processors:");
-
- // Obtain processors to put in the chain
- Collection<JBossMetaDataProcessor<JBossMetaData>> processors = this.getProcessors(du);
-
- // For each of the processors
- if (processors != null)
- {
- for (JBossMetaDataProcessor<JBossMetaData> processor : processors)
- {
- // Add to the chain
- chain.addProcessor(processor);
- logMessage.append(" ");
- logMessage.append(processor);
- }
- }
-
- // Log
- log.debug(logMessage.toString());
-
- // Return
- return chain;
-
- }
-
- /**
- * Obtains the processors to use in the ProcessorChain to be run
- * on the merged metadata attachment of the DeploymentUnit
- *
- * @param du
- * @return
- */
- @SuppressWarnings("unchecked")
- protected Collection<JBossMetaDataProcessor<JBossMetaData>> getProcessors(DeploymentUnit du)
- {
- // Initialize
- Collection<JBossMetaDataProcessor<JBossMetaData>> processors = new ArrayList<JBossMetaDataProcessor<JBossMetaData>>();
-
- /*
- * Add processors
- *
- * Maintainer's note: The order here is preserved
- */
-
- // JBMETA-122 Implicit Local Business Interface
- ClassLoader deploymentCl = du.getClassLoader();
- processors.add(new SetDefaultLocalBusinessInterfaceProcessor<JBossMetaData>(deploymentCl));
-
- // JBMETA-133, EJBTHREE-1539 Default ClusterConfig
- processors.add(ClusterConfigDefaultValueProcessor.INSTANCE);
-
- // JBMETA-143 Set explicit local JNDI name from @LocalBinding.jndiBinding
- processors.add(SetExplicitLocalJndiNameProcessor.INSTANCE);
-
- // JBMETA-118 Validation
- processors.add(JBossMetaDataValidatorChainProcessor.INSTANCE);
-
- /*
- * End Processor Adding
- */
-
- // Return
- return processors;
- }
-
}
Modified: projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt
===================================================================
--- projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/installer/src/main/resources/conf/jbossas-ejb3-files-to-place-in-commonlib.txt 2008-11-25 08:26:18 UTC (rev 81532)
@@ -10,3 +10,4 @@
jboss-ejb3-proxy-clustered.jar
jboss-ejb3-security.jar
jboss-ejb3-transactions.jar
+jboss-metadata.jar
Modified: projects/ejb3/trunk/plugin/pom.xml
===================================================================
--- projects/ejb3/trunk/plugin/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/plugin/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -112,6 +112,12 @@
<version>1.0.0-Beta1</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
</dependencies>
</project>
Modified: projects/ejb3/trunk/proxy/pom.xml
===================================================================
--- projects/ejb3/trunk/proxy/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/proxy/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>0.13.14</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<!-- Model Version -->
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-common</artifactId>
- <version>0.1.5</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -107,7 +107,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-test</artifactId>
- <version>1.0.0-Beta1</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java 2008-11-25 08:26:18 UTC (rev 81532)
@@ -21,6 +21,7 @@
*/
package org.jboss.ejb3.test.proxy.jndiregistrar;
+import javax.ejb.Local;
import javax.ejb.Remote;
import javax.ejb.Stateless;
@@ -37,13 +38,17 @@
* @version $Revision: $
*/
@Stateless
+ at Local(LocalJndiBindingTest.class)
@Remote(ClientBindUrlBindingTest.class)
@RemoteBindings(
{
@RemoteBinding(jndiBinding = ClientBindUrlBindingTest.JNDI_BINDING_1, clientBindUrl = ClientBindUrlBindingTest.CLIENT_BIND_URL_1),
@RemoteBinding(jndiBinding = ClientBindUrlBindingTest.JNDI_BINDING_2, clientBindUrl = ClientBindUrlBindingTest.CLIENT_BIND_URL_2)})
@LocalBinding(jndiBinding = LocalJndiBindingTest.JNDI_BINDING)
-public class ClientBindUrlTestBean extends JndiBindingTestBeanBase implements ClientBindUrlBindingTest
+public class ClientBindUrlTestBean extends JndiBindingTestBeanBase
+ implements
+ ClientBindUrlBindingTest,
+ LocalJndiBindingTest
{
}
Modified: projects/ejb3/trunk/test/pom.xml
===================================================================
--- projects/ejb3/trunk/test/pom.xml 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/test/pom.xml 2008-11-25 08:26:18 UTC (rev 81532)
@@ -4,7 +4,7 @@
<parent>
<artifactId>jboss-ejb3-build</artifactId>
<groupId>org.jboss.ejb3</groupId>
- <version>0.13.11</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -79,8 +79,9 @@
</dependency>
<dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: projects/ejb3/trunk/test/src/main/java/org/jboss/ejb3/test/common/MetaDataHelper.java
===================================================================
--- projects/ejb3/trunk/test/src/main/java/org/jboss/ejb3/test/common/MetaDataHelper.java 2008-11-25 08:15:14 UTC (rev 81531)
+++ projects/ejb3/trunk/test/src/main/java/org/jboss/ejb3/test/common/MetaDataHelper.java 2008-11-25 08:26:18 UTC (rev 81532)
@@ -30,6 +30,7 @@
import javax.annotation.Resource;
import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.ejb3.common.metadata.MetadataUtil;
import org.jboss.logging.Logger;
import org.jboss.metadata.annotation.creator.ProcessorUtils;
import org.jboss.metadata.annotation.creator.ejb.jboss.JBoss50Creator;
@@ -41,10 +42,9 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
-import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
-import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.metadata.javaee.spec.ResourceReferenceMetaData;
+import org.jboss.metadata.process.chain.ProcessorChain;
/**
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
@@ -94,49 +94,15 @@
// Use a Session JNDI Binding Policy for the metadata
JBossSessionPolicyDecorator beanMetaData = new JBossSessionPolicyDecorator(beanMetaDataDelegate,
new BasicJndiBindingPolicy());
-
+
/*
- * Log Out JNDI Names
+ * Mock the post-merge processing deployers
*/
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ ProcessorChain<JBossMetaData> chain = MetadataUtil.getPostMergeMetadataProcessorChain(cl);
+ chain.process(metadata);
- // Business Remotes
- BusinessRemotesMetaData businessRemotes = beanMetaData.getBusinessRemotes();
- if (businessRemotes != null)
- {
- log.info("Business Remote JNDI Name: " + beanMetaData.getJndiName()); // [beanName]/remote
- for (String businessInterface : beanMetaData.getBusinessRemotes())
- {
- log.info("Business Remote JNDI Name for " + businessInterface + ": "
- + beanMetaData.determineResolvedJndiName(businessInterface));
- }
- }
-
- // Business Locals
- BusinessLocalsMetaData businessLocals = beanMetaData.getBusinessLocals();
- if (businessLocals != null)
- {
- log.info("Local JNDI Name: " + beanMetaData.getLocalJndiName()); // [beanName]/local
- for (String businessInterface : beanMetaData.getBusinessLocals())
- {
- log.info("Business Local JNDI Name for " + businessInterface + ": "
- + beanMetaData.determineResolvedJndiName(businessInterface));
- }
- }
-
- // Local Home
- String localHome = beanMetaData.getLocalHome();
- if (localHome != null && !localHome.trim().equals(""))
- {
- log.info("Local Home JNDI Name: " + beanMetaData.determineResolvedJndiName(localHome));
- }
-
- // Home
- String home = beanMetaData.getHome();
- if (home != null && !home.trim().equals(""))
- {
- log.info("Home JNDI Name: " + beanMetaData.determineResolvedJndiName(home));
- }
-
+ // Return
return beanMetaData;
}
More information about the jboss-cvs-commits
mailing list