incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mnutt...@apache.org
Subject svn commit: r1022020 - in /incubator/aries/trunk/application: ./ application-default-local-platform/ application-itests/ application-itests/src/test/java/org/apache/aries/application/runtime/itests/ application-utils/src/main/java/org/apache/aries/appl...
Date Wed, 13 Oct 2010 08:11:36 GMT
Author: mnuttall
Date: Wed Oct 13 08:11:35 2010
New Revision: 1022020

URL: http://svn.apache.org/viewvc?rev=1022020&view=rev
Log:
ARIES-444: Register the default local platform service in a separate bundle rather than in
the appliation utils. From a patch by Emily Jiang.

Modified:
    incubator/aries/trunk/application/application-default-local-platform/   (props changed)
    incubator/aries/trunk/application/application-itests/pom.xml
    incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
    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-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
    incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml
    incubator/aries/trunk/application/pom.xml

Propchange: incubator/aries/trunk/application/application-default-local-platform/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Oct 13 08:11:35 2010
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=1022020&r1=1022019&r2=1022020&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Wed Oct 13 08:11:35 2010
@@ -170,6 +170,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+             <groupId>org.apache.aries.application</groupId>
+             <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+             <scope>test</scope>
+        </dependency>
+        <dependency>
         	<groupId>org.apache.aries.transaction</groupId>
         	<artifactId>org.apache.aries.transaction.blueprint</artifactId>
         	<version>0.3-incubating-SNAPSHOT</version>

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java?rev=1022020&r1=1022019&r2=1022020&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
(original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/AbstractIntegrationTest.java
Wed Oct 13 08:11:35 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.aries.application.runtime.itests;
 
-import static org.junit.Assert.assertNotNull;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
 import static org.ops4j.pax.exam.OptionUtils.combine;
@@ -24,8 +23,6 @@ import static org.ops4j.pax.exam.OptionU
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
-import org.apache.aries.blueprint.BlueprintConstants;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
@@ -36,7 +33,6 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
@@ -153,26 +149,5 @@ public class AbstractIntegrationTest {
       throw new RuntimeException(e);
     }
   }
-  
-  /**
-   * Checks if the OBR Resolver is available. If this test succeeds, it starts 
-   * the 'org.apache.aries.application.runtime' bundle. Of course this method 
-   * can only work properly if org.apache.aries.application.runtime was added
-   * to Pax Exam configuration with 'noStart()'. 
-   * @throws BundleException 
-   */
-  protected void startApplicationRuntimeBundle() throws BundleException{
-    // Need to make sure that the OBR resolver was made available. This 
-    // resolver is registered by the org.apache.aries.application.resolver.obr
-    // bundle with osgi.service.blueprint.compname=obr-resolver.
-    getOsgiService(AriesApplicationResolver.class, "(" + 
-        BlueprintConstants.COMPONENT_NAME_PROPERTY + "=obr-resolver)", 
-        DEFAULT_TIMEOUT);
-    // If we reached this point, initialization of the OBR resolver has been
-    // finished. Let's start the org.apache.aries.application.runtime bundle.
-    Bundle appRuntimeBundle = getBundle("org.apache.aries.application.runtime");
-    assertNotNull(appRuntimeBundle);
-    appRuntimeBundle.start();
-  }
-
+ 
 }
\ No newline at end of file

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -137,6 +137,7 @@ 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.default.local.platform"),
         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"),

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -137,6 +137,7 @@ public class BasicNoOpResolverTest exten
         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.default.local.platform"),
         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"),

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -247,6 +247,7 @@ public class IsolatedRuntimeTest extends
         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.default.local.platform"),
         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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -188,6 +188,7 @@ public class MinimumImportsTest extends 
         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.application", "org.apache.aries.application.default.local.platform"),
         mavenBundle("org.apache.aries", "org.apache.aries.util"),
         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/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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -112,8 +112,7 @@ public class OBRAppManagerTest extends A
 
 	  @Test
 	  public void testAppWithApplicationManifest() throws Exception {
-	    startApplicationRuntimeBundle();
-
+	    
 	    RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
 	    
 	    repositoryAdmin.addRepository(new File("repository.xml").toURI().toURL());
@@ -171,11 +170,12 @@ public class OBRAppManagerTest extends A
         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.default.local.platform"),
         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"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
 
         mavenBundle("org.osgi", "org.osgi.compendium"),

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -227,8 +227,6 @@ public class OBRResolverAdvancedTest ext
   @Test(expected=ResolverException.class)
   public void testDemoAppResolveFail() throws ResolverException, Exception
   {
-    startApplicationRuntimeBundle();
-
     generateOBRRepoXML(false, TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE
+ "_0.0.0.jar",  USE_BUNDLE_BY_REFERENCE+".jar");
     
     RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -251,8 +249,6 @@ public class OBRResolverAdvancedTest ext
   @Test
   public void testDemoApp() throws Exception 
   {
-    startApplicationRuntimeBundle();
-
     generateOBRRepoXML(false, TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE
+ ".jar", USE_BUNDLE_BY_REFERENCE+".jar");
     
     RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -328,7 +324,6 @@ public class OBRResolverAdvancedTest ext
    */
   @Test
   public void testRepo() throws Exception {
-    startApplicationRuntimeBundle();
     generateOBRRepoXML(true, REPO_BUNDLE+".jar");
     //print out the repository.xml
     BufferedReader reader = new BufferedReader(new FileReader(new File("repository.xml")));
@@ -369,7 +364,6 @@ public class OBRResolverAdvancedTest ext
   
   @Test
   public void testMutlipleServices() throws Exception{
-    startApplicationRuntimeBundle();
     generateOBRRepoXML(false, HELLO_WORLD_SERVICE_BUNDLE1 + ".jar", HELLO_WORLD_SERVICE_BUNDLE2
+ ".jar");
     
     RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -459,9 +453,10 @@ 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.default.local.platform"),
         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.runtime"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.resolver.obr"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.deployment.management"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.modeller"),

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -148,8 +148,6 @@ public class OBRResolverTest extends Abs
   @Test(expected=ResolverException.class)
   public void testBlogAppResolveFail() throws ResolverException, Exception
   {
-    startApplicationRuntimeBundle();
-
     generateOBRRepoXML(TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE
+ "_0.0.0.jar");
     
     RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -171,8 +169,6 @@ public class OBRResolverTest extends Abs
   @Test
   public void testBlogApp() throws Exception 
   {
-    startApplicationRuntimeBundle();
-
     generateOBRRepoXML(TRANSITIVE_BUNDLE_BY_REFERENCE + ".jar", CORE_BUNDLE_BY_REFERENCE
+ ".jar");
     
     RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
@@ -255,13 +251,14 @@ 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.default.local.platform"),
         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"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.management"),
-        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime").noStart(),
+        mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime"),
         mavenBundle("org.apache.aries.application", "org.apache.aries.application.runtime.itest.interfaces"),
         mavenBundle("org.osgi", "org.osgi.compendium"),
         mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -40,8 +40,8 @@ import org.apache.aries.application.mana
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.UpdateException;
 import org.apache.aries.application.management.spi.framework.BundleFramework;
-import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.apache.aries.application.management.spi.update.UpdateStrategy;
 import org.apache.aries.application.modelling.ModellingManager;
 import org.apache.aries.application.runtime.itests.util.IsolationTestUtils;
@@ -262,6 +262,7 @@ 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.default.local.platform"),
         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"),

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java?rev=1022020&r1=1022019&r2=1022020&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultLocalPlatform.java
Wed Oct 13 08:11:35 2010
@@ -1,37 +0,0 @@
-/*
- * 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.utils.runtime;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.apache.aries.application.management.spi.runtime.LocalPlatform;
-
-public class DefaultLocalPlatform implements LocalPlatform {
-
-  public File getTemporaryDirectory() throws IOException {
-    File f = File.createTempFile("ebaTmp", null);
-    f.delete();
-    f.mkdir();
-    return f;
-  } 
-  public File getTemporaryFile () throws IOException { 
-    return File.createTempFile("ebaTmp", null);
-  }
-}

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=1022020&r1=1022019&r2=1022020&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
Wed Oct 13 08:11:35 2010
@@ -25,13 +25,4 @@
   <bean id="deploymentMf-factory" class="org.apache.aries.application.impl.DeploymentMetadataFactoryImpl"
/>
   <service interface="org.apache.aries.application.DeploymentMetadataFactory" ref="deploymentMf-factory"
/>
   
-  <!-- Default implementations of services that must be implemented against a 
-       particular application server environment follow -->
-
-  <bean id="default-local-platform" class="org.apache.aries.application.utils.runtime.DefaultLocalPlatform"
/>
-  
-  <service interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"

-            ref="default-local-platform"
-            ranking="-1" />
-         
 </blueprint>

Modified: incubator/aries/trunk/application/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/pom.xml?rev=1022020&r1=1022019&r2=1022020&view=diff
==============================================================================
--- incubator/aries/trunk/application/pom.xml (original)
+++ incubator/aries/trunk/application/pom.xml Wed Oct 13 08:11:35 2010
@@ -181,21 +181,26 @@
                 <artifactId>org.apache.aries.application.modeller</artifactId>
                 <version>${project.version}</version>
             </dependency>
-<dependency>
+			<dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.resolver.noop</artifactId>
                 <version>${project.version}</version>
             </dependency>
-<dependency>
+			<dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.noop.platform.repo</artifactId>
                 <version>${project.version}</version>
             </dependency>
-<dependency>
+			<dependency>
                 <groupId>org.apache.aries.application</groupId>
                 <artifactId>org.apache.aries.application.noop.postresolve.process</artifactId>
                 <version>${project.version}</version>
             </dependency>
+			<dependency>
+                <groupId>org.apache.aries.application</groupId>
+                <artifactId>org.apache.aries.application.default.local.platform</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>
@@ -220,6 +225,7 @@
         <module>application-modeller</module>
         <module>application-noop-platform-repository</module>
 	   <module>application-noop-postresolve-process</module>
+	   <module>application-default-local-platform</module>
 
     </modules>
 



Mime
View raw message