You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/12/31 08:44:06 UTC
tomee git commit: better packaging for eartest
Repository: tomee
Updated Branches:
refs/heads/develop 61222b934 -> 54237f97a
better packaging for eartest
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/54237f97
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/54237f97
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/54237f97
Branch: refs/heads/develop
Commit: 54237f97aa03d2675a2b9158c43c6913eba384a6
Parents: 61222b9
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed Dec 31 08:43:43 2014 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed Dec 31 08:43:43 2014 +0100
----------------------------------------------------------------------
.../openejb/arquillian/tests/ear/Bean.java | 37 ++++++++++++++++++++
.../openejb/arquillian/tests/ear/EarTest.java | 27 --------------
.../openejb/arquillian/tests/ear/Hello.java | 37 ++++++++++++++++++++
3 files changed, 74 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/54237f97/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Bean.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Bean.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Bean.java
new file mode 100644
index 0000000..9d55f2e
--- /dev/null
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Bean.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian.tests.ear;
+
+import org.junit.Test;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+
+@Singleton
+@Startup
+public class Bean {
+
+ @PostConstruct
+ private void post() {
+// Thread.sleep(TimeUnit.MINUTES.toMillis(1));
+ }
+
+ public String getMessage() {
+ return Test.class.getName();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/54237f97/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
index 489cbd2..8fbd9ca 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
@@ -75,31 +75,4 @@ public class EarTest {
final String slurp = IO.slurp(servlet);
Assert.assertEquals(Test.class.getName(), slurp);
}
-
-
- @Singleton
- @Startup
- public static class Bean {
-
- @PostConstruct
- private void post() throws InterruptedException {
-// Thread.sleep(TimeUnit.MINUTES.toMillis(1));
- }
-
- public String getMessage() {
- return Test.class.getName();
- }
- }
-
- @WebServlet("/blue")
- public static class Hello extends HttpServlet {
-
- @EJB
- private Bean bean;
-
- @Override
- protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
- resp.getWriter().print(bean.getMessage());
- }
- }
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/54237f97/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Hello.java
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Hello.java b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Hello.java
new file mode 100644
index 0000000..b4bff66
--- /dev/null
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/Hello.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.arquillian.tests.ear;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebServlet("/blue")
+public class Hello extends HttpServlet {
+
+ @EJB
+ private Bean bean;
+
+ @Override
+ protected void service(final HttpServletRequest req, final HttpServletResponse resp) throws ServletException, IOException {
+ resp.getWriter().print(bean.getMessage());
+ }
+}