You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ti...@apache.org on 2011/10/20 10:11:29 UTC
svn commit: r1186658 - in /aries/trunk: blueprint/blueprint-bundle/
blueprint/blueprint-cm/ samples/
samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/
transaction/transaction-manager/
Author: timothyjward
Date: Thu Oct 20 08:11:29 2011
New Revision: 1186658
URL: http://svn.apache.org/viewvc?rev=1186658&view=rev
Log:
ARIES-754: Try to get trunk building properly again - Fix blog sample itest
Modified:
aries/trunk/blueprint/blueprint-bundle/pom.xml
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
aries/trunk/samples/pom.xml
aries/trunk/transaction/transaction-manager/pom.xml
Modified: aries/trunk/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-bundle/pom.xml?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-bundle/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-bundle/pom.xml Thu Oct 20 08:11:29 2011
@@ -50,6 +50,9 @@
We use the range macro to get a 0.x to 0.x+1 version range while Aries is still
stabilizing API. This should be removed once the dependency is available at a
version greater than or equal to 1.0.0
+
+ We also add a version range from 1.2 for config admin. This is what we need,
+ but we rely on the 4.2 compendium for a lot of other stuff.
-->
<aries.osgi.import>
!org.apache.aries.blueprint*,
@@ -61,7 +64,7 @@
org.eclipse.osgi.framework.adaptor;resolution:=optional,
org.osgi.service.event*;resolution:=optional,
org.osgi.service.framework;resolution:=optional,
- org.osgi.service.cm,
+ org.osgi.service.cm;version="[1.2,2)",
org.apache.aries.blueprint.annotation.service;version="$<range;[==,=+)>";resolution:=optional,
org.apache.aries.quiesce.manager;version="$<range;[==,=+)>";resolution:=optional,
org.apache.aries.quiesce.participant;version="$<range;[==,=+)>";resolution:=optional,
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Thu Oct 20 08:11:29 2011
@@ -68,6 +68,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
+ <version>4.1.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractIntegrationTest.java Thu Oct 20 08:11:29 2011
@@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.aries.blueprint.NamespaceHandler;
import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.CoreOptions;
@@ -116,7 +117,10 @@ public abstract class AbstractIntegratio
}
}
-
+ protected void waitForStart() {
+ getOsgiService(NamespaceHandler.class, "(osgi.service.blueprint.namespace=http://aries.apache.org/xmlns/transactions/v1.0.0)", DEFAULT_TIMEOUT);
+ }
+
protected Bundle getInstalledBundle(String symbolicName) {
for (Bundle b : bundleContext.getBundles()) {
if (b.getSymbolicName().equals(symbolicName)) {
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Thu Oct 20 08:11:29 2011
@@ -44,6 +44,8 @@ public class JdbcBlogSampleWithEbaTest e
@Test
public void test() throws Exception {
+ waitForStart();
+
URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jdbc.eba");
AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Thu Oct 20 08:11:29 2011
@@ -47,6 +47,8 @@ public class JpaBlogSampleWithEbaTest ex
@Test
public void test() throws Exception {
+ waitForStart();
+
/* Install and start the blog eba */
URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jpa.eba");
AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
Modified: aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Thu Oct 20 08:11:29 2011
@@ -50,6 +50,8 @@ public class QuiesceBlogSampleWithEbaTes
@Test
public void test() throws Exception {
+ waitForStart();
+
/* Install and start the blog eba */
URL urlToEba = getUrlToEba("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.jpa.eba");
AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
Modified: aries/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/samples/pom.xml?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/samples/pom.xml (original)
+++ aries/trunk/samples/pom.xml Thu Oct 20 08:11:29 2011
@@ -109,7 +109,7 @@
<!-- Aries Testsupport Versions -->
- <ariesTestsupportUnitVersion>0.3.1-SNAPSHOT</ariesTestsupportUnitVersion>
+ <ariesTestsupportUnitVersion>0.4-SNAPSHOT</ariesTestsupportUnitVersion>
<!-- Aries Transaction Versions -->
<ariesTransactionBlueprintVersion>0.3.1-SNAPSHOT</ariesTransactionBlueprintVersion>
Modified: aries/trunk/transaction/transaction-manager/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/transaction/transaction-manager/pom.xml?rev=1186658&r1=1186657&r2=1186658&view=diff
==============================================================================
--- aries/trunk/transaction/transaction-manager/pom.xml (original)
+++ aries/trunk/transaction/transaction-manager/pom.xml Thu Oct 20 08:11:29 2011
@@ -88,6 +88,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>