You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@tomee.apache.org by bu...@apache.org on 2013/09/19 12:29:50 UTC
svn commit: r879066 - in /websites/staging/tomee/trunk: cgi-bin/ content/
content/examples-trunk/moviefun/
content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/
Author: buildbot
Date: Thu Sep 19 10:29:49 2013
New Revision: 879066
Log:
Staging update by buildbot for tomee
Added:
websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/Basedir.java
Modified:
websites/staging/tomee/trunk/cgi-bin/ (props changed)
websites/staging/tomee/trunk/content/ (props changed)
websites/staging/tomee/trunk/content/examples-trunk/moviefun/pom.xml
websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
Propchange: websites/staging/tomee/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 19 10:29:49 2013
@@ -1 +1 @@
-1524674
+1524680
Propchange: websites/staging/tomee/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Sep 19 10:29:49 2013
@@ -1 +1 @@
-1524674
+1524680
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun/pom.xml
==============================================================================
Binary files - no diff available.
Added: websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/Basedir.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/Basedir.java (added)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/Basedir.java Thu Sep 19 10:29:49 2013
@@ -0,0 +1,34 @@
+/*
+ * 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.superbiz.moviefun;
+
+import org.apache.ziplock.JarLocation;
+
+import java.io.File;
+
+/**
+* @version $Revision$ $Date$
+*/
+public class Basedir {
+
+ public static File basedir(final String s) {
+ final File classes = JarLocation.jarLocation(MoviesArquillianHtmlUnitTest.class);
+ final File target = classes.getParentFile();
+ final File basedir = target.getParentFile();
+ return new File(basedir, s);
+ }
+}
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java Thu Sep 19 10:29:49 2013
@@ -56,7 +56,7 @@ public class MoviesArquillianHtmlUnitTes
});
File[] libs = Maven.resolver()
- .loadPomFromFile("pom.xml").resolve(dependencies)
+ .loadPomFromFile(Basedir.basedir("pom.xml")).resolve(dependencies)
.withTransitivity().asFile();
WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
@@ -66,7 +66,7 @@ public class MoviesArquillianHtmlUnitTes
.addAsLibraries(libs);
war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class)
- .importDirectory(WEBAPP_SRC).as(GenericArchive.class),
+ .importDirectory(Basedir.basedir(WEBAPP_SRC)).as(GenericArchive.class),
"/", Filters.includeAll());
return war;
Modified: websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java
==============================================================================
--- websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java (original)
+++ websites/staging/tomee/trunk/content/examples-trunk/moviefun/src/test/java/org/superbiz/moviefun/MoviesHtmlUnitTest.java Thu Sep 19 10:29:49 2013
@@ -20,6 +20,7 @@ import com.gargoylesoftware.htmlunit.Web
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.apache.commons.io.FileUtils;
import org.apache.tomee.embedded.EmbeddedTomEEContainer;
+import org.apache.ziplock.Archive;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -31,6 +32,7 @@ import java.net.ServerSocket;
import java.util.Properties;
import static org.junit.Assert.assertTrue;
+import static org.superbiz.moviefun.Basedir.basedir;
public class MoviesHtmlUnitTest {
@@ -70,16 +72,11 @@ public class MoviesHtmlUnitTest {
}
private static File createWebApp() throws IOException {
- File file = new File(System.getProperty("java.io.tmpdir") + "/tomee-" + Math.random());
- if (!file.mkdirs() && !file.exists()) {
- throw new RuntimeException("can't create " + file.getAbsolutePath());
- }
-
- FileUtils.copyDirectory(new File("target/classes"), new File(file, "WEB-INF/classes"));
- FileUtils.copyDirectory(new File("target/test-libs"), new File(file, "WEB-INF/lib"));
- FileUtils.copyDirectory(new File("src/main/webapp"), file);
-
- return file;
+ return Archive.archive()
+ .copyTo("WEB-INF/classes", basedir("target/classes"))
+ .copyTo("WEB-INF/lib", basedir("target/test-libs"))
+ .copyTo("", basedir("src/main/webapp"))
+ .asDir();
}
@Test