incubator-aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahrw...@apache.org
Subject svn commit: r996729 [2/2] - in /incubator/aries/trunk/application: application-api/ application-api/src/main/java/org/apache/aries/application/ application-api/src/main/java/org/apache/aries/application/management/ application-api/src/main/java/org/apa...
Date Tue, 14 Sep 2010 00:29:44 GMT
Modified: incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
(original)
+++ incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
Tue Sep 14 00:29:41 2010
@@ -26,8 +26,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.VersionRange;
-import org.apache.aries.application.management.InvalidAttributeException;
 import org.apache.aries.application.modelling.ImportedPackage;
 import org.apache.aries.application.modelling.impl.ImportedPackageImpl;
 import org.apache.aries.application.modelling.internal.PackageRequirementMerger;

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
Tue Sep 14 00:29:41 2010
@@ -40,15 +40,15 @@ import java.util.Set;
 
 import org.apache.aries.application.ApplicationMetadata;
 import org.apache.aries.application.Content;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.VersionRange;
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.AriesApplicationResolver;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.InvalidAttributeException;
-import org.apache.aries.application.management.PlatformRepository;
-import org.apache.aries.application.management.RepositoryGenerator;
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.management.spi.repository.PlatformRepository;
+import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
+import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.apache.aries.application.modelling.ImportedBundle;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.modelling.utils.ModellingConstants;

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ModelledBundleResource.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ModelledBundleResource.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ModelledBundleResource.java
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ModelledBundleResource.java
Tue Sep 14 00:29:41 2010
@@ -30,7 +30,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.ExportedBundle;
 import org.apache.aries.application.modelling.ExportedPackage;
 import org.apache.aries.application.modelling.ExportedService;

Modified: incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
(original)
+++ incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
Tue Sep 14 00:29:41 2010
@@ -36,8 +36,8 @@ import javax.xml.transform.TransformerFa
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.apache.aries.application.management.RepositoryGenerator;
 import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.resolver.obr.ext.BundleResource;
 import org.apache.aries.application.resolver.obr.ext.BundleResourceTransformer;

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=996729&r1=996728&r2=996729&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
Tue Sep 14 00:29:41 2010
@@ -27,7 +27,7 @@
         <property name="platformRepository" ref="platformRepository"/>
         
     </bean>
-    <reference id="platformRepository" interface="org.apache.aries.application.management.PlatformRepository"
availability="optional"/>        
+    <reference id="platformRepository" interface="org.apache.aries.application.management.spi.repository.PlatformRepository"
availability="optional"/>        
     
     <bean id="repository-generator" class="org.apache.aries.application.resolver.obr.impl.RepositoryGeneratorImpl"
activation="lazy">
         <argument>
@@ -35,8 +35,8 @@
         </argument>
         <property name="bundleResourceTransformers" ref="bundle-resource-transformers"/>
     </bean>
-    <service id="repository-generator-service" ref="repository-generator" interface="org.apache.aries.application.management.RepositoryGenerator"/>
-    <service interface="org.apache.aries.application.management.AriesApplicationResolver"
ref="obr-resolver"/>
+    <service id="repository-generator-service" ref="repository-generator" interface="org.apache.aries.application.management.spi.repository.RepositoryGenerator"/>
+    <service interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"
ref="obr-resolver"/>
     
     <reference-list id="bundle-resource-transformers" 
       interface="org.apache.aries.application.resolver.obr.ext.BundleResourceTransformer"

Modified: incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
Tue Sep 14 00:29:41 2010
@@ -36,13 +36,13 @@ import org.apache.aries.application.Cont
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.BundleFramework;
-import org.apache.aries.application.management.BundleFrameworkFactory;
-import org.apache.aries.application.management.BundleFrameworkManager;
-import org.apache.aries.application.management.ContextException;
 import org.apache.aries.application.management.UpdateException;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
-import org.apache.aries.application.management.provider.UpdateStrategy;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkFactory;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkManager;
+import org.apache.aries.application.management.spi.repository.ContextException;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.update.UpdateStrategy;
 import org.apache.aries.application.utils.runtime.InstallUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;

Modified: incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
(original)
+++ incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
Tue Sep 14 00:29:41 2010
@@ -27,9 +27,9 @@ import org.osgi.framework.InvalidSyntaxE
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.aries.application.management.BundleFramework;
-import org.apache.aries.application.management.BundleFrameworkFactory;
-import org.apache.aries.application.management.ContextException;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkFactory;
+import org.apache.aries.application.management.spi.repository.ContextException;
 
 import static org.apache.aries.application.utils.AppConstants.LOG_ENTRY;
 import static org.apache.aries.application.utils.AppConstants.LOG_EXIT;

Modified: incubator/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
(original)
+++ incubator/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
Tue Sep 14 00:29:41 2010
@@ -25,12 +25,12 @@
       <property name="updateStrategies" ref="strategies" />
   </bean>
 
-  <service interface="org.apache.aries.application.management.BundleFrameworkManager"
+  <service interface="org.apache.aries.application.management.spi.framework.BundleFrameworkManager"
             ref="equinox-bundle-framework-manager"
             ranking="-1"/>
             
-  <reference id="bundle-framework-factory" interface="org.apache.aries.application.management.BundleFrameworkFactory"/>
+  <reference id="bundle-framework-factory" interface="org.apache.aries.application.management.spi.framework.BundleFrameworkFactory"/>
 
-  <reference-list id="strategies" interface="org.apache.aries.application.management.provider.UpdateStrategy"
availability="optional" />
+  <reference-list id="strategies" interface="org.apache.aries.application.management.spi.update.UpdateStrategy"
availability="optional" />
 
 </blueprint>

Modified: incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkFactoryImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkFactoryImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkFactoryImpl.java
Tue Sep 14 00:29:41 2010
@@ -21,8 +21,8 @@ package org.apache.aries.application.run
 
 import java.util.Properties;
 
-import org.apache.aries.application.management.BundleFramework;
-import org.apache.aries.application.management.BundleFrameworkFactory;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;

Modified: incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
Tue Sep 14 00:29:41 2010
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.BundleFramework;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.framework.BundleFramework;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: incubator/aries/trunk/application/application-runtime-framework/src/main/resources/OSGI-INF/blueprint/bundle-framework.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-framework/src/main/resources/OSGI-INF/blueprint/bundle-framework.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-framework/src/main/resources/OSGI-INF/blueprint/bundle-framework.xml
(original)
+++ incubator/aries/trunk/application/application-runtime-framework/src/main/resources/OSGI-INF/blueprint/bundle-framework.xml
Tue Sep 14 00:29:41 2010
@@ -21,7 +21,7 @@
   
   <bean id="bundle-framework-factory" class="org.apache.aries.application.runtime.framework.BundleFrameworkFactoryImpl"
/>
 
-  <service interface="org.apache.aries.application.management.BundleFrameworkFactory"
+  <service interface="org.apache.aries.application.management.spi.framework.BundleFrameworkFactory"
             ref="bundle-framework-factory"
             ranking="-1"/>
             

Modified: incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
Tue Sep 14 00:29:41 2010
@@ -36,12 +36,12 @@ import org.apache.aries.application.Depl
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.BundleFrameworkManager;
-import org.apache.aries.application.management.BundleRepositoryManager;
-import org.apache.aries.application.management.ContextException;
 import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.UpdateException;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkManager;
+import org.apache.aries.application.management.spi.repository.BundleRepositoryManager;
+import org.apache.aries.application.management.spi.repository.ContextException;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.slf4j.Logger;

Modified: incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
Tue Sep 14 00:29:41 2010
@@ -32,12 +32,12 @@ import java.util.concurrent.ConcurrentMa
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.aries.application.management.BundleFrameworkManager;
-import org.apache.aries.application.management.BundleRepositoryManager;
 import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.UpdateException;
 import org.apache.aries.application.management.AriesApplicationContext.ApplicationState;
+import org.apache.aries.application.management.spi.framework.BundleFrameworkManager;
+import org.apache.aries.application.management.spi.repository.BundleRepositoryManager;
+import org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager;
 import org.osgi.framework.BundleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
(original)
+++ incubator/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
Tue Sep 14 00:29:41 2010
@@ -24,9 +24,9 @@
     <property name="bundleRepositoryManager" ref="bundle-repository-manager"/>
   </bean>
 
-  <service interface="org.apache.aries.application.management.AriesApplicationContextManager"
ref="app-context-manager" ranking="-1"/>
+  <service interface="org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager"
ref="app-context-manager" ranking="-1"/>
     
-  <reference id="bundle-framework-manager" interface="org.apache.aries.application.management.BundleFrameworkManager"/>
-  <reference id="bundle-repository-manager" interface="org.apache.aries.application.management.BundleRepositoryManager"/>
+  <reference id="bundle-framework-manager" interface="org.apache.aries.application.management.spi.framework.BundleFrameworkManager"/>
+  <reference id="bundle-repository-manager" interface="org.apache.aries.application.management.spi.repository.BundleRepositoryManager"/>
   
 </blueprint>

Modified: incubator/aries/trunk/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
Tue Sep 14 00:29:41 2010
@@ -32,10 +32,10 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.aries.application.DeploymentContent;
-import org.apache.aries.application.management.BundleRepository;
-import org.apache.aries.application.management.BundleRepositoryManager;
-import org.apache.aries.application.management.ContextException;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.repository.BundleRepository;
+import org.apache.aries.application.management.spi.repository.BundleRepositoryManager;
+import org.apache.aries.application.management.spi.repository.ContextException;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.apache.aries.application.utils.service.ArrayServiceList;
 import org.apache.aries.application.utils.service.ServiceCollection;
 import org.osgi.framework.BundleContext;

Modified: incubator/aries/trunk/application/application-runtime-repository/src/main/resources/OSGI-INF/blueprint/repository-management.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime-repository/src/main/resources/OSGI-INF/blueprint/repository-management.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime-repository/src/main/resources/OSGI-INF/blueprint/repository-management.xml
(original)
+++ incubator/aries/trunk/application/application-runtime-repository/src/main/resources/OSGI-INF/blueprint/repository-management.xml
Tue Sep 14 00:29:41 2010
@@ -23,7 +23,7 @@
       <property name="bundleContext" ref="blueprintBundleContext"/>
   </bean>
  
-  <service interface="org.apache.aries.application.management.BundleRepositoryManager"
+  <service interface="org.apache.aries.application.management.spi.repository.BundleRepositoryManager"
             ref="equinox-bundle-repository-manager"
             ranking="-1"/>
 

Modified: incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextImpl.java
Tue Sep 14 00:29:41 2010
@@ -30,9 +30,9 @@ import org.apache.aries.application.Depl
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationResolver;
 import org.apache.aries.application.management.BundleInfo;
 import org.apache.aries.application.management.ManagementException;
+import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextManagerImpl.java
(original)
+++ incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextManagerImpl.java
Tue Sep 14 00:29:41 2010
@@ -29,10 +29,10 @@ import java.util.concurrent.ConcurrentMa
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.UpdateException;
 import org.apache.aries.application.management.AriesApplicationContext.ApplicationState;
+import org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: incubator/aries/trunk/application/application-runtime/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-runtime/src/main/resources/OSGI-INF/blueprint/app-context-management.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-runtime/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
(original)
+++ incubator/aries/trunk/application/application-runtime/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
Tue Sep 14 00:29:41 2010
@@ -23,6 +23,6 @@
     <property name="bundleContext" ref="blueprintBundleContext"/>
   </bean>
 
-  <service interface="org.apache.aries.application.management.AriesApplicationContextManager"
ref="app-context-manager" />
+  <service interface="org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager"
ref="app-context-manager" />
     
 </blueprint>

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
Tue Sep 14 00:29:41 2010
@@ -26,10 +26,10 @@ import java.util.jar.Manifest;
 
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.DeploymentMetadataFactory;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.filesystem.IFile;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.InvalidAttributeException;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.utils.manifest.ManifestProcessor;
 

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.java
Tue Sep 14 00:29:41 2010
@@ -39,10 +39,10 @@ import org.apache.aries.application.Appl
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.DeploymentMetadata;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.VersionRange;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.InvalidAttributeException;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.FilterUtils;

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=996729&r1=996728&r2=996729&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
Tue Sep 14 00:29:41 2010
@@ -21,7 +21,7 @@ package org.apache.aries.application.uti
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.aries.application.management.LocalPlatform;
+import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 
 public class DefaultLocalPlatform implements LocalPlatform {
 

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java
Tue Sep 14 00:29:41 2010
@@ -23,7 +23,7 @@ package org.apache.aries.application.uti
 import java.net.URI;
 import java.util.Collection;
 
-import org.apache.aries.application.management.PlatformRepository;
+import org.apache.aries.application.management.spi.repository.PlatformRepository;
 
 public class DefaultPlatformRepository implements PlatformRepository
 {

Modified: incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java
(original)
+++ incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java
Tue Sep 14 00:29:41 2010
@@ -24,10 +24,10 @@ import java.util.Set;
 
 import org.apache.aries.application.Content;
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.AriesApplicationResolver;
 import org.apache.aries.application.management.BundleInfo;
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.ResolverException;
+import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.osgi.framework.Version;
 

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=996729&r1=996728&r2=996729&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
Tue Sep 14 00:29:41 2010
@@ -31,13 +31,13 @@
   <bean id="default-local-platform" class="org.apache.aries.application.utils.runtime.DefaultLocalPlatform"
/>
   <bean id="no-op-resolver" class="org.apache.aries.application.utils.runtime.NoOpResolver"
/> 
  
-  <service interface="org.apache.aries.application.management.LocalPlatform" 
+  <service interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"

             ref="default-local-platform"
             ranking="-1" />
-  <service interface="org.apache.aries.application.management.AriesApplicationResolver"

+  <service interface="org.apache.aries.application.management.spi.resolve.AriesApplicationResolver"

             ref="no-op-resolver"
             ranking="-1" />
   <bean id="default-platform-repository" class="org.apache.aries.application.utils.runtime.DefaultPlatformRepository"/>
-  <service interface="org.apache.aries.application.management.PlatformRepository" ref="default-platform-repository"
ranking="-1"/>
+  <service interface="org.apache.aries.application.management.spi.repository.PlatformRepository"
ref="default-platform-repository" ranking="-1"/>
             
 </blueprint>



Mime
View raw message