myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r1777596 - /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
Date Fri, 06 Jan 2017 12:17:53 GMT
Author: deki
Date: Fri Jan  6 12:17:53 2017
New Revision: 1777596

URL: http://svn.apache.org/viewvc?rev=1777596&view=rev
Log:
changed setup for Jenkins integration tests once more

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java?rev=1777596&r1=1777595&r2=1777596&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
(original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
Fri Jan  6 12:17:53 2017
@@ -62,11 +62,16 @@ public class QUnitTests {
 
   @Deployment
   public static WebArchive createDeployment() {
-    File pom = new File("pom.xml"); // Jenkins.
-    if (!pom.exists()) {
-      LOG.warn("unable to find pom - fall back");
-      pom = new File("tobago-example/tobago-example-demo/pom.xml");
+    WebArchive webArchive;
+    try {
+      webArchive = createWebArchive(new File("tobago-example/tobago-example-demo/pom.xml"));
+    } catch (Exception e) {
+      webArchive = createWebArchive(new File("pom.xml")); // Jenkins
     }
+    return webArchive;
+  }
+
+  private static WebArchive createWebArchive(File pom) {
     WebArchive webArchive = ShrinkWrap.create(MavenImporter.class).
        loadPomFromFile(pom, "jsf-provided", "!myfaces-2.0").importBuildOutput()
        .as(WebArchive.class);



Mime
View raw message