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 [1/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
Author: mahrwald
Date: Tue Sep 14 00:29:41 2010
New Revision: 996729

URL: http://svn.apache.org/viewvc?rev=996729&view=rev
Log:
ARIES-404: Commit package restructuring

Added:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/InvalidAttributeException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConversion.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ConversionException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFramework.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkFactory.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepository.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepositoryManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ContextException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/PlatformRepository.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/RepositoryGenerator.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/DeploymentManifestManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/LocalPlatform.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java
      - copied, changed from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/provider/UpdateStrategy.java
Removed:
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConversion.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFramework.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkFactory.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepository.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepositoryManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ContextException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ConversionException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/DeploymentManifestManager.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/InvalidAttributeException.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/LocalPlatform.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/PlatformRepository.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/RepositoryGenerator.java
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/provider/
Modified:
    incubator/aries/trunk/application/application-api/pom.xml
    incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
    incubator/aries/trunk/application/application-converters/src/main/java/org/apache/aries/application/converters/WabConverterService.java
    incubator/aries/trunk/application/application-converters/src/main/resources/OSGI-INF/blueprint/aries.xml
    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-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java
    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/IsolatedRuntimeTest.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-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
    incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
    incubator/aries/trunk/application/application-management/src/main/resources/OSGI-INF/blueprint/app-management.xml
    incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
    incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/repository/ApplicationRepositoryTest.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ParserProxyImpl.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingManager.java
    incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingUtils.java
    incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java
    incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java
    incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/PackageRequirementMergerTest.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/OBRAriesResolver.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/ModelledBundleResource.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/java/org/apache/aries/application/resolver/obr/impl/RepositoryGeneratorImpl.java
    incubator/aries/trunk/application/application-obr-resolver/src/main/resources/OSGI-INF/blueprint/obr-resolver.xml
    incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/BundleFrameworkManagerImpl.java
    incubator/aries/trunk/application/application-runtime-framework-management/src/main/java/org/apache/aries/application/runtime/framework/management/SharedBundleFramework.java
    incubator/aries/trunk/application/application-runtime-framework-management/src/main/resources/OSGI-INF/blueprint/bundle-framework-management.xml
    incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkFactoryImpl.java
    incubator/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/BundleFrameworkImpl.java
    incubator/aries/trunk/application/application-runtime-framework/src/main/resources/OSGI-INF/blueprint/bundle-framework.xml
    incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextImpl.java
    incubator/aries/trunk/application/application-runtime-isolated/src/main/java/org/apache/aries/application/runtime/isolated/impl/ApplicationContextManagerImpl.java
    incubator/aries/trunk/application/application-runtime-isolated/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
    incubator/aries/trunk/application/application-runtime-repository/src/main/java/org/apache/aries/application/runtime/repository/BundleRepositoryManagerImpl.java
    incubator/aries/trunk/application/application-runtime-repository/src/main/resources/OSGI-INF/blueprint/repository-management.xml
    incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextImpl.java
    incubator/aries/trunk/application/application-runtime/src/main/java/org/apache/aries/application/runtime/impl/ApplicationContextManagerImpl.java
    incubator/aries/trunk/application/application-runtime/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataFactoryImpl.java
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/impl/DeploymentMetadataImpl.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/java/org/apache/aries/application/utils/runtime/DefaultPlatformRepository.java
    incubator/aries/trunk/application/application-utils/src/main/java/org/apache/aries/application/utils/runtime/NoOpResolver.java
    incubator/aries/trunk/application/application-utils/src/main/resources/OSGI-INF/blueprint/app-utils.xml

Modified: incubator/aries/trunk/application/application-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/pom.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/pom.xml (original)
+++ incubator/aries/trunk/application/application-api/pom.xml Tue Sep 14 00:29:41 2010
@@ -36,8 +36,8 @@
             org.apache.aries.application;
             org.apache.aries.application.filesystem;
             org.apache.aries.application.management;
-            org.apache.aries.application.management.provider;
-            org.apache.aries.application.modelling
+            org.apache.aries.application.management.spi.*;
+            org.apache.aries.application.modelling;
         </aries.osgi.export.pkg>
     </properties>
 

Modified: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/DeploymentMetadata.java Tue Sep 14 00:29:41 2010
@@ -26,7 +26,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.aries.application.management.InvalidAttributeException;
 import org.osgi.framework.Filter;
 import org.osgi.framework.Version;
 

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/InvalidAttributeException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/InvalidAttributeException.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/InvalidAttributeException.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/InvalidAttributeException.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application;
 
 
 

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConversion.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConversion.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConversion.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConversion.java Tue Sep 14 00:29:41 2010
@@ -17,11 +17,13 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.convert;
 
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.apache.aries.application.management.BundleInfo;
+
 /**
  * A BundleConversion represents a .JAR file which has been converted in to 
  * an well-formed OSGi bundle, or a .WAR file which has been converted into a .WAB 

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleConverter.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/BundleConverter.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.convert;
 
 import org.apache.aries.application.filesystem.IDirectory;
 import org.apache.aries.application.filesystem.IFile;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ConversionException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ConversionException.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ConversionException.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/convert/ConversionException.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.convert;
 
 /**
  * An Exception thrown by a BundleConverter

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFramework.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFramework.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFramework.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFramework.java Tue Sep 14 00:29:41 2010
@@ -17,11 +17,12 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.framework;
 
 import java.util.List;
 
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.AriesApplication;
+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;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkFactory.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkFactory.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkFactory.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkFactory.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.framework;
 
 import java.util.Properties;
 import org.osgi.framework.BundleContext;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkManager.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkManager.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleFrameworkManager.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/framework/BundleFrameworkManager.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.framework;
 
 import java.util.Collection;
 import java.util.Map;
@@ -27,7 +27,10 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.DeploymentMetadata;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.UpdateException;
+import org.apache.aries.application.management.spi.repository.ContextException;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 
 public interface BundleFrameworkManager
 {

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepository.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepository.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepository.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepository.java Tue Sep 14 00:29:41 2010
@@ -17,12 +17,13 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.repository;
 
 import java.util.Set;
 
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
+import org.apache.aries.application.management.AriesApplication;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepositoryManager.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepositoryManager.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/BundleRepositoryManager.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/BundleRepositoryManager.java Tue Sep 14 00:29:41 2010
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.repository;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.aries.application.DeploymentContent;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 
 public interface BundleRepositoryManager
 {

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ContextException.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ContextException.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/ContextException.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/ContextException.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.repository;
 
 /**
  * An exception thrown by various methods within this package.

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/PlatformRepository.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/PlatformRepository.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/PlatformRepository.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/PlatformRepository.java Tue Sep 14 00:29:41 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.repository;
 
 import java.net.URI;
 import java.util.Collection;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/RepositoryGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/RepositoryGenerator.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/RepositoryGenerator.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/repository/RepositoryGenerator.java Tue Sep 14 00:29:41 2010
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.repository;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Collection;
 
+import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.modelling.ModelledResource;
 
 public interface RepositoryGenerator

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationResolver.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/AriesApplicationResolver.java Tue Sep 14 00:29:41 2010
@@ -17,13 +17,18 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.resolve;
 
 import java.util.Collection;
 import java.util.Set;
 
 import org.apache.aries.application.ApplicationMetadata;
 import org.apache.aries.application.Content;
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationManager;
+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.modelling.ModelledResource;
 import org.osgi.framework.Version;
 

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/DeploymentManifestManager.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/DeploymentManifestManager.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/DeploymentManifestManager.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/resolve/DeploymentManifestManager.java Tue Sep 14 00:29:41 2010
@@ -16,13 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.resolve;
 
 import java.util.Collection;
 import java.util.jar.Manifest;
 
 import org.apache.aries.application.Content;
 import org.apache.aries.application.ServiceDeclaration;
+import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.ResolveConstraint;
+import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.modelling.ModelledResource;
 
 public interface DeploymentManifestManager

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/AriesApplicationContextManager.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/AriesApplicationContextManager.java Tue Sep 14 00:29:41 2010
@@ -17,11 +17,15 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.runtime;
 
 import java.util.Set;
 
 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.ManagementException;
+import org.apache.aries.application.management.UpdateException;
 import org.osgi.framework.BundleException;
 
 /**

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/LocalPlatform.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/LocalPlatform.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/LocalPlatform.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/runtime/LocalPlatform.java Tue Sep 14 00:29:41 2010
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.aries.application.management;
+package org.apache.aries.application.management.spi.runtime;
 
 import java.io.File;
 import java.io.IOException;

Copied: incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java (from r996336, incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/provider/UpdateStrategy.java)
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java?p2=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java&p1=incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/provider/UpdateStrategy.java&r1=996336&r2=996729&rev=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/provider/UpdateStrategy.java (original)
+++ incubator/aries/trunk/application/application-api/src/main/java/org/apache/aries/application/management/spi/update/UpdateStrategy.java Tue Sep 14 00:29:41 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.aries.application.management.provider;
+package org.apache.aries.application.management.spi.update;
 
 import java.util.Collection;
 import java.util.Map;
@@ -24,11 +24,11 @@ import java.util.Map;
 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.BundleRepository;
-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.spi.framework.BundleFramework;
+import org.apache.aries.application.management.spi.repository.BundleRepository;
+import org.apache.aries.application.management.spi.repository.ContextException;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.osgi.framework.Bundle;
 
 /**

Modified: incubator/aries/trunk/application/application-converters/src/main/java/org/apache/aries/application/converters/WabConverterService.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-converters/src/main/java/org/apache/aries/application/converters/WabConverterService.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-converters/src/main/java/org/apache/aries/application/converters/WabConverterService.java (original)
+++ incubator/aries/trunk/application/application-converters/src/main/java/org/apache/aries/application/converters/WabConverterService.java Tue Sep 14 00:29:41 2010
@@ -26,9 +26,9 @@ import java.util.Properties;
 import org.apache.aries.application.ApplicationMetadataFactory;
 import org.apache.aries.application.filesystem.IDirectory;
 import org.apache.aries.application.filesystem.IFile;
-import org.apache.aries.application.management.BundleConversion;
-import org.apache.aries.application.management.BundleConverter;
 import org.apache.aries.application.management.BundleInfo;
+import org.apache.aries.application.management.spi.convert.BundleConversion;
+import org.apache.aries.application.management.spi.convert.BundleConverter;
 import org.apache.aries.application.utils.management.SimpleBundleInfo;
 import org.apache.aries.application.utils.manifest.BundleManifest;
 import org.apache.aries.web.converter.WabConversion;

Modified: incubator/aries/trunk/application/application-converters/src/main/resources/OSGI-INF/blueprint/aries.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-converters/src/main/resources/OSGI-INF/blueprint/aries.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-converters/src/main/resources/OSGI-INF/blueprint/aries.xml (original)
+++ incubator/aries/trunk/application/application-converters/src/main/resources/OSGI-INF/blueprint/aries.xml Tue Sep 14 00:29:41 2010
@@ -25,7 +25,7 @@
     <property name="wabConverter" value="converterService" />
   </bean>
   
-  <service interface="org.apache.aries.application.management.BundleConverter" ref="bundleConverter">
+  <service interface="org.apache.aries.application.management.spi.convert.BundleConverter" ref="bundleConverter">
       <service-properties>
           <entry key="convert-type" value="war" />
       </service-properties>

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -43,17 +43,17 @@ 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;
-import org.apache.aries.application.management.AriesApplicationResolver;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.DeploymentManifestManager;
-import org.apache.aries.application.management.InvalidAttributeException;
-import org.apache.aries.application.management.LocalPlatform;
 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.management.spi.resolve.DeploymentManifestManager;
+import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.modelling.ExportedPackage;
 import org.apache.aries.application.modelling.ExportedService;
 import org.apache.aries.application.modelling.ImportedBundle;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -27,10 +27,10 @@
   </bean>
   
   <reference id = "modelledResourceManager" interface="org.apache.aries.application.modelling.ModelledResourceManager"/>
-  <reference id="localPlatform" interface="org.apache.aries.application.management.LocalPlatform"/>
-  <reference id="resolver" interface="org.apache.aries.application.management.AriesApplicationResolver"/>
+  <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-list id="post-resolver-transformers" interface="org.apache.aries.application.PostResolveTransformer" availability="optional"/>
   
-  <service id ="deploymentManifestManager-Service" ref="deploymentManifestManager" interface="org.apache.aries.application.management.DeploymentManifestManager"/>
+  <service id ="deploymentManifestManager-Service" ref="deploymentManifestManager" interface="org.apache.aries.application.management.spi.resolve.DeploymentManifestManager"/>
     
 </blueprint>
\ No newline at end of file

Modified: incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java (original)
+++ incubator/aries/trunk/application/application-deployment-management/src/test/java/org/apache/aries/application/deployment/management/DeploymentGeneratorTest.java Tue Sep 14 00:29:41 2010
@@ -37,15 +37,15 @@ 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.VersionRange;
 import org.apache.aries.application.deployment.management.impl.DeploymentManifestManagerImpl;
 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.LocalPlatform;
 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.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.modelling.ExportedPackage;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.modelling.utils.ModellingManager;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -24,7 +24,7 @@ import static org.ops4j.pax.exam.OptionU
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.aries.application.management.AriesApplicationResolver;
+import org.apache.aries.application.management.spi.resolve.AriesApplicationResolver;
 import org.apache.aries.blueprint.BlueprintConstants;
 import org.junit.After;
 import org.junit.Before;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -29,8 +29,8 @@ import org.apache.aries.application.Vers
 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.management.RepositoryGenerator;
 import org.apache.aries.application.management.ResolveConstraint;
+import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.runtime.itests.util.IsolationTestUtils;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -43,8 +43,8 @@ import org.apache.aries.application.file
 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.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.modelling.ModelledResourceManager;
 import org.apache.aries.application.utils.filesystem.FileSystem;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -38,8 +38,8 @@ import org.apache.aries.application.file
 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.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.modelling.ModelledResourceManager;
 import org.apache.aries.application.utils.filesystem.FileSystem;

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=996729&r1=996728&r2=996729&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 Tue Sep 14 00:29:41 2010
@@ -34,12 +34,12 @@ import org.apache.aries.application.Vers
 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.management.BundleFramework;
-import org.apache.aries.application.management.RepositoryGenerator;
 import org.apache.aries.application.management.ResolveConstraint;
 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.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.runtime.itests.util.IsolationTestUtils;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;

Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/util/IsolationTestUtils.java Tue Sep 14 00:29:41 2010
@@ -31,8 +31,8 @@ import java.util.jar.Attributes;
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.BundleRepository;
-import org.apache.aries.application.management.RepositoryGenerator;
+import org.apache.aries.application.management.spi.repository.BundleRepository;
+import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.modelling.utils.ModellingManager;
 import org.apache.aries.isolated.sample.HelloWorld;

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationImpl.java Tue Sep 14 00:29:41 2010
@@ -35,9 +35,9 @@ import org.apache.aries.application.Appl
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.BundleConversion;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.LocalPlatform;
+import org.apache.aries.application.management.spi.convert.BundleConversion;
+import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.filesystem.IOUtils;
 import org.slf4j.Logger;

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/impl/AriesApplicationManagerImpl.java Tue Sep 14 00:29:41 2010
@@ -44,22 +44,22 @@ import org.apache.aries.application.file
 import org.apache.aries.application.filesystem.IFile;
 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.AriesApplicationListener;
 import org.apache.aries.application.management.AriesApplicationManager;
-import org.apache.aries.application.management.BundleConversion;
-import org.apache.aries.application.management.BundleConverter;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.BundleRepository;
-import org.apache.aries.application.management.ConversionException;
-import org.apache.aries.application.management.DeploymentManifestManager;
-import org.apache.aries.application.management.LocalPlatform;
 import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.management.UpdateException;
 import org.apache.aries.application.management.internal.MessageUtil;
 import org.apache.aries.application.management.repository.ApplicationRepository;
+import org.apache.aries.application.management.spi.convert.BundleConversion;
+import org.apache.aries.application.management.spi.convert.BundleConverter;
+import org.apache.aries.application.management.spi.convert.ConversionException;
+import org.apache.aries.application.management.spi.repository.BundleRepository;
+import org.apache.aries.application.management.spi.resolve.DeploymentManifestManager;
+import org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager;
+import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.aries.application.utils.filesystem.IOUtils;

Modified: incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java (original)
+++ incubator/aries/trunk/application/application-management/src/main/java/org/apache/aries/application/management/repository/ApplicationRepository.java Tue Sep 14 00:29:41 2010
@@ -23,9 +23,9 @@ import java.util.Set;
 import org.apache.aries.application.Content;
 import org.apache.aries.application.DeploymentContent;
 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.BundleRepository;
+import org.apache.aries.application.management.spi.repository.BundleRepository;
+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-management/src/main/resources/OSGI-INF/blueprint/app-management.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/main/resources/OSGI-INF/blueprint/app-management.xml?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/main/resources/OSGI-INF/blueprint/app-management.xml (original)
+++ incubator/aries/trunk/application/application-management/src/main/resources/OSGI-INF/blueprint/app-management.xml Tue Sep 14 00:29:41 2010
@@ -32,11 +32,11 @@
   <reference id="app-metadata-factory" interface="org.apache.aries.application.ApplicationMetadataFactory"/>
   <reference id="deployment-metadata-factory" interface="org.apache.aries.application.DeploymentMetadataFactory"/>
   <reference-list id="bundle-converters" 
-                  interface="org.apache.aries.application.management.BundleConverter"
+                  interface="org.apache.aries.application.management.spi.convert.BundleConverter"
                   availability="optional"/>
-  <reference id="deploymentManifestManager" interface="org.apache.aries.application.management.DeploymentManifestManager"/>
-  <reference id="localPlatform" interface="org.apache.aries.application.management.LocalPlatform"/>
-  <reference id="application-context-manager" interface="org.apache.aries.application.management.AriesApplicationContextManager"/>
+  <reference id="deploymentManifestManager" interface="org.apache.aries.application.management.spi.resolve.DeploymentManifestManager"/>
+  <reference id="localPlatform" interface="org.apache.aries.application.management.spi.runtime.LocalPlatform"/>
+  <reference id="application-context-manager" interface="org.apache.aries.application.management.spi.runtime.AriesApplicationContextManager"/>
     
   <service interface="org.apache.aries.application.management.AriesApplicationManager" ref="app-manager" />
   

Modified: incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java (original)
+++ incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/impl/AriesApplicationManagerImplTest.java Tue Sep 14 00:29:41 2010
@@ -55,18 +55,18 @@ import org.apache.aries.application.impl
 import org.apache.aries.application.impl.DeploymentMetadataFactoryImpl;
 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.AriesApplicationResolver;
-import org.apache.aries.application.management.BundleConversion;
-import org.apache.aries.application.management.BundleConverter;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.ConversionException;
-import org.apache.aries.application.management.DeploymentManifestManager;
-import org.apache.aries.application.management.LocalPlatform;
 import org.apache.aries.application.management.ManagementException;
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.management.UpdateException;
+import org.apache.aries.application.management.spi.convert.BundleConversion;
+import org.apache.aries.application.management.spi.convert.BundleConverter;
+import org.apache.aries.application.management.spi.convert.ConversionException;
+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.runtime.AriesApplicationContextManager;
+import org.apache.aries.application.management.spi.runtime.LocalPlatform;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.utils.AppConstants;
 import org.apache.aries.application.utils.filesystem.FileSystem;

Modified: incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/repository/ApplicationRepositoryTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/repository/ApplicationRepositoryTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/repository/ApplicationRepositoryTest.java (original)
+++ incubator/aries/trunk/application/application-management/src/test/java/org/apache/aries/application/management/repository/ApplicationRepositoryTest.java Tue Sep 14 00:29:41 2010
@@ -26,7 +26,7 @@ import org.apache.aries.application.Vers
 import org.apache.aries.application.impl.DeploymentContentImpl;
 import org.apache.aries.application.management.AriesApplication;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
 import org.apache.aries.unittest.mocks.MethodCall;
 import org.apache.aries.unittest.mocks.Skeleton;
 import org.junit.Test;

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ExportedBundleImpl.java Tue Sep 14 00:29:41 2010
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.jar.Attributes;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.ImportedBundle;
 import org.apache.aries.application.modelling.internal.MessageUtil;
 import org.apache.aries.application.modelling.utils.ModellingConstants;

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedBundleImpl.java Tue Sep 14 00:29:41 2010
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.ImportedBundle;
 import org.apache.aries.application.modelling.Provider;
 import org.apache.aries.application.modelling.ResourceType;

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedPackageImpl.java Tue Sep 14 00:29:41 2010
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.ImportedPackage;
 import org.apache.aries.application.modelling.Provider;
 import org.apache.aries.application.modelling.ResourceType;

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ImportedServiceImpl.java Tue Sep 14 00:29:41 2010
@@ -28,7 +28,7 @@ import java.util.Hashtable;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.ImportedService;
 import org.apache.aries.application.modelling.Provider;
 import org.apache.aries.application.modelling.ResourceType;

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceImpl.java Tue Sep 14 00:29:41 2010
@@ -39,8 +39,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.jar.Attributes;
 
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.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-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java Tue Sep 14 00:29:41 2010
@@ -39,10 +39,10 @@ import java.util.jar.Attributes;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.modelling.internal.BundleBlueprintParser;
 import org.apache.aries.application.filesystem.IDirectory;
 import org.apache.aries.application.filesystem.IFile;
-import org.apache.aries.application.management.InvalidAttributeException;
 import org.apache.aries.application.modelling.ExportedService;
 import org.apache.aries.application.modelling.ImportedService;
 import org.apache.aries.application.modelling.ModelledResource;

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

Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingManager.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingManager.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingManager.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingManager.java Tue Sep 14 00:29:41 2010
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.jar.Attributes;
 
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.management.BundleInfo;
-import org.apache.aries.application.management.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-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingUtils.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingUtils.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingUtils.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/utils/ModellingUtils.java Tue Sep 14 00:29:41 2010
@@ -28,8 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+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.ImportedBundle;
 import org.apache.aries.application.modelling.ImportedPackage;
 import org.apache.aries.application.modelling.Provider;

Modified: incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/BundleResourceTest.java Tue Sep 14 00:29:41 2010
@@ -27,7 +27,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.jar.Manifest;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.modelling.ModelledResource;
 import org.apache.aries.application.modelling.ResourceType;

Modified: incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java?rev=996729&r1=996728&r2=996729&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/test/java/org/apache/aries/application/modelling/utils/DeployedBundlesTest.java Tue Sep 14 00:29:41 2010
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.jar.Attributes;
 
-import org.apache.aries.application.management.InvalidAttributeException;
+import org.apache.aries.application.InvalidAttributeException;
 import org.apache.aries.application.management.ResolverException;
 import org.apache.aries.application.modelling.ExportedService;
 import org.apache.aries.application.modelling.ImportedBundle;



Mime
View raw message