incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1498519 - in /sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter: pom.xml src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
Date Mon, 01 Jul 2013 15:24:50 GMT
Author: bdelacretaz
Date: Mon Jul  1 15:24:49 2013
New Revision: 1498519

URL: http://svn.apache.org/r1498519
Log:
SLING-2938 - have Pax Exam use the bundle from target, so that it is up to date

Modified:
    sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/pom.xml
    sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java

Modified: sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/pom.xml?rev=1498519&r1=1498518&r2=1498519&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/pom.xml (original)
+++ sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/pom.xml Mon Jul  1 15:24:49
2013
@@ -100,6 +100,11 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <systemPropertyVariables>
+                        <project.bundle.file>${project.build.directory}/${project.build.finalName}.jar</project.bundle.file>
+                    </systemPropertyVariables>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java?rev=1498519&r1=1498518&r2=1498519&view=diff
==============================================================================
--- sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
(original)
+++ sling/whiteboard/bdelacretaz/adapter-methods/extensions-adapter/src/test/java/org/apache/sling/adapter/internal/AdapterMethodManagerIT.java
Mon Jul  1 15:24:49 2013
@@ -21,12 +21,14 @@ package org.apache.sling.adapter.interna
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
+import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -108,6 +110,7 @@ public class AdapterMethodManagerIT {
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
         final String paxLogLevel = System.getProperty("pax.exam.log.level", "INFO");
+        final File thisProjectsBundle = new File(System.getProperty("project.bundle.file"));
         
         return options(
                 junitBundles(),
@@ -126,7 +129,7 @@ public class AdapterMethodManagerIT {
                         
                         mavenBundle("org.apache.sling", "org.apache.sling.commons.json",
"2.0.6"),
                         mavenBundle("org.apache.sling", "org.apache.sling.commons.osgi",
"2.1.0"),
-                        mavenBundle("org.apache.sling", "org.apache.sling.adapter")
+                        bundle(thisProjectsBundle.toURI().toString())
                 )); 
     }
     



Mime
View raw message