svn commit: r915178 - in /openejb/trunk/openejb3/container/openejb-junit/src: main/java/org/apache/openejb/junit/ main/java/org/apache/openejb/junit/annotations/ main/java/org/apache/openejb/junit/context/ test/java/org/apache/openejb/junit/

Mon, 22 Feb 2010 20:55:36 -0800 

Author: dblevins
Date: Tue Feb 23 04:55:07 2010
New Revision: 915178

URL: http://svn.apache.org/viewvc?rev=915178&view=rev
Log:
Removed "annotation" package

Added:
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/ContextConfig.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/Property.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/RunTestAs.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResource.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResourceTypes.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java
   (contents, props changed)
      - copied, changed from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestSecurity.java
Removed:
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/ContextConfig.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/Property.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/RunTestAs.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResource.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResourceTypes.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestSecurity.java
Modified:
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java
    
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/OpenEjbTestContext.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
    
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/ContextConfig.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/ContextConfig.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/ContextConfig.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
 Tue Feb 23 04:55:07 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 import org.apache.openejb.junit.OpenEjbRunner;
 

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/ContextConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/JUnit4Runner.java
 Tue Feb 23 04:55:07 2010
@@ -17,7 +17,7 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.TestSecurity;
+import org.apache.openejb.junit.TestSecurity;
 import org.apache.openejb.junit.context.ContextWrapperStatement;
 import org.apache.openejb.junit.context.TestContext;
 import org.apache.openejb.junit.model.MultiStatementExecutor;

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/Property.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/Property.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/Property.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java
 Tue Feb 23 04:55:07 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 /**
  * @author quintin

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/Property.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/RunTestAs.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/RunTestAs.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/RunTestAs.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java
 Tue Feb 23 04:55:07 2010
@@ -18,7 +18,7 @@
  *  Pretoria
  *  0041
  */
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/RunTestAs.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResource.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResource.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResource.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java
 Tue Feb 23 04:55:07 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResourceTypes.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResourceTypes.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestResourceTypes.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java
 Tue Feb 23 04:55:07 2010
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 /**
  * @author quintin

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestResourceTypes.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java
 (from r915166, 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestSecurity.java)
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java?p2=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java&p1=openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestSecurity.java&r1=915166&r2=915178&rev=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/annotations/TestSecurity.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java
 Tue Feb 23 04:55:07 2010
@@ -18,7 +18,7 @@
  *  Pretoria
  *  0041
  */
-package org.apache.openejb.junit.annotations;
+package org.apache.openejb.junit;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

Propchange: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/TestSecurity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/OpenEjbTestContext.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/OpenEjbTestContext.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/OpenEjbTestContext.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/main/java/org/apache/openejb/junit/context/OpenEjbTestContext.java
 Tue Feb 23 04:55:07 2010
@@ -18,11 +18,11 @@
 package org.apache.openejb.junit.context;
 
 import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.Property;
-import org.apache.openejb.junit.annotations.RunTestAs;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.Property;
+import org.apache.openejb.junit.RunTestAs;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -242,7 +242,7 @@
     }
 
     /**
-     * Loads the configuration file specified in the {...@link ContextConfig} 
annotation
+     * Loads the configuration file specified in the {...@link 
org.apache.openejb.junit.ContextConfig} annotation
      * into the specified Properties instance
      *
      * @param env

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFile.java
 Tue Feb 23 04:55:07 2010
@@ -17,9 +17,9 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigFileAndProperties.java
 Tue Feb 23 04:55:07 2010
@@ -17,10 +17,10 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.Property;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.Property;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestClassConfigProperties.java
 Tue Feb 23 04:55:07 2010
@@ -17,10 +17,10 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.Property;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.Property;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import org.junit.Test;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestDualConfigOverride.java
 Tue Feb 23 04:55:07 2010
@@ -17,10 +17,10 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.Property;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.Property;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurity.java
 Tue Feb 23 04:55:07 2010
@@ -18,7 +18,7 @@
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.junit.annotations.TestSecurity;
+import org.apache.openejb.junit.TestSecurity;
 import org.apache.openejb.junit.ejbs.BasicEjbLocal;
 import org.apache.openejb.junit.ejbs.SecuredEjbLocal;
 import static org.junit.Assert.assertEquals;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestEjbSecurityRunTestAs.java
 Tue Feb 23 04:55:07 2010
@@ -1,7 +1,7 @@
 package org.apache.openejb.junit;
 
 import org.apache.openejb.api.LocalClient;
-import org.apache.openejb.junit.annotations.RunTestAs;
+import org.apache.openejb.junit.RunTestAs;
 import org.apache.openejb.junit.ejbs.BasicEjbLocal;
 import org.apache.openejb.junit.ejbs.SecuredEjbLocal;
 import static org.junit.Assert.assertEquals;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigFile.java
 Tue Feb 23 04:55:07 2010
@@ -17,9 +17,9 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestMethodConfigProperties.java
 Tue Feb 23 04:55:07 2010
@@ -17,10 +17,10 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.ContextConfig;
-import org.apache.openejb.junit.annotations.Property;
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.ContextConfig;
+import org.apache.openejb.junit.Property;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

Modified: 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java?rev=915178&r1=915177&r2=915178&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-junit/src/test/java/org/apache/openejb/junit/TestRunner.java
 Tue Feb 23 04:55:07 2010
@@ -17,8 +17,8 @@
 
 package org.apache.openejb.junit;
 
-import org.apache.openejb.junit.annotations.TestResource;
-import org.apache.openejb.junit.annotations.TestResourceTypes;
+import org.apache.openejb.junit.TestResource;
+import org.apache.openejb.junit.TestResourceTypes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

Reply via email to