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/09/30 12:04:42 UTC
svn commit: r1628383 - in /tomee/tomee/trunk/maven/tomee-maven-plugin/src:
main/java/org/apache/openejb/maven/plugin/
test/java/org/apache/openejb/maven/plugin/
test/java/org/apache/openejb/maven/plugin/app/
test/java/org/apache/openejb/maven/plugin/test/
Author: rmannibucau
Date: Tue Sep 30 10:04:42 2014
New Revision: 1628383
URL: http://svn.apache.org/r1628383
Log:
TOMEE-1361 ensuring we can reload a jaxrs app
Added:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Mojo.java
- copied, changed from r1628374, tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Url.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/Endpoint.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/JAXRSReloadTest.java
- copied, changed from r1628374, tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/TomEEMavenPluginTest.java
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1628383&r1=1628382&r2=1628383&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java Tue Sep 30 10:04:42 2014
@@ -216,7 +216,7 @@ public abstract class UpdatableTomEEMojo
return RELOAD_CMD.equalsIgnoreCase(line);
}
- protected synchronized void reload() {
+ public synchronized void reload() {
if (deployOpenEjbApplication) {
String path = deployedFile.getAbsolutePath();
if (path.endsWith(".war") || path.endsWith(".ear")) {
Copied: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Mojo.java (from r1628374, tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Url.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Mojo.java?p2=tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Mojo.java&p1=tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Url.java&r1=1628374&r2=1628383&rev=1628383&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Url.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/Mojo.java Tue Sep 30 10:04:42 2014
@@ -23,5 +23,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
-public @interface Url {
+public @interface Mojo {
}
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java?rev=1628383&r1=1628382&r2=1628383&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java Tue Sep 30 10:04:42 2014
@@ -87,7 +87,10 @@ public class TomEEMavenPluginRule implem
final TestTomEEMojo testMojo = newMojo();
for (final Field f : testInstance.getClass().getDeclaredFields()) {
- if (f.getAnnotation(Url.class) != null) {
+ if (f.getAnnotation(Mojo.class) != null) {
+ f.setAccessible(true);
+ f.set(testInstance, testMojo);
+ } else if (f.getAnnotation(Url.class) != null) {
f.setAccessible(true);
f.set(testInstance, "http://localhost:" + testMojo.tomeeHttpPort);
} else if (f.getAnnotation(Config.class) != null) {
@@ -95,7 +98,7 @@ public class TomEEMavenPluginRule implem
final Field mojoField = AbstractTomEEMojo.class.getDeclaredField(f.getName());
mojoField.setAccessible(true);
- f.set(mojoField, f.get(testInstance));
+ mojoField.set(testMojo, f.get(testInstance));
}
}
Added: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/Endpoint.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/Endpoint.java?rev=1628383&view=auto
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/Endpoint.java (added)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/app/Endpoint.java Tue Sep 30 10:04:42 2014
@@ -0,0 +1,28 @@
+/*
+ * 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.maven.plugin.app;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("ping")
+public class Endpoint {
+ @GET
+ public String ping() {
+ return "pong";
+ }
+}
Copied: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/JAXRSReloadTest.java (from r1628374, tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/TomEEMavenPluginTest.java)
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/JAXRSReloadTest.java?p2=tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/JAXRSReloadTest.java&p1=tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/TomEEMavenPluginTest.java&r1=1628374&r2=1628383&rev=1628383&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/TomEEMavenPluginTest.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/test/JAXRSReloadTest.java Tue Sep 30 10:04:42 2014
@@ -16,26 +16,72 @@
*/
package org.apache.openejb.maven.plugin.test;
+import org.apache.openejb.loader.Files;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.maven.plugin.Config;
+import org.apache.openejb.maven.plugin.Mojo;
import org.apache.openejb.maven.plugin.TomEEMavenPluginRule;
+import org.apache.openejb.maven.plugin.UpdatableTomEEMojo;
import org.apache.openejb.maven.plugin.Url;
+import org.apache.openejb.maven.plugin.app.Endpoint;
+import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
+import java.io.File;
+import java.io.IOException;
import java.net.URL;
-import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class TomEEMavenPluginTest {
+public class JAXRSReloadTest {
+ private static File JAXRS_APP = new File("target/tests/webapps/app-jaxrs");
+
+ @BeforeClass
+ public static void createJAXRSWebApp() throws IOException {
+ Files.mkdirs(JAXRS_APP);
+
+ final String resource = Endpoint.class.getName().replace(".", "/") + ".class";
+ final File to = new File(JAXRS_APP, "WEB-INF/classes/" + resource);
+ if (to.exists()) { // already done
+ return;
+ }
+ Files.mkdirs(to.getParentFile());
+ IO.copy(new File("target/test-classes/" + resource), to);
+ }
+
@Rule
public TomEEMavenPluginRule TMPRule = new TomEEMavenPluginRule();
+ @Mojo
+ private UpdatableTomEEMojo mojo;
+
@Url
private String url;
+ @Config
+ private boolean removeDefaultWebapps = true;
+
+ @Config
+ protected boolean forceReloadable = true;
+
+ @Config
+ protected boolean deployOpenEjbApplication = true;
+
+ @Config
+ private File catalinaBase = JAXRS_APP.getParentFile().getParentFile();
+
+ @Config
+ private File deployedFile = JAXRS_APP;
+
+ @Config
+ private String args = "-Dopenejb.classloader.forced-load=" + Endpoint.class.getPackage().getName();
+
@Test
public void simpleStart() throws Exception {
- assertThat(IO.slurp(new URL(url + "/docs")), containsString("Apache Tomcat"));
+ assertThat(IO.slurp(new URL(url + "/app-jaxrs/ping")).trim(), is("pong"));
+ mojo.reload();
+ assertThat(IO.slurp(new URL(url + "/app-jaxrs/ping")).trim(), is("pong"));
}
}