Author: dblevins
Date: Mon Nov 5 12:54:15 2012
New Revision: 1405774
URL: http://svn.apache.org/viewvc?rev=1405774&view=rev
Log:
TOMEE-524: EARs not re-unpacked on startup when changed
Added:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/EarUnpackTest.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java?rev=1405774&r1=1405773&r2=1405774&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JarExtractor.java
Mon Nov 5 12:54:15 2012
@@ -60,8 +60,14 @@ public class JarExtractor {
*/
public static void extract(File file, File destinationDir) throws
IOException {
if (destinationDir.exists()) {
- // Ear file is already installed
- return;
+
+ if (destinationDir.lastModified() > file.lastModified()) {
+ // Ear file is already installed
+ // Unpacked dir is newer than archive
+ return;
+ }
+
+ deleteDir(destinationDir);
}
logger.info("Extracting jar: " + file.getAbsolutePath());
Added:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/EarUnpackTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/EarUnpackTest.java?rev=1405774&view=auto
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/EarUnpackTest.java
(added)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/EarUnpackTest.java
Mon Nov 5 12:54:15 2012
@@ -0,0 +1,76 @@
+/*
+ * 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.config;
+
+import junit.framework.TestCase;
+import org.apache.openejb.assembler.classic.AppInfo;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.loader.Files;
+import org.apache.openejb.util.Archives;
+
+import javax.ejb.Singleton;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EarUnpackTest extends TestCase {
+
+ public void test() throws Exception {
+ final File appsDir = Files.tmpdir();
+
+ final Assembler assembler = new Assembler();
+ final ConfigurationFactory factory = new ConfigurationFactory();
+
+ final File ear = new File(appsDir, "colors.ear");
+
+ { // First Version of the EAR
+ Map<String, Object> contents = new HashMap<String, Object>();
+ contents.put("orange.jar", Archives.jarArchive(Orange.class));
+ Archives.jarArchive(ear, contents);
+
+ final AppInfo appInfo = factory.configureApplication(ear);
+ assertEquals(appInfo.ejbJars.size(), 1);
+ assertEquals("orange", appInfo.ejbJars.get(0).moduleId);
+ }
+
+ { // First Version of the EAR
+ Map<String, Object> contents = new HashMap<String, Object>();
+ contents.put("yellow.jar", Archives.jarArchive(Yellow.class));
+ Archives.jarArchive(ear, contents);
+
+ final AppInfo appInfo = factory.configureApplication(ear);
+ assertEquals(appInfo.ejbJars.size(), 1);
+ assertEquals("yellow", appInfo.ejbJars.get(0).moduleId);
+ }
+
+ }
+
+
+ @Singleton
+ public static class Orange {
+
+ }
+
+ @Singleton
+ public static class Yellow {
+
+ }
+
+}
