[jboss-cvs] JBossAS SVN: r111907 - in branches/JBPAPP_5_1/testsuite/src: main/org/jboss/test/deployment/jbpapp6517 and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 2 22:02:46 EDT 2011
Author: bmaxwell
Date: 2011-08-02 22:02:46 -0400 (Tue, 02 Aug 2011)
New Revision: 111907
Added:
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml
Removed:
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/
branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml
Log:
[JBPAPP-6517] testcase for EAR and other top level deployments should be Atomic
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,50 +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.
- *
- * 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.test.deployment.jbpapp6517;
-
-/**
- * @author bmaxwell
- *
- */
-public class CheckCompleteAllTestCase extends CheckCompleteTestCase
-{
-
- // this will check complete on any deployment that can have children
- public void testCheckSubDeploymentCompleteDeployerAll()
- {
- // deploy CheckSubDeploymentCompleteDeployer configured to check all
- deployFailOnException(checkCompleteDeployerAll);
-
- // deploy ear & eat expected exception
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- // undeploy ear
- // call fail if not valid
- verifyCheckCompleteCalled(testEar, earEjb3JMXName);
-
- // repeat for sar
- verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
-
- // undeploy CheckSubDeploymentCompleteDeployer configured to check all
- undeployLogException(checkCompleteDeployerAll);
- }
-
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteAllTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public class CheckCompleteAllTestCase extends CheckCompleteTestCase
+{
+
+ // this will check complete on any deployment that can have children
+ public void testCheckSubDeploymentCompleteDeployerAll()
+ {
+ // deploy CheckSubDeploymentCompleteDeployer configured to check all
+ deployFailOnException(checkCompleteDeployerAll);
+
+ // deploy ear & eat expected exception
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ // undeploy ear
+ // call fail if not valid
+ verifyCheckCompleteCalled(testEar, earEjb3JMXName);
+
+ // repeat for sar
+ verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
+
+ // undeploy CheckSubDeploymentCompleteDeployer configured to check all
+ undeployLogException(checkCompleteDeployerAll);
+ }
+
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,60 +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.
- *
- * 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.test.deployment.jbpapp6517;
-
-import java.io.File;
-import java.net.URI;
-import java.util.Properties;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import junit.framework.TestCase;
-
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-/**
- * @author bmaxwell
- *
- */
-public class CheckCompleteDefaultTestCase extends CheckCompleteTestCase
-{
- // this is without the deployer
- public void testDefaultWithoutCheckSubDeploymentCompleteDeployer()
- {
- // deploy ear & eat expected exception
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- // undeploy ear
- // call fail if not valid
- verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
-
- // Repeat for sar
- verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
- }
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteDefaultTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517;
+
+import java.io.File;
+import java.net.URI;
+import java.util.Properties;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
+
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public class CheckCompleteDefaultTestCase extends CheckCompleteTestCase
+{
+ // this is without the deployer
+ public void testDefaultWithoutCheckSubDeploymentCompleteDeployer()
+ {
+ // deploy ear & eat expected exception
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ // undeploy ear
+ // call fail if not valid
+ verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
+
+ // Repeat for sar
+ verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
+ }
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,49 +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.
- *
- * 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.test.deployment.jbpapp6517;
-
-/**
- * @author bmaxwell
- *
- */
-public class CheckCompleteEarTestCase extends CheckCompleteTestCase
-{
- // this will check complete on just ear deployments
- public void testCheckSubDeploymentCompleteDeployerEAROnly()
- {
- // deploy the CheckSubDeploymentCompleteDeployer that only acts on ears
- deployFailOnException(checkCompleteDeployerEAR);
-
- // deploy ear & eat expected exception
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- // undeploy ear
- // call fail if not valid
- verifyCheckCompleteCalled(testEar, earEjb3JMXName);
-
- // same as above, except in the case of the sar, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .ear files
- verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
-
- // undeploy the CheckSubDeploymentCompleteDeployer that only acts on ears
- undeployLogException(checkCompleteDeployerEAR);
- }
-
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteEarTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public class CheckCompleteEarTestCase extends CheckCompleteTestCase
+{
+ // this will check complete on just ear deployments
+ public void testCheckSubDeploymentCompleteDeployerEAROnly()
+ {
+ // deploy the CheckSubDeploymentCompleteDeployer that only acts on ears
+ deployFailOnException(checkCompleteDeployerEAR);
+
+ // deploy ear & eat expected exception
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ // undeploy ear
+ // call fail if not valid
+ verifyCheckCompleteCalled(testEar, earEjb3JMXName);
+
+ // same as above, except in the case of the sar, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .ear files
+ verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
+
+ // undeploy the CheckSubDeploymentCompleteDeployer that only acts on ears
+ undeployLogException(checkCompleteDeployerEAR);
+ }
+
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,49 +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.
- *
- * 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.test.deployment.jbpapp6517;
-
-/**
- * @author bmaxwell
- *
- */
-public class CheckCompleteSarTestCase extends CheckCompleteTestCase
-{
- // this will check complete on just sar deployments
- public void testCheckSubDeploymentCompleteDeployerSAROnly()
- {
- // deploy the CheckSubDeploymentCompleteDeployer that only acts on sars
- deployFailOnException(checkCompleteDeployerSAR);
-
- // deploy sar & eat expected exception
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- // undeploy sar
- // call fail if not valid
- verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
-
- // same as above, except in the case of the ear, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .sar files
- verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
-
- // undeploy the CheckSubDeploymentCompleteDeployer that only acts on sars
- undeployLogException(checkCompleteDeployerSAR);
- }
-
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteSarTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public class CheckCompleteSarTestCase extends CheckCompleteTestCase
+{
+ // this will check complete on just sar deployments
+ public void testCheckSubDeploymentCompleteDeployerSAROnly()
+ {
+ // deploy the CheckSubDeploymentCompleteDeployer that only acts on sars
+ deployFailOnException(checkCompleteDeployerSAR);
+
+ // deploy sar & eat expected exception
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ // undeploy sar
+ // call fail if not valid
+ verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
+
+ // same as above, except in the case of the ear, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .sar files
+ verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
+
+ // undeploy the CheckSubDeploymentCompleteDeployer that only acts on sars
+ undeployLogException(checkCompleteDeployerSAR);
+ }
+
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,317 +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.
- *
- * 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.test.deployment.jbpapp6517;
-
-import java.io.File;
-import java.net.URI;
-import java.util.Properties;
-
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanInfo;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-
-import junit.framework.TestCase;
-
-import org.jboss.deployment.MainDeployerMBean;
-import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
-import org.jboss.security.SecurityAssociation;
-import org.jboss.security.SimplePrincipal;
-
-/**
- * @author bmaxwell
- *
- */
-public abstract class CheckCompleteTestCase extends TestCase
-{
- public static String objectNameString = "jboss.system:service=MainDeployer";
-
- private static String host = "localhost";
-
- protected String testEar = "file://" + new File("lib/jbpapp-6517.ear").getAbsolutePath();
- protected String testSar = "file://" + new File("lib/jbpapp-6517.sar").getAbsolutePath();
-
- protected String checkCompleteDeployerAll = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml").getAbsolutePath();
- protected String checkCompleteDeployerEAR = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml").getAbsolutePath();
- protected String checkCompleteDeployerSAR = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml").getAbsolutePath();
-
- protected String earEjb3JMXName = "jboss.j2ee:ear=jbpapp-6517.ear,jar=jbpapp-6517-ejb.jar,name=HelloBean,service=EJB3";
- protected String sarEjb3JMXName = "jboss.j2ee:ear=jbpapp-6517.sar,jar=jbpapp-6517-ejb.jar,name=HelloBean,service=EJB3";
-
- public CheckCompleteTestCase()
- {
- init("admin","admin");
- }
-
- // TODO the tests are moved into different files since there is a bug where we can't deploy/undeploy the deployer - move them back when bug is fixed
-
- // this is without the deployer
-// public void testDefaultWithoutCheckSubDeploymentCompleteDeployer()
-// {
-// // deploy ear & eat expected exception
-// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
-// // undeploy ear
-// // call fail if not valid
-// verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
-//
-// // Repeat for sar
-// verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
-// }
-//
-// public void testCheckSubDeploymentCompleteDeployerAll()
-// {
-// // deploy CheckSubDeploymentCompleteDeployer configured to check all
-// deployFailOnException(checkCompleteDeployerAll);
-//
-// // deploy ear & eat expected exception
-// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
-// // undeploy ear
-// // call fail if not valid
-// verifyCheckCompleteCalled(testEar, earEjb3JMXName);
-//
-// // repeat for sar
-// verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
-//
-// // undeploy CheckSubDeploymentCompleteDeployer configured to check all
-// undeployLogException(checkCompleteDeployerAll);
-// }
-//
-// public void testCheckSubDeploymentCompleteDeployerEAROnly()
-// {
-// // deploy the CheckSubDeploymentCompleteDeployer that only acts on ears
-// deployFailOnException(checkCompleteDeployerEAR);
-//
-// // deploy ear & eat expected exception
-// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
-// // undeploy ear
-// // call fail if not valid
-// verifyCheckCompleteCalled(testEar, earEjb3JMXName);
-//
-// // same as above, except in the case of the sar, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .ear files
-// verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
-//
-// // undeploy the CheckSubDeploymentCompleteDeployer that only acts on ears
-// undeployLogException(checkCompleteDeployerEAR);
-// }
-//
-// public void testCheckSubDeploymentCompleteDeployerSAROnly()
-// {
-// // deploy the CheckSubDeploymentCompleteDeployer that only acts on sars
-// deployFailOnException(checkCompleteDeployerSAR);
-//
-// // deploy sar & eat expected exception
-// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
-// // undeploy sar
-// // call fail if not valid
-// verifyCheckCompleteCalled(testSar,sarEjb3JMXName);
-//
-// // same as above, except in the case of the ear, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .sar files
-// verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
-//
-// // undeploy the CheckSubDeploymentCompleteDeployer that only acts on sars
-// undeployLogException(checkCompleteDeployerSAR);
-// }
-
- // helper methods from here on
-
- protected void verifyCheckCompleteNotCalled(String testApp, String jmxName)
- {
- // deploy ear & eat expected exception
- deployTestAppEatException(testApp);
-
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- boolean ejbExists = existsInJMX(jmxName);
-
- // undeploy ear
- undeployLogException(testApp);
-
- if ( ! ejbExists )
- fail("When the CheckSubDeploymentCompleteDeployer checkcomplete is not called, the test EJB3 in " + testApp + " should be deployed: " + jmxName);
- }
-
- protected void verifyCheckCompleteCalled(String testApp, String jmxName)
- {
- // deploy ear & eat expected exception
- deployTestAppEatException(testApp);
-
- // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
- boolean ejbExists = existsInJMX(jmxName);
-
- // undeploy ear
- undeployLogException(testApp);
-
- if ( ejbExists )
- fail("When the CheckSubDeploymentCompleteDeployer checkcomplete is called, the test EJB3 in " + testApp + " should not be deployed: " + jmxName);
- }
-
- // deploy/undeploy helper methods to eat exceptions and fail if necessary to make test code not need a lot of try/catch
-
- protected void undeployLogException(String path)
- {
- try
- {
- undeploy(path);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
- protected void deployFailOnException(String path)
- {
- try
- {
- deploy(path);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Failed to deploy: " + path);
- }
- }
-
- protected void deployTestAppEatException(String path)
- {
- try
- {
- deploy(path);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- // do nothing since it should fail to deploy
- return;
- }
- // fail test if no exception because it should have failed to deploy
- fail("Test app: " + path + " should have failed to deploy because of the microcontainer beans throwing exception in create");
- }
-
- // See if a jmxName exists in JMX - fail test on unexpected errors
- private boolean existsInJMX(String jmxName)
- {
- ObjectName objectName = null;
- MBeanServerConnection mbeanServer = null;
- try
- {
- mbeanServer = getRMIServer();
- objectName = new ObjectName(jmxName);
- }
- catch ( Exception e )
- {
- fail(e.getMessage());
- }
-
- try
- {
- MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName);
- }
- catch ( InstanceNotFoundException infe )
- {
- return false;
- }
- catch ( Exception e )
- {
- // fail if an exception occurs trying to call getMBeanInfo
- fail(e.getMessage());
- }
- return true;
- }
-
- // helper methods to get access to the mbean server and main deployer
-
- private static MBeanServerConnection getRMIServer() throws Exception
- {
- String connectorName = "jmx/rmi/RMIAdaptor";
- RMIAdaptor server = (RMIAdaptor) getInitialContext(host).lookup(connectorName);
- //invoke MainDeployer MBean service
- return server;
- }
-
- private static InitialContext getInitialContext(String host) throws Exception
- {
- if ( host == null )
- return new InitialContext();
- else
- {
- Properties props = new Properties();
- props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
- props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
- props.put(Context.PROVIDER_URL, "jnp://"+host+":1099");
- return new InitialContext(props);
- }
- }
-
- private void init(String username, String password)
- {
- SecurityAssociation.setPrincipal(new SimplePrincipal(username));
- SecurityAssociation.setCredential(password);
- }
-
- /**
- * This is an example of getting the MainDeployer from the MBean Server and invoking deploy using
- * standard MBean reflective invoke commands
- */
- protected static void deploy(String deployURL) throws Exception
- {
- MainDeployerMBean mbean = null;
-
- ObjectName objectName = new ObjectName(objectNameString);
- MBeanServerConnection server = getRMIServer();
-
- // arguments for the invoke call
- String operationName = "deploy"; // the method
- Object[] params = new Object[]
- {deployURL}; // the arguments
- String[] signature = new String[]
- {String.class.getName()}; // the class type of the arguments
-
- //Object invoke(ObjectName name, String operationName, Object[] params, String[] signature)
- //throws InstanceNotFoundException, MBeanException, ReflectionException
- Object returnValue = server.invoke(objectName, operationName, params, signature);
- }
-
- /**
- * This is an example of getting the MainDeployer from the MBean Server and invoking undeploy using
- * standard MBean reflective invoke commands
- */
- protected static void undeploy(String deployURL) throws Exception
- {
- MainDeployerMBean mbean = null;
-
- ObjectName objectName = new ObjectName(objectNameString);
- MBeanServerConnection server = getRMIServer();
-
- // arguments for the invoke call
- String operationName = "undeploy"; // the method
- Object[] params = new Object[]
- {deployURL}; // the arguments
- String[] signature = new String[]
- {String.class.getName()}; // the class type of the arguments
-
- //Object invoke(ObjectName name, String operationName, Object[] params, String[] signature)
- //throws InstanceNotFoundException, MBeanException, ReflectionException
- Object returnValue = server.invoke(objectName, operationName, params, signature);
- }
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/CheckCompleteTestCase.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,317 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517;
+
+import java.io.File;
+import java.net.URI;
+import java.util.Properties;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanInfo;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+import junit.framework.TestCase;
+
+import org.jboss.deployment.MainDeployerMBean;
+import org.jboss.jmx.adaptor.rmi.RMIAdaptor;
+import org.jboss.security.SecurityAssociation;
+import org.jboss.security.SimplePrincipal;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public abstract class CheckCompleteTestCase extends TestCase
+{
+ public static String objectNameString = "jboss.system:service=MainDeployer";
+
+ private static String host = "localhost";
+
+ protected String testEar = "file://" + new File("lib/jbpapp-6517.ear").getAbsolutePath();
+ protected String testSar = "file://" + new File("lib/jbpapp-6517.sar").getAbsolutePath();
+
+ protected String checkCompleteDeployerAll = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml").getAbsolutePath();
+ protected String checkCompleteDeployerEAR = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml").getAbsolutePath();
+ protected String checkCompleteDeployerSAR = "file://" + new File("resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml").getAbsolutePath();
+
+ protected String earEjb3JMXName = "jboss.j2ee:ear=jbpapp-6517.ear,jar=jbpapp-6517-ejb.jar,name=HelloBean,service=EJB3";
+ protected String sarEjb3JMXName = "jboss.j2ee:ear=jbpapp-6517.sar,jar=jbpapp-6517-ejb.jar,name=HelloBean,service=EJB3";
+
+ public CheckCompleteTestCase()
+ {
+ init("admin","admin");
+ }
+
+ // TODO the tests are moved into different files since there is a bug where we can't deploy/undeploy the deployer - move them back when bug is fixed
+
+ // this is without the deployer
+// public void testDefaultWithoutCheckSubDeploymentCompleteDeployer()
+// {
+// // deploy ear & eat expected exception
+// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+// // undeploy ear
+// // call fail if not valid
+// verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
+//
+// // Repeat for sar
+// verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
+// }
+//
+// public void testCheckSubDeploymentCompleteDeployerAll()
+// {
+// // deploy CheckSubDeploymentCompleteDeployer configured to check all
+// deployFailOnException(checkCompleteDeployerAll);
+//
+// // deploy ear & eat expected exception
+// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+// // undeploy ear
+// // call fail if not valid
+// verifyCheckCompleteCalled(testEar, earEjb3JMXName);
+//
+// // repeat for sar
+// verifyCheckCompleteCalled(testSar, sarEjb3JMXName);
+//
+// // undeploy CheckSubDeploymentCompleteDeployer configured to check all
+// undeployLogException(checkCompleteDeployerAll);
+// }
+//
+// public void testCheckSubDeploymentCompleteDeployerEAROnly()
+// {
+// // deploy the CheckSubDeploymentCompleteDeployer that only acts on ears
+// deployFailOnException(checkCompleteDeployerEAR);
+//
+// // deploy ear & eat expected exception
+// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+// // undeploy ear
+// // call fail if not valid
+// verifyCheckCompleteCalled(testEar, earEjb3JMXName);
+//
+// // same as above, except in the case of the sar, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .ear files
+// verifyCheckCompleteNotCalled(testSar, sarEjb3JMXName);
+//
+// // undeploy the CheckSubDeploymentCompleteDeployer that only acts on ears
+// undeployLogException(checkCompleteDeployerEAR);
+// }
+//
+// public void testCheckSubDeploymentCompleteDeployerSAROnly()
+// {
+// // deploy the CheckSubDeploymentCompleteDeployer that only acts on sars
+// deployFailOnException(checkCompleteDeployerSAR);
+//
+// // deploy sar & eat expected exception
+// // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+// // undeploy sar
+// // call fail if not valid
+// verifyCheckCompleteCalled(testSar,sarEjb3JMXName);
+//
+// // same as above, except in the case of the ear, the ejb3 should still be deployed since the checkCompleteDeployerEAR should only check for .sar files
+// verifyCheckCompleteNotCalled(testEar, earEjb3JMXName);
+//
+// // undeploy the CheckSubDeploymentCompleteDeployer that only acts on sars
+// undeployLogException(checkCompleteDeployerSAR);
+// }
+
+ // helper methods from here on
+
+ protected void verifyCheckCompleteNotCalled(String testApp, String jmxName)
+ {
+ // deploy ear & eat expected exception
+ deployTestAppEatException(testApp);
+
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ boolean ejbExists = existsInJMX(jmxName);
+
+ // undeploy ear
+ undeployLogException(testApp);
+
+ if ( ! ejbExists )
+ fail("When the CheckSubDeploymentCompleteDeployer checkcomplete is not called, the test EJB3 in " + testApp + " should be deployed: " + jmxName);
+ }
+
+ protected void verifyCheckCompleteCalled(String testApp, String jmxName)
+ {
+ // deploy ear & eat expected exception
+ deployTestAppEatException(testApp);
+
+ // check jmx or jndi - with CheckSubDeploymentCompleteDeployer the EJB3 should not be in jmx or jndi
+ boolean ejbExists = existsInJMX(jmxName);
+
+ // undeploy ear
+ undeployLogException(testApp);
+
+ if ( ejbExists )
+ fail("When the CheckSubDeploymentCompleteDeployer checkcomplete is called, the test EJB3 in " + testApp + " should not be deployed: " + jmxName);
+ }
+
+ // deploy/undeploy helper methods to eat exceptions and fail if necessary to make test code not need a lot of try/catch
+
+ protected void undeployLogException(String path)
+ {
+ try
+ {
+ undeploy(path);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ protected void deployFailOnException(String path)
+ {
+ try
+ {
+ deploy(path);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ fail("Failed to deploy: " + path);
+ }
+ }
+
+ protected void deployTestAppEatException(String path)
+ {
+ try
+ {
+ deploy(path);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ // do nothing since it should fail to deploy
+ return;
+ }
+ // fail test if no exception because it should have failed to deploy
+ fail("Test app: " + path + " should have failed to deploy because of the microcontainer beans throwing exception in create");
+ }
+
+ // See if a jmxName exists in JMX - fail test on unexpected errors
+ private boolean existsInJMX(String jmxName)
+ {
+ ObjectName objectName = null;
+ MBeanServerConnection mbeanServer = null;
+ try
+ {
+ mbeanServer = getRMIServer();
+ objectName = new ObjectName(jmxName);
+ }
+ catch ( Exception e )
+ {
+ fail(e.getMessage());
+ }
+
+ try
+ {
+ MBeanInfo mbeanInfo = mbeanServer.getMBeanInfo(objectName);
+ }
+ catch ( InstanceNotFoundException infe )
+ {
+ return false;
+ }
+ catch ( Exception e )
+ {
+ // fail if an exception occurs trying to call getMBeanInfo
+ fail(e.getMessage());
+ }
+ return true;
+ }
+
+ // helper methods to get access to the mbean server and main deployer
+
+ private static MBeanServerConnection getRMIServer() throws Exception
+ {
+ String connectorName = "jmx/rmi/RMIAdaptor";
+ RMIAdaptor server = (RMIAdaptor) getInitialContext(host).lookup(connectorName);
+ //invoke MainDeployer MBean service
+ return server;
+ }
+
+ private static InitialContext getInitialContext(String host) throws Exception
+ {
+ if ( host == null )
+ return new InitialContext();
+ else
+ {
+ Properties props = new Properties();
+ props.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory");
+ props.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
+ props.put(Context.PROVIDER_URL, "jnp://"+host+":1099");
+ return new InitialContext(props);
+ }
+ }
+
+ private void init(String username, String password)
+ {
+ SecurityAssociation.setPrincipal(new SimplePrincipal(username));
+ SecurityAssociation.setCredential(password);
+ }
+
+ /**
+ * This is an example of getting the MainDeployer from the MBean Server and invoking deploy using
+ * standard MBean reflective invoke commands
+ */
+ protected static void deploy(String deployURL) throws Exception
+ {
+ MainDeployerMBean mbean = null;
+
+ ObjectName objectName = new ObjectName(objectNameString);
+ MBeanServerConnection server = getRMIServer();
+
+ // arguments for the invoke call
+ String operationName = "deploy"; // the method
+ Object[] params = new Object[]
+ {deployURL}; // the arguments
+ String[] signature = new String[]
+ {String.class.getName()}; // the class type of the arguments
+
+ //Object invoke(ObjectName name, String operationName, Object[] params, String[] signature)
+ //throws InstanceNotFoundException, MBeanException, ReflectionException
+ Object returnValue = server.invoke(objectName, operationName, params, signature);
+ }
+
+ /**
+ * This is an example of getting the MainDeployer from the MBean Server and invoking undeploy using
+ * standard MBean reflective invoke commands
+ */
+ protected static void undeploy(String deployURL) throws Exception
+ {
+ MainDeployerMBean mbean = null;
+
+ ObjectName objectName = new ObjectName(objectNameString);
+ MBeanServerConnection server = getRMIServer();
+
+ // arguments for the invoke call
+ String operationName = "undeploy"; // the method
+ Object[] params = new Object[]
+ {deployURL}; // the arguments
+ String[] signature = new String[]
+ {String.class.getName()}; // the class type of the arguments
+
+ //Object invoke(ObjectName name, String operationName, Object[] params, String[] signature)
+ //throws InstanceNotFoundException, MBeanException, ReflectionException
+ Object returnValue = server.invoke(objectName, operationName, params, signature);
+ }
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,33 +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.
- *
- * 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.test.deployment.jbpapp6517.ejb3;
-
-import javax.ejb.Remote;
-
-/**
- * @author bmaxwell
- */
-public @Remote interface Hello
-{
- public String hello(String name);
-}
-
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/Hello.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,33 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517.ejb3;
+
+import javax.ejb.Remote;
+
+/**
+ * @author bmaxwell
+ */
+public @Remote interface Hello
+{
+ public String hello(String name);
+}
+
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,39 +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.
- *
- * 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.test.deployment.jbpapp6517.ejb3;
-
-import javax.ejb.Stateless;
-import org.jboss.ejb3.annotation.RemoteBinding;
-
-/**
- *
- * @author bmaxwell
- */
- at Stateless
- at RemoteBinding(jndiBinding="HelloBean/remote")
-public class HelloBean implements Hello
-{
- public String hello(String name)
- {
- return "Hello " + name;
- }
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/ejb3/HelloBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517.ejb3;
+
+import javax.ejb.Stateless;
+import org.jboss.ejb3.annotation.RemoteBinding;
+
+/**
+ *
+ * @author bmaxwell
+ */
+ at Stateless
+ at RemoteBinding(jndiBinding="HelloBean/remote")
+public class HelloBean implements Hello
+{
+ public String hello(String name)
+ {
+ return "Hello " + name;
+ }
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,36 +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.
- *
- * 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.test.deployment.jbpapp6517.mcbean;
-
-public class HelloMCBean implements HelloMCMBean
-{
- public void start()
- {
- System.out.println(" >>> enter start");
- throw new RuntimeException("exceptions launched from start");
- }
-
- public void stop()
- {
- System.out.println(" >>> enter stop");
- }
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517.mcbean;
+
+public class HelloMCBean implements HelloMCMBean
+{
+ public void start()
+ {
+ System.out.println(" >>> enter start");
+ throw new RuntimeException("exceptions launched from start");
+ }
+
+ public void stop()
+ {
+ System.out.println(" >>> enter stop");
+ }
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,26 +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.
- *
- * 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.test.deployment.jbpapp6517.mcbean;
-
-public interface HelloMCMBean
-{
-}
Copied: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/deployment/jbpapp6517/mcbean/HelloMCMBean.java 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ *
+ * 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.test.deployment.jbpapp6517.mcbean;
+
+public interface HelloMCMBean
+{
+}
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
-</deployment>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployer-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+</deployment>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- </bean>
-</deployment>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerAll-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ </bean>
+</deployment>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,11 +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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- <property name="types">.ear</property>
- </bean>
-</deployment>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerEAR-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,11 @@
+<?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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="types">.ear</property>
+ </bean>
+</deployment>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,11 +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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
- <property name="mainDeployer"><inject bean="MainDeployer"/></property>
- <property name="types">.war,.sar</property>
- </bean>
-</deployment>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/checkSubDeploymentCompleteDeployerSAR-jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,11 @@
+<?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="CheckSubDeploymentCompleteDeployer" class="org.jboss.deployment.CheckSubDeploymentCompleteDeployer">
+ <property name="mainDeployer"><inject bean="MainDeployer"/></property>
+ <property name="types">.war,.sar</property>
+ </bean>
+</deployment>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4">
- <description></description>
- <display-name>jbpapp-6517</display-name>
-
- <module>
- <java>jbpapp-6517-bean.jar</java>
- </module>
-
- <module>
- <ejb>jbpapp-6517-ejb.jar</ejb>
- </module>
-
-</application>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/application.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd" version="1.4">
+ <description></description>
+ <display-name>jbpapp-6517</display-name>
+
+ <module>
+ <java>jbpapp-6517-bean.jar</java>
+ </module>
+
+ <module>
+ <ejb>jbpapp-6517-ejb.jar</ejb>
+ </module>
+
+</application>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<jboss-app>
-
-<module-order>strict</module-order>
-
- <loader-repository>
- testcase.jboss.org:loader=testcase.ear
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
-
-</jboss-app>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/ear/META-INF/jboss-app.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<jboss-app>
+
+<module-order>strict</module-order>
+
+ <loader-repository>
+ testcase.jboss.org:loader=testcase.ear
+ <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+
+</jboss-app>
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,2 +0,0 @@
-# A sample users.properties file for use with the UsersRolesLoginModule
-admin=admin
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/jmx-console-users.properties 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+admin=admin
Deleted: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml 2011-05-13 02:58:01 UTC (rev 111360)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -1,7 +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="HelloMCBean" class="org.jboss.test.deployment.jbpapp6517.mcbean.HelloMCBean">
- <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="org.jboss.test.deployment.jbpapp6517.mcbean:service=HelloMCBean",exposedInterface=org.jboss.test.deployment.jbpapp6517.mcbean.HelloMCMBean.class,registerDirectly=false)</annotation>
-</bean>
-
-</deployment>
Copied: branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml (from rev 111360, branches/JBPAPP_5_1_0_Final_JBPAPP-5820/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml)
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/org/jboss/test/deployment/jbpapp6517/mcbean/META-INF/jboss-beans.xml 2011-08-03 02:02:46 UTC (rev 111907)
@@ -0,0 +1,7 @@
+<?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="HelloMCBean" class="org.jboss.test.deployment.jbpapp6517.mcbean.HelloMCBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="org.jboss.test.deployment.jbpapp6517.mcbean:service=HelloMCBean",exposedInterface=org.jboss.test.deployment.jbpapp6517.mcbean.HelloMCMBean.class,registerDirectly=false)</annotation>
+</bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list