incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1005403 - in /incubator/aries/trunk: application/application-api/src/main/java/org/apache/aries/application/ application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/ application/application-deployment-...
Date Thu, 07 Oct 2010 10:45:50 GMT
Author: mnuttall
Date: Thu Oct  7 10:45:50 2010
New Revision: 1005403

URL: http://svn.apache.org/viewvc?rev=1005403&view=rev
Log:
ARIES-361: Default bundles for integration plug points. From a patch by Emily Jiang. 

Added:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java
      - copied, changed from r1005382, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/PostResolveTransformer.java
Removed:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/PostResolveTransformer.java
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java
Modified:
    incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
    incubator/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
    incubator/aries/trunk/application/application-itests/pom.xml
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
    incubator/aries/trunk/application/application-noop-resolver/   (props changed)
    incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
    incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
    incubator/aries/trunk/samples/blog/blog-itests/   (props changed)
    incubator/aries/trunk/samples/blog/blog-itests/pom.xml
    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
    incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java (from r1005382, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/PostResolveTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/PostResolveTransformer.java&r1=1005382&r2=1005403&rev=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/PostResolveTransformer.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/PostResolveTransformer.java Thu Oct  7 10:45:50 2010
@@ -1,34 +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 WARRANTIESOR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.aries.application;
-
-import org.apache.aries.application.management.ResolverException;
-import org.apache.aries.application.modelling.DeployedBundles;
-
-public interface PostResolveTransformer
-{
-/**
- *  This method is to perform any post process after the resolver returns back a collection of bundles. It returns the updated manifest map.
- * @param bundles A collection of bundles required by this application. 
- * @return Modified collection of bundles
- * @throws ResolverException
- */
-  DeployedBundles postResolveProcess(DeployedBundles deployedBundles) throws ResolverException;
-  
-}
+/*
+ * 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 WARRANTIESOR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.aries.application.management.spi.resolve;
+
+import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.modelling.DeployedBundles;
+
+public interface PostResolveTransformer
+{
+/**
+ *  This method is to perform any post process after the resolver returns back a collection of bundles. It returns the updated manifest map.
+ * @param bundles A collection of bundles required by this application. 
+ * @return Modified collection of bundles
+ * @throws ResolverException
+ */
+  DeployedBundles postResolveProcess(DeployedBundles deployedBundles) throws ResolverException;
+
+}

Modified: incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-deployment-management/src/main/java/org/apache/aries/application/deployment/management/impl/DeploymentManifestManagerImpl.java Thu Oct  7 10:45:50 2010
@@ -43,7 +43,6 @@ import java.util.jar.Manifest;
 import org.apache.aries.application.ApplicationMetadata;
 import org.apache.aries.application.Content;
 import org.apache.aries.application.InvalidAttributeException;
-import org.apache.aries.application.PostResolveTransformer;
 import org.apache.aries.application.ServiceDeclaration;
 import org.apache.aries.application.deployment.management.internal.MessageUtil;
 import org.apache.aries.application.management.AriesApplication;
@@ -52,6 +51,7 @@ import org.apache.aries.application.mana
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.apache.aries.application.management.spi.resolve.DeploymentManifestManager;
+import org.apache.aries.application.management.spi.resolve.PostResolveTransformer;
 import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.modelling.DeployedBundles;
 import org.apache.aries.application.modelling.ExportedPackage;

Modified: incubator/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml (original)
+++ incubator/aries/trunk/application/application-deployment-management/src/main/resources/OSGI-INF/blueprint/deployment-manager.xml Thu Oct  7 10:45:50 2010
@@ -33,7 +33,7 @@
   <reference id="modelledResourceManager" interface="org.apache.aries.application.modelling.ModelledResourceManager"/>
   <reference id="localPlatform" interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"/>
   <reference id="resolver" interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"/>
-  <reference id="postResolveTransformer" interface="org.apache.aries.application.PostResolveTransformer" availability="optional"/>
+  <reference id="postResolveTransformer" interface="org.apache.aries.application.management.spi.resolve.PostResolveTransformer"/>
   
   <service id ="deploymentManifestManager-Service" ref="deploymentManifestManager" interface="org.apache.aries.application.management.spi.resolve.DeploymentManifestManager"/>
     

Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Thu Oct  7 10:45:50 2010
@@ -153,13 +153,22 @@
             <artifactId>org.apache.aries.application.resolver.obr</artifactId>
             <scope>test</scope>
         </dependency>
-        
+       
         <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.resolver.noop</artifactId>
             <scope>test</scope>
         </dependency>
-        
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.noop.platform.repo</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
         	<groupId>org.apache.aries.transaction</groupId>
         	<artifactId>org.apache.aries.transaction.blueprint</artifactId>

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java Thu Oct  7 10:45:50 2010
@@ -137,6 +137,8 @@ public class BasicAppManagerTest extends
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         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.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java Thu Oct  7 10:45:50 2010
@@ -1,161 +1,163 @@
-/*
- * 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.apache.aries.application.runtime.itests;
-
-import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import java.io.File;
-import java.io.FileOutputStream;
-
-import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
-import org.apache.aries.application.utils.filesystem.FileSystem;
-import org.apache.aries.sample.HelloWorld;
-import org.apache.aries.unittest.fixture.ArchiveFixture;
-import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-
-@RunWith(JUnit4TestRunner.class)
-public class BasicNoOpResolverTest extends AbstractIntegrationTest {
-  
-  /* Use @Before not @BeforeClass so as to ensure that these resources
-   * are created in the paxweb temp directory, and not in the svn tree 
-   */
-  static boolean createdApplications = false;
-  @Before
-  public static void createApplications() throws Exception {
-    if (createdApplications) { 
-      return;
-    }
-    ZipFixture testEba = ArchiveFixture.newZip()
-      .jar("sample.jar")
-        .manifest().symbolicName("org.apache.aries.sample")
-          .attribute("Bundle-Version", "1.0.0")
-          .attribute("Import-Package", "org.apache.aries.sample")
-          .end()
-        .binary("org/apache/aries/sample/impl/HelloWorldImpl.class", 
-            BasicAppManagerTest.class.getClassLoader().getResourceAsStream("org/apache/aries/sample/impl/HelloWorldImpl.class"))
-        .binary("OSGI-INF/blueprint/sample-blueprint.xml", 
-            BasicAppManagerTest.class.getClassLoader().getResourceAsStream("basic/sample-blueprint.xml"))
-        .end();
-      
-    FileOutputStream fout = new FileOutputStream("test.eba");
-    testEba.writeOut(fout);
-    fout.close();
-    
-    ZipFixture testEba2 = testEba.binary("META-INF/APPLICATION.MF", 
-        BasicAppManagerTest.class.getClassLoader().getResourceAsStream("basic/APPLICATION.MF"))
-        .end();
-    fout = new FileOutputStream("test2.eba");
-    testEba2.writeOut(fout);
-    fout.close();
-    createdApplications = true;
-  }
-  
-  @Test
-  public void testAppWithoutApplicationManifest() throws Exception {
-    
-    AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
-    AriesApplication app = manager.createApplication(FileSystem.getFSRoot(new File("test.eba")));
-    
-    // application name should be equal to eba name since application.mf is not provided
-    assertEquals("test.eba", app.getApplicationMetadata().getApplicationName());
-    AriesApplicationContext ctx = manager.install(app);
-    ctx.start();
-    
-    HelloWorld hw = getOsgiService(HelloWorld.class);
-    String result = hw.getMessage();
-    assertEquals (result, "hello world");
-    
-    ctx.stop();
-    manager.uninstall(ctx);
-  }
-
-  @Test
-  public void testAppWithApplicationManifest() throws Exception {
-    AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
-    AriesApplication app = manager.createApplication(FileSystem.getFSRoot(new File("test2.eba")));
-    
-    // application name should equal to whatever Application name provided in the application.mf
-    assertEquals("test application 2", app.getApplicationMetadata().getApplicationName());
-    
-    AriesApplicationContext ctx = manager.install(app);
-    ctx.start();
-    
-    HelloWorld hw = getOsgiService(HelloWorld.class);
-    String result = hw.getMessage();
-    assertEquals (result, "hello world");
-    
-    ctx.stop();
-    manager.uninstall(ctx);
-  }
-
-  
-  @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] configuration() {
-    Option[] options = options(
-        // Log
-        mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-        mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-        // Felix Config Admin
-        mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
-        // Felix mvn url handler
-        mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-        // this is how you set the default log level when using pax
-        // logging (logProfile)
-        systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
-        // Bundles
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
-        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.resolver.noop"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
-        mavenBundle("org.apache.aries", "org.apache.aries.util"),
-        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"), 
-        mavenBundle("org.osgi", "org.osgi.compendium"),
-        mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
-        
-        
-        /* For debugging, uncomment the next two lines
-        vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),
-        waitForFrameworkStartup(),
-        
-        and add these imports:
-        import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
-        import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-        */
-
-        equinox().version("3.5.0"));
-    options = updateOptions(options);
-    return options;
-  }
-}
+/*
+ * 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.apache.aries.application.runtime.itests;
+
+import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationManager;
+import org.apache.aries.application.utils.filesystem.FileSystem;
+import org.apache.aries.sample.HelloWorld;
+import org.apache.aries.unittest.fixture.ArchiveFixture;
+import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
+@RunWith(JUnit4TestRunner.class)
+public class BasicNoOpResolverTest extends AbstractIntegrationTest {
+  
+  /* Use @Before not @BeforeClass so as to ensure that these resources
+   * are created in the paxweb temp directory, and not in the svn tree 
+   */
+  static boolean createdApplications = false;
+  @Before
+  public static void createApplications() throws Exception {
+    if (createdApplications) { 
+      return;
+    }
+    ZipFixture testEba = ArchiveFixture.newZip()
+      .jar("sample.jar")
+        .manifest().symbolicName("org.apache.aries.sample")
+          .attribute("Bundle-Version", "1.0.0")
+          .attribute("Import-Package", "org.apache.aries.sample")
+          .end()
+        .binary("org/apache/aries/sample/impl/HelloWorldImpl.class", 
+            BasicAppManagerTest.class.getClassLoader().getResourceAsStream("org/apache/aries/sample/impl/HelloWorldImpl.class"))
+        .binary("OSGI-INF/blueprint/sample-blueprint.xml", 
+            BasicAppManagerTest.class.getClassLoader().getResourceAsStream("basic/sample-blueprint.xml"))
+        .end();
+      
+    FileOutputStream fout = new FileOutputStream("test.eba");
+    testEba.writeOut(fout);
+    fout.close();
+    
+    ZipFixture testEba2 = testEba.binary("META-INF/APPLICATION.MF", 
+        BasicAppManagerTest.class.getClassLoader().getResourceAsStream("basic/APPLICATION.MF"))
+        .end();
+    fout = new FileOutputStream("test2.eba");
+    testEba2.writeOut(fout);
+    fout.close();
+    createdApplications = true;
+  }
+  
+  @Test
+  public void testAppWithoutApplicationManifest() throws Exception {
+    
+    AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
+    AriesApplication app = manager.createApplication(FileSystem.getFSRoot(new File("test.eba")));
+    
+    // application name should be equal to eba name since application.mf is not provided
+    assertEquals("test.eba", app.getApplicationMetadata().getApplicationName());
+    AriesApplicationContext ctx = manager.install(app);
+    ctx.start();
+    
+    HelloWorld hw = getOsgiService(HelloWorld.class);
+    String result = hw.getMessage();
+    assertEquals (result, "hello world");
+    
+    ctx.stop();
+    manager.uninstall(ctx);
+  }
+
+  @Test
+  public void testAppWithApplicationManifest() throws Exception {
+    AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
+    AriesApplication app = manager.createApplication(FileSystem.getFSRoot(new File("test2.eba")));
+    
+    // application name should equal to whatever Application name provided in the application.mf
+    assertEquals("test application 2", app.getApplicationMetadata().getApplicationName());
+    
+    AriesApplicationContext ctx = manager.install(app);
+    ctx.start();
+    
+    HelloWorld hw = getOsgiService(HelloWorld.class);
+    String result = hw.getMessage();
+    assertEquals (result, "hello world");
+    
+    ctx.stop();
+    manager.uninstall(ctx);
+  }
+
+  
+  @org.ops4j.pax.exam.junit.Configuration
+  public static Option[] configuration() {
+    Option[] options = options(
+        // Log
+        mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+        mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+        // Felix Config Admin
+        mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
+        // Felix mvn url handler
+        mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
+        // this is how you set the default log level when using pax
+        // logging (logProfile)
+        systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+        // Bundles
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
+        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.resolver.noop"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
+        mavenBundle("org.apache.aries", "org.apache.aries.util"),
+        mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint"), 
+        mavenBundle("org.osgi", "org.osgi.compendium"),
+        mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
+        
+        
+        /* For debugging, uncomment the next two lines
+        vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),
+        waitForFrameworkStartup(),
+        
+        and add these imports:
+        import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+        import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+        */
+
+        equinox().version("3.5.0"));
+    options = updateOptions(options);
+    return options;
+  }
+}

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java Thu Oct  7 10:45:50 2010
@@ -245,6 +245,8 @@ public class IsolatedRuntimeTest extends
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java Thu Oct  7 10:45:50 2010
@@ -185,6 +185,8 @@ public class MinimumImportsTest extends 
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         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.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Thu Oct  7 10:45:50 2010
@@ -169,6 +169,8 @@ public class OBRAppManagerTest extends A
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         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.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Thu Oct  7 10:45:50 2010
@@ -459,6 +459,8 @@ public class OBRResolverAdvancedTest ext
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java Thu Oct  7 10:45:50 2010
@@ -255,6 +255,8 @@ public class OBRResolverTest extends Abs
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         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.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java Thu Oct  7 10:45:50 2010
@@ -262,6 +262,8 @@ public class UpdateAppTest extends Abstr
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.api"),
         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.noop.platform.repo"),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
         mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),

Propchange: incubator/aries/trunk/application/application-noop-resolver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct  7 10:45:50 2010
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml (original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml Thu Oct  7 10:45:50 2010
@@ -28,7 +28,7 @@
         <property name="modellingHelper" ref="modellingHelper"/>
         
     </bean>
-    <reference id="platformRepository" interface="org.apache.aries.application.management.spi.repository.PlatformRepository" availability="optional"/>
+    <reference id="platformRepository" interface="org.apache.aries.application.management.spi.repository.PlatformRepository"/>
     <reference id="modellingManager" interface="org.apache.aries.application.modelling.ModellingManager"/>
     <reference id="modellingHelper" interface="org.apache.aries.application.modelling.utils.ModellingHelper"/>
     <service ref="obr-resolver" interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"/>

Modified: incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml (original)
+++ incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml Thu Oct  7 10:45:50 2010
@@ -33,8 +33,5 @@
   <service interface="org.apache.aries.application.management.spi.runtime.LocalPlatform" 
             ref="default-local-platform"
             ranking="-1" />
-  
-  <bean id="default-platform-repository" class="org.apache.aries.application.utils.runtime.DefaultPlatformRepository"/>
-  <service interface="org.apache.aries.application.management.spi.repository.PlatformRepository" ref="default-platform-repository" ranking="-1"/>
-            
+         
 </blueprint>

Propchange: incubator/aries/trunk/samples/blog/blog-itests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Oct  7 10:45:50 2010
@@ -1,3 +1,4 @@
 target
 .classpath
 .project
+.settings

Modified: incubator/aries/trunk/samples/blog/blog-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/pom.xml?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/pom.xml (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/pom.xml Thu Oct  7 10:45:50 2010
@@ -335,6 +335,16 @@
             <scope>test</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.noop.platform.repo</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
+            <scope>test</scope>
+        </dependency>
 		<dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.bundlerepository</artifactId>

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=1005403&r1=1005402&r2=1005403&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 Oct  7 10:45:50 2010
@@ -142,6 +142,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.noop.platform.repo"),
+                mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
                 mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
                 mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),

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=1005403&r1=1005402&r2=1005403&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 Oct  7 10:45:50 2010
@@ -163,6 +163,8 @@ bootDelegationPackages("javax.transactio
             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.noop.platform.repo"),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
             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" ),

Modified: incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java?rev=1005403&r1=1005402&r2=1005403&view=diff
==============================================================================
--- incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java (original)
+++ incubator/aries/trunk/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/QuiesceBlogSampleWithEbaTest.java Thu Oct  7 10:45:50 2010
@@ -1,248 +1,249 @@
-/*
- * 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.apache.aries.samples.blog.itests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-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;
-import org.apache.aries.quiesce.manager.QuiesceManager;
-
-
-
-@RunWith(JUnit4TestRunner.class)
-public class QuiesceBlogSampleWithEbaTest extends AbstractIntegrationTest {
-
-    @Test
-    public void test() throws Exception {
-	
-	/* 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);
-	AriesApplication app = manager.createApplication(urlToEba);
-	AriesApplicationContext ctx = manager.install(app);
-	ctx.start();
-
-    /* Find and check all the blog sample bundles */
-
-	Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
-    assertNotNull(bapi);
-	assertEquals(bapi.ACTIVE, bapi.getState());
-
-	Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
-    assertNotNull(bweb);
-	assertEquals(bweb.ACTIVE, bweb.getState());
-
-	Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
-    assertNotNull(bbiz);
-	assertEquals(bbiz.ACTIVE, bbiz.getState());
-
-	Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jpa");
-    assertNotNull(bper);
-	assertEquals(bper.ACTIVE, bper.getState());
- 
-    /* Datasource and transaction manager services are used by the blog sample */
-	Bundle bds = getInstalledBundle("org.apache.aries.samples.blog.datasource");
-	Bundle txs = getInstalledBundle("org.apache.aries.transaction.manager");
-
-    /*Wait for all the required services to be registered */
-    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-    waitForServices(bds, "javax.sql.XADataSource");
-    waitForServices(txs, "javax.transaction.TransactionManager");
-
-
-    /*Check that they haven't timed out trying to register*/
-	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
-	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
-
-	/*Check what services are registered - uncomment for additional debug */
-	/*
-	listBundleServices(bbiz);
-	listBundleServices(bper);
-	listBundleServices(bds);
-	listBundleServices(txs);
-    
-	System.out.println("In test and trying to get connection....");
-	*/
-
-	HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
-    String response = getHTTPResponse(conn);
-
-	/* Uncomment for additional debug */
-	/*
-	System.out.println("ZZZZZ " + response);
-    System.out.println("ZZZZZ " + conn.getResponseCode());
-    System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK);
-	*/
-
-
-    assertEquals(HttpURLConnection.HTTP_OK,
-        conn.getResponseCode());
-
-    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
-    
-    
-    //So Blog is working properly, let's quiesce it, we would expect to get a JPA and a Blueprint 
-    //participant
-    
-    QuiesceManager quiesceMgr = getOsgiService(QuiesceManager.class);
-    List<Bundle> bundleList = new ArrayList<Bundle>();
-    bundleList.add(bapi);
-    quiesceMgr.quiesce(500,bundleList);
-    Thread.sleep(1000);
-    
-    //blog api bundle should now be stopped, but others should still be running
-    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
-	assertEquals(bweb.ACTIVE, bweb.getState());
-	assertEquals(bbiz.ACTIVE, bbiz.getState());
-	assertEquals(bper.ACTIVE, bper.getState());
-	
-	bundleList.add(bweb);
-	bundleList.add(bbiz);
-	bundleList.add(bper);
-	
-	quiesceMgr.quiesce(500,bundleList);
-    Thread.sleep(1000);
-    
-    //all blog bundles should now be stopped
-    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
-    assertTrue("Blog web bundle should have been quiesced, but it's state is "+bweb.getState(), bweb.getState() != bweb.ACTIVE);
-    assertTrue("Blog biz bundle should have been quiesced, but it's state is "+bbiz.getState(), bbiz.getState() != bbiz.ACTIVE);
-    assertTrue("Blog persistence bundle should have been quiesced, but it's state is "+bper.getState(), bper.getState() != bper.ACTIVE);
-    
-    //check we can start them again after quiesce and everything works as before
-    bapi.start();
-    bweb.start();
-    bbiz.start();
-    bper.start();
-
-    /*Wait for all the required services to be registered */
-    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
-    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
-    waitForServices(bds, "javax.sql.XADataSource");
-    waitForServices(txs, "javax.transaction.TransactionManager");
-
-
-    /*Check that they haven't timed out trying to register*/
-	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
-	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
-	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
-	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
-    
-	conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
-    response = getHTTPResponse(conn);
-
-    assertEquals(HttpURLConnection.HTTP_OK,
-        conn.getResponseCode());
-
-    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
-    
-	ctx.stop();
-    manager.uninstall(ctx);
-
-    }
-
-
-    @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] configuration() {
-        Option[] options = options(
-bootDelegationPackages("javax.transaction", "javax.transaction.*"),
-			vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax
 .security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace
 ,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.Porta
 bleServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
-            // Log
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
-            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
-            // Felix mvn url handler - do we need this?
-            mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
-
-
-            // this is how you set the default log level when using pax logging (logProfile)
-            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
-
-            // Bundles
-            mavenBundle("org.eclipse.equinox", "cm"),
-            mavenBundle("org.eclipse.osgi", "services"),
-
-            mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
-            mavenBundle("org.ops4j.pax.web", "pax-web-jsp"),
-            mavenBundle("org.apache.derby", "derby"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
-
-            mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
-            mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
-            mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
-            mavenBundle("org.apache.openjpa", "openjpa"),
-            mavenBundle("commons-lang", "commons-lang"),
-            mavenBundle("commons-collections", "commons-collections"),
-            mavenBundle("commons-pool", "commons-pool"),
-            mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
-            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
-            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
-            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
-            mavenBundle("org.apache.aries", "org.apache.aries.util" ),
-            mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
-            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
-            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
-            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" ),
-            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
-            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
-            mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
-
-            
-            mavenBundle("asm", "asm-all" ),
-            equinox().version("3.5.0")
-
-        );
-        options = updateOptions(options);
-        return options;
-    }
-
-}
+/*
+ * 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.apache.aries.samples.blog.itests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationManager;
+import org.apache.aries.quiesce.manager.QuiesceManager;
+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;
+
+
+
+@RunWith(JUnit4TestRunner.class)
+public class QuiesceBlogSampleWithEbaTest extends AbstractIntegrationTest {
+
+    @Test
+    public void test() throws Exception {
+	
+	/* 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);
+	AriesApplication app = manager.createApplication(urlToEba);
+	AriesApplicationContext ctx = manager.install(app);
+	ctx.start();
+
+    /* Find and check all the blog sample bundles */
+
+	Bundle bapi = getInstalledBundle("org.apache.aries.samples.blog.api");
+    assertNotNull(bapi);
+	assertEquals(bapi.ACTIVE, bapi.getState());
+
+	Bundle bweb = getInstalledBundle("org.apache.aries.samples.blog.web");
+    assertNotNull(bweb);
+	assertEquals(bweb.ACTIVE, bweb.getState());
+
+	Bundle bbiz = getInstalledBundle("org.apache.aries.samples.blog.biz");
+    assertNotNull(bbiz);
+	assertEquals(bbiz.ACTIVE, bbiz.getState());
+
+	Bundle bper = getInstalledBundle("org.apache.aries.samples.blog.persistence.jpa");
+    assertNotNull(bper);
+	assertEquals(bper.ACTIVE, bper.getState());
+ 
+    /* Datasource and transaction manager services are used by the blog sample */
+	Bundle bds = getInstalledBundle("org.apache.aries.samples.blog.datasource");
+	Bundle txs = getInstalledBundle("org.apache.aries.transaction.manager");
+
+    /*Wait for all the required services to be registered */
+    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
+    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
+    waitForServices(bds, "javax.sql.XADataSource");
+    waitForServices(txs, "javax.transaction.TransactionManager");
+
+
+    /*Check that they haven't timed out trying to register*/
+	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
+	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
+	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
+	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
+
+	/*Check what services are registered - uncomment for additional debug */
+	/*
+	listBundleServices(bbiz);
+	listBundleServices(bper);
+	listBundleServices(bds);
+	listBundleServices(txs);
+    
+	System.out.println("In test and trying to get connection....");
+	*/
+
+	HttpURLConnection conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+    String response = getHTTPResponse(conn);
+
+	/* Uncomment for additional debug */
+	/*
+	System.out.println("ZZZZZ " + response);
+    System.out.println("ZZZZZ " + conn.getResponseCode());
+    System.out.println("ZZZZZ " + HttpURLConnection.HTTP_OK);
+	*/
+
+
+    assertEquals(HttpURLConnection.HTTP_OK,
+        conn.getResponseCode());
+
+    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
+    
+    
+    //So Blog is working properly, let's quiesce it, we would expect to get a JPA and a Blueprint 
+    //participant
+    
+    QuiesceManager quiesceMgr = getOsgiService(QuiesceManager.class);
+    List<Bundle> bundleList = new ArrayList<Bundle>();
+    bundleList.add(bapi);
+    quiesceMgr.quiesce(500,bundleList);
+    Thread.sleep(1000);
+    
+    //blog api bundle should now be stopped, but others should still be running
+    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
+	assertEquals(bweb.ACTIVE, bweb.getState());
+	assertEquals(bbiz.ACTIVE, bbiz.getState());
+	assertEquals(bper.ACTIVE, bper.getState());
+	
+	bundleList.add(bweb);
+	bundleList.add(bbiz);
+	bundleList.add(bper);
+	
+	quiesceMgr.quiesce(500,bundleList);
+    Thread.sleep(1000);
+    
+    //all blog bundles should now be stopped
+    assertTrue("Blog api bundle should have been quiesced, but it's state is "+bapi.getState(), bapi.getState() != bapi.ACTIVE);
+    assertTrue("Blog web bundle should have been quiesced, but it's state is "+bweb.getState(), bweb.getState() != bweb.ACTIVE);
+    assertTrue("Blog biz bundle should have been quiesced, but it's state is "+bbiz.getState(), bbiz.getState() != bbiz.ACTIVE);
+    assertTrue("Blog persistence bundle should have been quiesced, but it's state is "+bper.getState(), bper.getState() != bper.ACTIVE);
+    
+    //check we can start them again after quiesce and everything works as before
+    bapi.start();
+    bweb.start();
+    bbiz.start();
+    bper.start();
+
+    /*Wait for all the required services to be registered */
+    waitForServices(bbiz, "org.apache.aries.samples.blog.api.BloggingService");
+    waitForServices(bper, "org.apache.aries.samples.blog.api.persistence.BlogPersistenceService");
+    waitForServices(bds, "javax.sql.XADataSource");
+    waitForServices(txs, "javax.transaction.TransactionManager");
+
+
+    /*Check that they haven't timed out trying to register*/
+	assertTrue("No services reistered for " + bbiz.getSymbolicName(), isServiceRegistered(bbiz));
+	assertTrue("No services reistered for " + bper.getSymbolicName(), isServiceRegistered(bper));
+	assertTrue("No services reistered for " + bds.getSymbolicName(), isServiceRegistered(bds));
+	assertTrue("No services reistered for " + txs.getSymbolicName(), isServiceRegistered(txs));
+    
+	conn = makeConnection("http://localhost:8080/org.apache.aries.samples.blog.web/ViewBlog");
+    response = getHTTPResponse(conn);
+
+    assertEquals(HttpURLConnection.HTTP_OK,
+        conn.getResponseCode());
+
+    assertTrue("The response did not contain the expected content", response.contains("Blog home"));
+    
+	ctx.stop();
+    manager.uninstall(ctx);
+
+    }
+
+
+    @org.ops4j.pax.exam.junit.Configuration
+    public static Option[] configuration() {
+        Option[] options = options(
+bootDelegationPackages("javax.transaction", "javax.transaction.*"),
+			vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.callback,javax
 .security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.namespace
 ,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.Porta
 bleServer.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
+            // Log
+            mavenBundle("org.ops4j.pax.logging", "pax-logging-api"),
+            mavenBundle("org.ops4j.pax.logging", "pax-logging-service"),
+            // Felix mvn url handler - do we need this?
+            mavenBundle("org.ops4j.pax.url", "pax-url-mvn"),
+
+
+            // this is how you set the default log level when using pax logging (logProfile)
+            systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+
+            // Bundles
+            mavenBundle("org.eclipse.equinox", "cm"),
+            mavenBundle("org.eclipse.osgi", "services"),
+
+            mavenBundle("org.ops4j.pax.web", "pax-web-extender-war"),
+            mavenBundle("org.ops4j.pax.web", "pax-web-jetty-bundle"),
+            mavenBundle("org.ops4j.pax.web", "pax-web-jsp"),
+            mavenBundle("org.apache.derby", "derby"),
+            mavenBundle("org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"),
+
+            mavenBundle("org.apache.geronimo.specs", "geronimo-jta_1.1_spec"),
+            mavenBundle("org.apache.geronimo.specs", "geronimo-j2ee-connector_1.5_spec"),
+            mavenBundle("org.apache.geronimo.components", "geronimo-transaction"),
+            mavenBundle("org.apache.openjpa", "openjpa"),
+            mavenBundle("commons-lang", "commons-lang"),
+            mavenBundle("commons-collections", "commons-collections"),
+            mavenBundle("commons-pool", "commons-pool"),
+            mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
+            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
+            mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
+            mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint" ),
+            mavenBundle("org.apache.aries", "org.apache.aries.util" ),
+            mavenBundle("org.apache.aries.jndi", "org.apache.aries.jndi" ),
+            mavenBundle("org.apache.felix", "org.apache.felix.bundlerepository"),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.install" ),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.api" ),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.management" ),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.platform.repo"),
+            mavenBundle("org.apache.aries.application", "org.apache.aries.application.noop.postresolve.process"),
+            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" ),
+            mavenBundle("org.apache.aries.jpa", "org.apache.aries.jpa.container.context" ),
+            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.manager" ),
+            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.blueprint" ),
+            mavenBundle("org.apache.aries.transaction", "org.apache.aries.transaction.wrappers" ),
+            mavenBundle("org.apache.aries.samples.blog", "org.apache.aries.samples.blog.datasource" ),
+
+            
+            mavenBundle("asm", "asm-all" ),
+            equinox().version("3.5.0")
+
+        );
+        options = updateOptions(options);
+        return options;
+    }
+
+}



Mime
View raw message