You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2010/08/26 14:01:18 UTC
svn commit: r989625 - in /incubator/aries/trunk/samples/blog/blog-itests: ./
src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
Author: mnuttall
Date: Thu Aug 26 12:01:17 2010
New Revision: 989625
URL: http://svn.apache.org/viewvc?rev=989625&view=rev
Log:
ARIES-361: Provisioning changes required to support application isolation. From a patch submitted by Emily Jiang.
Modified:
incubator/aries/trunk/samples/blog/blog-itests/ (props changed)
incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
Propchange: incubator/aries/trunk/samples/blog/blog-itests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 26 12:01:17 2010
@@ -0,0 +1,3 @@
+target
+.classpath
+.project
Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java?rev=989625&r1=989624&r2=989625&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JdbcBlogSampleWithEbaTest.java Thu Aug 26 12:01:17 2010
@@ -54,18 +54,18 @@ public class JdbcBlogSampleWithEbaTest e
/* Check that the Blog Sample bundles are present an started */
Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
assertNotNull(bapi);
- assertEquals(bapi.ACTIVE, bapi.getState());
+ assertEquals(Bundle.ACTIVE, bapi.getState());
Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
assertNotNull(bweb);
Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
assertNotNull(bbiz);
- assertEquals(bbiz.ACTIVE, bbiz.getState());
+ assertEquals(Bundle.ACTIVE, bbiz.getState());
Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jdbc");
assertNotNull(bper);
- assertEquals(bper.ACTIVE, bper.getState());
+ assertEquals(Bundle.ACTIVE, bper.getState());
/* Require services from biz and persistence - wait for them to register */
waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
@@ -143,6 +143,8 @@ public class JdbcBlogSampleWithEbaTest e
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
mavenBundle("org.apache.felix", "org.apache.felix.fileinstall" ),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ),
Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java?rev=989625&r1=989624&r2=989625&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/JpaBlogSampleWithEbaTest.java Thu Aug 26 12:01:17 2010
@@ -29,16 +29,15 @@ import static org.ops4j.pax.exam.contain
import java.net.HttpURLConnection;
import java.net.URL;
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationManager;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
-import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
-
@RunWith(JUnit4TestRunner.class)
@@ -58,19 +57,19 @@ public class JpaBlogSampleWithEbaTest ex
Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
assertNotNull(bapi);
- assertEquals(bapi.ACTIVE, bapi.getState());
+ assertEquals(Bundle.ACTIVE, bapi.getState());
Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
assertNotNull(bweb);
- assertEquals(bweb.ACTIVE, bweb.getState());
+ assertEquals(Bundle.ACTIVE, bweb.getState());
Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
assertNotNull(bbiz);
- assertEquals(bbiz.ACTIVE, bbiz.getState());
+ assertEquals(Bundle.ACTIVE, bbiz.getState());
Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jpa");
assertNotNull(bper);
- assertEquals(bper.ACTIVE, bper.getState());
+ assertEquals(Bundle.ACTIVE, bper.getState());
/* Datasource and transaction manager services are used by the blog sample */
Bundle bds = getInstalledBundle("org.apache.aries.samples.blog.datasource");
@@ -161,6 +160,8 @@ bootDelegationPackages("javax.transactio
mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime" ),
mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils" ),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+ mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.api" ),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container" ),
mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.blueprint.aries" ),