[jboss-cvs] JBossAS SVN: r60159 - in trunk/ejb3/src: test/org/jboss/ejb3/test/service and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 1 08:56:59 EST 2007
Author: wolfc
Date: 2007-02-01 08:56:59 -0500 (Thu, 01 Feb 2007)
New Revision: 60159
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
Log:
EJBTHREE-859: ObjectName canonical name instead of serialized name
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -285,8 +285,9 @@
throws Exception
{
ObjectName on = container.getObjectName();
- kernelAbstraction.install(on.getCanonicalName(), container.getDependencyPolicy(), container);
- log.debug("Bound ejb3 container " + on);
+ String name = on.getCanonicalName();
+ kernelAbstraction.install(name, container.getDependencyPolicy(), container);
+ log.debug("Bound ejb3 container " + name);
}
protected abstract PolicyConfiguration createPolicyConfiguration() throws Exception;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/main/org/jboss/ejb3/MCKernelAbstraction.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -151,7 +151,7 @@
try
{
server.registerMBean(service, on);
- install(on.toString(), dependencies, service);
+ install(on.getCanonicalName(), dependencies, service);
// EJBTHREE-606: emulate the ServiceController calls
MBeanInfo info = server.getMBeanInfo(on); // redundant call for speed
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFive.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -34,22 +34,22 @@
@Management(ServiceFiveManagement.class)
public class ServiceFive implements ServiceFiveManagement
{
- @Depends("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+ @Depends("jboss.ejb3:is=serviceThree,management=interface,with=customName")
public ServiceThreeManagement serviceThreeA;
- @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceFour,type=ManagementInterface")
+ @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceFour,service=EJB3,type=ManagementInterface")
public ObjectName serviceFourA;
private ServiceThreeManagement serviceThreeB;
private ObjectName serviceFourB;
- @Depends("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+ @Depends("jboss.ejb3:is=serviceThree,management=interface,with=customName")
public void setServiceThree(ServiceThreeManagement proxy)
{
serviceThreeB = proxy;
}
- @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceFour,type=ManagementInterface")
+ @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceFour,service=EJB3,type=ManagementInterface")
public void setServiceFour(ObjectName on)
{
serviceFourB = on;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceFour.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -31,7 +31,7 @@
*/
@Service
@Management(ServiceFourManagement.class)
- at Depends ("jboss.ejb3:management=interface,with=customName,is=serviceThree")
+ at Depends ("jboss.ejb3:is=serviceThree,management=interface,with=customName")
public class ServiceFour implements ServiceFourManagement
{
public void create() throws Exception
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceThree.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -32,9 +32,10 @@
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
*/
+// note: this is a serialized name, not a canonical name
@Service (objectName = "jboss.ejb3:management=interface,with=customName,is=serviceThree")
@Management(ServiceThreeManagement.class)
- at Depends ({"jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceTwo","jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface"})
+ at Depends ({"jboss.j2ee:jar=service-test.jar,name=ServiceTwo,service=EJB3","jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface"})
public class ServiceThree implements ServiceThreeManagement
{
@EJB
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/ServiceTwo.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -35,7 +35,7 @@
@Service
@RemoteBinding(jndiBinding = "serviceTwo/remote")
@LocalBinding (jndiBinding = "serviceTwo/local")
- at Depends ("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface")
+ at Depends ("jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
@Remote(ServiceTwoRemote.class)
@Local(ServiceTwoLocal.class)
public class ServiceTwo implements ServiceTwoLocal, ServiceTwoRemote
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/Session.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -34,7 +34,7 @@
@Remote(SessionRemote.class)
public class Session implements SessionRemote
{
- @Depends("jboss.j2ee:service=EJB3,jar=service-test.jar,name=ServiceOne,type=ManagementInterface")
+ @Depends("jboss.j2ee:jar=service-test.jar,name=ServiceOne,service=EJB3,type=ManagementInterface")
public ObjectName serviceOne;
// @EJB StatelessRemote stateless;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2007-02-01 13:29:30 UTC (rev 60158)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/service/TestResourceInjectionService.java 2007-02-01 13:56:59 UTC (rev 60159)
@@ -4,6 +4,7 @@
import javax.jms.Topic;
import javax.jms.TopicConnectionFactory;
+import org.jboss.annotation.ejb.Depends;
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Service;
import org.jboss.logging.Logger;
@@ -16,13 +17,14 @@
*/
@Service(objectName = "jboss.ejb3.bugs:service=TestResourceInjectionService")
@Management(TestResourceInjectionServiceIF.class)
+ at Depends("jboss.mq.destination:name=myTestTopic,service=Topic")
public class TestResourceInjectionService implements TestResourceInjectionServiceIF {
private static Logger log = Logger.getLogger(TestResourceInjectionService.class);
public boolean testedSuccessful = false;
- @Resource(mappedName = "topic/testTopic")
+ @Resource(mappedName = "topic/myTestTopic")
private Topic testTopic;
@Resource(mappedName = "ConnectionFactory")
More information about the jboss-cvs-commits
mailing list