[jboss-cvs] JBossAS SVN: r75380 - projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-07-04 05:51:35 -0400 (Fri, 04 Jul 2008)
New Revision: 75380

Removed:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java
Modified:
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java
Log:
The forcejaxb stuff is retired, now it always uses jaxb

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java	2008-07-04 09:49:50 UTC (rev 75379)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java	2008-07-04 09:51:35 UTC (rev 75380)
@@ -43,11 +43,8 @@
    {
       String property = System.getProperty("jboss.mc.secure", "false");
       boolean enableSecurity = Boolean.valueOf(property).booleanValue();
-      property = System.getProperty("jboss.mc.jaxb", "false");
-      boolean useJaxbDeployer = Boolean.valueOf(property).booleanValue();
       AOPMicrocontainerTestDelegate delegate = new AOPMicrocontainerTestDelegate(clazz);
       delegate.enableSecurity = enableSecurity;
-      delegate.useJaxbDeployer = useJaxbDeployer;
       return delegate;
    }
    

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java	2008-07-04 09:49:50 UTC (rev 75379)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java	2008-07-04 09:51:35 UTC (rev 75380)
@@ -40,8 +40,6 @@
    /** The deployed urls */
    private static final CopyOnWriteArrayList<URL> urls = new CopyOnWriteArrayList<URL>();
    
-   boolean useJaxbDeployer;
-
    /**
     * Create a new AOPMicrocontainerTestDelegate.
     * 

Deleted: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java	2008-07-04 09:49:50 UTC (rev 75379)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ForceJBossXBAopMicrocontainerTest.java	2008-07-04 09:51:35 UTC (rev 75380)
@@ -1,52 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors. 
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/ 
-package org.jboss.test.aop.junit;
-
-import java.net.URL;
-
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.test.AbstractTestDelegate;
-
-/**
- * 
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ForceJBossXBAopMicrocontainerTest extends AOPMicrocontainerTest
-{
-   public ForceJBossXBAopMicrocontainerTest(String name)
-   {
-      super(name);
-   }
-
-   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
-   {
-      AOPMicrocontainerTestDelegate delegate = (AOPMicrocontainerTestDelegate)AOPMicrocontainerTest.getDelegate(clazz);
-      delegate.useJaxbDeployer = true;
-      return delegate;
-   }
-
-   protected KernelDeployment unmarshal(final URL url) throws Exception 
-   {
-      return null;//((AOPMicrocontainerTestDelegate)getDelegate()).unmarshal(url);
-   }
-}