You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/02/20 21:33:41 UTC

[tomee] branch master updated: Removed deprecated annotations - TOMEE-2460

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new cc7fdfe  Removed deprecated annotations - TOMEE-2460
     new 5f1de4e  Merge pull request #380 from BogdanStirbat/TOMEE-2460
cc7fdfe is described below

commit cc7fdfe77130e55cf8f30b87dbdb64006df3cc51
Author: Bogdan Stirbat <bo...@gmail.com>
AuthorDate: Fri Jan 25 15:03:36 2019 +0200

    Removed deprecated annotations - TOMEE-2460
---
 examples/application-composer/README.md                             | 6 +++---
 examples/rest-cdi/README.md                                         | 4 ++--
 examples/rest-xml-json/README.md                                    | 4 ++--
 examples/simple-rest/README.md                                      | 4 ++--
 .../org/apache/openejb/server/groovy/BeanManagerHelperTest.java     | 4 ++--
 .../src/test/java/org/apache/openejb/server/cxf/FeatureTest.java    | 4 ++--
 .../java/org/apache/openejb/server/cxf/GlobalFeatureConfigTest.java | 4 ++--
 .../server/httpd/ServletContextListenerRegistrationTest.java        | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/examples/application-composer/README.md b/examples/application-composer/README.md
index 946eb6c..6424b8f 100644
--- a/examples/application-composer/README.md
+++ b/examples/application-composer/README.md
@@ -19,7 +19,7 @@ that is used to build the actual applications:
 # Composing an Application
 
 The main difference to the embedded `EJBContainer` API is building the application in the test code.  This is done with one or more methods in the test case annotated
-with `org.apache.openejb.junit.Module` using the following format:
+with `org.apache.openejb.testing.Module` using the following format:
 
     @Module
     public <return-value> <module-name>() {
@@ -45,8 +45,8 @@ Used in an actual testcase, that might look like so:
     import org.apache.openejb.jee.StatefulBean;
     import org.apache.openejb.jee.jpa.unit.PersistenceUnit;
     import org.apache.openejb.junit.ApplicationComposer;
-    import org.apache.openejb.junit.Configuration;
-    import org.apache.openejb.junit.Module;
+    import org.apache.openejb.testing.Configuration;
+    import org.apache.openejb.testing.Module;
     import org.junit.Test;
     import org.junit.runner.RunWith;
 
diff --git a/examples/rest-cdi/README.md b/examples/rest-cdi/README.md
index 558832d..b90b53a 100644
--- a/examples/rest-cdi/README.md
+++ b/examples/rest-cdi/README.md
@@ -59,8 +59,8 @@ which prints the http messages in the logs.
     import org.apache.openejb.jee.WebApp;
     import org.apache.openejb.junit.ApplicationComposer;
     import org.apache.openejb.junit.Classes;
-    import org.apache.openejb.junit.EnableServices;
-    import org.apache.openejb.junit.Module;
+    import org.apache.openejb.testing.EnableServices;
+    import org.apache.openejb.testing.Module;
     import org.junit.Test;
     import org.junit.runner.RunWith;
     
diff --git a/examples/rest-xml-json/README.md b/examples/rest-xml-json/README.md
index e4dfbad..6a414ed 100644
--- a/examples/rest-xml-json/README.md
+++ b/examples/rest-xml-json/README.md
@@ -59,8 +59,8 @@ which prints the http messages in the logs.
     import org.apache.openejb.jee.WebApp;
     import org.apache.openejb.junit.ApplicationComposer;
     import org.apache.openejb.junit.Classes;
-    import org.apache.openejb.junit.EnableServices;
-    import org.apache.openejb.junit.Module;
+    import org.apache.openejb.testing.EnableServices;
+    import org.apache.openejb.testing.Module;
     import org.junit.Test;
     import org.junit.runner.RunWith;
     
diff --git a/examples/simple-rest/README.md b/examples/simple-rest/README.md
index 9e40c4e..579a60c 100644
--- a/examples/simple-rest/README.md
+++ b/examples/simple-rest/README.md
@@ -51,8 +51,8 @@ Finally to test it we use cxf client API to call the REST service in get() and p
     import org.apache.cxf.jaxrs.client.WebClient;
     import org.apache.openejb.jee.SingletonBean;
     import org.apache.openejb.junit.ApplicationComposer;
-    import org.apache.openejb.junit.EnableServices;
-    import org.apache.openejb.junit.Module;
+    import org.apache.openejb.testing.EnableServices;
+    import org.apache.openejb.testing.Module;
     import org.junit.Test;
     import org.junit.runner.RunWith;
 
diff --git a/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/BeanManagerHelperTest.java b/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/BeanManagerHelperTest.java
index 641b8a0..da52268 100644
--- a/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/BeanManagerHelperTest.java
+++ b/server/openejb-common-cli/src/test/java/org/apache/openejb/server/groovy/BeanManagerHelperTest.java
@@ -18,8 +18,8 @@ package org.apache.openejb.server.groovy;
 
 import org.apache.openejb.jee.Beans;
 import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
 import org.apache.openejb.util.OpenEJBScripter;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java b/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java
index 7e308a3..39a9133 100644
--- a/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java
+++ b/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/FeatureTest.java
@@ -30,8 +30,8 @@ import org.apache.openejb.jee.SingletonBean;
 import org.apache.openejb.jee.oejb3.EjbDeployment;
 import org.apache.openejb.jee.oejb3.OpenejbJar;
 import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
 import org.apache.openejb.server.cxf.fault.AuthenticatorServiceBean;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/GlobalFeatureConfigTest.java b/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/GlobalFeatureConfigTest.java
index 5e9c678..32565b6 100644
--- a/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/GlobalFeatureConfigTest.java
+++ b/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/GlobalFeatureConfigTest.java
@@ -22,8 +22,8 @@ import org.apache.cxf.feature.LoggingFeature;
 import org.apache.openejb.OpenEjbContainer;
 import org.apache.openejb.jee.StatelessBean;
 import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.Configuration;
-import org.apache.openejb.junit.Module;
+import org.apache.openejb.testing.Configuration;
+import org.apache.openejb.testing.Module;
 import org.apache.openejb.server.cxf.fault.AuthenticatorServiceBean;
 import org.apache.openejb.server.cxf.transport.util.CxfUtil;
 import org.junit.Test;
diff --git a/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java b/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java
index a380b81..d12fdee 100644
--- a/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java
+++ b/server/openejb-http/src/test/java/org/apache/openejb/server/httpd/ServletContextListenerRegistrationTest.java
@@ -18,8 +18,8 @@ package org.apache.openejb.server.httpd;
 
 import org.apache.openejb.jee.WebApp;
 import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.junit.EnableServices;
-import org.apache.openejb.junit.Module;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
 import org.junit.Test;
 import org.junit.runner.RunWith;