Author: pete.muir(a)jboss.org Date: 2009-01-06 18:52:50 -0500 (Tue, 06 Jan 2009) New Revision: 800 Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java Removed: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BusinessInterfaceDescriptor.java ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java Log: move Ejb classes to ejb package Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-06 23:52:50 UTC (rev 800) @@ -36,8 +36,8 @@ import javax.webbeans.manager.Manager; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bootstrap.spi.EjbDescriptor; import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; import org.jboss.webbeans.introspector.AnnotatedField; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.AnnotatedParameter; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbDescriptorCache.java 2009-01-06 23:52:50 UTC (rev 800) @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArraySet; -import org.jboss.webbeans.bootstrap.spi.EjbDescriptor; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; /** * EJB descriptors by EJB implementation class or name Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockEjbDescriptor.java 2009-01-06 23:52:50 UTC (rev 800) @@ -11,8 +11,8 @@ import javax.ejb.Stateful; import javax.ejb.Stateless; -import org.jboss.webbeans.bootstrap.spi.BusinessInterfaceDescriptor; -import org.jboss.webbeans.bootstrap.spi.EjbDescriptor; +import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; import org.jboss.webbeans.test.annotations.Singleton; public class MockEjbDescriptor<T> implements EjbDescriptor<T> Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockWebBeanDiscovery.java 2009-01-06 23:52:50 UTC (rev 800) @@ -11,8 +11,8 @@ import javax.ejb.Stateful; import javax.ejb.Stateless; -import org.jboss.webbeans.bootstrap.spi.EjbDescriptor; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; public class MockWebBeanDiscovery implements WebBeanDiscovery { Deleted: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BusinessInterfaceDescriptor.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BusinessInterfaceDescriptor.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BusinessInterfaceDescriptor.java 2009-01-06 23:52:50 UTC (rev 800) @@ -1,42 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed 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. - */ - -package org.jboss.webbeans.bootstrap.spi; - -/** - * Represents the business interface of an EJB - * - * @author Pete Muir - * - * @param <T> - */ -public interface BusinessInterfaceDescriptor<T> -{ - - /** - * Gets the business interface class - */ - public Class<T> getInterface(); - - /** - * Gets the JNDI name under which the EJB is registered - * - * @return The JNDI name - */ - public String getJndiName(); - -} \ No newline at end of file Deleted: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java 2009-01-06 23:52:50 UTC (rev 800) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed 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. - */ - -package org.jboss.webbeans.bootstrap.spi; - -import java.lang.reflect.Method; - - -/** - * EJB metadata from the EJB descriptor - * - * @author Pete Muir - * - * @param <T> - */ -public interface EjbDescriptor<T> -{ - - /** - * Gets the EJB type - * - * @return The EJB Bean class - */ - public Class<T> getType(); - - /** - * Gets the local business interfaces of the EJB - * - * @return An iterator over the local business interfaces - */ - public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces(); - - /** - * Gets the remote business interfaces of the EJB - * - * @return An iterator over the remote business interfaces - */ - public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces(); - - /** - * Get the remove methods of the EJB - * - * @return An iterator over the remove methods - */ - public Iterable<Method> getRemoveMethods(); - - /** - * Indicates if the bean is stateless - * - * @return True if stateless, false otherwise - */ - public boolean isStateless(); - - /** - * Indicates if the bean is a EJB 3.1 Singleton - * - * @return True if the bean is a singleton, false otherwise - */ - public boolean isSingleton(); - - /** - * Indicates if the EJB is stateful - * - * @return True if the bean is stateful, false otherwise - */ - public boolean isStateful(); - - /** - * Indicates if the EJB is and MDB - * - * @return True if the bean is an MDB, false otherwise - */ - public boolean isMessageDriven(); - - /** - * Gets the EJB name - * - * @return The name - */ - public String getEjbName(); - - /** - * @return The JNDI string which can be used to lookup a proxy which - * implements all local business interfaces - * - */ - public String getLocalJndiName(); - -} Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-01-06 23:51:50 UTC (rev 799) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/WebBeanDiscovery.java 2009-01-06 23:52:50 UTC (rev 800) @@ -19,6 +19,8 @@ import java.net.URL; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; + /** * A container should implement this interface to allow the Web Beans RI to * discover the Web Beans to deploy Copied: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java (from rev 797, ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/BusinessInterfaceDescriptor.java) =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java 2009-01-06 23:52:50 UTC (rev 800) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed 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. + */ + +package org.jboss.webbeans.ejb.spi; + +/** + * Represents the business interface of an EJB + * + * @author Pete Muir + * + * @param <T> + */ +public interface BusinessInterfaceDescriptor<T> +{ + + /** + * Gets the business interface class + */ + public Class<T> getInterface(); + + /** + * Gets the JNDI name under which the EJB is registered + * + * @return The JNDI name + */ + public String getJndiName(); + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/BusinessInterfaceDescriptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java (from rev 797, ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/bootstrap/spi/EjbDescriptor.java) =================================================================== --- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java (rev 0) +++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java 2009-01-06 23:52:50 UTC (rev 800) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed 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. + */ + +package org.jboss.webbeans.ejb.spi; + +import java.lang.reflect.Method; + + +/** + * EJB metadata from the EJB descriptor + * + * @author Pete Muir + * + * @param <T> + */ +public interface EjbDescriptor<T> +{ + + /** + * Gets the EJB type + * + * @return The EJB Bean class + */ + public Class<T> getType(); + + /** + * Gets the local business interfaces of the EJB + * + * @return An iterator over the local business interfaces + */ + public Iterable<BusinessInterfaceDescriptor<?>> getLocalBusinessInterfaces(); + + /** + * Gets the remote business interfaces of the EJB + * + * @return An iterator over the remote business interfaces + */ + public Iterable<BusinessInterfaceDescriptor<?>> getRemoteBusinessInterfaces(); + + /** + * Get the remove methods of the EJB + * + * @return An iterator over the remove methods + */ + public Iterable<Method> getRemoveMethods(); + + /** + * Indicates if the bean is stateless + * + * @return True if stateless, false otherwise + */ + public boolean isStateless(); + + /** + * Indicates if the bean is a EJB 3.1 Singleton + * + * @return True if the bean is a singleton, false otherwise + */ + public boolean isSingleton(); + + /** + * Indicates if the EJB is stateful + * + * @return True if the bean is stateful, false otherwise + */ + public boolean isStateful(); + + /** + * Indicates if the EJB is and MDB + * + * @return True if the bean is an MDB, false otherwise + */ + public boolean isMessageDriven(); + + /** + * Gets the EJB name + * + * @return The name + */ + public String getEjbName(); + + /** + * @return The JNDI string which can be used to lookup a proxy which + * implements all local business interfaces + * + */ + public String getLocalJndiName(); + +} Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbDescriptor.java ___________________________________________________________________ Name: svn:mime-type + text/plain