[jboss-cvs] JBossAS SVN: r99315 - in projects/ejb3/trunk: async-impl and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 12 14:54:23 EST 2010
Author: ALRubinger
Date: 2010-01-12 14:54:22 -0500 (Tue, 12 Jan 2010)
New Revision: 99315
Added:
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/timerservice/
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/timerservice/MockTimerService.java
Removed:
projects/ejb3/trunk/api/
Modified:
projects/ejb3/trunk/async-impl/pom.xml
projects/ejb3/trunk/build/pom.xml
projects/ejb3/trunk/embedded/pom.xml
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java
projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/common/AbstractEmbeddedTestCase.java
projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/jpa/unit/PhoneBookTestCase.java
projects/ejb3/trunk/endpoint-deployer/pom.xml
projects/ejb3/trunk/nointerface/pom.xml
projects/ejb3/trunk/pom.xml
Log:
[EJBTHREE-1984] Remove org.jboss.ejb3:jboss-ejb3-api and move all references to org.jboss.javaee:jboss-ejb-api_3.1
Modified: projects/ejb3/trunk/async-impl/pom.xml
===================================================================
--- projects/ejb3/trunk/async-impl/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/async-impl/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.3</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
@@ -80,7 +80,7 @@
<properties>
<!-- Versioning -->
- <version.org.jboss.ejb3_jboss.ejb3.api>3.1.1-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.api>
+ <version.org.jboss.javaee_jboss.ejb.api_3.1>1.0-alpha-1</version.org.jboss.javaee_jboss.ejb.api_3.1>
<version.org.jboss.ejb3_jboss.ejb3.async.spi>2.0.0-SNAPSHOT</version.org.jboss.ejb3_jboss.ejb3.async.spi>
<version.org.jboss.ejb3_jboss.ejb3.interceptors>1.0.0</version.org.jboss.ejb3_jboss.ejb3.interceptors>
<version.org.jboss.security_jboss.security>2.0.2.SP6</version.org.jboss.security_jboss.security>
@@ -101,11 +101,11 @@
<version>${version.org.jboss.ejb3_jboss.ejb3.async.spi}</version>
</dependency>
- <!-- org.jboss.ejb3:jboss-ejb3-interceptors -->
+ <!-- org.jboss.javaee:jboss-ejb-api_3.1 -->
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>${version.org.jboss.ejb3_jboss.ejb3.api}</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ <version>${version.org.jboss.javaee_jboss.ejb.api_3.1}</version>
</dependency>
<!-- org.jboss.ejb3:jboss-ejb3-interceptors -->
Modified: projects/ejb3/trunk/build/pom.xml
===================================================================
--- projects/ejb3/trunk/build/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/build/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -110,6 +110,7 @@
<version.org.jboss.microcontainer>2.0.8.GA</version.org.jboss.microcontainer>
<version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
<version.org.jboss.ws_jbossws-spi>1.0.3.GA</version.org.jboss.ws_jbossws-spi>
+ <version.org.jboss.javaee_jboss-ejb-api_3.1>1.0-alpha-1</version.org.jboss.javaee_jboss-ejb-api_3.1>
<!-- Miscellaneous -->
<jvmargs />
@@ -178,6 +179,8 @@
<exclude>org.jboss.ejb3:jboss-ejb3-proxy</exclude>
<!-- EJBTHREE-1865 Use org.hibernate:hibernate-core-->
<exclude>org.hibernate:hibernate</exclude>
+ <!-- EJBTHREE-1984 Use org.jboss.javaee:jboss-ejb-api_3.1-->
+ <exclude>org.jboss.ejb3:jboss-ejb3-api</exclude>
</excludes>
</bannedDependencies>
<requireMavenVersion>
@@ -411,6 +414,12 @@
<dependency>
<groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
+ <version>${version.org.jboss.javaee_jboss-ejb-api_3.1}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
<artifactId>jboss-persistence-api</artifactId>
<version>3.0.0.CR1</version>
</dependency>
Modified: projects/ejb3/trunk/embedded/pom.xml
===================================================================
--- projects/ejb3/trunk/embedded/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-build</artifactId>
- <version>1.0.2</version>
+ <version>1.0.9-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -187,14 +187,13 @@
<version>0.1.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>1.0.0</version>
+ <version>1.1.22</version>
<exclusions>
<exclusion>
<groupId>bsh</groupId>
@@ -216,6 +215,10 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -292,6 +295,13 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <!-- Needed for Hibernate -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.10</version>
+ <scope>runtime</scope>
+ </dependency>
<!-- For Arjuna / JBoss Transaction -->
<dependency>
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainer.java 2010-01-12 19:54:22 UTC (rev 99315)
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Map;
-import javax.ejb.EJBContainer;
+import javax.ejb.embeddable.EJBContainer;
import org.jboss.bootstrap.spi.mc.config.MCServerConfig;
import org.jboss.bootstrap.spi.mc.config.MCServerConfigFactory;
@@ -43,7 +43,6 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.client.VFSDeployment;
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
-import org.jboss.ejb3.api.spi.EJBContainerWrapper;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
@@ -61,33 +60,36 @@
// stage 0
private ClassLoader classLoader;
-
+
// stage 1
private MCServer server;
// stage 2
private Kernel kernel;
+
private MainDeployer mainDeployer;
public static JBossEJBContainer on(EJBContainer container)
{
- if(container == null)
+ if (container == null)
throw new IllegalArgumentException("container is null");
- if(container instanceof EJBContainerWrapper)
- return on(((EJBContainerWrapper) container).getDelegate());
- if(container instanceof JBossEJBContainer)
+// if (container instanceof EJBContainerWrapper)
+// return on(((EJBContainerWrapper) container).getDelegate());
+ if (container instanceof JBossEJBContainer)
return (JBossEJBContainer) container;
throw new IllegalArgumentException(container + " is not an instance of JBossEJBContainer");
}
-
+
public JBossEJBContainer(Map<?, ?> properties, String... modules) throws Throwable
{
try
{
- VirtualFile roots[] = { };
- classLoader = ClassLoaderSystem.getInstance().registerClassLoaderPolicy(VFSClassLoaderPolicy.createVFSClassLoaderPolicy("preboot-cl", roots));
+ VirtualFile roots[] =
+ {};
+ classLoader = ClassLoaderSystem.getInstance().registerClassLoaderPolicy(
+ VFSClassLoaderPolicy.createVFSClassLoaderPolicy("preboot-cl", roots));
URL confURL = classLoader.getResource("conf");
- if(confURL == null)
+ if (confURL == null)
throw new IllegalStateException("can't find a 'conf' directory on the classpath of " + classLoader);
MCServerConfig config = MCServerConfigFactory.createServerConfig(classLoader);
// To Bootstrap the home is where bootstrap.xml lives
@@ -100,16 +102,16 @@
try
{
server.start();
-
+
// we're at stage 2
kernel = server.getKernel();
mainDeployer = getBean("MainDeployer", ControllerState.INSTALLED, MainDeployer.class);
-
+
deployDeployDirectory();
-
+
// TODO: I need a cunning plan
deployMain("ejb3-interceptors-aop.xml");
-
+
deployModules(modules);
}
finally
@@ -117,7 +119,7 @@
Thread.currentThread().setContextClassLoader(oldCl);
}
}
- catch(Throwable t)
+ catch (Throwable t)
{
close();
throw t;
@@ -128,32 +130,33 @@
public void close()
{
// TODO: why does this not happen on mainDeployer.stop?
- if(mainDeployer != null)
+ if (mainDeployer != null)
{
mainDeployer.prepareShutdown();
mainDeployer.shutdown();
mainDeployer = null;
}
-
- if(server != null)
+
+ if (server != null)
{
- within(classLoader, new Runnable() {
+ within(classLoader, new Runnable()
+ {
public void run()
{
try
{
server.shutdown();
}
- catch(Exception e)
+ catch (Exception e)
{
log.warn("Failed to shutdown server " + server, e);
}
}
});
}
-
+
kernel = null;
-
+
ClassLoaderSystem.getInstance().unregisterClassLoader(classLoader);
}
@@ -164,10 +167,10 @@
mainDeployer.checkComplete(deployment);
return deployment;
}
-
+
public void deploy(Deployment... deployments) throws DeploymentException, IOException
{
- for(Deployment deployment : deployments)
+ for (Deployment deployment : deployments)
{
deploy(deployment);
}
@@ -183,16 +186,16 @@
protected void deployDeployDirectory() throws DeploymentException, IOException
{
URL deployDirURL = classLoader.getResource("deploy");
- if(deployDirURL == null)
+ if (deployDirURL == null)
{
// We can function without it, but to what extend?
log.warn("Can't find a deploy directory resource on class loader " + classLoader);
return;
}
-
+
List<Deployment> deployments = new ArrayList<Deployment>();
VirtualFile deployDir = VFS.getRoot(deployDirURL);
- for(VirtualFile child : deployDir.getChildren())
+ for (VirtualFile child : deployDir.getChildren())
{
VFSDeployment deployment = VFSDeploymentFactory.getInstance().createVFSDeployment(child);
log.info("Deploying " + deployment.getName());
@@ -200,8 +203,9 @@
}
mainDeployer.deploy(deployments.toArray(new Deployment[0]));
}
-
- private void deployMain(String name) throws DeploymentException, IllegalArgumentException, MalformedURLException, IOException
+
+ private void deployMain(String name) throws DeploymentException, IllegalArgumentException, MalformedURLException,
+ IOException
{
URL url = getResource(name);
deploy(url);
@@ -210,10 +214,10 @@
private void deployModules(String modules[]) throws MalformedURLException, IOException, DeploymentException
{
// TODO: deploy the world!
- if(modules == null)
+ if (modules == null)
return;
- for(String module : modules)
+ for (String module : modules)
{
deploy(new URL(module));
}
@@ -244,7 +248,8 @@
* @throws ClassCastException when the bean can not be cast to the expected type
* @throws IllegalStateException when the bean does not exist at that state
*/
- protected <T> T getBean(final Object name, final ControllerState state, final Class<T> expected) throws ClassCastException, IllegalStateException
+ protected <T> T getBean(final Object name, final ControllerState state, final Class<T> expected)
+ throws ClassCastException, IllegalStateException
{
if (expected == null)
throw new IllegalArgumentException("Null expected");
@@ -260,7 +265,8 @@
* @return the context
* @throws IllegalStateException when the context does not exist at that state
*/
- protected KernelControllerContext getControllerContext(final Object name, final ControllerState state) throws IllegalStateException
+ protected KernelControllerContext getControllerContext(final Object name, final ControllerState state)
+ throws IllegalStateException
{
KernelController controller = kernel.getController();
KernelControllerContext context = (KernelControllerContext) controller.getContext(name, state);
@@ -272,7 +278,7 @@
private URL getResource(String name) throws IllegalArgumentException
{
URL url = classLoader.getResource(name);
- if(url == null)
+ if (url == null)
throw new IllegalArgumentException("No resource named " + name + " found on " + classLoader);
return url;
}
@@ -286,7 +292,8 @@
* @return the context
* @throws IllegalStateException when the context does not exist at that state
*/
- protected KernelControllerContext handleNotFoundContext(Controller controller, Object name, ControllerState state) throws IllegalStateException
+ protected KernelControllerContext handleNotFoundContext(Controller controller, Object name, ControllerState state)
+ throws IllegalStateException
{
throw new IllegalStateException("Bean not found " + name + " at state " + state + " in controller " + controller);
}
Modified: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/JBossEJBContainerProvider.java 2010-01-12 19:54:22 UTC (rev 99315)
@@ -24,8 +24,8 @@
import java.util.Collection;
import java.util.Map;
-import javax.ejb.EJBContainer;
import javax.ejb.EJBException;
+import javax.ejb.embeddable.EJBContainer;
import javax.ejb.spi.EJBContainerProvider;
@@ -42,7 +42,7 @@
String modules[] = null;
if(properties != null)
{
- Object o = properties.get(EJBContainer.EMBEDDABLE_MODULES_PROPERTY);
+ Object o = properties.get(EJBContainer.MODULES);
if(o != null)
{
if(o instanceof String)
@@ -50,7 +50,7 @@
else if(o instanceof Collection)
modules = toStringArray(o);
else
- throw new EJBException("Illegal type of " + EJBContainer.EMBEDDABLE_MODULES_PROPERTY + " (" + o.getClass().getName() + ") (EJB 3.1 22.2.2.2)");
+ throw new EJBException("Illegal type of " + EJBContainer.MODULES + " (" + o.getClass().getName() + ") (EJB 3.1 22.2.2.2)");
}
}
return new JBossEJBContainer(properties, modules);
Added: projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/timerservice/MockTimerService.java
===================================================================
--- projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/timerservice/MockTimerService.java (rev 0)
+++ projects/ejb3/trunk/embedded/src/main/java/org/jboss/ejb3/embedded/timerservice/MockTimerService.java 2010-01-12 19:54:22 UTC (rev 99315)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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.embedded.timerservice;
+
+import javax.ejb.TimerService;
+
+import org.jboss.ejb3.timerservice.spi.TimedObjectInvoker;
+import org.jboss.ejb3.timerservice.spi.TimerServiceFactory;
+
+/**
+ * Used to fulfill autowiring dependencies present in ejb3-core
+ * strictly within the context of EJB3 Embeddded. Should be replaced
+ * with a working implementation should the need become available.
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ */
+ at Deprecated
+public class MockTimerService implements TimerServiceFactory
+{
+
+ /**
+ * @see org.jboss.ejb3.timerservice.spi.TimerServiceFactory#createTimerService(org.jboss.ejb3.timerservice.spi.TimedObjectInvoker)
+ */
+ @Override
+ public TimerService createTimerService(final TimedObjectInvoker arg0)
+ {
+ return null;
+ }
+
+ /**
+ * @see org.jboss.ejb3.timerservice.spi.TimerServiceFactory#restoreTimerService(javax.ejb.TimerService)
+ */
+ @Override
+ public void restoreTimerService(final TimerService arg0)
+ {
+ }
+
+ /**
+ * @see org.jboss.ejb3.timerservice.spi.TimerServiceFactory#suspendTimerService(javax.ejb.TimerService)
+ */
+ @Override
+ public void suspendTimerService(final TimerService arg0)
+ {
+ }
+
+}
Modified: projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml
===================================================================
--- projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/src/main/resources/deploy/ejb-deployers-beans.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -133,23 +133,27 @@
<!-- SFSB JNDI Registrar -->
<bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+ class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatefulSessionRegistrar">
<constructor>
<parameter>
- org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+ org.jboss.ejb3.proxy.impl.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
</parameter>
</constructor>
</bean>
<!-- SLSB JNDI Registrar -->
<bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+ class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatelessSessionRegistrar">
<constructor>
<parameter>
- org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+ org.jboss.ejb3.proxy.impl.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
</parameter>
</constructor>
</bean>
+
+ <!-- EJB Reference Resolver -->
+ <bean name="org.jboss.ejb3.EjbReferenceResolver"
+ class="org.jboss.ejb3.core.resolvers.ScopedEJBReferenceResolver" />
<!-- We could have directly used the org.jboss.ejb3.Ejb3Registry as a MC bean
and added the "register" and "unregister" methods as callbacks, but since
@@ -165,4 +169,9 @@
<uncallback method="removeContainer"/>
</bean>
+
+ <!-- Timer Service Factory -->
+ <bean name="org.jboss.ejb3.TimerServiceFactory"
+ class="org.jboss.ejb3.embedded.timerservice.MockTimerService" />
+
</deployment>
\ No newline at end of file
Modified: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/common/AbstractEmbeddedTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/common/AbstractEmbeddedTestCase.java 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/common/AbstractEmbeddedTestCase.java 2010-01-12 19:54:22 UTC (rev 99315)
@@ -30,10 +30,10 @@
import java.lang.reflect.Field;
import java.util.Properties;
-import javax.ejb.EJBContainer;
+import javax.ejb.embeddable.EJBContainer;
import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.ejb3.proxy.remoting.ProxyRemotingUtils;
+import org.jboss.ejb3.proxy.impl.remoting.ProxyRemotingUtils;
import org.jboss.metadata.rar.jboss.mcf.NonXADataSourceDeploymentMetaData;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/jpa/unit/PhoneBookTestCase.java
===================================================================
--- projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/jpa/unit/PhoneBookTestCase.java 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/embedded/src/test/java/org/jboss/ejb3/embedded/test/jpa/unit/PhoneBookTestCase.java 2010-01-12 19:54:22 UTC (rev 99315)
@@ -32,7 +32,7 @@
import java.io.IOException;
import java.util.Properties;
-import javax.ejb.EJBContainer;
+import javax.ejb.embeddable.EJBContainer;
import javax.naming.InitialContext;
import javax.naming.NamingException;
Modified: projects/ejb3/trunk/endpoint-deployer/pom.xml
===================================================================
--- projects/ejb3/trunk/endpoint-deployer/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/endpoint-deployer/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-embedded</artifactId>
- <version>1.0.0-Alpha-2</version>
+ <version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<!-- comes in through org.jboss.aop:jboss-aop-asintegration-core -->
Modified: projects/ejb3/trunk/nointerface/pom.xml
===================================================================
--- projects/ejb3/trunk/nointerface/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/nointerface/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -192,11 +192,9 @@
<!-- The EJB3.1 API support (ex: @LocalBean) -->
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.1-SNAPSHOT</version>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api_3.1</artifactId>
</dependency>
-
<dependency>
<groupId>org.jboss.naming</groupId>
Modified: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml 2010-01-12 19:50:37 UTC (rev 99314)
+++ projects/ejb3/trunk/pom.xml 2010-01-12 19:54:22 UTC (rev 99315)
@@ -35,7 +35,6 @@
<!-- Aggregate Modules -->
<modules>
<module>aop-deployers</module>
- <module>api</module>
<module>async-impl</module>
<module>async-spi</module>
<module>as-int</module>
More information about the jboss-cvs-commits
mailing list